⬆️ Refactor hot water test methods to improve type hinting and return handling

Author: liudger

tests/test_bsblan_edge_cases.py

@@ -37,7 +37,7 @@ async def test_validate_api_section_key_error(monkeypatch: Any) -> None:
         # Set up basic initialization
         bsblan._firmware_version = "1.0.38-20200730234859"
         bsblan._api_version = "v3"
-        bsblan._api_data = {"other_section": {}}  # Missing section
+        bsblan._api_data = {"other_section": {}}  # type: ignore[assignment]
 
         # Mock API validator
         mock_validator = MagicMock()
@@ -53,7 +53,7 @@ async def test_validate_api_section_key_error(monkeypatch: Any) -> None:
             BSBLANError,
             match="Section 'nonexistent' not found in API data",
         ):
-            await bsblan._validate_api_section("nonexistent")
+            await bsblan._validate_api_section("nonexistent")  # type: ignore[arg-type]
 
 
 @pytest.mark.asyncio

tests/test_hot_water_additional.py

@@ -54,11 +54,12 @@ def mock_request(**kwargs: Any) -> dict[str, Any]:
             param_string = kwargs.get("params", {}).get("Parameter", "")
             if param_string:
                 requested_param_ids = param_string.split(",")
-                return {
+                result: dict[str, Any] = {
                     param_id: fixture_data[param_id]
                     for param_id in requested_param_ids
                     if param_id in fixture_data
                 }
+                return result
             return fixture_data
 
         request_mock = AsyncMock(side_effect=mock_request)
@@ -196,11 +197,12 @@ def mock_request(**kwargs: Any) -> dict[str, Any]:
             param_string = kwargs.get("params", {}).get("Parameter", "")
             if param_string:
                 requested_param_ids = param_string.split(",")
-                return {
+                result: dict[str, Any] = {
                     param_id: schedule_fixture_data[param_id]
                     for param_id in requested_param_ids
                     if param_id in schedule_fixture_data
                 }
+                return result
             return schedule_fixture_data
 
         request_mock = AsyncMock(side_effect=mock_request)
@@ -278,7 +280,7 @@ async def test_populate_hot_water_cache_no_validator() -> None:
     bsblan = BSBLAN(config)
 
     # Ensure no validator is set
-    bsblan._api_validator = None
+    bsblan._api_validator = None  # type: ignore[assignment]
 
     # Should not raise an error, just return without doing anything
     bsblan._populate_hot_water_cache()

tests/test_hotwater_state.py

@@ -73,11 +73,12 @@ def mock_request(**kwargs: Any) -> dict[str, Any]:
             if param_string:
                 requested_param_ids = param_string.split(",")
                 # Return only the requested parameters from the fixture
-                return {
+                result: dict[str, Any] = {
                     param_id: fixture_data[param_id]
                     for param_id in requested_param_ids
                     if param_id in fixture_data
                 }
+                return result
             return fixture_data
 
         request_mock = AsyncMock(side_effect=mock_request)