Diff: testing.cpp

Revision:

50:c1f682eb4c4e

Parent:

37:2d9480c498c9

Child:

51:4a70184ff7dc

--- a/testing.cpp	Fri Jun 17 08:23:04 2016 +0000
+++ b/testing.cpp	Fri Jun 17 10:31:42 2016 +0000
@@ -17,7 +17,7 @@
 
 MOCK(temp_mock_steady, 35.0);
 MOCK(salt_mock_steady, 6.1);
-MOCK(prox_mock_steady, 10.0);
+MOCK(prox_mock_steady, 500.0);
 
 
 MOCK(temp_mock1, 40.1+(t/1000.0));
@@ -26,10 +26,10 @@
 MOCK(temp_mock2, 29.9-(t/1000.0));
 ALARM_TEST(testTempDangerousLowAlarm, temp_mock2, salt_mock_steady, prox_mock_steady, NUMBER_OF_SEC_BEFORE_CRITICAL_ALARM+1);
 
-MOCK(temp_mock3, 30+t*0.000001);
+MOCK(temp_mock3, 30+(t*0.000001));
 ALARM_TEST(testTempLowRangeAlarm, temp_mock3, salt_mock_steady, prox_mock_steady, NUMBER_OF_SEC_BEFORE_UNDESIRED_ALARM+1);
 
-MOCK(temp_mock4, 38+t*0.000001);
+MOCK(temp_mock4, 38+(t*0.000001));
 ALARM_TEST(testTempHighRangeAlarm, temp_mock4, salt_mock_steady, prox_mock_steady, NUMBER_OF_SEC_BEFORE_UNDESIRED_ALARM+1);
 
 MOCK(overflow_undesired_mock, 900+(t/4000.0));
@@ -44,19 +44,19 @@
 MOCK(leak_critical_mock, -1-(t/4000.0));
 ALARM_TEST(testAlarmWaterLeakCritical, temp_mock_steady, salt_mock_steady, leak_critical_mock, NUMBER_OF_SEC_BEFORE_UNDESIRED_ALARM+1);
 
-MOCK(salinity_mock1, 3.1+(t*0.00001));
+MOCK(salinity_mock1, 3.1+(t*0.000005));
 ALARM_TEST(testSalinityLowRangeAlarm, temp_mock_steady, salinity_mock1, prox_mock_steady, NUMBER_OF_SEC_BEFORE_UNDESIRED_ALARM+1);
 
-MOCK(salinity_mock2, 9.1+(t*0.00001));
+MOCK(salinity_mock2, 9.1+(t*0.000005));
 ALARM_TEST(testSalinityHighRangeAlarm, temp_mock_steady, salinity_mock2, prox_mock_steady, NUMBER_OF_SEC_BEFORE_UNDESIRED_ALARM+1);
 
-MOCK(salinity_mock3, 2.9-(t*0.00001));
+MOCK(salinity_mock3, 2.9-(t*0.000005));
 ALARM_TEST(testSalinityDangerousLowAlarm, temp_mock_steady, salinity_mock3, prox_mock_steady, NUMBER_OF_SEC_BEFORE_CRITICAL_ALARM+1);
 
-MOCK(salinity_mock4, 12.1+(t*0.00001));
+MOCK(salinity_mock4, 12.1+(t*0.000005));
 ALARM_TEST(testSalinityDangerousHighAlarm, temp_mock_steady, salinity_mock4, prox_mock_steady, NUMBER_OF_SEC_BEFORE_CRITICAL_ALARM+1);
 
-MOCK(temp_heating_mock, 29+0.001*t);
+MOCK(temp_heating_mock, 29+(0.001*t));
 bool testTemperatureHeater(TestCase *tc) {
     DEF_MOCKS(temp_heating_mock, salt_mock_steady, prox_mock_steady);
     PIDController pidc(false,0,&temp,&salt,&prox);
@@ -85,12 +85,12 @@
     
     START_TESTS();
     
-    TESTCASE("Test if alarm is raised when temp > 40 for 30 seconds", testTempDangerousHighAlarm);
-    TESTCASE("Test if alarm is raised when temp < 30 for 30 seconds", testTempDangerousLowAlarm);
-    TESTCASE("Test if alarm is raised when temp > 30 and < 32 for 5 minutes", testTempLowRangeAlarm);
-    TESTCASE("Test if alarm is raised when temp > 38 and < 40 for 5 minutes", testTempHighRangeAlarm);
+    //TESTCASE("Test if alarm is raised when temp > 40 for 30 seconds", testTempDangerousHighAlarm); // PASSED
+    //TESTCASE("Test if alarm is raised when temp < 30 for 30 seconds", testTempDangerousLowAlarm); // PASSED
+    //TESTCASE("Test if alarm is raised when temp > 30 and < 32 for 5 minutes", testTempLowRangeAlarm); // PASSED
+    //TESTCASE("Test if alarm is raised when temp > 38 and < 40 for 5 minutes", testTempHighRangeAlarm); // PASSED
     
-    TESTCASE("Test if alarm is raised when salinity > 3 and < 6 for 5 minutes", testSalinityLowRangeAlarm);
+    //TESTCASE("Test if alarm is raised when salinity > 3 and < 6 for 5 minutes", testSalinityLowRangeAlarm); // PASSED
     TESTCASE("Test if alarm is raised when salinity > 9 and < 12 for 5 minutes", testSalinityHighRangeAlarm);
     TESTCASE("Test if alarm is raised when salinity < 3 for 30 seconds", testSalinityDangerousLowAlarm);
     TESTCASE("Test if alarm is raised when salinity > 12 for 30 seconds", testSalinityDangerousHighAlarm);