Correct device-items total counts

Author: bouwew

tests/test_smile.py

@@ -693,7 +693,7 @@ async def test_connect_legacy_anna(self):
         assert smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 42
+        assert self.device_items == 43
         assert not self.notifications
 
         result = await self.tinker_thermostat(
@@ -791,7 +791,7 @@ async def test_connect_legacy_anna_2(self):
         assert smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 42
+        assert self.device_items == 43
         assert not self.notifications
 
         result = await self.tinker_thermostat(
@@ -989,7 +989,7 @@ async def test_connect_anna_v4(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 51
+        assert self.device_items == 52
         assert not self.notifications
 
         assert not smile._anna_cooling_present
@@ -1103,7 +1103,7 @@ async def test_connect_anna_v4_dhw(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 51
+        assert self.device_items == 52
         assert not self.notifications
 
         result = await self.tinker_thermostat(
@@ -1150,7 +1150,7 @@ async def test_connect_anna_v4_no_tag(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 51
+        assert self.device_items == 52
 
         result = await self.tinker_thermostat(
             smile,
@@ -1234,7 +1234,7 @@ async def test_connect_anna_without_boiler_fw3(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 34
+        assert self.device_items == 35
         assert not self.notifications
 
         result = await self.tinker_thermostat(
@@ -1315,7 +1315,7 @@ async def test_connect_anna_without_boiler_fw4(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 34
+        assert self.device_items == 35
         assert not self.notifications
 
         result = await self.tinker_thermostat(
@@ -1396,7 +1396,7 @@ async def test_connect_anna_without_boiler_fw42(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 34
+        assert self.device_items == 35
         assert not self.notifications
 
         result = await self.tinker_thermostat(
@@ -1525,7 +1525,7 @@ async def test_connect_adam_plus_anna(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 72
+        assert self.device_items == 73
         assert not self.notifications
 
         result = await self.tinker_thermostat(
@@ -1577,7 +1577,7 @@ async def test_connect_adam_plus_anna_copy_with_error_domain_added(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 71
+        assert self.device_items == 72
 
         assert "3d28a20e17cb47dca210a132463721d5" in self.notifications
 
@@ -1767,7 +1767,7 @@ async def test_connect_adam_plus_anna_new(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 129
+        assert self.device_items == 132
 
         result = await self.tinker_thermostat(
             smile,
@@ -2183,7 +2183,7 @@ async def test_connect_adam_zone_per_device(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 260
+        assert self.device_items == 269
 
         assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
         await smile.delete_notification()
@@ -2601,7 +2601,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 260
+        assert self.device_items == 269
 
         assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
 
@@ -2700,16 +2700,19 @@ async def test_adam_heatpump_cooling(self):
                 "last_used": "Werkdag schema",
                 "control_state": "off",
                 "mode": "cool",
-                "sensors": {"temperature": 18.8, "battery": 55},
-                "setpoint": 18.0,
+                "sensors": {
+                    "temperature": 18.8,
+                    "battery": 55,
+                    "setpoint": 18.0,
+                },
             },
         }
 
         self.smile_setup = "adam_heatpump_cooling"
         server, smile, client = await self.connect_wrapper()
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 356
+        assert self.device_items == 366
 
         await smile.close_connection()
         await self.disconnect(server, client)
@@ -2932,7 +2935,7 @@ async def test_adam_plus_jip(self):
         server, smile, client = await self.connect_wrapper()
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 173
+        assert self.device_items == 181
 
         # Negative test
         result = await self.tinker_thermostat(
@@ -3322,7 +3325,7 @@ async def test_connect_anna_heatpump_cooling_fake_firmware(self):
         assert smile.smile_version[0] == "4.10.10"
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 54
+        assert self.device_items == 55
         assert smile._anna_cooling_present
         assert smile.lortherm_cooling_enabled
         assert smile._lortherm_cooling_active
@@ -3362,7 +3365,7 @@ async def test_connect_anna_loria_idle_fake_firmware(self):
         assert smile.smile_version[0] == "4.10.10"
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 54
+        assert self.device_items == 55
         assert smile._anna_cooling_present
         assert smile.lortherm_cooling_enabled
         assert not smile._lortherm_cooling_active
@@ -3396,7 +3399,7 @@ async def test_connect_adam_onoff_cooling_fake_firmware(self):
         assert smile.smile_type == "thermostat"
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 53
+        assert self.device_items == 54
         assert smile._cooling_present
         assert smile._adam_cooling_enabled
 
@@ -3543,7 +3546,7 @@ async def test_connect_anna_elga_2_schedule_off(self):
         assert smile.smile_hostname == "smile000000"
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 53
+        assert self.device_items == 54
 
         await smile.close_connection()
         await self.disconnect(server, client)