some extra tests

Author: GreenWizard2015

controller/tea_poor/test/test_native/tests/CommandProcessor_test.h

@@ -5,6 +5,7 @@
 
 const auto VALID_POWER = "100";
 const auto INVALID_TIME_ERROR_MESSAGE = "{ \"error\": \"invalid milliseconds value\" }";
+const auto INVALID_POWER_ERROR_MESSAGE = "{ \"error\": \"invalid power value\" }";
 // test that pour_tea() method returns error message if milliseconds:
 // - greater than threshold
 // - less than 0
@@ -18,6 +19,19 @@ TEST(CommandProcessor, pour_tea_invalid_milliseconds) {
   ASSERT_EQ(commandProcessor.pour_tea("abc", VALID_POWER), INVALID_TIME_ERROR_MESSAGE);
 }
 
+// test that pour_tea() method returns error message if power:
+// - greater than 100
+// - less than 0
+// - empty string
+// - not a number
+TEST(CommandProcessor, pour_tea_invalid_power) {
+  CommandProcessor commandProcessor(123, nullptr, nullptr);
+  ASSERT_EQ(commandProcessor.pour_tea("123", "101"), INVALID_POWER_ERROR_MESSAGE);
+  ASSERT_EQ(commandProcessor.pour_tea("123", "-1"), INVALID_POWER_ERROR_MESSAGE);
+  ASSERT_EQ(commandProcessor.pour_tea("123", ""), INVALID_POWER_ERROR_MESSAGE);
+  ASSERT_EQ(commandProcessor.pour_tea("123", "abc"), INVALID_POWER_ERROR_MESSAGE);
+}
+
 // for simplicity of the UI, we should accept as valid 0 and exactly threshold value
 TEST(CommandProcessor, pour_tea_valid_boundary_values) {
   auto env = std::make_shared<FakeEnvironment>();
@@ -28,7 +42,7 @@ TEST(CommandProcessor, pour_tea_valid_boundary_values) {
   ASSERT_NE(commandProcessor.pour_tea("123", VALID_POWER), INVALID_TIME_ERROR_MESSAGE);
 }
 
-// test that start pouring tea by calling pour_tea() method and its stops after T milliseconds
+// test that start pouring tea by calling pour_tea() method with specified parameters
 TEST(CommandProcessor, pour_tea) {
   auto env = std::make_shared<FakeEnvironment>();
   env->time(2343);

controller/tea_poor/test/test_native/tests/WaterPumpScheduler_test.h

@@ -6,12 +6,13 @@
 TEST(WaterPumpScheduler, test_pump_stops_after_given_time) {
   // random time between 1 and 10 seconds
   const unsigned long runTimeMs = 1000 + (rand() % 10) * 1000;
-  IWaterPumpPtr fakeWaterPump = std::make_shared<FakeWaterPump>();
+  const auto fakeWaterPump = std::make_shared<FakeWaterPump>();
   WaterPumpScheduler waterPumpScheduler(fakeWaterPump);
   waterPumpScheduler.setup();
   // start water pump
   unsigned long currentTimeMs = 0;
   waterPumpScheduler.start(runTimeMs, 1, currentTimeMs);
+  ASSERT_EQ(fakeWaterPump->powerInPercents(), 1);
   // check status
   auto status = waterPumpScheduler.status();
   ASSERT_TRUE(status.isRunning);
@@ -29,7 +30,7 @@ TEST(WaterPumpScheduler, test_pump_stops_after_given_time) {
 
 // test that pump is periodically forced to stop after given time
 TEST(WaterPumpScheduler, test_pump_is_periodically_forced_to_stop_after_given_time) {
-  IWaterPumpPtr fakeWaterPump = std::make_shared<FakeWaterPump>();
+  const auto fakeWaterPump = std::make_shared<FakeWaterPump>();
   WaterPumpScheduler waterPumpScheduler(fakeWaterPump, 1000); // force stop each 1 second
   waterPumpScheduler.setup();
   // start water pump
@@ -42,8 +43,19 @@ TEST(WaterPumpScheduler, test_pump_is_periodically_forced_to_stop_after_given_ti
   for(int i = 0; i < 10; i++) {
     // emulate that pump was started again
     fakeWaterPump->start(1);
+    ASSERT_EQ(fakeWaterPump->powerInPercents(), 1);
     currentTimeMs += 1000;
     waterPumpScheduler.tick(currentTimeMs);
     ASSERT_FALSE(fakeWaterPump->isRunning()); // pump should be stopped
   }
+}
+
+// test that pumps power is set to specified value
+TEST(WaterPumpScheduler, test_pumps_power_is_set_to_specified_value) {
+  const auto fakeWaterPump = std::make_shared<FakeWaterPump>();
+  WaterPumpScheduler waterPumpScheduler(fakeWaterPump);
+  waterPumpScheduler.setup();
+  const int power = 23;
+  waterPumpScheduler.start(1, power, 0);
+  ASSERT_EQ(fakeWaterPump->powerInPercents(), power);
 }