Add test for shared device state, fix request paths with shared state.

Jojo-1000 · Moritz Wirger
1 parent c04fb6a0
Showing 5 changed files with 44 additions and 7 deletions
include/hueplusplus/BaseDevice.h
src/BaseDevice.cpp
src/Sensor.cpp
test/test_BaseDevice.cpp
test/test_Bridge.cpp
@@ -145,7 +145,6 @@ protected:
 protected:
     int id; //!< holds the id of the device
-    std::string path; //!< holds the path of the device
     APICache state; //!< holds the current state of the device
 };
 } // namespace hueplusplus
@@ -97,7 +97,7 @@ BaseDevice::BaseDevice(int id, const std::shared_ptr&lt;APICache&gt;&amp; baseCache)
 BaseDevice::BaseDevice(
     int id, const HueCommandAPI& commands, const std::string& path, std::chrono::steady_clock::duration refreshDuration, const nlohmann::json& currentState)
-    : id(id), path(path), state(path + std::to_string(id), commands, refreshDuration, currentState)
+    : id(id), state(path + std::to_string(id), commands, refreshDuration, currentState)
 {
     // Initialize value if not null
     state.getValue();
@@ -105,7 +105,7 @@ BaseDevice::BaseDevice(
 nlohmann::json BaseDevice::sendPutRequest(const std::string& subPath, const nlohmann::json& request, FileInfo fileInfo)
 {
-    return state.getCommandAPI().PUTRequest(path + std::to_string(id) + subPath, request, std::move(fileInfo));
+    return state.getCommandAPI().PUTRequest(state.getRequestPath() + subPath, request, std::move(fileInfo));
 }
 void BaseDevice::refresh(bool force)
@@ -205,7 +205,7 @@ void Sensor::setStateAttribute(const std::string&amp; key, const nlohmann::json&amp; val
 std::string Sensor::getStateAddress(const std::string& key) const
 {
-    return path + "/state/" + key;
+    return state.getRequestPath() + "/state/" + key;
 }
 nlohmann::json Sensor::getConfig() const
@@ -122,4 +122,4 @@ TEST_F(BaseDeviceTest, setName)
     EXPECT_CALL(*handler, PUTJson("/api/" + getBridgeUsername() + path + "1/name", request, getBridgeIp(), getBridgePort()))
         .WillOnce(Return(response));
     EXPECT_TRUE(device.setName(name));
-}
 \ No newline at end of file
+}
@@ -265,7 +265,7 @@ TEST(Bridge, getLight)
         *handler, GETJson("/api/" + getBridgeUsername(), nlohmann::json::object(), getBridgeIp(), getBridgePort()))
         .Times(1)
         .WillOnce(Return(hue_bridge_state));
-    
+
     // Refresh cache
     test_bridge = Bridge(getBridgeIp(), getBridgePort(), getBridgeUsername(), handler);
@@ -281,6 +281,45 @@ TEST(Bridge, getLight)
     EXPECT_EQ(test_light_1.getColorType(), ColorType::TEMPERATURE);
 }
+TEST(Bridge, SharedState)
+{
+    using namespace ::testing;
+    std::shared_ptr<MockHttpHandler> handler = std::make_shared<MockHttpHandler>();
+
+    nlohmann::json hue_bridge_state {{"lights",
+        {{"1",
+            {{"state",
+                 {{"on", true}, {"bri", 254}, {"ct", 366}, {"alert", "none"}, {"colormode", "ct"},
+                     {"reachable", true}}},
+                {"swupdate", {{"state", "noupdates"}, {"lastinstall", nullptr}}}, {"type", "Color temperature light"},
+                {"name", "Hue ambiance lamp 1"}, {"modelid", "LTW001"}, {"manufacturername", "Philips"},
+                {"uniqueid", "00:00:00:00:00:00:00:00-00"}, {"swversion", "5.50.1.19085"}}}}}};
+
+    EXPECT_CALL(
+        *handler, GETJson("/api/" + getBridgeUsername(), nlohmann::json::object(), getBridgeIp(), getBridgePort()))
+        .Times(1)
+        .WillOnce(Return(hue_bridge_state));
+    Bridge test_bridge(getBridgeIp(), getBridgePort(), getBridgeUsername(), handler, std::chrono::seconds(10), true);
+
+    // Test when correct data is sent
+    Light test_light_1 = test_bridge.lights().get(1);
+
+    Light test_light_copy = test_bridge.lights().get(1);
+    const std::string newName = "New light name";
+    EXPECT_CALL(*handler, PUTJson("/api/" + getBridgeUsername() + "/lights/1/name", _, getBridgeIp(), getBridgePort()))
+        .WillOnce(Return(nlohmann::json({{"success", {{{"/lights/1/name", newName}}}}})));
+    test_light_1.setName(newName);
+    hue_bridge_state["lights"]["1"]["name"] = newName;
+
+    EXPECT_CALL(*handler,
+        GETJson("/api/" + getBridgeUsername() + "/lights/1", nlohmann::json::object(), getBridgeIp(), getBridgePort()))
+        .Times(1)
+        .WillOnce(Return(hue_bridge_state["lights"]["1"]));
+    test_light_1.refresh(true);
+
+    EXPECT_EQ(newName, test_light_copy.getName());
+}
+
 TEST(Bridge, removeLight)
 {
     using namespace ::testing;
@@ -396,7 +435,6 @@ TEST(Bridge, getGroup)
         .Times(1)
         .WillOnce(Return(hue_bridge_state));
-
     // Refresh cache
     test_bridge = Bridge(getBridgeIp(), getBridgePort(), getBridgeUsername(), handler);