Added tests to all devices. Refactored all other tests and added new cases.

Author: epdevlab

inelsmqtt/const.py

@@ -244,7 +244,7 @@
     "111": SWITCH, # FA3_612M,
     "112": SWITCH, # IOU3_108M,
 
-    "114" : SWITCH, # RC3_610DALI,
+    "114": SWITCH, # RC3_610DALI,
     "115": SENSOR, # IM3_20B,
     "116": SENSOR, # IM3_40B,
     "117": SENSOR, # IM3_80B
@@ -258,7 +258,7 @@
     "128": SWITCH, # GCR3_11,
     "129": SWITCH, # GCH3_31,
 
-    "136": SENSOR, # GSP3_100,
+    "136": BUTTON, # GSP3_100,
     "137": BUTTON, # GDB3_10,
     "138": BUTTON, # GSB3_40SX,
     "139": BUTTON, # GSB3_60SX

inelsmqtt/devices/__init__.py

@@ -97,6 +97,15 @@ def is_subscribed(self) -> bool:
         """
         return self.__mqtt.is_subscribed(self.__state_topic)
 
+    @property
+    def device_class(self) -> str:
+        """Get device class of the device
+
+        Returns:
+            str: Device class
+        """
+        return self.__device_class
+
     @property
     def inels_type(self) -> str:
         """Get inels type of the device
@@ -140,12 +149,12 @@ def is_available(self) -> bool:
         Returns:
             bool: True/False
         """
-        gw = self.__mqtt.messages().get(self._Device__gw_connected_topic)
+        gw = self.__mqtt.messages().get(self.gw_connected_topic)
         if gw is not None:
             if not GW_CONNECTED.get(gw):
                 return False
 
-        val = self.__mqtt.messages().get(self._Device__connected_topic)
+        val = self.__mqtt.messages().get(self.connected_topic)
         if isinstance(val, (bytes, bytearray)):
             val = val.decode()
 
@@ -182,6 +191,24 @@ def domain(self) -> str:
             str: Name of the domain
         """
         return self.__domain
+    
+    @property
+    def connected_topic(self) -> str:
+        """Connected topic
+
+        Returns:
+            str: string of the connected topic
+        """
+        return self.__connected_topic
+
+    @property
+    def gw_connected_topic(self) -> str:
+        """Gateway connected topic
+
+        Returns:
+            str: string of the gateway connected topic
+        """
+        return self.__gw_connected_topic
 
     @property
     def state(self) -> Any:
@@ -359,4 +386,4 @@ def model_number(self) -> str:
     @property
     def serial_number(self) -> str:
         """Serial number of the device."""
-        return self.__device.unique_id
+        return self.__device.unique_id

inelsmqtt/discovery.py

@@ -16,17 +16,6 @@ def __init__(self, mqtt: InelsMqtt) -> None:
         """Initialize inels mqtt discovery"""
         self.__mqtt = mqtt
         self.__devices: list[Device] = []
-        self.__coordinators: list[str] = []
-        self.__coordinators_with_devices: dict[str, list[Device]] = {}
-
-    @property
-    def coordinators(self) -> list[str]:
-        """Coordinators list
-
-        Returns:
-            _type_: list of coordinator serial numbers
-        """
-        return self.__coordinators
 
     @property
     def devices(self) -> list[Device]:
@@ -72,12 +61,6 @@ def discovery(self) -> dict[str, list[Device]]:
         devs = sanitized_devs
 
         self.__devices = [Device(self.__mqtt, "inels/status/" + item) for item in devs]
-        # for item in self.__devices:
-        #     if item.parent_id not in self.__coordinators:
-        #         self.__coordinators.append(item.parent_id)
-        #         self.__coordinators_with_devices[item.parent_id] = []
-
-        #     self.__coordinators_with_devices[item.parent_id].append(item)
 
         _LOGGER.info("Discovered %s devices", len(self.__devices))
 

inelsmqtt/util.py

@@ -1,3 +1,4 @@
 flake8==4.0.1
 paho-mqtt==1.6.1
-attrs>=21.2.0
+pytest==8.2.0
+attrs>=21.2.0