plugwise 1.7.7__tar.gz → 1.7.8a1__tar.gz

{plugwise-1.7.7 → plugwise-1.7.8a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plugwise
-Version: 1.7.7
+Version: 1.7.8a1
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Author: Plugwise device owners
 Maintainer: bouwew, CoMPaTech

{plugwise-1.7.7 → plugwise-1.7.8a1}/plugwise.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plugwise
-Version: 1.7.7
+Version: 1.7.8a1
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Author: Plugwise device owners
 Maintainer: bouwew, CoMPaTech

{plugwise-1.7.7 → plugwise-1.7.8a1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "1.7.7"
+version         = "1.7.8a1"
 license         = "MIT"
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"

{plugwise-1.7.7 → plugwise-1.7.8a1}/tests/test_adam.py

@@ -22,20 +22,20 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         self.smile_setup = "adam_plus_anna_new"
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
-        server, smile, client = await self.connect_wrapper()
-        assert smile.smile.hostname == "smile000000"
+        server, api, client = await self.connect_wrapper()
+        assert api.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
-            smile,
+            api,
             smile_type=None,
             smile_version="3.7.8",
         )
 
-        await self.device_test(smile, "2023-12-17 00:00:01", testdata)
-        assert smile.gateway_id == "da224107914542988a88561b4452b0f6"
-        assert smile._last_active["f2bf9048bef64cc5b6d5110154e33c81"] == "Weekschema"
-        assert smile._last_active["f871b8c4d63549319221e294e4f88074"] == "Badkamer"
+        await self.device_test(api, "2023-12-17 00:00:01", testdata)
+        assert api.gateway_id == "da224107914542988a88561b4452b0f6"
+        assert api._last_active["f2bf9048bef64cc5b6d5110154e33c81"] == "Weekschema"
+        assert api._last_active["f871b8c4d63549319221e294e4f88074"] == "Badkamer"
         assert self.entity_items == 178
         assert self.entity_list == [
             "da224107914542988a88561b4452b0f6",
@@ -52,24 +52,24 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
             "f2bf9048bef64cc5b6d5110154e33c81",
             "f871b8c4d63549319221e294e4f88074",
         ]
-        assert smile.reboot
+        assert api.reboot
 
         result = await self.tinker_thermostat(
-            smile,
+            api,
             "f2bf9048bef64cc5b6d5110154e33c81",
             good_schedules=["Weekschema", "Badkamer", "Test"],
         )
         assert result
 
         # Special test-case for turning a schedule off based on only the location id.
-        await smile.set_schedule_state("f2bf9048bef64cc5b6d5110154e33c81", "off")
+        await api.set_schedule_state("f2bf9048bef64cc5b6d5110154e33c81", "off")
 
         # Special test-case for turning a schedule off for a location via the option "off".
-        await smile.set_schedule_state("f2bf9048bef64cc5b6d5110154e33c81", "on", "off")
+        await api.set_schedule_state("f2bf9048bef64cc5b6d5110154e33c81", "on", "off")
 
         # bad schedule-state test
         result = await self.tinker_thermostat_schedule(
-            smile,
+            api,
             "f2bf9048bef64cc5b6d5110154e33c81",
             "bad",
             good_schedules=["Badkamer"],
@@ -77,18 +77,16 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         )
         assert result
 
-        smile._schedule_old_states["f2bf9048bef64cc5b6d5110154e33c81"]["Badkamer"] = (
-            "off"
-        )
+        api._schedule_old_states["f2bf9048bef64cc5b6d5110154e33c81"]["Badkamer"] = "off"
         result_1 = await self.tinker_thermostat_schedule(
-            smile,
+            api,
             "f2bf9048bef64cc5b6d5110154e33c81",
             "on",
             good_schedules=["Badkamer"],
             single=True,
         )
         result_2 = await self.tinker_thermostat_schedule(
-            smile,
+            api,
             "f2bf9048bef64cc5b6d5110154e33c81",
             "on",
             good_schedules=["Badkamer"],
@@ -97,44 +95,44 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         assert result_1 and result_2
 
         switch_change = await self.tinker_switch(
-            smile,
+            api,
             "e8ef2a01ed3b4139a53bf749204fe6b4",
             ["2568cc4b9c1e401495d4741a5f89bee1", "29542b2b6a6a4169acecc15c72a599b8"],
         )
         assert switch_change
         switch_change = await self.tinker_switch(
-            smile, "056ee145a816487eaa69243c3280f8bf", model="dhw_cm_switch"
+            api, "056ee145a816487eaa69243c3280f8bf", model="dhw_cm_switch"
         )
         assert switch_change
         # Test relay without lock-attribute
         switch_change = await self.tinker_switch(
-            smile,
+            api,
             "854f8a9b0e7e425db97f1f110e1ce4b3",
         )
         assert not switch_change
         switch_change = await self.tinker_switch(
-            smile, "2568cc4b9c1e401495d4741a5f89bee1"
+            api, "2568cc4b9c1e401495d4741a5f89bee1"
         )
         assert not switch_change
         switch_change = await self.tinker_switch(
-            smile,
+            api,
             "2568cc4b9c1e401495d4741a5f89bee1",
             model="lock",
         )
         assert switch_change
 
         assert await self.tinker_switch_bad_input(
-            smile,
+            api,
             "854f8a9b0e7e425db97f1f110e1ce4b3",
         )
 
-        tinkered = await self.tinker_gateway_mode(smile)
+        tinkered = await self.tinker_gateway_mode(api)
         assert not tinkered
 
-        tinkered = await self.tinker_regulation_mode(smile)
+        tinkered = await self.tinker_regulation_mode(api)
         assert not tinkered
 
-        tinkered = await self.tinker_max_boiler_temp(smile)
+        tinkered = await self.tinker_max_boiler_temp(api)
         assert not tinkered
 
         # Now change some data and change directory reading xml from
@@ -144,13 +142,13 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         )
         self.smile_setup = "updated/adam_plus_anna_new"
         await self.device_test(
-            smile, "2022-01-16 00:00:01", testdata_updated, initialize=False
+            api, "2022-01-16 00:00:01", testdata_updated, initialize=False
         )
 
         # Simulate receiving no xml-data after a requesting a reboot of the gateway
         self.smile_setup = "reboot/adam_plus_anna_new"
         try:
-            await self.device_test(smile, initialize=False)
+            await self.device_test(api, initialize=False)
         except pw_exceptions.PlugwiseError as err:
             _LOGGER.debug(
                 f"Receiving no data after a reboot is properly handled: {err}"
@@ -159,30 +157,28 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         # Simulate receiving xml-data with <error>
         self.smile_setup = "error/adam_plus_anna_new"
         try:
-            await self.device_test(smile, initialize=False)
+            await self.device_test(api, initialize=False)
         except pw_exceptions.ResponseError:
             _LOGGER.debug("Receiving error-data from the Gateway")
 
-        await smile.close_connection()
+        await api.close_connection()
         await self.disconnect(server, client)
 
         self.smile_setup = "adam_plus_anna_new"
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
-        server, smile, client = await self.connect_wrapper(raise_timeout=True)
-        await self.device_test(
-            smile, "2023-12-17 00:00:01", testdata, skip_testing=True
-        )
+        server, api, client = await self.connect_wrapper(raise_timeout=True)
+        await self.device_test(api, "2023-12-17 00:00:01", testdata, skip_testing=True)
 
-        tinkered = await self.tinker_max_boiler_temp(smile, unhappy=True)
+        tinkered = await self.tinker_max_boiler_temp(api, unhappy=True)
         assert tinkered
 
-        tinkered = await self.tinker_gateway_mode(smile, unhappy=True)
+        tinkered = await self.tinker_gateway_mode(api, unhappy=True)
         assert tinkered
 
-        tinkered = await self.tinker_regulation_mode(smile, unhappy=True)
+        tinkered = await self.tinker_regulation_mode(api, unhappy=True)
         assert tinkered
 
-        await smile.close_connection()
+        await api.close_connection()
         await self.disconnect(server, client)
 
     @pytest.mark.asyncio
@@ -191,12 +187,12 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         self.smile_setup = "adam_plus_anna_new_regulation_off"
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
-        server, smile, client = await self.connect_wrapper()
-        assert smile.smile.hostname == "smile000000"
+        server, api, client = await self.connect_wrapper()
+        assert api.smile.hostname == "smile000000"
 
-        await self.device_test(smile, "2023-12-17 00:00:01", testdata)
+        await self.device_test(api, "2023-12-17 00:00:01", testdata)
 
-        await smile.close_connection()
+        await api.close_connection()
         await self.disconnect(server, client)
 
     @pytest.mark.asyncio
@@ -205,79 +201,77 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         self.smile_setup = "adam_zone_per_device"
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
-        server, smile, client = await self.connect_wrapper()
-        assert smile.smile.hostname == "smile000000"
+        server, api, client = await self.connect_wrapper()
+        assert api.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
-            smile,
+            api,
             smile_version="3.0.15",
         )
 
-        await self.device_test(smile, "2022-05-16 00:00:01", testdata)
-        assert smile.gateway_id == "fe799307f1624099878210aa0b9f1475"
-        assert smile._last_active["12493538af164a409c6a1c79e38afe1c"] == BADKAMER_SCHEMA
-        assert smile._last_active["c50f167537524366a5af7aa3942feb1e"] == GF7_WOONKAMER
-        assert smile._last_active["82fa13f017d240daa0d0ea1775420f24"] == CV_JESSIE
-        assert smile._last_active["08963fec7c53423ca5680aa4cb502c63"] == BADKAMER_SCHEMA
-        assert smile._last_active["446ac08dd04d4eff8ac57489757b7314"] == BADKAMER_SCHEMA
+        await self.device_test(api, "2022-05-16 00:00:01", testdata)
+        assert api.gateway_id == "fe799307f1624099878210aa0b9f1475"
+        assert api._last_active["12493538af164a409c6a1c79e38afe1c"] == BADKAMER_SCHEMA
+        assert api._last_active["c50f167537524366a5af7aa3942feb1e"] == GF7_WOONKAMER
+        assert api._last_active["82fa13f017d240daa0d0ea1775420f24"] == CV_JESSIE
+        assert api._last_active["08963fec7c53423ca5680aa4cb502c63"] == BADKAMER_SCHEMA
+        assert api._last_active["446ac08dd04d4eff8ac57489757b7314"] == BADKAMER_SCHEMA
         assert self.entity_items == 370
 
         assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
-        await smile.delete_notification()
+        await api.delete_notification()
 
         result = await self.tinker_thermostat(
-            smile, "c50f167537524366a5af7aa3942feb1e", good_schedules=[GF7_WOONKAMER]
+            api, "c50f167537524366a5af7aa3942feb1e", good_schedules=[GF7_WOONKAMER]
         )
         assert result
         result = await self.tinker_thermostat(
-            smile, "82fa13f017d240daa0d0ea1775420f24", good_schedules=[CV_JESSIE]
+            api, "82fa13f017d240daa0d0ea1775420f24", good_schedules=[CV_JESSIE]
         )
         assert result
         switch_change = await self.tinker_switch(
-            smile, "675416a629f343c495449970e2ca37b5"
+            api, "675416a629f343c495449970e2ca37b5"
         )
         assert not switch_change
 
-        reboot = await self.tinker_reboot(smile)
+        reboot = await self.tinker_reboot(api)
         assert reboot
 
-        await smile.close_connection()
+        await api.close_connection()
         await self.disconnect(server, client)
 
-        server, smile, client = await self.connect_wrapper(raise_timeout=True)
-        await self.device_test(
-            smile, "2022-05-16 00:00:01", testdata, skip_testing=True
-        )
+        server, api, client = await self.connect_wrapper(raise_timeout=True)
+        await self.device_test(api, "2022-05-16 00:00:01", testdata, skip_testing=True)
         result = await self.tinker_thermostat(
-            smile,
+            api,
             "c50f167537524366a5af7aa3942feb1e",
             good_schedules=[GF7_WOONKAMER],
             unhappy=True,
         )
         assert result
         result = await self.tinker_thermostat(
-            smile,
+            api,
             "82fa13f017d240daa0d0ea1775420f24",
             good_schedules=[CV_JESSIE],
             unhappy=True,
         )
         assert result
 
-        tinkered = await self.tinker_max_boiler_temp(smile, unhappy=True)
+        tinkered = await self.tinker_max_boiler_temp(api, unhappy=True)
         assert not tinkered
 
         try:
-            await smile.delete_notification()
+            await api.delete_notification()
             notification_deletion = False  # pragma: no cover
         except pw_exceptions.ConnectionFailedError:
             notification_deletion = True
         assert notification_deletion
 
-        reboot = await self.tinker_reboot(smile, unhappy=True)
+        reboot = await self.tinker_reboot(api, unhappy=True)
         assert reboot
 
-        await smile.close_connection()
+        await api.close_connection()
         await self.disconnect(server, client)
 
     @pytest.mark.asyncio
@@ -286,46 +280,46 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         self.smile_setup = "adam_multiple_devices_per_zone"
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
-        server, smile, client = await self.connect_wrapper()
-        assert smile.smile.hostname == "smile000000"
+        server, api, client = await self.connect_wrapper()
+        assert api.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
-            smile,
+            api,
             smile_version="3.0.15",
         )
 
-        await self.device_test(smile, "2022-05-16 00:00:01", testdata)
-        assert smile._last_active["12493538af164a409c6a1c79e38afe1c"] == BADKAMER_SCHEMA
-        assert smile._last_active["c50f167537524366a5af7aa3942feb1e"] == GF7_WOONKAMER
-        assert smile._last_active["82fa13f017d240daa0d0ea1775420f24"] == CV_JESSIE
-        assert smile._last_active["08963fec7c53423ca5680aa4cb502c63"] == BADKAMER_SCHEMA
-        assert smile._last_active["446ac08dd04d4eff8ac57489757b7314"] == BADKAMER_SCHEMA
+        await self.device_test(api, "2022-05-16 00:00:01", testdata)
+        assert api._last_active["12493538af164a409c6a1c79e38afe1c"] == BADKAMER_SCHEMA
+        assert api._last_active["c50f167537524366a5af7aa3942feb1e"] == GF7_WOONKAMER
+        assert api._last_active["82fa13f017d240daa0d0ea1775420f24"] == CV_JESSIE
+        assert api._last_active["08963fec7c53423ca5680aa4cb502c63"] == BADKAMER_SCHEMA
+        assert api._last_active["446ac08dd04d4eff8ac57489757b7314"] == BADKAMER_SCHEMA
         assert self.entity_items == 375
 
         assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
 
         result = await self.tinker_thermostat(
-            smile, "c50f167537524366a5af7aa3942feb1e", good_schedules=[GF7_WOONKAMER]
+            api, "c50f167537524366a5af7aa3942feb1e", good_schedules=[GF7_WOONKAMER]
         )
         assert result
         result = await self.tinker_thermostat(
-            smile, "82fa13f017d240daa0d0ea1775420f24", good_schedules=[CV_JESSIE]
+            api, "82fa13f017d240daa0d0ea1775420f24", good_schedules=[CV_JESSIE]
         )
         assert result
         switch_change = await self.tinker_switch(
-            smile, "675416a629f343c495449970e2ca37b5"
+            api, "675416a629f343c495449970e2ca37b5"
         )
         assert not switch_change
         # Test a blocked group-change, both relays are locked.
         group_change = await self.tinker_switch(
-            smile,
+            api,
             "e8ef2a01ed3b4139a53bf749204fe6b4",
             ["02cf28bfec924855854c544690a609ef", "4a810418d5394b3f82727340b91ba740"],
         )
         assert not group_change
 
-        await smile.close_connection()
+        await api.close_connection()
         await self.disconnect(server, client)
 
     @pytest.mark.asyncio
@@ -334,24 +328,24 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         self.smile_setup = "adam_heatpump_cooling"
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
-        server, smile, client = await self.connect_wrapper()
-
-        await self.device_test(smile, "2022-01-02 00:00:01", testdata)
-        assert smile._last_active["b52908550469425b812c87f766fe5303"] == WERKDAG_SCHEMA
-        assert smile._last_active["20e735858f8146cead98b873177a4f99"] == WERKDAG_SCHEMA
-        assert smile._last_active["e39529c79ab54fda9bed26cfc0447546"] == WERKDAG_SCHEMA
-        assert smile._last_active["9a27714b970547ee9a6bdadc2b815ad5"] == WERKDAG_SCHEMA
-        assert smile._last_active["93ac3f7bf25342f58cbb77c4a99ac0b3"] == WERKDAG_SCHEMA
-        assert smile._last_active["fa5fa6b34f6b40a0972988b20e888ed4"] == WERKDAG_SCHEMA
-        assert smile._last_active["04b15f6e884448288f811d29fb7b1b30"] == WERKDAG_SCHEMA
-        assert smile._last_active["a562019b0b1f47a4bde8ebe3dbe3e8a9"] == WERKDAG_SCHEMA
-        assert smile._last_active["8cf650a4c10c44819e426bed406aec34"] == WERKDAG_SCHEMA
-        assert smile._last_active["5cc21042f87f4b4c94ccb5537c47a53f"] == WERKDAG_SCHEMA
+        server, api, client = await self.connect_wrapper()
+
+        await self.device_test(api, "2022-01-02 00:00:01", testdata)
+        assert api._last_active["b52908550469425b812c87f766fe5303"] == WERKDAG_SCHEMA
+        assert api._last_active["20e735858f8146cead98b873177a4f99"] == WERKDAG_SCHEMA
+        assert api._last_active["e39529c79ab54fda9bed26cfc0447546"] == WERKDAG_SCHEMA
+        assert api._last_active["9a27714b970547ee9a6bdadc2b815ad5"] == WERKDAG_SCHEMA
+        assert api._last_active["93ac3f7bf25342f58cbb77c4a99ac0b3"] == WERKDAG_SCHEMA
+        assert api._last_active["fa5fa6b34f6b40a0972988b20e888ed4"] == WERKDAG_SCHEMA
+        assert api._last_active["04b15f6e884448288f811d29fb7b1b30"] == WERKDAG_SCHEMA
+        assert api._last_active["a562019b0b1f47a4bde8ebe3dbe3e8a9"] == WERKDAG_SCHEMA
+        assert api._last_active["8cf650a4c10c44819e426bed406aec34"] == WERKDAG_SCHEMA
+        assert api._last_active["5cc21042f87f4b4c94ccb5537c47a53f"] == WERKDAG_SCHEMA
         assert self.entity_items == 498
         assert self.cooling_present
         assert self._cooling_enabled
 
-        await smile.close_connection()
+        await api.close_connection()
         await self.disconnect(server, client)
 
     @pytest.mark.asyncio
@@ -360,21 +354,21 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         self.smile_setup = "adam_onoff_cooling_fake_firmware"
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
-        server, smile, client = await self.connect_wrapper()
-        assert smile.smile.hostname == "smile000000"
+        server, api, client = await self.connect_wrapper()
+        assert api.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
-            smile,
+            api,
             smile_version=None,
         )
 
-        await self.device_test(smile, "2022-01-02 00:00:01", testdata)
+        await self.device_test(api, "2022-01-02 00:00:01", testdata)
         assert self.entity_items == 65
         assert self.cooling_present
         # assert self._cooling_enabled - no cooling_enabled indication present
 
-        await smile.close_connection()
+        await api.close_connection()
         await self.disconnect(server, client)
 
     @pytest.mark.asyncio
@@ -383,48 +377,46 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         self.smile_setup = "adam_plus_anna"
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
-        server, smile, client = await self.connect_wrapper()
-        assert smile.smile.hostname == "smile000000"
+        server, api, client = await self.connect_wrapper()
+        assert api.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
-            smile,
+            api,
             smile_version="3.0.15",
         )
 
-        await self.device_test(smile, "2020-03-22 00:00:01", testdata)
-        assert smile.gateway_id == "b128b4bbbd1f47e9bf4d756e8fb5ee94"
-        assert smile._last_active["009490cc2f674ce6b576863fbb64f867"] == "Weekschema"
+        await self.device_test(api, "2020-03-22 00:00:01", testdata)
+        assert api.gateway_id == "b128b4bbbd1f47e9bf4d756e8fb5ee94"
+        assert api._last_active["009490cc2f674ce6b576863fbb64f867"] == "Weekschema"
         assert self.entity_items == 81
         assert "6fb89e35caeb4b1cb275184895202d84" in self.notifications
 
         result = await self.tinker_thermostat(
-            smile, "009490cc2f674ce6b576863fbb64f867", good_schedules=["Weekschema"]
+            api, "009490cc2f674ce6b576863fbb64f867", good_schedules=["Weekschema"]
         )
         assert result
         switch_change = await self.tinker_switch(
-            smile, "aa6b0002df0a46e1b1eb94beb61eddfe"
+            api, "aa6b0002df0a46e1b1eb94beb61eddfe"
         )
         assert switch_change
-        await smile.close_connection()
+        await api.close_connection()
         await self.disconnect(server, client)
 
-        server, smile, client = await self.connect_wrapper(raise_timeout=True)
-        await self.device_test(
-            smile, "2020-03-22 00:00:01", testdata, skip_testing=True
-        )
+        server, api, client = await self.connect_wrapper(raise_timeout=True)
+        await self.device_test(api, "2020-03-22 00:00:01", testdata, skip_testing=True)
         result = await self.tinker_thermostat(
-            smile,
+            api,
             "009490cc2f674ce6b576863fbb64f867",
             good_schedules=["Weekschema"],
             unhappy=True,
         )
         assert result
         switch_change = await self.tinker_switch(
-            smile, "aa6b0002df0a46e1b1eb94beb61eddfe", unhappy=True
+            api, "aa6b0002df0a46e1b1eb94beb61eddfe", unhappy=True
         )
         assert switch_change
-        await smile.close_connection()
+        await api.close_connection()
         await self.disconnect(server, client)
 
     @pytest.mark.asyncio
@@ -433,19 +425,19 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         self.smile_setup = "adam_jip"
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
-        server, smile, client = await self.connect_wrapper()
-
-        await self.device_test(smile, "2021-06-20 00:00:01", testdata)
-        assert smile.gateway_id == "b5c2386c6f6342669e50fe49dd05b188"
-        assert smile._last_active["d58fec52899f4f1c92e4f8fad6d8c48c"] is None
-        assert smile._last_active["06aecb3d00354375924f50c47af36bd2"] is None
-        assert smile._last_active["d27aede973b54be484f6842d1b2802ad"] is None
-        assert smile._last_active["13228dab8ce04617af318a2888b3c548"] is None
+        server, api, client = await self.connect_wrapper()
+
+        await self.device_test(api, "2021-06-20 00:00:01", testdata)
+        assert api.gateway_id == "b5c2386c6f6342669e50fe49dd05b188"
+        assert api._last_active["d58fec52899f4f1c92e4f8fad6d8c48c"] is None
+        assert api._last_active["06aecb3d00354375924f50c47af36bd2"] is None
+        assert api._last_active["d27aede973b54be484f6842d1b2802ad"] is None
+        assert api._last_active["13228dab8ce04617af318a2888b3c548"] is None
         assert self.entity_items == 245
 
         # Negative test
         result = await self.tinker_thermostat(
-            smile,
+            api,
             "13228dab8ce04617af318a2888b3c548",
             schedule_on=False,
             good_schedules=[None],
@@ -453,11 +445,11 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         assert result
 
         result = await self.tinker_thermostat_schedule(
-            smile,
+            api,
             "13228dab8ce04617af318a2888b3c548",
             "off",
             good_schedules=[None],
         )
         assert result
-        await smile.close_connection()
+        await api.close_connection()
         await self.disconnect(server, client)