Diff: testing.cpp

Revision:

30:cf12566013a5

Parent:

28:f4a4ee58d57e

Child:

31:1c50d2d8c155

--- a/testing.cpp	Tue Jun 14 09:57:44 2016 +0000
+++ b/testing.cpp	Tue Jun 14 10:26:03 2016 +0000
@@ -18,63 +18,30 @@
 MOCK(salt_mock_steady, 6.1);
 MOCK(prox_mock_steady, 10.0);
 
+
 MOCK(temp_mock1, 40.1+(t/1000.0));
-bool testTempDangerousHighAlarm(TestCase *tc) {
-    
-    DEF_MOCKS(temp_mock1, salt_mock_steady, prox_mock_steady);
-    
-    AlarmController alarm(false,0,&temp,&salt,&prox);
-    for(int i = 0; i < NUMBER_OF_SEC_BEFORE_CRITICAL_ALARM+1; i++) {
-        alarm.run();
-        Thread::wait(1000);
-    }
-    
-    return alarm.is_error();    
-}
-
+ALARM_TEST(testTempDangerousHighAlarm, temp_mock1, salt_mock_steady, prox_mock_steady, NUMBER_OF_SEC_BEFORE_CRITICAL_ALARM+1);
 
 MOCK(temp_mock2, 29.9-(t/1000.0));
-bool testTempDangerousLowAlarm(TestCase *tc) {
-    
-    DEF_MOCKS(temp_mock2, salt_mock_steady, prox_mock_steady);
-    
-    AlarmController alarm(false,0,&temp,&salt,&prox);
-    for(int i = 0; i < NUMBER_OF_SEC_BEFORE_CRITICAL_ALARM+1; i++) {
-        alarm.run();
-        Thread::wait(1000);
-    }
-    
-    return alarm.is_error();    
-}
+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);
-bool testTempLowRangeAlarm(TestCase *tc) {
-    
-    DEF_MOCKS(temp_mock3, salt_mock_steady, prox_mock_steady);
-    
-    AlarmController alarm(false,0,&temp,&salt,&prox);
-    for(int i = 0; i < NUMBER_OF_SEC_BEFORE_UNDESIRED_ALARM+1; i++) {
-        alarm.run();
-        Thread::wait(1000);
-    }
-    
-    return alarm.is_error();    
-}
-
+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);
-bool testTempHighRangeAlarm(TestCase *tc) {
-    
-    DEF_MOCKS(temp_mock4, salt_mock_steady, prox_mock_steady);
-    
-    AlarmController alarm(false,0,&temp,&salt,&prox);
-    for(int i = 0; i < NUMBER_OF_SEC_BEFORE_UNDESIRED_ALARM+1; i++) {
-        alarm.run();
-        Thread::wait(1000);
-    }
-    
-    return alarm.is_error();    
-}
+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));
+ALARM_TEST(testAlarmWaterOverflowUndesired, temp_mock_steady, salt_mock_steady, overflow_undesired_mock, NUMBER_OF_SEC_BEFORE_UNDESIRED_ALARM+1);
+
+MOCK(overflow_critical_mock, 1001+(t/4000.0));
+ALARM_TEST(testAlarmWaterOverflowCritical, temp_mock_steady, salt_mock_steady, overflow_critical_mock, NUMBER_OF_SEC_BEFORE_CRITICAL_ALARM+1);
+
+MOCK(leak_undesired_mock, 1+(t/4000.0));
+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);
 
 
 bool testTemperatureHeater(TestCase *tc) {
@@ -82,33 +49,13 @@
     return true;    
 }
 
-MOCK(overflow_undesired_mock, 900+(t/4000.0));
-bool testAlarmWaterOverflowUndesired(TestCase *tc) {
-    DEF_MOCKS(temp_mock_steady, salt_mock_steady, overflow_undesired_mock);
-    
-    AlarmController alarm(false,0,&temp,&salt,&prox);
-    for(int i = 0; i < NUMBER_OF_SEC_BEFORE_UNDESIRED_ALARM+1; i++) {
-        alarm.run();
-        Thread::wait(1000);
-    }
-    
-    return alarm.is_error(); 
-}
+
+
+
 
-bool testAlarmWaterOverflowCritical(TestCase *tc) {
-    // TODO 1001 should raise alarm in 30 sec
-    return true;    
-}
+
 
-bool testAlarmWaterLeakUndesired(TestCase *tc) {
-    // TODO 0-100 ml for 5 minutes
-    return true;    
-}
 
-bool testAlarmWaterLeakCritical(TestCase *tc) {
-    // TODO 0 ml should produce alarm in 30 sec
-    return true;   
-}
 
 int test_main() {
     TestCase("Test if alarm is raised when temp > 40 for 30 seconds", testTempDangerousHighAlarm);
@@ -117,5 +64,10 @@
     TestCase("Test if alarm is raised when temp > 38 and < 40 for 300 seconds", testTempHighRangeAlarm);
     //TestCase("Test if heater gets enabled at < 32 and disabled at 32+", testTemperatureHeater);
     
+    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);
+    
     return 0;
 }
\ No newline at end of file