make trigger_behavior selector translations common

homeassistant/components/alarm_control_panel/strings.json

@@ -78,9 +78,9 @@
   "selector": {
     "trigger_behavior": {
       "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
+        "any": "[%key:common::selector::trigger_behavior::options::any%]",
+        "first": "[%key:common::selector::trigger_behavior::options::first%]",
+        "last": "[%key:common::selector::trigger_behavior::options::last%]"
       }
     }
   },

homeassistant/components/assist_satellite/strings.json

@@ -23,9 +23,9 @@
     },
     "trigger_behavior": {
       "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
+        "any": "[%key:common::selector::trigger_behavior::options::any%]",
+        "first": "[%key:common::selector::trigger_behavior::options::first%]",
+        "last": "[%key:common::selector::trigger_behavior::options::last%]"
       }
     }
   },

homeassistant/components/asuswrt/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["aioasuswrt", "asusrouter", "asyncssh"],
-  "requirements": ["aioasuswrt==1.5.2", "asusrouter==1.21.3"]
+  "requirements": ["aioasuswrt==1.5.1", "asusrouter==1.21.3"]
 }

homeassistant/components/binary_sensor/strings.json

@@ -324,9 +324,9 @@
   "selector": {
     "trigger_behavior": {
       "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
+        "any": "[%key:common::selector::trigger_behavior::options::any%]",
+        "first": "[%key:common::selector::trigger_behavior::options::first%]",
+        "last": "[%key:common::selector::trigger_behavior::options::last%]"
       }
     }
   },

homeassistant/components/bsblan/manifest.json

@@ -7,7 +7,7 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["bsblan"],
-  "requirements": ["python-bsblan==3.1.4"],
+  "requirements": ["python-bsblan==3.1.3"],
   "zeroconf": [
     {
       "name": "bsb-lan*",

homeassistant/components/climate/strings.json

@@ -194,9 +194,9 @@
     },
     "trigger_behavior": {
       "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
+        "any": "[%key:common::selector::trigger_behavior::options::any%]",
+        "first": "[%key:common::selector::trigger_behavior::options::first%]",
+        "last": "[%key:common::selector::trigger_behavior::options::last%]"
       }
     }
   },

homeassistant/components/energyid/strings.json

@@ -1,8 +1,8 @@
 {
   "config": {
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+      "already_configured": "This device is already configured.",
+      "reauth_successful": "Reauthentication successful."
     },
     "create_entry": {
       "add_sensor_mapping_hint": "You can now add mappings from any sensor in Home Assistant to {integration_name} using the '+ add sensor mapping' button."

homeassistant/components/fan/strings.json

@@ -73,9 +73,9 @@
     },
     "trigger_behavior": {
       "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
+        "any": "[%key:common::selector::trigger_behavior::options::any%]",
+        "first": "[%key:common::selector::trigger_behavior::options::first%]",
+        "last": "[%key:common::selector::trigger_behavior::options::last%]"
       }
     }
   },

homeassistant/components/gentex_homelink/__init__.py

@@ -10,7 +10,7 @@ from homeassistant.helpers import aiohttp_client, config_entry_oauth2_flow
 
 from . import oauth2
 from .const import DOMAIN
-from .coordinator import HomeLinkConfigEntry, HomeLinkCoordinator
+from .coordinator import HomeLinkConfigEntry, HomeLinkCoordinator, HomeLinkData
 
 PLATFORMS: list[Platform] = [Platform.EVENT]
 
@@ -44,7 +44,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: HomeLinkConfigEntry) ->
     )
 
     await coordinator.async_config_entry_first_refresh()
-    entry.runtime_data = coordinator
+    entry.runtime_data = HomeLinkData(
+        provider=provider, coordinator=coordinator, last_update_id=None
+    )
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
@@ -52,5 +54,5 @@ async def async_setup_entry(hass: HomeAssistant, entry: HomeLinkConfigEntry) ->
 
 async def async_unload_entry(hass: HomeAssistant, entry: HomeLinkConfigEntry) -> bool:
     """Unload a config entry."""
-    await entry.runtime_data.async_on_unload(None)
+    await entry.runtime_data.coordinator.async_on_unload(None)
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/gentex_homelink/coordinator.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Callable
+from dataclasses import dataclass
 from functools import partial
 import logging
 from typing import TypedDict
@@ -16,10 +17,19 @@ from homeassistant.util.ssl import get_default_context
 
 _LOGGER = logging.getLogger(__name__)
 
-type HomeLinkConfigEntry = ConfigEntry[HomeLinkCoordinator]
+type HomeLinkConfigEntry = ConfigEntry[HomeLinkData]
 type EventCallback = Callable[[HomeLinkEventData], None]
 
 
+@dataclass
+class HomeLinkData:
+    """Class for HomeLink integration runtime data."""
+
+    provider: MQTTProvider
+    coordinator: HomeLinkCoordinator
+    last_update_id: str | None
+
+
 class HomeLinkEventData(TypedDict):
     """Data for a single event."""
 
@@ -58,7 +68,7 @@ class HomeLinkCoordinator:
         self._listeners[target_event_id] = update_callback
         return partial(self.__async_remove_listener_internal, target_event_id)
 
-    def __async_remove_listener_internal(self, listener_id: str) -> None:
+    def __async_remove_listener_internal(self, listener_id: str):
         del self._listeners[listener_id]
 
     @callback
@@ -82,7 +92,7 @@ class HomeLinkCoordinator:
         await self.discover_devices()
         self.provider.listen(self.on_message)
 
-    async def discover_devices(self) -> None:
+    async def discover_devices(self):
         """Discover devices and build the Entities."""
         self.device_data = await self.provider.discover()
 

homeassistant/components/gentex_homelink/event.py

@@ -3,24 +3,25 @@
 from __future__ import annotations
 
 from homeassistant.components.event import EventDeviceClass, EventEntity
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN, EVENT_PRESSED
-from .coordinator import HomeLinkConfigEntry, HomeLinkCoordinator, HomeLinkEventData
+from .coordinator import HomeLinkCoordinator, HomeLinkEventData
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: HomeLinkConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
-    """Add the entities for the event platform."""
-    coordinator = config_entry.runtime_data
+    """Add the entities for the binary sensor."""
+    coordinator = config_entry.runtime_data.coordinator
 
     async_add_entities(
-        HomeLinkEventEntity(coordinator, button.id, button.name, device.id, device.name)
+        HomeLinkEventEntity(button.id, button.name, device.id, device.name, coordinator)
         for device in coordinator.device_data
         for button in device.buttons
     )
@@ -39,11 +40,11 @@ class HomeLinkEventEntity(EventEntity):
 
     def __init__(
         self,
-        coordinator: HomeLinkCoordinator,
         button_id: str,
         param_name: str,
         device_id: str,
         device_name: str,
+        coordinator: HomeLinkCoordinator,
     ) -> None:
         """Initialize the event entity."""
 
@@ -73,4 +74,5 @@ class HomeLinkEventEntity(EventEntity):
         if update_data["requestId"] != self.last_request_id:
             self._trigger_event(EVENT_PRESSED)
             self.last_request_id = update_data["requestId"]
-            self.async_write_ha_state()
+
+        self.async_write_ha_state()

homeassistant/components/lawn_mower/strings.json

@@ -18,9 +18,9 @@
   "selector": {
     "trigger_behavior": {
       "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
+        "any": "[%key:common::selector::trigger_behavior::options::any%]",
+        "first": "[%key:common::selector::trigger_behavior::options::first%]",
+        "last": "[%key:common::selector::trigger_behavior::options::last%]"
       }
     }
   },

homeassistant/components/light/strings.json

@@ -330,9 +330,9 @@
     },
     "trigger_behavior": {
       "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
+        "any": "[%key:common::selector::trigger_behavior::options::any%]",
+        "first": "[%key:common::selector::trigger_behavior::options::first%]",
+        "last": "[%key:common::selector::trigger_behavior::options::last%]"
       }
     }
   },

homeassistant/components/media_player/strings.json

@@ -184,9 +184,9 @@
     },
     "trigger_behavior": {
       "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
+        "any": "[%key:common::selector::trigger_behavior::options::any%]",
+        "first": "[%key:common::selector::trigger_behavior::options::first%]",
+        "last": "[%key:common::selector::trigger_behavior::options::last%]"
       }
     }
   },

homeassistant/components/overkiz/water_heater/__init__.py

@@ -56,5 +56,4 @@ WIDGET_TO_WATER_HEATER_ENTITY = {
 CONTROLLABLE_NAME_TO_WATER_HEATER_ENTITY = {
     "modbuslink:AtlanticDomesticHotWaterProductionMBLComponent": AtlanticDomesticHotWaterProductionMBLComponent,
     "io:AtlanticDomesticHotWaterProductionV2_CV4E_IOComponent": AtlanticDomesticHotWaterProductionV2IOComponent,
-    "io:AtlanticDomesticHotWaterProductionV2_CETHI_V4_IOComponent": AtlanticDomesticHotWaterProductionV2IOComponent,
 }

homeassistant/components/rituals_perfume_genie/strings.json

@@ -2,7 +2,7 @@
   "config": {
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+      "reauth_successful": "Re-authentication was successful"
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",

homeassistant/components/smarttub/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/smarttub",
   "iot_class": "cloud_polling",
   "loggers": ["smarttub"],
-  "requirements": ["python-smarttub==0.0.46"]
+  "requirements": ["python-smarttub==0.0.45"]
 }

homeassistant/components/tuya/binary_sensor.py

@@ -380,7 +380,7 @@ class _CustomDPCodeWrapper(DPCodeWrapper):
 
     def read_device_status(self, device: CustomerDevice) -> bool | None:
         """Read the device value for the dpcode."""
-        if (raw_value := device.status.get(self.dpcode)) is None:
+        if (raw_value := self._read_device_status_raw(device)) is None:
             return None
         return raw_value in self._valid_values
 

homeassistant/components/tuya/cover.py

@@ -33,7 +33,7 @@ class _DPCodePercentageMappingWrapper(DPCodeIntegerWrapper):
         return False
 
     def read_device_status(self, device: CustomerDevice) -> float | None:
-        if (value := device.status.get(self.dpcode)) is None:
+        if (value := self._read_device_status_raw(device)) is None:
             return None
 
         return round(

homeassistant/components/tuya/event.py

@@ -77,7 +77,7 @@ class _AlarmMessageWrapper(DPCodeStringWrapper, _DPCodeEventWrapper):
 
     def get_event_attributes(self, device: CustomerDevice) -> dict[str, Any] | None:
         """Return the event attributes for the alarm message."""
-        if (raw_value := device.status.get(self.dpcode)) is None:
+        if (raw_value := self._read_device_status_raw(device)) is None:
             return None
         return {"message": b64decode(raw_value).decode("utf-8")}
 

homeassistant/components/tuya/light.py

@@ -53,7 +53,7 @@ class _BrightnessWrapper(DPCodeIntegerWrapper):
 
     def read_device_status(self, device: CustomerDevice) -> Any | None:
         """Return the brightness of this light between 0..255."""
-        if (brightness := device.status.get(self.dpcode)) is None:
+        if (brightness := self._read_device_status_raw(device)) is None:
             return None
 
         # Remap value to our scale
@@ -114,7 +114,7 @@ class _ColorTempWrapper(DPCodeIntegerWrapper):
 
     def read_device_status(self, device: CustomerDevice) -> Any | None:
         """Return the color temperature value in Kelvin."""
-        if (temperature := device.status.get(self.dpcode)) is None:
+        if (temperature := self._read_device_status_raw(device)) is None:
             return None
 
         return color_util.color_temperature_mired_to_kelvin(

homeassistant/components/tuya/models.py

@@ -46,6 +46,13 @@ class DPCodeWrapper(DeviceWrapper):
         """Init DPCodeWrapper."""
         self.dpcode = dpcode
 
+    def _read_device_status_raw(self, device: CustomerDevice) -> Any | None:
+        """Read the raw device status for the DPCode.
+
+        Private helper method for `read_device_status`.
+        """
+        return device.status.get(self.dpcode)
+
     def _convert_value_to_raw_value(self, device: CustomerDevice, value: Any) -> Any:
         """Convert a Home Assistant value back to a raw device value.
 
@@ -83,7 +90,7 @@ class DPCodeTypeInformationWrapper[T: TypeInformation](DPCodeWrapper):
     def read_device_status(self, device: CustomerDevice) -> Any | None:
         """Read the device value for the dpcode."""
         return self.type_information.process_raw_value(
-            device.status.get(self.dpcode), device
+            self._read_device_status_raw(device), device
         )
 
     @classmethod
@@ -190,7 +197,7 @@ class DPCodeBitmapBitWrapper(DPCodeWrapper):
 
     def read_device_status(self, device: CustomerDevice) -> bool | None:
         """Read the device value for the dpcode."""
-        if (raw_value := device.status.get(self.dpcode)) is None:
+        if (raw_value := self._read_device_status_raw(device)) is None:
             return None
         return (raw_value & (1 << self._mask)) != 0
 

homeassistant/components/tuya/sensor.py

@@ -76,7 +76,9 @@ class _WindDirectionWrapper(DPCodeTypeInformationWrapper[EnumTypeInformation]):
 
     def read_device_status(self, device: CustomerDevice) -> float | None:
         """Read the device value for the dpcode."""
-        if (raw_value := device.status.get(self.dpcode)) in self.type_information.range:
+        if (
+            raw_value := self._read_device_status_raw(device)
+        ) in self.type_information.range:
             return self._WIND_DIRECTIONS.get(raw_value)
         return None
 

homeassistant/components/vacuum/strings.json

@@ -38,9 +38,9 @@
   "selector": {
     "trigger_behavior": {
       "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
+        "any": "[%key:common::selector::trigger_behavior::options::any%]",
+        "first": "[%key:common::selector::trigger_behavior::options::first%]",
+        "last": "[%key:common::selector::trigger_behavior::options::last%]"
       }
     }
   },

homeassistant/package_constraints.txt

@@ -223,6 +223,3 @@ gql<4.0.0
 
 # Pin pytest-rerunfailures to prevent accidental breaks
 pytest-rerunfailures==16.0.1
-
-# pycares 5.x is not yet compatible with aiodns
-pycares==4.11.0

homeassistant/strings.json

@@ -124,6 +124,15 @@
       "model": "Model",
       "ui_managed": "Managed via UI"
     },
+    "selector": {
+      "trigger_behavior": {
+        "options": {
+          "any": "Any",
+          "first": "First",
+          "last": "Last"
+        }
+      }
+    },
     "state": {
       "active": "Active",
       "auto": "Auto",

requirements_all.txt

@@ -206,7 +206,7 @@ aioaquacell==0.2.0
 aioaseko==1.0.0
 
 # homeassistant.components.asuswrt
-aioasuswrt==1.5.2
+aioasuswrt==1.5.1
 
 # homeassistant.components.husqvarna_automower
 aioautomower==2.7.1
@@ -2475,7 +2475,7 @@ python-awair==0.2.5
 python-blockchain-api==0.0.2
 
 # homeassistant.components.bsblan
-python-bsblan==3.1.4
+python-bsblan==3.1.3
 
 # homeassistant.components.citybikes
 python-citybikes==0.3.3
@@ -2578,7 +2578,7 @@ python-ripple-api==0.0.3
 python-roborock==3.12.2
 
 # homeassistant.components.smarttub
-python-smarttub==0.0.46
+python-smarttub==0.0.45
 
 # homeassistant.components.snoo
 python-snoo==0.8.3

requirements_test_all.txt

@@ -197,7 +197,7 @@ aioaquacell==0.2.0
 aioaseko==1.0.0
 
 # homeassistant.components.asuswrt
-aioasuswrt==1.5.2
+aioasuswrt==1.5.1
 
 # homeassistant.components.husqvarna_automower
 aioautomower==2.7.1
@@ -2086,7 +2086,7 @@ python-MotionMount==2.3.0
 python-awair==0.2.5
 
 # homeassistant.components.bsblan
-python-bsblan==3.1.4
+python-bsblan==3.1.3
 
 # homeassistant.components.ecobee
 python-ecobee-api==0.3.2
@@ -2159,7 +2159,7 @@ python-rabbitair==0.0.8
 python-roborock==3.12.2
 
 # homeassistant.components.smarttub
-python-smarttub==0.0.46
+python-smarttub==0.0.45
 
 # homeassistant.components.snoo
 python-snoo==0.8.3

script/gen_requirements_all.py

@@ -214,9 +214,6 @@ gql<4.0.0
 
 # Pin pytest-rerunfailures to prevent accidental breaks
 pytest-rerunfailures==16.0.1
-
-# pycares 5.x is not yet compatible with aiodns
-pycares==4.11.0
 """
 
 GENERATED_MESSAGE = (

tests/components/gentex_homelink/__init__.py

@@ -1,32 +1 @@
 """Tests for the homelink integration."""
-
-from typing import Any
-from unittest.mock import AsyncMock
-
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry
-
-
-async def setup_integration(hass: HomeAssistant, entry: MockConfigEntry) -> None:
-    """Set up the homelink integration for testing."""
-    entry.add_to_hass(hass)
-    await hass.config_entries.async_setup(entry.entry_id)
-    await hass.async_block_till_done()
-
-
-async def update_callback(
-    hass: HomeAssistant, mock: AsyncMock, update_type: str, data: dict[str, Any]
-) -> None:
-    """Invoke the MQTT provider's message callback with the specified update type and data."""
-    for call in mock.listen.call_args_list:
-        call[0][0](
-            "topic",
-            {
-                "type": update_type,
-                "data": data,
-            },
-        )
-
-    await hass.async_block_till_done()
-    await hass.async_block_till_done()

tests/components/gentex_homelink/conftest.py

@@ -3,14 +3,8 @@
 from collections.abc import Generator
 from unittest.mock import AsyncMock, patch
 
-from homelink.model.button import Button
-import homelink.model.device
 import pytest
 
-from homeassistant.components.gentex_homelink import DOMAIN
-
-from tests.common import MockConfigEntry
-
 
 @pytest.fixture
 def mock_srp_auth() -> Generator[AsyncMock]:
@@ -30,50 +24,6 @@ def mock_srp_auth() -> Generator[AsyncMock]:
         yield instance
 
 
-@pytest.fixture
-def mock_mqtt_provider(mock_device: AsyncMock) -> Generator[AsyncMock]:
-    """Mock MQTT provider."""
-    with patch(
-        "homeassistant.components.gentex_homelink.MQTTProvider", autospec=True
-    ) as mock_mqtt_provider:
-        instance = mock_mqtt_provider.return_value
-        instance.discover.return_value = [mock_device]
-        yield instance
-
-
-@pytest.fixture
-def mock_device() -> AsyncMock:
-    """Mock Device instance."""
-    device = AsyncMock(spec=homelink.model.device.Device, autospec=True)
-    buttons = [
-        Button(id="1", name="Button 1", device=device),
-        Button(id="2", name="Button 2", device=device),
-        Button(id="3", name="Button 3", device=device),
-    ]
-    device.id = "TestDevice"
-    device.name = "TestDevice"
-    device.buttons = buttons
-    return device
-
-
-@pytest.fixture
-def mock_config_entry() -> MockConfigEntry:
-    """Mock setup entry."""
-    return MockConfigEntry(
-        domain=DOMAIN,
-        data={
-            "auth_implementation": "gentex_homelink",
-            "token": {
-                "access_token": "access",
-                "refresh_token": "refresh",
-                "expires_in": 3600,
-                "token_type": "bearer",
-                "expires_at": 1234567890,
-            },
-        },
-    )
-
-
 @pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock]:
     """Mock setup entry."""

tests/components/gentex_homelink/snapshots/test_event.ambr

@@ -1,172 +0,0 @@
-# serializer version: 1
-# name: test_entities[event.testdevice_button_1-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'event_types': list([
-        'Pressed',
-      ]),
-    }),
-    'config_entry_id': <ANY>,
-    'config_subentry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'event',
-    'entity_category': None,
-    'entity_id': 'event.testdevice_button_1',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <EventDeviceClass.BUTTON: 'button'>,
-    'original_icon': None,
-    'original_name': 'Button 1',
-    'platform': 'gentex_homelink',
-    'previous_unique_id': None,
-    'suggested_object_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '1',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_entities[event.testdevice_button_1-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'button',
-      'event_type': None,
-      'event_types': list([
-        'Pressed',
-      ]),
-      'friendly_name': 'TestDevice Button 1',
-    }),
-    'context': <ANY>,
-    'entity_id': 'event.testdevice_button_1',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_entities[event.testdevice_button_2-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'event_types': list([
-        'Pressed',
-      ]),
-    }),
-    'config_entry_id': <ANY>,
-    'config_subentry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'event',
-    'entity_category': None,
-    'entity_id': 'event.testdevice_button_2',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <EventDeviceClass.BUTTON: 'button'>,
-    'original_icon': None,
-    'original_name': 'Button 2',
-    'platform': 'gentex_homelink',
-    'previous_unique_id': None,
-    'suggested_object_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '2',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_entities[event.testdevice_button_2-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'button',
-      'event_type': None,
-      'event_types': list([
-        'Pressed',
-      ]),
-      'friendly_name': 'TestDevice Button 2',
-    }),
-    'context': <ANY>,
-    'entity_id': 'event.testdevice_button_2',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---
-# name: test_entities[event.testdevice_button_3-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': set({
-    }),
-    'area_id': None,
-    'capabilities': dict({
-      'event_types': list([
-        'Pressed',
-      ]),
-    }),
-    'config_entry_id': <ANY>,
-    'config_subentry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'event',
-    'entity_category': None,
-    'entity_id': 'event.testdevice_button_3',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'options': dict({
-    }),
-    'original_device_class': <EventDeviceClass.BUTTON: 'button'>,
-    'original_icon': None,
-    'original_name': 'Button 3',
-    'platform': 'gentex_homelink',
-    'previous_unique_id': None,
-    'suggested_object_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': '3',
-    'unit_of_measurement': None,
-  })
-# ---
-# name: test_entities[event.testdevice_button_3-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      'device_class': 'button',
-      'event_type': None,
-      'event_types': list([
-        'Pressed',
-      ]),
-      'friendly_name': 'TestDevice Button 3',
-    }),
-    'context': <ANY>,
-    'entity_id': 'event.testdevice_button_3',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': 'unknown',
-  })
-# ---

tests/components/gentex_homelink/snapshots/test_init.ambr

@@ -1,32 +0,0 @@
-# serializer version: 1
-# name: test_device
-  DeviceRegistryEntrySnapshot({
-    'area_id': None,
-    'config_entries': <ANY>,
-    'config_entries_subentries': <ANY>,
-    'configuration_url': None,
-    'connections': set({
-    }),
-    'disabled_by': None,
-    'entry_type': None,
-    'hw_version': None,
-    'id': <ANY>,
-    'identifiers': set({
-      tuple(
-        'gentex_homelink',
-        'TestDevice',
-      ),
-    }),
-    'labels': set({
-    }),
-    'manufacturer': None,
-    'model': None,
-    'model_id': None,
-    'name': 'TestDevice',
-    'name_by_user': None,
-    'primary_config_entry': <ANY>,
-    'serial_number': None,
-    'sw_version': None,
-    'via_device_id': None,
-  })
-# ---

tests/components/gentex_homelink/test_coordinator.py

@@ -0,0 +1,160 @@
+"""Tests for the homelink coordinator."""
+
+import asyncio
+import time
+from unittest.mock import patch
+
+from homelink.model.button import Button
+from homelink.model.device import Device
+import pytest
+
+from homeassistant.components.gentex_homelink import async_setup_entry
+from homeassistant.components.gentex_homelink.const import EVENT_PRESSED
+from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import STATE_UNAVAILABLE
+from homeassistant.core import HomeAssistant
+import homeassistant.helpers.entity_registry as er
+
+from tests.common import MockConfigEntry
+from tests.test_util.aiohttp import AiohttpClientMocker
+from tests.typing import ClientSessionGenerator
+
+DOMAIN = "gentex_homelink"
+
+deviceInst = Device(id="TestDevice", name="TestDevice")
+deviceInst.buttons = [
+    Button(id="Button 1", name="Button 1", device=deviceInst),
+    Button(id="Button 2", name="Button 2", device=deviceInst),
+    Button(id="Button 3", name="Button 3", device=deviceInst),
+]
+
+
+async def test_get_state_updates(
+    hass: HomeAssistant,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test state updates.
+
+    Tests that get_state calls are called by home assistant, and the homeassistant components respond appropriately to the data returned.
+    """
+    with patch(
+        "homeassistant.components.gentex_homelink.MQTTProvider", autospec=True
+    ) as MockProvider:
+        instance = MockProvider.return_value
+        instance.discover.return_value = [deviceInst]
+        config_entry = MockConfigEntry(
+            domain=DOMAIN,
+            unique_id=None,
+            version=1,
+            data={
+                "auth_implementation": "gentex_homelink",
+                "token": {"expires_at": time.time() + 10000, "access_token": ""},
+                "last_update_id": None,
+            },
+            state=ConfigEntryState.LOADED,
+        )
+        config_entry.add_to_hass(hass)
+        result = await async_setup_entry(hass, config_entry)
+        # Assert configuration worked without errors
+        assert result
+
+        provider = config_entry.runtime_data.provider
+        state_data = {
+            "type": "state",
+            "data": {
+                "Button 1": {"requestId": "rid1", "timestamp": time.time()},
+                "Button 2": {"requestId": "rid2", "timestamp": time.time()},
+                "Button 3": {"requestId": "rid3", "timestamp": time.time()},
+            },
+        }
+
+        # Test successful setup and first data fetch. The buttons should be unknown at the start
+        await hass.async_block_till_done(wait_background_tasks=True)
+        states = hass.states.async_all()
+        assert states, "No states were loaded"
+        assert all(state != STATE_UNAVAILABLE for state in states), (
+            "At least one state was not initialized as STATE_UNAVAILABLE"
+        )
+        buttons_unknown = [s.state == "unknown" for s in states]
+        assert buttons_unknown and all(buttons_unknown), (
+            "At least one button state was not initialized to unknown"
+        )
+
+        provider.listen.mock_calls[0].args[0](None, state_data)
+
+        await hass.async_block_till_done(wait_background_tasks=True)
+        await asyncio.gather(*asyncio.all_tasks() - {asyncio.current_task()})
+        await asyncio.sleep(0.01)
+        states = hass.states.async_all()
+
+        assert all(state != STATE_UNAVAILABLE for state in states), (
+            "Some button became unavailable"
+        )
+        buttons_pressed = [s.attributes["event_type"] == EVENT_PRESSED for s in states]
+        assert buttons_pressed and all(buttons_pressed), (
+            "At least one button was not pressed"
+        )
+
+
+async def test_request_sync(hass: HomeAssistant) -> None:
+    """Test that the config entry is reloaded when a requestSync request is sent."""
+    updatedDeviceInst = Device(id="TestDevice", name="TestDevice")
+    updatedDeviceInst.buttons = [
+        Button(id="Button 1", name="New Button 1", device=deviceInst),
+        Button(id="Button 2", name="New Button 2", device=deviceInst),
+        Button(id="Button 3", name="New Button 3", device=deviceInst),
+    ]
+
+    with patch(
+        "homeassistant.components.gentex_homelink.MQTTProvider", autospec=True
+    ) as MockProvider:
+        instance = MockProvider.return_value
+        instance.discover.side_effect = [[deviceInst], [updatedDeviceInst]]
+        config_entry = MockConfigEntry(
+            domain=DOMAIN,
+            unique_id=None,
+            version=1,
+            data={
+                "auth_implementation": "gentex_homelink",
+                "token": {"expires_at": time.time() + 10000, "access_token": ""},
+                "last_update_id": None,
+            },
+            state=ConfigEntryState.LOADED,
+        )
+        config_entry.add_to_hass(hass)
+        result = await async_setup_entry(hass, config_entry)
+        # Assert configuration worked without errors
+        assert result
+
+        # Check to see if the correct buttons names were loaded
+        comp = er.async_get(hass)
+        button_names = {"Button 1", "Button 2", "Button 3"}
+        registered_button_names = {b.original_name for b in comp.entities.values()}
+
+        assert button_names == registered_button_names, (
+            "Expect button names to be correct for the initial config"
+        )
+
+        provider = config_entry.runtime_data.provider
+        coordinator = config_entry.runtime_data.coordinator
+
+        with patch.object(
+            coordinator.hass.config_entries, "async_reload"
+        ) as async_reload_mock:
+            # Mimic request sync event
+            state_data = {
+                "type": "requestSync",
+            }
+            # async reload should not be called yet
+            async_reload_mock.assert_not_called()
+            # Send the request sync
+            provider.listen.mock_calls[0].args[0](None, state_data)
+            # Wait for the request to be processed
+            await hass.async_block_till_done(wait_background_tasks=True)
+            await asyncio.gather(*asyncio.all_tasks() - {asyncio.current_task()})
+            await asyncio.sleep(0.01)
+
+            # Now async reload should have been called
+            async_reload_mock.assert_called()

tests/components/gentex_homelink/test_event.py

@@ -1,55 +1,77 @@
 """Test that the devices and entities are correctly configured."""
 
-import time
-from unittest.mock import AsyncMock
+from unittest.mock import patch
 
+from homelink.model.button import Button
+from homelink.model.device import Device
 import pytest
-from syrupy.assertion import SnapshotAssertion
 
-from homeassistant.const import STATE_UNKNOWN
+from homeassistant.components.gentex_homelink import async_setup_entry
+from homeassistant.components.gentex_homelink.const import DOMAIN
+from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
+import homeassistant.helpers.device_registry as dr
 import homeassistant.helpers.entity_registry as er
 
-from . import setup_integration, update_callback
+from tests.common import MockConfigEntry
+from tests.test_util.aiohttp import AiohttpClientMocker
+from tests.typing import ClientSessionGenerator
 
-from tests.common import MockConfigEntry, snapshot_platform
+CLIENT_ID = "1234"
+CLIENT_SECRET = "5678"
+TEST_CONFIG_ENTRY_ID = "ABC123"
+
+"""Mock classes for testing."""
 
 
-async def test_entities(
+deviceInst = Device(id="TestDevice", name="TestDevice")
+deviceInst.buttons = [
+    Button(id="1", name="Button 1", device=deviceInst),
+    Button(id="2", name="Button 2", device=deviceInst),
+    Button(id="3", name="Button 3", device=deviceInst),
+]
+
+
+@pytest.fixture
+async def test_setup_config(
     hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_mqtt_provider: AsyncMock,
-    entity_registry: er.EntityRegistry,
-    snapshot: SnapshotAssertion,
+    hass_client_no_auth: ClientSessionGenerator,
+    aioclient_mock: AiohttpClientMocker,
+    caplog: pytest.LogCaptureFixture,
 ) -> None:
+    """Setup config entry."""
+    with patch(
+        "homeassistant.components.gentex_homelink.MQTTProvider", autospec=True
+    ) as MockProvider:
+        instance = MockProvider.return_value
+        instance.discover.return_value = [deviceInst]
+        config_entry = MockConfigEntry(
+            domain=DOMAIN,
+            unique_id=None,
+            version=1,
+            data={"auth_implementation": "gentex_homelink"},
+            state=ConfigEntryState.LOADED,
+        )
+        config_entry.add_to_hass(hass)
+        result = await async_setup_entry(hass, config_entry)
+
+        # Assert configuration worked without errors
+        assert result
+
+
+async def test_device_registered(hass: HomeAssistant, test_setup_config) -> None:
+    """Check if a device is registered."""
+    # Assert we got a device with the test ID
+    device_registry = dr.async_get(hass)
+    device = device_registry.async_get_device([(DOMAIN, "TestDevice")])
+    assert device
+    assert device.name == "TestDevice"
+
+
+def test_entities_registered(hass: HomeAssistant, test_setup_config) -> None:
     """Check if the entities are registered."""
-    await setup_integration(hass, mock_config_entry)
+    comp = er.async_get(hass)
+    button_names = {"Button 1", "Button 2", "Button 3"}
+    registered_button_names = {b.original_name for b in comp.entities.values()}
 
-    await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
-
-
-@pytest.mark.freeze_time("2021-07-30")
-async def test_entities_update(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_mqtt_provider: AsyncMock,
-) -> None:
-    """Check if the entities are updated."""
-    await setup_integration(hass, mock_config_entry)
-
-    assert hass.states.get("event.testdevice_button_1").state == STATE_UNKNOWN
-
-    await update_callback(
-        hass,
-        mock_mqtt_provider,
-        "state",
-        {
-            "1": {"requestId": "rid1", "timestamp": time.time()},
-            "2": {"requestId": "rid2", "timestamp": time.time()},
-            "3": {"requestId": "rid3", "timestamp": time.time()},
-        },
-    )
-    assert (
-        hass.states.get("event.testdevice_button_1").state
-        == "2021-07-30T00:00:00.000+00:00"
-    )
+    assert button_names == registered_button_names

tests/components/gentex_homelink/test_init.py

@@ -1,66 +1,32 @@
 """Test that the integration is initialized correctly."""
 
-from unittest.mock import AsyncMock, patch
-
-from syrupy.assertion import SnapshotAssertion
+from unittest.mock import patch
 
+from homeassistant.components import gentex_homelink
 from homeassistant.components.gentex_homelink.const import DOMAIN
-from homeassistant.config_entries import ConfigEntryState
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.device_registry as dr
-
-from . import setup_integration, update_callback
+from homeassistant.setup import async_setup_component
 
 from tests.common import MockConfigEntry
 
 
-async def test_device(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_mqtt_provider: AsyncMock,
-    device_registry: dr.DeviceRegistry,
-    snapshot: SnapshotAssertion,
-) -> None:
-    """Test device is registered correctly."""
-    await setup_integration(hass, mock_config_entry)
-
-    device = device_registry.async_get_device(
-        identifiers={(DOMAIN, "TestDevice")},
-    )
-    assert device
-    assert device == snapshot
-
-
-async def test_reload_sync(
-    hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_mqtt_provider: AsyncMock,
-) -> None:
-    """Test that the config entry is reloaded when a requestSync request is sent."""
-    await setup_integration(hass, mock_config_entry)
-
-    with patch.object(hass.config_entries, "async_reload") as async_reload_mock:
-        await update_callback(
-            hass,
-            mock_mqtt_provider,
-            "requestSync",
-            {},
-        )
-
-        async_reload_mock.assert_called_once_with(mock_config_entry.entry_id)
-
-
 async def test_load_unload_entry(
     hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
-    mock_mqtt_provider: AsyncMock,
 ) -> None:
     """Test the entry can be loaded and unloaded."""
-    await setup_integration(hass, mock_config_entry)
+    with patch("homeassistant.components.gentex_homelink.MQTTProvider", autospec=True):
+        entry = MockConfigEntry(
+            domain=DOMAIN,
+            unique_id=None,
+            version=1,
+            data={"auth_implementation": "gentex_homelink"},
+        )
+        entry.add_to_hass(hass)
 
-    assert mock_config_entry.state is ConfigEntryState.LOADED
+        assert await async_setup_component(hass, DOMAIN, {}) is True, (
+            "Component is not set up"
+        )
 
-    await hass.config_entries.async_unload(mock_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
+        assert await gentex_homelink.async_unload_entry(hass, entry), (
+            "Component not unloaded"
+        )