more typing

tests/common.py

@@ -4,6 +4,7 @@
 """Python client library for the InterGas InComfort system (via Lan2RF gateway)."""
 
 from __future__ import annotations
+from typing import Any
 
 import aiohttp
 from aioresponses import aioresponses
@@ -20,7 +21,9 @@
 )
 
 
-async def gwy_with_heaterlist(hostname, heaterlist=GATEWAYS_WITH_HEATER[0]) -> Gateway:
+async def gwy_with_heaterlist(
+    hostname: str | None, heaterlist: dict[str, Any]
+) -> Gateway:
     """Request the heaterlist from a mocked gateway."""
 
     with aioresponses() as mocked:
@@ -37,7 +40,7 @@ async def gwy_with_heaterlist(hostname, heaterlist=GATEWAYS_WITH_HEATER[0]) -> G
     return gwy
 
 
-async def heater_with_status(data_heater, heaterlist=GATEWAYS_WITH_HEATER[0]) -> Heater:
+async def heater_with_status(data_heater: Any, heaterlist: Any) -> Heater:
     """Update the heater status from a mocked gateway."""
 
     with aioresponses() as mocked:

tests/test_gateway.py

@@ -6,7 +6,13 @@
 from __future__ import annotations
 
 import pytest
-from common import HOSTNAME, SERIAL_NO_0, SERIAL_NO_1, gwy_with_heaterlist
+from common import (
+    GATEWAYS_WITH_HEATER,
+    HOSTNAME,
+    SERIAL_NO_0,
+    SERIAL_NO_1,
+    gwy_with_heaterlist,
+)
 
 from incomfortclient import (
     HEATERLIST,
@@ -28,30 +34,35 @@
     {HEATERLIST: [None, NULL_SERIAL_NO, None, None, SERIAL_NO_0, None, None, None]},
 )
 
+# pylint: disable=protected-access
+
 
 @pytest.mark.asyncio
-async def test_gateway_invalid():
+async def test_gateway_invalid() -> None:
+    """Test an invalid gateway."""
     try:
-        await gwy_with_heaterlist(None)
+        await gwy_with_heaterlist(None, GATEWAYS_WITH_HEATER[0])
     except InvalidGateway:
         return
     raise AssertionError
 
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize("index", range(len(GATEWAYS_SANS_HEATERS)))
-async def test_heaterlist_empty(index, gateways=GATEWAYS_SANS_HEATERS):
+async def test_heaterlist_empty(index: int) -> None:
+    """Test the gateway with an empty heater list."""
     try:
-        await gwy_with_heaterlist(HOSTNAME, heaterlist=gateways[index])
+        await gwy_with_heaterlist(HOSTNAME, heaterlist=GATEWAYS_SANS_HEATERS[index])
     except InvalidHeaterList:
         return
     raise AssertionError
 
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize("index", range(len(GATEWAYS_WITH_HEATERS)))
-async def test_heaterlist_valid(index, gateways=GATEWAYS_WITH_HEATERS):
-    gwy = await gwy_with_heaterlist(HOSTNAME, heaterlist=gateways[index])
+async def test_heaterlist_valid(index: int) -> None:
+    """Test the gateway with a valid heater list."""
+    gwy = await gwy_with_heaterlist(HOSTNAME, heaterlist=GATEWAYS_WITH_HEATERS[index])
 
     assert gwy._heaters[0].serial_no == SERIAL_NO_0
     assert len(gwy._heaters) < 2 or gwy._heaters[1].serial_no == SERIAL_NO_1

tests/test_heater.py

@@ -6,7 +6,7 @@
 from __future__ import annotations
 
 import pytest
-from common import SERIAL_NO_0, heater_with_status
+from common import GATEWAYS_WITH_HEATER, SERIAL_NO_0, heater_with_status
 
 # Test data...
 HEATER_SANS_ROOMS = (
@@ -112,14 +112,18 @@
 
 
 @pytest.mark.asyncio
-async def test_heater_sans_rooms():
-    heater = await heater_with_status(HEATER_SANS_ROOMS[0])
+async def test_heater_sans_rooms() -> None:
+    """Test heater without rooms."""
+    heater = await heater_with_status(HEATER_SANS_ROOMS[0], GATEWAYS_WITH_HEATER[0])
     assert heater.status == HEATER_SANS_ROOMS[1]
     assert len(heater.rooms) == 0
 
 
 @pytest.mark.asyncio
-async def test_heater_with_rooms():
-    heater = await heater_with_status(HEATER_WITH_ROOMS[0])
+async def test_heater_with_rooms() -> None:
+    """Test heater with rooms."""
+    heater = await heater_with_status(
+        HEATER_WITH_ROOMS[0], heaterlist=GATEWAYS_WITH_HEATER[0]
+    )
     assert heater.status == HEATER_WITH_ROOMS[1]
     assert len(heater.rooms) == 1 and heater.rooms[0].status == HEATER_WITH_ROOMS[2]