Fix zwave_js config validation for values (#127972)

homeassistant/components/zwave_js/config_validation.py

@@ -34,6 +34,8 @@ def boolean(value: Any) -> bool:
 
 VALUE_SCHEMA = vol.Any(
     boolean,
+    float,
+    int,
     vol.Coerce(int),
     vol.Coerce(float),
     BITMASK_SCHEMA,

tests/components/zwave_js/test_config_validation.py

@@ -1,27 +1,31 @@
 """Test the Z-Wave JS config validation helpers."""
 
+from typing import Any
+
 import pytest
 import voluptuous as vol
 
-from homeassistant.components.zwave_js.config_validation import boolean
+from homeassistant.components.zwave_js.config_validation import VALUE_SCHEMA, boolean
 
 
-def test_boolean_validation() -> None:
+@pytest.mark.parametrize(
-    """Test boolean config validator."""
+    ("test_cases", "expected_value"),
-    # test bool
+    [
-    assert boolean(True)
+        ([True, "true", "yes", "on", "ON", "enable"], True),
-    assert not boolean(False)
+        ([False, "false", "no", "off", "NO", "disable"], False),
-    # test strings
+        ([1.1, "1.1"], 1.1),
-    assert boolean("TRUE")
+        ([1.0, "1.0"], 1.0),
-    assert not boolean("FALSE")
+        ([1, "1"], 1),
-    assert boolean("ON")
+    ],
-    assert not boolean("NO")
+)
-    # ensure 1's and 0's don't get converted to bool
+def test_validation(test_cases: list[Any], expected_value: Any) -> None:
+    """Test config validation."""
+    for case in test_cases:
+        assert VALUE_SCHEMA(case) == expected_value
+
+
+@pytest.mark.parametrize("value", ["invalid", "1", "0", 1, 0])
+def test_invalid_boolean_validation(value: str | int) -> None:
+    """Test invalid cases for boolean config validator."""
     with pytest.raises(vol.Invalid):
-        boolean("1")
+        boolean(value)
-    with pytest.raises(vol.Invalid):
-        boolean("0")
-    with pytest.raises(vol.Invalid):
-        boolean(1)
-    with pytest.raises(vol.Invalid):
-        boolean(0)