Merge pull request #184 from plugwise/fix_test

Fix missing Circle +

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# v0.17.8: Smile: Bugfix, improve testing
+- Fix https://github.com/plugwise/plugwise-beta/issues/277
+- Improve incorrect test-case validation
+
 # v0.17.7: Smile: Corrections, fixes, clean up
 - Move compressor_state into binary_sensors
 - Adam: add missing zigbee_mac to wireless thermostats

plugwise/__init__.py

@@ -1,6 +1,6 @@
 """Plugwise module."""
 
-__version__ = "0.17.7"
+__version__ = "0.17.8"
 
 from plugwise.smile import Smile
 from plugwise.stick import Stick

plugwise/helper.py

@@ -446,6 +446,9 @@ def _get_module_data(
                 # Stretches
                 if found := module.find("./protocols/network_router"):
                     model_data["zigbee_mac_address"] = found.find("mac_address").text
+                # Also look for the Circle+/Stealth M+
+                if found := module.find("./protocols/network_coordinator"):
+                    model_data["zigbee_mac_address"] = found.find("mac_address").text
 
         return model_data
 

tests/test_smile.py

@@ -401,8 +401,8 @@ async def device_test(self, smile=pw_smile.Smile, testdata=None):
         asserts = 0
         for testdevice, measurements in testdata.items():
             tests += 1
-            asserts += 1
             assert testdevice in device_list
+            asserts += 1
             # if testdevice not in device_list:
             #    _LOGGER.info("Device {} to test against {} not found in device_list for {}".format(testdevice,measurements,self.smile_setup))
             # else:
@@ -431,10 +431,9 @@ async def device_test(self, smile=pw_smile.Smile, testdata=None):
                                     if key_1 != key_2:
                                         continue
 
-                                    asserts += 1
                                     assert val_1 == val_2
+                                    asserts += 1
                         else:
-                            asserts += 1
                             # The schedule temperature changes accordung to the set schedule,
                             # so the value can differ when testing at different times during the day.
                             if measure_key == "schedule_temperature":
@@ -443,12 +442,15 @@ async def device_test(self, smile=pw_smile.Smile, testdata=None):
                                 )
                                 if measure_assert is not None:
                                     assert isinstance(dev_data[measure_key], float)
+                                    asserts += 1
                                 else:  # edge-case: schedule_temperature = None
                                     assert (
                                         dev_data[measure_key] == measure_assert
                                     )  # pragma: no cover
+                                    asserts += 1
                             else:
                                 assert dev_data[measure_key] == measure_assert
+                                asserts += 1
 
         assert tests == asserts
 
@@ -2526,6 +2528,23 @@ async def test_connect_stretch_v31(self):
                 "vendor": "Plugwise B.V.",
                 "zigbee_mac_address": "ABCD012345670101",
             },
+            "e1c884e7dede431dadee09506ec4f859": {
+                "class": "refrigerator",
+                "fw": "2011-06-27T10:47:37+02:00",
+                "hw": "6539-0700-7330",
+                "location": "0000aaaa0000aaaa0000aaaa0000aa00",
+                "mac_address": None,
+                "model": "Circle+ type F",
+                "name": "Koelkast (92C4A)",
+                "vendor": "Plugwise",
+                "zigbee_mac_address": "0123456789AB",
+                "sensors": {
+                    "electricity_consumed": 50.5,
+                    "electricity_consumed_interval": 0.08,
+                    "electricity_produced": 0.0,
+                },
+                "switches": {"relay": True, "lock": False},
+            },
             "5871317346d045bc9f6b987ef25ee638": {
                 "class": "water_heater_vessel",
                 "fw": "2011-06-27T10:52:18+02:00",
@@ -2659,6 +2678,24 @@ async def test_connect_stretch_v23(self):
                 "vendor": "Plugwise B.V.",
                 "zigbee_mac_address": "ABCD012345670101",
             },
+            "24b2ed37c8964c73897db6340a39c129": {
+                "class": "router",
+                "fw": "2011-06-27T10:47:37+02:00",
+                "hw": "6539-0700-7325",
+                "location": "0000aaaa0000aaaa0000aaaa0000aa00",
+                "mac_address": None,
+                "model": "Circle+ type F",
+                "name": "MK Netwerk 1A4455E",
+                "vendor": "Plugwise",
+                "zigbee_mac_address": "0123456789AB",
+                "sensors": {
+                    "electricity_consumed": 4.63,
+                    "electricity_consumed_interval": 0.65,
+                    "electricity_produced": 0.0,
+                    "electricity_produced_interval": 0.0,
+                },
+                "switches": {"relay": True, "lock": True},
+            },
             "09c8ce93d7064fa6a233c0e4c2449bfe": {
                 "class": "lamp",
                 "fw": "2011-06-27T10:52:18+02:00",
@@ -2968,6 +3005,25 @@ async def test_connect_stretch_v27_no_domain(self):
         """Test erroneous domain_objects file from user."""
         # testdata dictionary with key ctrl_id_dev_id => keys:values
         testdata = {
+            # Circle+
+            "9b9bfdb3c7ad4ca5817ccaa235f1e094": {
+                "class": "zz_misc",
+                "fw": "2011-06-27T10:47:37+02:00",
+                "hw": "6539-0700-7326",
+                "location": "0000aaaa0000aaaa0000aaaa0000aa00",
+                "mac_address": None,
+                "model": "Circle+ type F",
+                "name": "25881A2",
+                "vendor": "Plugwise",
+                "zigbee_mac_address": "ABCD012345670A04",
+                "sensors": {
+                    "electricity_consumed": 13.3,
+                    "electricity_consumed_interval": 7.77,
+                    "electricity_produced": 0.0,
+                    "electricity_produced_interval": 0.0,
+                },
+                "switches": {"relay": True, "lock": True},
+            },
             # 76BF93
             "8b8d14b242e24cd789743c828b9a2ea9": {
                 "sensors": {"electricity_consumed": 1.69},