Diff: testing.cpp

Revision:

71:38bb6bf09933

Parent:

68:b769c0f23406

--- a/testing.cpp	Mon Jun 20 13:31:09 2016 +0000
+++ b/testing.cpp	Tue Jun 21 12:09:12 2016 +0000
@@ -87,12 +87,19 @@
 MOCK(vol_mock1, 600.0f);
 
 bool testPumps1(TestCase *tc) {
-    DEF_MOCKS(temp_mock_steady, salinity_mock5, vol_mock1);
+    
+    Thread::wait(5000);
+    
+    DEF_MOCKS(temp_mock_steady, salinity_mock11, vol_mock1);
     PIDController pidc(false,0,&temp,&salt,&prox);
     
+    temp.run();
+    salt.run();
+    prox.run();
+    
     pidc.run();
     
-    cout << "Manually verify the amount of salty water pumped for 1.0f salt and 600ml volume\r\n";
+    printf("Manually verify the amount of salty water pumped for 2.0f salt and 600ml volume\r\n");
     
     Thread::wait(5000);
     
@@ -107,7 +114,7 @@
     
     START_TESTS();
     
-    TESTCASE("Test if alarm is raised when temp > 40 for 30 seconds", testTempDangerousHighAlarm);
+    /*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);
@@ -123,7 +130,7 @@
     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 pump at 1.0f ppt salinity and 600ml volume", testPumps1);
     
     END_TESTS();