Diff: testing.cpp

Revision:

51:4a70184ff7dc

Parent:

50:c1f682eb4c4e

Child:

52:eaddbde192f1

--- a/testing.cpp	Fri Jun 17 10:31:42 2016 +0000
+++ b/testing.cpp	Fri Jun 17 11:02:01 2016 +0000
@@ -42,7 +42,7 @@
 ALARM_TEST(testAlarmWaterLeakUndesired, temp_mock_steady, salt_mock_steady, leak_undesired_mock, NUMBER_OF_SEC_BEFORE_UNDESIRED_ALARM+1);
 
 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);
+ALARM_TEST(testAlarmWaterLeakCritical, temp_mock_steady, salt_mock_steady, leak_critical_mock, NUMBER_OF_SEC_BEFORE_CRITICAL_ALARM+1);
 
 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);
@@ -71,10 +71,10 @@
     
     pidc.run();
     tc->assert(pidc.is_heating(), "PIDController should be heating at temp=31!");
-    Thread::wait(1500);
+    Thread::wait(2500);
     
     pidc.run();
-    tc->assert(!pidc.is_heating(), "PIDController shouldn't be heating at temp=32.5!");
+    tc->assert(!pidc.is_heating(), "PIDController shouldn't be heating at temp=33.5!");
     
     return true;    
 }
@@ -85,22 +85,22 @@
     
     START_TESTS();
     
-    //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 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); // 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);
+    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); // PASSED
+    TESTCASE("Test if alarm is raised when salinity < 3 for 30 seconds", testSalinityDangerousLowAlarm); // PASSED
+    TESTCASE("Test if alarm is raised when salinity > 12 for 30 seconds", testSalinityDangerousHighAlarm); // PASSED
     
-    TESTCASE("Test if heater gets enabled at < 32 and disabled at 32+", testTemperatureHeater);
+    TESTCASE("Test if heater gets enabled at < 32 and disabled at 33+", testTemperatureHeater); // PASSED
     
-    TESTCASE("Test if alarm is raised when water tank level in range 900-1000 ml for 5 minutes", testAlarmWaterOverflowUndesired);
-    TESTCASE("Test if alarm is raised when water tank level is 1001 for 30 seconds", testAlarmWaterOverflowCritical);
-    TESTCASE("Test if alarm is raised when water tank level is in range 0-100 ml for 5 minutes", testAlarmWaterLeakUndesired);
-    TESTCASE("Test if alarm is raised when water tank level is < 0 for 30 seconds", testAlarmWaterLeakCritical);
+    TESTCASE("Test if alarm is raised when water tank level in range 900-1000 ml for 5 minutes", testAlarmWaterOverflowUndesired); // PASSED
+    TESTCASE("Test if alarm is raised when water tank level is 1001 for 30 seconds", testAlarmWaterOverflowCritical); // PASSED
+    TESTCASE("Test if alarm is raised when water tank level is in range 0-100 ml for 5 minutes", testAlarmWaterLeakUndesired); // PASSED
+    TESTCASE("Test if alarm is raised when water tank level is < 0 for 30 seconds", testAlarmWaterLeakCritical); // PASSED
     
     END_TESTS();