Update test-related

Author: bouwew

tests/test_adam.py

@@ -23,7 +23,7 @@ async def test_connect_adam_plus_anna_new(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -192,7 +192,7 @@ async def test_connect_adam_plus_anna_new_regulation_off(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         await self.device_test(smile, "2023-12-17 00:00:01", testdata)
 
@@ -206,7 +206,7 @@ async def test_connect_adam_zone_per_device(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -287,7 +287,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -361,7 +361,7 @@ async def test_connect_adam_onoff_cooling_fake_firmware(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -384,7 +384,7 @@ async def test_connect_adam_plus_anna(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,

tests/test_init.py

@@ -547,7 +547,7 @@ def test_and_assert(test_dict, data, header):
             if initialize:
                 _LOGGER.info("Asserting testdata:")
                 data = await smile.async_update()
-                if smile.smile_legacy:
+                if smile.smile.legacy:
                     assert smile._timeout == 30
                 else:
                     assert smile._timeout == 10
@@ -557,7 +557,7 @@ def test_and_assert(test_dict, data, header):
 
         _LOGGER.info("Gateway id = %s", smile.gateway_id)
         _LOGGER.info("Heater id = %s", smile.heater_id)
-        _LOGGER.info("Hostname = %s", smile.smile_hostname)
+        _LOGGER.info("Hostname = %s", smile.smile.hostname)
         _LOGGER.info("Entities list = %s", data)
 
         self.cooling_present = smile.cooling_present
@@ -670,7 +670,7 @@ async def tinker_thermostat_temp(
         tinker_temp_passed = False
         test_temp = {"setpoint": 22.9}
         if self.cooling_present and not block_cooling:
-            if smile.smile_name == "Smile Anna":
+            if smile.smile.name == "Smile Anna":
                 if self._cooling_enabled:
                     test_temp = {"setpoint_low": 4.0, "setpoint_high": 23.0}
                 else:
@@ -999,17 +999,17 @@ def validate_test_basics(
         if smile_type:
             log_msg = f" # Assert type matching {smile_type}"
             parent_logger.info(log_msg)
-            assert smile.smile_type == smile_type
+            assert smile.smile.type == smile_type
         if smile_version:
             log_msg = f" # Assert version matching '{smile_version}"
             parent_logger.info(log_msg)
-            assert smile.smile_version == version.parse(smile_version)
+            assert smile.smile.version == version.parse(smile_version)
         log_msg = f" # Assert legacy {smile_legacy}"
         parent_logger.info(log_msg)
         if smile_legacy:
-            assert smile.smile_legacy
+            assert smile.smile.legacy
         else:
-            assert not smile.smile_legacy
+            assert not smile.smile.legacy
 
     class PlugwiseTestError(Exception):
         """Plugwise test exceptions class."""