Rewored the thermostat tests

whatisbyandby · Jul 6, 2024 · b2fd40f · b2fd40f
1 parent 3bb09d3
commit b2fd40f
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 174 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -79,7 +79,6 @@ int main()
     context.repl = &repl;
     context.thermostat = &thermostat;
 
-
     ThermostatError err = context.initialize();
 
 

diff --git a/src/subscriber/subscriber.cpp b/src/subscriber/subscriber.cpp
diff --git a/src/subscriber/subscriber.hpp b/src/subscriber/subscriber.hpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -21,5 +21,4 @@ add_subdirectory(logging)
 add_subdirectory(json)
 add_subdirectory(repl)
 add_subdirectory(producer)
-add_subdirectory(subscriber)
 add_subdirectory(wifi)
diff --git a/test/mocks/mock_mqtt.cpp b/test/mocks/mock_mqtt.cpp
@@ -28,10 +28,12 @@ ThermostatError Mqtt::publish(const char *topic, char *message)
         .returnIntValueOrDefault(THERMOSTAT_OK);
 }
 
-ThermostatError Mqtt::subscribe(const char *topic)
+ThermostatError Mqtt::subscribe(const char *topic, CommandCallback callback, void *arg)
 {
     return (ThermostatError) mock()
         .actualCall("Mqtt::subscribe")
         .withStringParameter("topic", topic)
+        .withPointerParameter("callback", (void *)(ThermostatCommand*(*)(ThermostatCommand*, void *))callback)
+        .withPointerParameter("arg", arg)
         .returnIntValueOrDefault(THERMOSTAT_OK);
 }
diff --git a/test/subscriber/CMakeLists.txt b/test/subscriber/CMakeLists.txt
diff --git a/test/subscriber/test_subscriber.cpp b/test/subscriber/test_subscriber.cpp
diff --git a/test/subscriber/test_subscriber_main.cpp b/test/subscriber/test_subscriber_main.cpp
diff --git a/test/thermostat/test_thermostat.cpp b/test/thermostat/test_thermostat.cpp
@@ -8,21 +8,19 @@
 #include <iostream>
 
 static Thermostat *thermostat;
-static ThermostatContext *context;
 static TemperatureController *tempController;
 static EnvironmentSensor *sensor;
+static Hvac *hvac;
 
 TEST_GROUP(ThermostatTestGroup){
     void setup(){
       thermostat = new Thermostat();
-      context = new ThermostatContext();
       tempController = new TemperatureController();
       sensor = new EnvironmentSensor();
+      hvac = new Hvac();
 
-      context->sensor = sensor;
-      context->tempController = tempController;
 
-      thermostat->initialize(context);
+      thermostat->initialize(sensor, tempController, hvac);
 
 
 }
@@ -32,9 +30,9 @@ void teardown()
    mock().checkExpectations();
    mock().clear();
    delete thermostat;
-   delete context;
    delete tempController;
    delete sensor;
+   delete hvac;
 
 }
 }
@@ -178,7 +176,7 @@ TEST(ThermostatTestGroup, UpdateThermostat_ExpectHeaterOn_UnderTemp)
 {
 
    thermostat->setMode(HEAT);
-   context->tempController->setTargetTemperature(25.0);
+   tempController->setTargetTemperature(25.0);
 
    double temperature = 20.0;
    double humidity = 50.0;
@@ -205,7 +203,7 @@ TEST(ThermostatTestGroup, UpdateThermostat_ExpectHeaterOn_InRange)
 {
 
    thermostat->setMode(HEAT);
-   context->tempController->setTargetTemperature(20);
+   tempController->setTargetTemperature(20);
 
    double temperature = 19.9;
    double humidity = 50.0;
@@ -232,7 +230,7 @@ TEST(ThermostatTestGroup, UpdateThermostat_ExpectAllOff_OverTemp)
 {
 
    thermostat->setMode(HEAT);
-   context->tempController->setTargetTemperature(20);
+   tempController->setTargetTemperature(20);
 
    double temperature = 20.1;
    double humidity = 50.0;
@@ -261,8 +259,8 @@ TEST(ThermostatTestGroup, GetState)
    thermostat->setTemperatureUnits(FAHRENHEIT);
    thermostat->setTargetTemperature(68.0);
 
-   context->tempController->setTargetTemperature(20);
-   context->tempController->setTemperatureRange(1.0);
+   tempController->setTargetTemperature(20);
+   tempController->setTemperatureRange(1.0);
 
    mock().expectOneCall("HVAC::getCurrentState").andReturnValue(HEATING);
 

diff --git a/test/thermostat/test_thermostat_controller.cpp b/test/thermostat/test_thermostat_controller.cpp
@@ -5,7 +5,6 @@
 
 static Thermostat *thermostat;
 static TemperatureController *tempController;
-static ThermostatContext *context;
 
 TEST_GROUP(ThermostatControllerTestGroup)
 {
@@ -14,10 +13,8 @@ TEST_GROUP(ThermostatControllerTestGroup)
         tempController = new TemperatureController();
         thermostat = new Thermostat();
 
-        context = new ThermostatContext();
-        context->tempController = tempController;
 
-        thermostat->initialize(context);
+        thermostat->initialize(NULL, tempController, NULL);
     }
 
     void teardown()
@@ -26,7 +23,6 @@ TEST_GROUP(ThermostatControllerTestGroup)
         mock().clear();
         delete thermostat;
         delete tempController;
-        delete context;
     }
 };
 

diff --git a/test/thermostat/test_thermostat_init.cpp b/test/thermostat/test_thermostat_init.cpp
@@ -7,12 +7,18 @@
 #include <iostream>
 
 static Thermostat *thermostat;
-static ThermostatContext *context;
+static EnvironmentSensor *environmentSensor;
+static TemperatureController *tempController;
+static Hvac *hvac;
 
 TEST_GROUP(ThermostatTestGroupInit){
     void setup(){
-      ThermostatContext newCtx;
-      context = &newCtx;
+         environmentSensor = new EnvironmentSensor();
+         tempController = new TemperatureController();
+         hvac = new Hvac();
+         thermostat = new Thermostat();
+         thermostat->initialize(environmentSensor, tempController, hvac);
+
 
 }
 
@@ -21,6 +27,10 @@ void teardown()
 
    mock().checkExpectations();
    mock().clear();
+   delete thermostat;
+   delete environmentSensor;
+   delete tempController;
+   delete hvac;
 }
 }
 ;
@@ -29,7 +39,7 @@ TEST(ThermostatTestGroupInit, ThermostatInitalize)
 {
 
    Thermostat *testInit = new Thermostat();
-   ENUMS_EQUAL_INT(THERMOSTAT_OK, testInit->initialize(context));
+   ENUMS_EQUAL_INT(THERMOSTAT_OK, testInit->initialize(environmentSensor, tempController, hvac));
    CHECK_TRUE(testInit->isInitialized());
    delete testInit;
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -79,7 +79,6 @@ int main()
		context.repl = &repl;
		context.thermostat = &thermostat;


		ThermostatError err = context.initialize();


Expand Down