Fix test-code

Author: bouwew

tests/test_adam.py

@@ -36,8 +36,8 @@ async def test_connect_adam_plus_anna_new(self):
         assert smile.gateway_id == "da224107914542988a88561b4452b0f6"
         assert smile._last_active["f2bf9048bef64cc5b6d5110154e33c81"] == "Weekschema"
         assert smile._last_active["f871b8c4d63549319221e294e4f88074"] == "Badkamer"
-        assert self.device_items == 173
-        assert self.device_list == [
+        assert self.entity_items == 173
+        assert self.entity_list == [
             "da224107914542988a88561b4452b0f6",
             "056ee145a816487eaa69243c3280f8bf",
             "10016900610d4c7481df78c89606ef22",

tests/test_init.py

@@ -516,19 +516,19 @@ async def disconnect(cls, server, client):
         await server.close()
 
     @staticmethod
-    def show_setup(location_list, device_zone_list):
+    def show_setup(location_list, entity_list):
         """Show informative outline of the setup."""
         _LOGGER.info("This environment looks like:")
         for loc_id, loc_info in location_list.items():
             _LOGGER.info(
                 "  --> Location: %s", "{} ({})".format(loc_info["name"], loc_id)
             )
             devzone_count = 0
-            for devzone_id, devzone_info in device_zone_list.items():
+            for devzone_id, devzone_info in entity_list.items():
                 if devzone_info.get("location", "not_found") == loc_id:
                     devzone_count += 1
                     _LOGGER.info(
-                        "      + Device_Zone: %s",
+                        "      + Entity: %s",
                         "{} ({} - {})".format(
                             devzone_info["name"], devzone_info["dev_class"], devzone_id
                         ),
@@ -595,7 +595,7 @@ def test_and_assert(test_dict, data, header):
                 _LOGGER.debug("Item %s test-asserts: %s", testitem, item_asserts)
 
             assert tests == asserts
-            _LOGGER.debug("Total device_zone test-asserts: %s", asserts)
+            _LOGGER.debug("Total entity test-asserts: %s", asserts)
 
         # pragma warning disable S3776
 
@@ -639,14 +639,14 @@ def test_and_assert(test_dict, data, header):
             _LOGGER.info("Skipping tests: Requested fixtures only")  # pragma: no cover
             return  # pragma: no cover
 
-        self.device_list = list(data.device_zones.keys())
+        self.entity_list = list(data.entities.keys())
         location_list = smile.loc_data
 
         _LOGGER.info("Gateway id = %s", data.gateway["gateway_id"])
         _LOGGER.info("Hostname = %s", smile.smile_hostname)
         _LOGGER.info("Gateway data = %s", data.gateway)
         _LOGGER.info("Entities list = %s", data.entities)
-        self.show_setup(location_list, data.device_zones)
+        self.show_setup(location_list, data.entities)
 
         if skip_testing:
             return