Diff: testing.cpp

Revision:

61:6b5c2ddcea0c

Parent:

60:17e0a8e2be4a

Child:

68:b769c0f23406

--- a/testing.cpp	Sun Jun 19 23:00:18 2016 +0000
+++ b/testing.cpp	Sun Jun 19 23:07:21 2016 +0000
@@ -1,7 +1,7 @@
 #include "mbed.h"
 
 #include "MockSensorController.h"
-#include "AlarmController.h"
+#include "SensorAlarmController.h"
 #include "PIDController.h"
 #include "testing.h"
 
@@ -60,26 +60,25 @@
     PIDController pidc(false,0,&temp,&salt,&prox);
     
     pidc.run();
-    tc->assert(pidc.is_heating(), "PIDController should be heating at temp=29!");
+    tc->assert(pidc.isHeating(), "PIDController should be heating at temp=29!");
     Thread::wait(1000);
     
     pidc.run();
-    tc->assert(pidc.is_heating(), "PIDController should be heating at temp=30!");
+    tc->assert(pidc.isHeating(), "PIDController should be heating at temp=30!");
     Thread::wait(1000);
     
     pidc.run();
-    tc->assert(pidc.is_heating(), "PIDController should be heating at temp=31!");
+    tc->assert(pidc.isHeating(), "PIDController should be heating at temp=31!");
     Thread::wait(2500);
     
     pidc.run();
-    tc->assert(!pidc.is_heating(), "PIDController shouldn't be heating at temp=33.5!");
+    tc->assert(!pidc.isHeating(), "PIDController shouldn't be heating at temp=33.5!");
     
     return true;    
 }
 
 
-
-int test_main() {
+int testMain() {
     
     START_TESTS();