Merge pull request #489 from plugwise/line-upfixtures

Implement fixture-changes from pw-beta, fix depreciation-warnings

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Ongoing
+
+- Update test-fixtures for Plugwise-beta/Core Plugwise.
+- Fix deprecation-warnings.
+
 ## v0.36.1
 
 - New Feature: For Adam, implement limited access to the gateway-modes.

fixtures/m_adam_heating/all_data.json

@@ -1,28 +1,5 @@
 {
   "devices": {
-    "01234567890abcdefghijklmnopqrstu": {
-      "available": false,
-      "dev_class": "thermo_sensor",
-      "firmware": "2020-11-04T01:00:00+01:00",
-      "hardware": "1",
-      "location": "f871b8c4d63549319221e294e4f88074",
-      "model": "Tom/Floor",
-      "name": "Tom Badkamer",
-      "sensors": {
-        "battery": 99,
-        "temperature": 18.6,
-        "temperature_difference": 2.3,
-        "valve_position": 0.0
-      },
-      "temperature_offset": {
-        "lower_bound": -2.0,
-        "resolution": 0.1,
-        "setpoint": 0.1,
-        "upper_bound": 2.0
-      },
-      "vendor": "Plugwise",
-      "zigbee_mac_address": "ABCD012345670A01"
-    },
     "056ee145a816487eaa69243c3280f8bf": {
       "available": true,
       "binary_sensors": {
@@ -139,7 +116,7 @@
         "Weekschema",
         "off"
       ],
-      "control_state": "preheating",
+      "control_state": "off",
       "dev_class": "zone_thermostat",
       "firmware": "2016-10-10T02:00:00+02:00",
       "hardware": "255",

plugwise/__init__.py

@@ -406,12 +406,12 @@ async def _smile_detect_legacy(
         """Helper-function for _smile_detect()."""
         return_model = model
         # Stretch: find the MAC of the zigbee master_controller (= Stick)
-        if network := result.find("./module/protocols/master_controller"):
+        if (network := result.find("./module/protocols/master_controller")) is not None:
             self.smile_zigbee_mac_address = network.find("mac_address").text
         # Find the active MAC in case there is an orphaned Stick
         if zb_networks := result.findall("./network"):
             for zb_network in zb_networks:
-                if zb_network.find("./nodes/network_router"):
+                if zb_network.find("./nodes/network_router") is not None:
                     network = zb_network.find("./master_controller")
                     self.smile_zigbee_mac_address = network.find("mac_address").text
 

plugwise/helper.py

@@ -349,14 +349,14 @@ def _get_module_data(
                 model_data["hardware_version"] = module.find("hardware_version").text
                 model_data["firmware_version"] = module.find("firmware_version").text
                 # Adam
-                if zb_node := module.find("./protocols/zig_bee_node"):
+                if (zb_node := module.find("./protocols/zig_bee_node")) is not None:
                     model_data["zigbee_mac_address"] = zb_node.find("mac_address").text
                     model_data["reachable"] = zb_node.find("reachable").text == "true"
                 # Stretches
-                if router := module.find("./protocols/network_router"):
+                if (router := module.find("./protocols/network_router")) is not None:
                     model_data["zigbee_mac_address"] = router.find("mac_address").text
                 # Also look for the Circle+/Stealth M+
-                if coord := module.find("./protocols/network_coordinator"):
+                if (coord := module.find("./protocols/network_coordinator")) is not None:
                     model_data["zigbee_mac_address"] = coord.find("mac_address").text
 
         return model_data
@@ -420,7 +420,7 @@ def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch:
 
             # Adam: look for the ZigBee MAC address of the Smile
             if self.smile(ADAM) and (
-                found := self._modules.find(".//protocols/zig_bee_coordinator")
+                (found := self._modules.find(".//protocols/zig_bee_coordinator")) is not None
             ):
                 appl.zigbee_mac = found.find("mac_address").text
 
@@ -1490,7 +1490,7 @@ def _schedules(self, location: str) -> tuple[list[str], str]:
             name = self._domain_objects.find(f'./rule[@id="{rule_id}"]/name').text
             locator = f'./rule[@id="{rule_id}"]/directives'
             # Show an empty schedule as no schedule found
-            if not self._domain_objects.find(locator):
+            if self._domain_objects.find(locator) is None:
                 continue  # pragma: no cover
 
             available.append(name)

scripts/manual_fixtures.py

@@ -188,6 +188,7 @@ def json_writer(
 m_adam_heating["devices"]["ad4838d7d35c4d6ea796ee12ae5aedf8"][
     "control_state"
 ] = "preheating"
+
 m_adam_heating["devices"]["ad4838d7d35c4d6ea796ee12ae5aedf8"]["mode"] = "heat"
 
 # Back at ad48
@@ -208,6 +209,10 @@ def json_writer(
     "setpoint"
 ] = 15.0
 
+m_adam_heating["devices"]["e2f4322d57924fa090fbbc48b3a140dc"][
+    "control_state"
+] = "off"
+
 m_adam_heating["devices"]["e2f4322d57924fa090fbbc48b3a140dc"]["sensors"][
     "setpoint"
 ] = 15.0
@@ -246,35 +251,6 @@ def json_writer(
     "resolution": 0.01,
 }
 
-# Add a non-existing device for testing device-removal
-m_adam_heating["devices"].update(
-    {
-        "01234567890abcdefghijklmnopqrstu": {
-            "available": False,
-            "dev_class": "thermo_sensor",
-            "firmware": "2020-11-04T01:00:00+01:00",
-            "hardware": "1",
-            "location": "f871b8c4d63549319221e294e4f88074",
-            "model": "Tom/Floor",
-            "name": "Tom Badkamer",
-            "sensors": {
-                "battery": 99,
-                "temperature": 18.6,
-                "temperature_difference": 2.3,
-                "valve_position": 0.0,
-            },
-            "temperature_offset": {
-                "lower_bound": -2.0,
-                "resolution": 0.1,
-                "setpoint": 0.1,
-                "upper_bound": 2.0,
-            },
-            "vendor": "Plugwise",
-            "zigbee_mac_address": "ABCD012345670A01",
-        }
-    }
-)
-
 json_writer("m_adam_heating", m_adam_heating, m_adam_cooling_device_list, base_n)
 
 ### ANNA