Refactor spc tests (#123287)

homeassistant/components/spc/__init__.py

@@ -41,7 +41,7 @@ CONFIG_SCHEMA = vol.Schema(
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the SPC component."""
 
-    async def async_upate_callback(spc_object):
+    async def async_update_callback(spc_object):
         if isinstance(spc_object, Area):
             async_dispatcher_send(hass, SIGNAL_UPDATE_ALARM.format(spc_object.id))
         elif isinstance(spc_object, Zone):
@@ -54,7 +54,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         session=session,
         api_url=config[DOMAIN].get(CONF_API_URL),
         ws_url=config[DOMAIN].get(CONF_WS_URL),
-        async_callback=async_upate_callback,
+        async_callback=async_update_callback,
     )
 
     hass.data[DATA_API] = spc

tests/components/spc/conftest.py

@@ -0,0 +1,26 @@
+"""Tests for Vanderbilt SPC component."""
+
+from collections.abc import Generator
+from unittest.mock import AsyncMock, patch
+
+import pyspcwebgw
+import pytest
+
+
+@pytest.fixture
+def mock_client() -> Generator[AsyncMock]:
+    """Mock the SPC client."""
+
+    with patch(
+        "homeassistant.components.spc.SpcWebGateway", autospec=True
+    ) as mock_client:
+        client = mock_client.return_value
+        client.async_load_parameters.return_value = True
+        mock_area = AsyncMock(spec=pyspcwebgw.area.Area)
+        mock_area.id = "1"
+        mock_area.mode = pyspcwebgw.const.AreaMode.FULL_SET
+        mock_area.last_changed_by = "Sven"
+        mock_area.name = "House"
+        mock_area.verified_alarm = False
+        client.areas = {"1": mock_area}
+        yield mock_client

tests/components/spc/test_alarm_control_panel.py

@@ -0,0 +1,34 @@
+"""Tests for Vanderbilt SPC component."""
+
+from unittest.mock import AsyncMock
+
+from pyspcwebgw.const import AreaMode
+
+from homeassistant.const import STATE_ALARM_ARMED_AWAY, STATE_ALARM_DISARMED
+from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
+
+
+async def test_update_alarm_device(hass: HomeAssistant, mock_client: AsyncMock) -> None:
+    """Test that alarm panel state changes on incoming websocket data."""
+
+    config = {"spc": {"api_url": "http://localhost/", "ws_url": "ws://localhost/"}}
+    assert await async_setup_component(hass, "spc", config) is True
+
+    await hass.async_block_till_done()
+
+    entity_id = "alarm_control_panel.house"
+
+    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
+    assert hass.states.get(entity_id).attributes["changed_by"] == "Sven"
+
+    mock_area = mock_client.return_value.areas["1"]
+
+    mock_area.mode = AreaMode.UNSET
+    mock_area.last_changed_by = "Anna"
+
+    await mock_client.call_args_list[0][1]["async_callback"](mock_area)
+    await hass.async_block_till_done()
+
+    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
+    assert hass.states.get(entity_id).attributes["changed_by"] == "Anna"

tests/components/spc/test_init.py

@@ -1,73 +1,22 @@
 """Tests for Vanderbilt SPC component."""
 
-from unittest.mock import Mock, PropertyMock, patch
+from unittest.mock import AsyncMock
 
-import pyspcwebgw
-from pyspcwebgw.const import AreaMode
-
-from homeassistant.components.spc import DATA_API
-from homeassistant.const import STATE_ALARM_ARMED_AWAY, STATE_ALARM_DISARMED
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
 
-async def test_valid_device_config(hass: HomeAssistant) -> None:
+async def test_valid_device_config(hass: HomeAssistant, mock_client: AsyncMock) -> None:
     """Test valid device config."""
     config = {"spc": {"api_url": "http://localhost/", "ws_url": "ws://localhost/"}}
 
-    with patch(
-        "homeassistant.components.spc.SpcWebGateway.async_load_parameters",
-        return_value=True,
-    ):
     assert await async_setup_component(hass, "spc", config) is True
 
 
-async def test_invalid_device_config(hass: HomeAssistant) -> None:
+async def test_invalid_device_config(
+    hass: HomeAssistant, mock_client: AsyncMock
+) -> None:
     """Test valid device config."""
     config = {"spc": {"api_url": "http://localhost/"}}
 
-    with patch(
-        "homeassistant.components.spc.SpcWebGateway.async_load_parameters",
-        return_value=True,
-    ):
     assert await async_setup_component(hass, "spc", config) is False
-
-
-async def test_update_alarm_device(hass: HomeAssistant) -> None:
-    """Test that alarm panel state changes on incoming websocket data."""
-
-    config = {"spc": {"api_url": "http://localhost/", "ws_url": "ws://localhost/"}}
-
-    area_mock = Mock(
-        spec=pyspcwebgw.area.Area,
-        id="1",
-        mode=AreaMode.FULL_SET,
-        last_changed_by="Sven",
-    )
-    area_mock.name = "House"
-    area_mock.verified_alarm = False
-
-    with patch(
-        "homeassistant.components.spc.SpcWebGateway.areas", new_callable=PropertyMock
-    ) as mock_areas:
-        mock_areas.return_value = {"1": area_mock}
-        with patch(
-            "homeassistant.components.spc.SpcWebGateway.async_load_parameters",
-            return_value=True,
-        ):
-            assert await async_setup_component(hass, "spc", config) is True
-
-        await hass.async_block_till_done()
-
-    entity_id = "alarm_control_panel.house"
-
-    assert hass.states.get(entity_id).state == STATE_ALARM_ARMED_AWAY
-    assert hass.states.get(entity_id).attributes["changed_by"] == "Sven"
-
-    area_mock.mode = AreaMode.UNSET
-    area_mock.last_changed_by = "Anna"
-    await hass.data[DATA_API]._async_callback(area_mock)
-    await hass.async_block_till_done()
-
-    assert hass.states.get(entity_id).state == STATE_ALARM_DISARMED
-    assert hass.states.get(entity_id).attributes["changed_by"] == "Anna"