Re-add removed test

Also add some support metods to check if a value is a valid XML Enum value

Author: nanomad

deebot_client/commands/xml/fan_speed.py

@@ -27,7 +27,11 @@ def _handle_xml(cls, event_bus: EventBus, xml: Element) -> HandlingResult:
 
         :return: A message response
         """
-        if xml.attrib.get("ret") != "ok" or not (speed := xml.attrib.get("speed")):
+        if (
+            xml.attrib.get("ret") != "ok"
+            or not (speed := xml.attrib.get("speed"))
+            or not FanSpeedLevel.is_valid_xml_value(speed)
+        ):
             return HandlingResult.analyse()
 
         event_bus.notify(FanSpeedEvent(FanSpeedLevel.from_xml(speed)))

deebot_client/util/enum.py

@@ -19,12 +19,26 @@ def __new__(cls, value: str, xml_value: str | None = None) -> Self:
         return obj
 
     @classmethod
-    def from_xml(cls, value: str | None) -> Self:
-        """Convert from xml value."""
+    def _from_xml(cls, value: str | None) -> Self | None:
+        """Convert from xml value, returning None if the value is not supported."""
         if value:
             for member in cls:
                 if member.xml_value == value:
                     return member
+        return None
+
+    @classmethod
+    def is_valid_xml_value(cls, value: str | None) -> bool:
+        """Convert from xml value."""
+        result = cls._from_xml(value)
+        return result is not None
+
+    @classmethod
+    def from_xml(cls, value: str | None) -> Self:
+        """Convert from xml value."""
+        result = cls._from_xml(value)
+        if result is not None:
+            return result
 
         msg = f"{value} is not a valid {cls.__name__}"
         raise ValueError(msg)
@@ -43,12 +57,26 @@ def __new__(cls, value: int, xml_value: str | None = None) -> Self:
         return obj
 
     @classmethod
-    def from_xml(cls, value: str | None) -> Self:
-        """Convert from xml value."""
+    def _from_xml(cls, value: str | None) -> Self | None:
+        """Convert from xml value, returning None if the value is not supported."""
         if value:
             for member in cls:
                 if member.xml_value == value:
                     return member
+        return None
+
+    @classmethod
+    def is_valid_xml_value(cls, value: str | None) -> bool:
+        """Convert from xml value."""
+        result = cls._from_xml(value)
+        return result is not None
+
+    @classmethod
+    def from_xml(cls, value: str | None) -> Self:
+        """Convert from xml value."""
+        result = cls._from_xml(value)
+        if result is not None:
+            return result
 
         msg = f"{value} is not a valid {cls.__name__}"
         raise ValueError(msg)

tests/commands/xml/test_fan_speed.py

@@ -41,8 +41,8 @@ async def test_get_fan_speed(speed: str, expected_event: Event) -> None:
 
 @pytest.mark.parametrize(
     "xml",
-    ["<ctl ret='error'/>"],
-    ids=["error"],
+    ["<ctl ret='error'/>", "<ctl ret='ok' />", "<ctl ret='ok' speed='invalid'/>"],
+    ids=["error", "no_state", "invalid_speed"],
 )
 async def test_get_fan_speed_error(xml: str) -> None:
     json = get_request_xml(xml)

tests/util/test_enum.py

@@ -13,6 +13,7 @@ class _TestStrEnumWithXml(StrEnumWithXml):
 
     def assert_self_conversion(self) -> None:
         assert self == _TestStrEnumWithXml(self.value)
+        assert _TestStrEnumWithXml.is_valid_xml_value(self.xml_value) is True
         assert self == _TestStrEnumWithXml.from_xml(self.xml_value)
 
 
@@ -22,6 +23,7 @@ class _TestIntEnumWithXml(IntEnumWithXml):
 
     def assert_self_conversion(self) -> None:
         assert self == _TestIntEnumWithXml(self.value)
+        assert _TestIntEnumWithXml.is_valid_xml_value(self.xml_value) is True
         assert self == _TestIntEnumWithXml.from_xml(self.xml_value)
 
 
@@ -49,5 +51,6 @@ def test_EnumWithXml_conversion(
 def test_EnumWithXml_invalid_value(
     test_enum_cls: type[T], invalid_value: str | None
 ) -> None:
+    assert test_enum_cls.is_valid_xml_value(invalid_value) is False
     with pytest.raises(ValueError, match=str(invalid_value)):
         test_enum_cls.from_xml(invalid_value)