Adapt test-json, test-cases/-asserts

bouwew · bouwew · commit f0a4d6ecafb1 · 2025-11-27T18:06:51.000+01:00
diff --git a/fixtures/adam_plus_anna_new/data.json b/fixtures/adam_plus_anna_new/data.json
@@ -202,15 +202,24 @@
     },
     "dev_class": "gateway",
     "firmware": "3.9.0",
-    "gateway_modes": ["away", "full", "vacation"],
+    "gateway_modes": [
+      "away",
+      "full",
+      "vacation"
+    ],
     "hardware": "AME Smile 2.0 board",
     "location": "bc93488efab249e5bc54fd7e175a6f91",
     "mac_address": "D40FB201CBA0",
     "model": "Gateway",
     "model_id": "smile_open_therm",
     "name": "Adam",
     "notifications": {},
-    "regulation_modes": ["bleeding_cold", "heating", "off", "bleeding_hot"],
+    "regulation_modes": [
+      "bleeding_cold",
+      "heating",
+      "off",
+      "bleeding_hot"
+    ],
     "select_gateway_mode": "full",
     "select_regulation_mode": "heating",
     "sensors": {
@@ -266,23 +275,6 @@
     "vendor": "Plugwise",
     "zigbee_mac_address": "000D6F000C86CBA0"
   },
-  "e8ef2a01ed3b4139a53bf749204fe6b4": {
-    "dev_class": "switching",
-    "members": [
-      "2568cc4b9c1e401495d4741a5f89bee1",
-      "29542b2b6a6a4169acecc15c72a599b8"
-    ],
-    "model": "Group",
-    "name": "Test",
-    "sensors": {
-      "electricity_consumed": 16.5,
-      "electricity_produced": 0.0
-    },
-    "switches": {
-      "relay": true
-    },
-    "vendor": "Plugwise"
-  },
   "f2bf9048bef64cc5b6d5110154e33c81": {
     "active_preset": "home",
     "available_schedules": [
@@ -297,7 +289,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Living room",
-    "preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
+    "preset_modes": [
+      "vacation",
+      "no_frost",
+      "asleep",
+      "home",
+      "away"
+    ],
     "select_schedule": "Weekschema",
     "select_zone_profile": "active",
     "sensors": {
@@ -320,7 +318,11 @@
       "secondary": []
     },
     "vendor": "Plugwise",
-    "zone_profiles": ["active", "off", "passive"]
+    "zone_profiles": [
+      "active",
+      "off",
+      "passive"
+    ]
   },
   "f871b8c4d63549319221e294e4f88074": {
     "active_preset": "vacation",
@@ -336,7 +338,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Bathroom",
-    "preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
+    "preset_modes": [
+      "vacation",
+      "no_frost",
+      "asleep",
+      "home",
+      "away"
+    ],
     "select_schedule": "off",
     "select_zone_profile": "passive",
     "sensors": {
@@ -351,10 +359,18 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
-      "secondary": ["1772a4ea304041adb83f357b751341ff"]
+      "primary": [
+        "e2f4322d57924fa090fbbc48b3a140dc"
+      ],
+      "secondary": [
+        "1772a4ea304041adb83f357b751341ff"
+      ]
     },
     "vendor": "Plugwise",
-    "zone_profiles": ["active", "off", "passive"]
+    "zone_profiles": [
+      "active",
+      "off",
+      "passive"
+    ]
   }
 }
diff --git a/tests/data/adam/adam_multiple_devices_per_zone.json b/tests/data/adam/adam_multiple_devices_per_zone.json
@@ -554,23 +554,6 @@
     "vendor": "Plugwise",
     "zigbee_mac_address": "ABCD012345670A11"
   },
-  "e8ef2a01ed3b4139a53bf749204fe6b4": {
-    "dev_class": "switching",
-    "members": [
-      "02cf28bfec924855854c544690a609ef",
-      "4a810418d5394b3f82727340b91ba740"
-    ],
-    "model": "Group",
-    "name": "Test",
-    "sensors": {
-      "electricity_consumed": 14.8,
-      "electricity_produced": 0.0
-    },
-    "switches": {
-      "relay": true
-    },
-    "vendor": "Plugwise"
-  },
   "f1fee6043d3642a9b0a65297455f008e": {
     "available": true,
     "binary_sensors": {
diff --git a/tests/data/adam/adam_plus_anna_new.json b/tests/data/adam/adam_plus_anna_new.json
@@ -266,23 +266,6 @@
     "vendor": "Plugwise",
     "zigbee_mac_address": "000D6F000C86CBA0"
   },
-  "e8ef2a01ed3b4139a53bf749204fe6b4": {
-    "dev_class": "switching",
-    "members": [
-      "2568cc4b9c1e401495d4741a5f89bee1",
-      "29542b2b6a6a4169acecc15c72a599b8"
-    ],
-    "model": "Group",
-    "name": "Test",
-    "sensors": {
-      "electricity_consumed": 16.5,
-      "electricity_produced": 0.0
-    },
-    "switches": {
-      "relay": true
-    },
-    "vendor": "Plugwise"
-  },
   "f2bf9048bef64cc5b6d5110154e33c81": {
     "active_preset": "home",
     "available_schedules": [
diff --git a/tests/data/adam/adam_plus_anna_new_UPDATED_DATA.json b/tests/data/adam/adam_plus_anna_new_UPDATED_DATA.json
@@ -32,14 +32,5 @@
     "binary_sensors": {
       "plugwise_notification": true
     }
-  },
-  "e8ef2a01ed3b4139a53bf749204fe6b4": {
-    "members": [
-      "2568cc4b9c1e401495d4741a5f89bee1",
-      "29542b2b6a6a4169acecc15c72a599b8"
-    ],
-    "switches": {
-      "relay": false
-    }
   }
 }
diff --git a/tests/data/adam/adam_plus_anna_new_regulation_off.json b/tests/data/adam/adam_plus_anna_new_regulation_off.json
@@ -214,19 +214,6 @@
     "vendor": "Plugwise",
     "zigbee_mac_address": "000D6F000C869B61"
   },
-  "e8ef2a01ed3b4139a53bf749204fe6b4": {
-    "dev_class": "switching",
-    "members": [
-      "2568cc4b9c1e401495d4741a5f89bee1",
-      "29542b2b6a6a4169acecc15c72a599b8"
-    ],
-    "model": "Group",
-    "name": "Test",
-    "switches": {
-      "relay": true
-    },
-    "vendor": "Plugwise"
-  },
   "f2bf9048bef64cc5b6d5110154e33c81": {
     "active_preset": "home",
     "available_schedules": [
diff --git a/tests/data/stretch/stretch_v23.json b/tests/data/stretch/stretch_v23.json
@@ -302,16 +302,6 @@
     "vendor": "Plugwise",
     "zigbee_mac_address": "ABCD012345670A11"
   },
-  "f7b145c8492f4dd7a4de760456fdef3e": {
-    "dev_class": "switching",
-    "members": ["407aa1c1099d463c9137a3a9eda787fd"],
-    "model": "Group",
-    "name": "Test",
-    "switches": {
-      "relay": false
-    },
-    "vendor": "Plugwise"
-  },
   "fd1b74f59e234a9dae4e23b2b5cf07ed": {
     "dev_class": "dryer",
     "firmware": "2011-06-27T10:52:18+02:00",
diff --git a/tests/data/stretch/stretch_v31.json b/tests/data/stretch/stretch_v31.json
@@ -85,35 +85,6 @@
     "vendor": "Plugwise",
     "zigbee_mac_address": "ABCD012345670A04"
   },
-  "d03738edfcc947f7b8f4573571d90d2d": {
-    "dev_class": "switching",
-    "members": [
-      "059e4d03c7a34d278add5c7a4a781d19",
-      "cfe95cf3de1948c0b8955125bf754614"
-    ],
-    "model": "Group",
-    "name": "Schakel",
-    "switches": {
-      "relay": true
-    },
-    "vendor": "Plugwise"
-  },
-  "d950b314e9d8499f968e6db8d82ef78c": {
-    "dev_class": "report",
-    "members": [
-      "059e4d03c7a34d278add5c7a4a781d19",
-      "5871317346d045bc9f6b987ef25ee638",
-      "aac7b735042c4832ac9ff33aae4f453b",
-      "cfe95cf3de1948c0b8955125bf754614",
-      "e1c884e7dede431dadee09506ec4f859"
-    ],
-    "model": "Group",
-    "name": "Stroomvreters",
-    "switches": {
-      "relay": true
-    },
-    "vendor": "Plugwise"
-  },
   "e1c884e7dede431dadee09506ec4f859": {
     "dev_class": "refrigerator",
     "firmware": "2011-06-27T10:47:37+02:00",
diff --git a/tests/data/stretch/stretch_v31_UPDATED_DATA.json b/tests/data/stretch/stretch_v31_UPDATED_DATA.json
@@ -31,14 +31,5 @@
       "relay": false,
       "lock": false
     }
-  },
-  "d03738edfcc947f7b8f4573571d90d2d": {
-    "members": [
-      "059e4d03c7a34d278add5c7a4a781d19",
-      "cfe95cf3de1948c0b8955125bf754614"
-    ],
-    "switches": {
-      "relay": false
-    }
   }
 }
diff --git a/tests/test_adam.py b/tests/test_adam.py
@@ -34,7 +34,7 @@ async def test_connect_adam_plus_anna_new(self):
 
         test_items = await self.device_test(api, "2025-10-12 00:00:01", testdata)
         assert api.gateway_id == "da224107914542988a88561b4452b0f6"
-        assert self.entity_items == 230
+        assert self.entity_items == 222
         assert test_items == self.entity_items
         assert self.entity_list == [
             "da224107914542988a88561b4452b0f6",
@@ -50,7 +50,6 @@ async def test_connect_adam_plus_anna_new(self):
             "14df5c4dc8cb4ba69f9d1ac0eaf7c5c6",
             "da575e9e09b947e281fb6e3ebce3b174",
             "c9293d1d68ee48fc8843c6f0dee2b6be",
-            "e8ef2a01ed3b4139a53bf749204fe6b4",
             "f2bf9048bef64cc5b6d5110154e33c81",
             "f871b8c4d63549319221e294e4f88074",
         ]
@@ -96,12 +95,6 @@ async def test_connect_adam_plus_anna_new(self):
         )
         assert result_1 and result_2
 
-        switch_change = await self.tinker_switch(
-            api,
-            "e8ef2a01ed3b4139a53bf749204fe6b4",
-            ["2568cc4b9c1e401495d4741a5f89bee1", "29542b2b6a6a4169acecc15c72a599b8"],
-        )
-        assert switch_change
         switch_change = await self.tinker_switch(
             api,
             "056ee145a816487eaa69243c3280f8bf",
@@ -302,7 +295,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
         )
 
         test_items = await self.device_test(api, "2022-05-16 00:00:01", testdata)
-        assert self.entity_items == 394
+        assert self.entity_items == 386
         assert test_items == self.entity_items
 
         assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
@@ -319,13 +312,6 @@ async def test_connect_adam_multiple_devices_per_zone(self):
             api, "675416a629f343c495449970e2ca37b5"
         )
         assert not switch_change
-        # Test a blocked group-change, both relays are locked.
-        group_change = await self.tinker_switch(
-            api,
-            "e8ef2a01ed3b4139a53bf749204fe6b4",
-            ["02cf28bfec924855854c544690a609ef", "4a810418d5394b3f82727340b91ba740"],
-        )
-        assert not group_change
 
         await api.close_connection()
         await self.disconnect(server, client)
diff --git a/tests/test_legacy_stretch.py b/tests/test_legacy_stretch.py
@@ -29,7 +29,7 @@ async def test_connect_stretch_v31(self):
 
         await self.device_test(api, "2022-05-16 00:00:01", testdata)
         assert api.gateway_id == "0000aaaa0000aaaa0000aaaa0000aa00"
-        assert self.entity_items == 85
+        assert self.entity_items == 73
 
         switch_change = await self.tinker_switch(
             api,
@@ -68,7 +68,7 @@ async def test_connect_stretch_v23(self):
         )
 
         await self.device_test(api, "2022-05-16 00:00:01", testdata)
-        assert self.entity_items == 244
+        assert self.entity_items == 238
 
         switch_change = await self.tinker_switch(
             api, "2587a7fcdd7e482dab03fda256076b4b"
@@ -78,12 +78,6 @@ async def test_connect_stretch_v23(self):
             api, "2587a7fcdd7e482dab03fda256076b4b", model="lock"
         )
         assert switch_change
-        switch_change = await self.tinker_switch(
-            api,
-            "f7b145c8492f4dd7a4de760456fdef3e",
-            ["407aa1c1099d463c9137a3a9eda787fd"],
-        )
-        assert switch_change
 
         await api.close_connection()
         await self.disconnect(server, client)

Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,5 @@`
`32`	`32`	`"binary_sensors": {`
`33`	`33`	`"plugwise_notification": true`
`34`	`34`	`}`
`35`		`- },`
`36`		`- "e8ef2a01ed3b4139a53bf749204fe6b4": {`
`37`		`- "members": [`
`38`		`- "2568cc4b9c1e401495d4741a5f89bee1",`
`39`		`- "29542b2b6a6a4169acecc15c72a599b8"`
`40`		`- ],`
`41`		`- "switches": {`
`42`		`- "relay": false`
`43`		`- }`
`44`	`35`	`}`
`45`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,14 +31,5 @@`
`31`	`31`	`"relay": false,`
`32`	`32`	`"lock": false`
`33`	`33`	`}`
`34`		`- },`
`35`		`- "d03738edfcc947f7b8f4573571d90d2d": {`
`36`		`- "members": [`
`37`		`- "059e4d03c7a34d278add5c7a4a781d19",`
`38`		`- "cfe95cf3de1948c0b8955125bf754614"`
`39`		`- ],`
`40`		`- "switches": {`
`41`		`- "relay": false`
`42`		`- }`
`43`	`34`	`}`
`44`	`35`	`}`