fixup! fixup! fixup! fixup! Refactor tests in GIOS

Author: mik-laj

tests/components/gios/conftest.py

@@ -9,6 +9,8 @@
 from homeassistant.components.gios.const import DOMAIN
 from homeassistant.core import HomeAssistant
 
+from . import setup_integration
+
 from tests.common import MockConfigEntry
 
 
@@ -47,7 +49,7 @@ def mock_config_entry() -> MockConfigEntry:
 
 @pytest.fixture
 async def mock_gios(hass: HomeAssistant) -> AsyncGenerator[MagicMock]:
-    """Return a mocked GIOS client."""
+    """Yield a mocked GIOS client."""
     with (
         patch("homeassistant.components.gios.Gios") as mock_gios,
         patch("homeassistant.components.gios.coordinator.Gios", mock_gios),
@@ -73,8 +75,6 @@ async def init_integration(
     mock_gios: MagicMock,
 ) -> MockConfigEntry:
     """Set up the GIOS integration for testing."""
-    mock_config_entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
+    await setup_integration(hass, mock_config_entry)
 
     return mock_config_entry

tests/components/gios/test_init.py

@@ -5,12 +5,10 @@
 from homeassistant.components.air_quality import DOMAIN as AIR_QUALITY_PLATFORM
 from homeassistant.components.gios.const import DOMAIN
 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import STATE_UNAVAILABLE, Platform
+from homeassistant.const import STATE_UNAVAILABLE
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 
-from . import setup_integration
-
 from tests.common import MockConfigEntry
 
 
@@ -96,25 +94,3 @@ async def test_remove_air_quality_entities(
 
     entry = entity_registry.async_get("air_quality.home")
     assert entry is None
-
-
-async def test_unique_id_migration(
-    hass: HomeAssistant,
-    entity_registry: er.EntityRegistry,
-    mock_gios: MagicMock,
-    mock_config_entry: MockConfigEntry,
-) -> None:
-    """Test states of the unique_id migration."""
-    entity_registry.async_get_or_create(
-        Platform.SENSOR,
-        DOMAIN,
-        "123-pm2.5",
-        suggested_object_id="home_pm2_5",
-        disabled_by=None,
-    )
-
-    await setup_integration(hass, mock_config_entry)
-
-    entry = entity_registry.async_get("sensor.home_pm2_5")
-    assert entry
-    assert entry.unique_id == "123-pm25"

tests/components/gios/test_sensor.py

@@ -9,14 +9,14 @@
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
-from homeassistant.components.gios.const import SCAN_INTERVAL
+from homeassistant.components.gios.const import DOMAIN, SCAN_INTERVAL
 from homeassistant.const import STATE_UNAVAILABLE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
+from . import setup_integration
 
-pytestmark = pytest.mark.usefixtures("init_integration")
+from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
 
 
 @pytest.fixture(autouse=True)
@@ -26,6 +26,7 @@ def override_platforms() -> Generator[None]:
         yield
 
 
+@pytest.mark.usefixtures("init_integration")
 async def test_sensor(
     hass: HomeAssistant,
     entity_registry: er.EntityRegistry,
@@ -36,6 +37,7 @@ async def test_sensor(
     await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
 
 
+@pytest.mark.usefixtures("init_integration")
 async def test_availability(hass: HomeAssistant) -> None:
     """Ensure that we mark the entities unavailable correctly when service causes an error."""
     state = hass.states.get("sensor.home_pm2_5")
@@ -51,6 +53,7 @@ async def test_availability(hass: HomeAssistant) -> None:
     assert state.state == "good"
 
 
+@pytest.mark.usefixtures("init_integration")
 async def test_availability_api_error(
     hass: HomeAssistant,
     mock_gios: MagicMock,
@@ -124,3 +127,25 @@ async def test_availability_api_error(
     state = hass.states.get("sensor.home_air_quality_index")
     assert state
     assert state.state == "good"
+
+
+async def test_unique_id_migration(
+    hass: HomeAssistant,
+    entity_registry: er.EntityRegistry,
+    mock_gios: MagicMock,
+    mock_config_entry: MockConfigEntry,
+) -> None:
+    """Test states of the unique_id migration."""
+    entity_registry.async_get_or_create(
+        Platform.SENSOR,
+        DOMAIN,
+        "123-pm2.5",
+        suggested_object_id="home_pm2_5",
+        disabled_by=None,
+    )
+
+    await setup_integration(hass, mock_config_entry)
+
+    entry = entity_registry.async_get("sensor.home_pm2_5")
+    assert entry
+    assert entry.unique_id == "123-pm25"