Refined unit tests

Author: ilcato

test/src/test_CloudColor.cpp

@@ -41,46 +41,59 @@ SCENARIO("Arduino Cloud Properties ", "[ArduinoCloudThing::CloudColor]") {
 
       value_color_test.setColorRGB(128, 64, 64);
       value_color_test.getRGB(r, g, b);
-      verify = r == 128 && g == 64 && b == 64;
 
-      REQUIRE(verify);
+      REQUIRE(r == 128);
+      REQUIRE(g == 64);
+      REQUIRE(b == 64);
 
       value_color_test.setColorRGB(126, 128, 64);
       value_color_test.getRGB(r, g, b);
-      verify = r == 126 && g == 128 && b == 64;
 
-      REQUIRE(verify);
+      REQUIRE(r == 126);
+      REQUIRE(g == 128);
+      REQUIRE(b == 64);
 
       value_color_test.setColorRGB(64, 128, 64);
       value_color_test.getRGB(r, g, b);
-      verify = r == 64 && g == 128 && b == 64;
 
-      REQUIRE(verify);
+      REQUIRE(r == 64);
+      REQUIRE(g == 128);
+      REQUIRE(b == 64);
 
       value_color_test.setColorRGB(64, 64, 128);
       value_color_test.getRGB(r, g, b);
-      verify = r == 64 && g == 64 && b == 128;
 
-      REQUIRE(verify);
+      REQUIRE(r == 64);
+      REQUIRE(g == 64);
+      REQUIRE(b == 128);
 
       value_color_test.setColorRGB(255, 0, 255);
       value_color_test.getRGB(r, g, b);
-      verify = r == 255 && g == 0 && b == 255;
 
-      REQUIRE(verify);
+      REQUIRE(r == 255);
+      REQUIRE(g == 0);
+      REQUIRE(b == 255);
 
       value_color_test.setColorRGB(0, 0, 0);
       value_color_test.getRGB(r, g, b);
-      verify = r == 0 && g == 0 && b == 0;
 
-      REQUIRE(verify);
+      REQUIRE(r == 0);
+      REQUIRE(g == 0);
+      REQUIRE(b == 0);
 
       value_color_test.setColorRGB(50, 100, 20);
       value_color_test.getRGB(r, g, b);
-      verify = r == 50 && g == 100 && b == 20;
 
-      REQUIRE(verify);
+      REQUIRE(r == 50);
+      REQUIRE(g == 100);
+      REQUIRE(b == 20);
+
+      value_color_test.setColorRGB(20, 50, 70);
+      value_color_test.getRGB(r, g, b);
 
+      REQUIRE(r == 20);
+      REQUIRE(g == 50);
+      REQUIRE(b == 70);
 
     }
   }

test/src/test_decode.cpp

@@ -125,8 +125,8 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]")
       thing.decode(payload, sizeof(payload) / sizeof(uint8_t));
       Location location_compare = Location(2, 3);
       Location value_location_test = location_test.getValue();
-      bool verify = (value_location_test == location_compare);
-      REQUIRE(verify);
+      REQUIRE(value_location_test.lat == location_compare.lat);
+      REQUIRE(value_location_test.lon == location_compare.lon);
     }
   }
 
@@ -148,17 +148,10 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]")
       Color color_compare = Color(2.0, 2.0, 2.0);
       Color value_color_test = color_test.getValue();
       bool verify = (value_color_test == color_compare);
-
-      CloudColor Color_RGB = CloudColor(0.0, 0.0, 0.0);
-      Color c = Color_RGB.getValue();
-      c.setColorRGB(20, 50, 70);
-      Color_RGB = c;
-      uint8_t r, g, b;
-      c.getRGB(r, g, b);
-      bool rgb = 20 == r && 50 == g && 70 == b;
-
-      REQUIRE(rgb);
       REQUIRE(verify);
+      REQUIRE(value_color_test.hue == color_compare.hue);
+      REQUIRE(value_color_test.sat == color_compare.sat);
+      REQUIRE(value_color_test.bri == color_compare.bri);
     }
   }