diff --git a/tests/components/hue/conftest.py b/tests/components/hue/conftest.py index 43a3b1518b7..dd4fc7f3d7a 100644 --- a/tests/components/hue/conftest.py +++ b/tests/components/hue/conftest.py @@ -20,7 +20,7 @@ from homeassistant.setup import async_setup_component from .const import FAKE_BRIDGE, FAKE_BRIDGE_DEVICE -from tests.common import MockConfigEntry, load_fixture, mock_device_registry +from tests.common import MockConfigEntry, load_fixture @pytest.fixture(autouse=True) @@ -276,9 +276,3 @@ async def setup_platform( # and make sure it completes before going further await hass.async_block_till_done() - - -@pytest.fixture(name="device_reg") -def get_device_reg(hass): - """Return an empty, loaded, registry.""" - return mock_device_registry(hass) diff --git a/tests/components/hue/test_device_trigger_v1.py b/tests/components/hue/test_device_trigger_v1.py index facd267cad9..c9334052aa6 100644 --- a/tests/components/hue/test_device_trigger_v1.py +++ b/tests/components/hue/test_device_trigger_v1.py @@ -21,7 +21,7 @@ async def test_get_triggers( hass: HomeAssistant, entity_registry: er.EntityRegistry, mock_bridge_v1, - device_reg: dr.DeviceRegistry, + device_registry: dr.DeviceRegistry, ) -> None: """Test we get the expected triggers from a hue remote.""" mock_bridge_v1.mock_sensor_responses.append(REMOTES_RESPONSE) @@ -32,7 +32,7 @@ async def test_get_triggers( assert len(hass.states.async_all()) == 1 # Get triggers for specific tap switch - hue_tap_device = device_reg.async_get_device( + hue_tap_device = device_registry.async_get_device( identifiers={(hue.DOMAIN, "00:00:00:00:00:44:23:08")} ) triggers = await async_get_device_automations( @@ -53,7 +53,7 @@ async def test_get_triggers( assert triggers == unordered(expected_triggers) # Get triggers for specific dimmer switch - hue_dimmer_device = device_reg.async_get_device( + hue_dimmer_device = device_registry.async_get_device( identifiers={(hue.DOMAIN, "00:17:88:01:10:3e:3a:dc")} ) hue_bat_sensor = entity_registry.async_get( @@ -91,7 +91,7 @@ async def test_get_triggers( async def test_if_fires_on_state_change( hass: HomeAssistant, mock_bridge_v1, - device_reg: dr.DeviceRegistry, + device_registry: dr.DeviceRegistry, service_calls: list[ServiceCall], ) -> None: """Test for button press trigger firing.""" @@ -101,7 +101,7 @@ async def test_if_fires_on_state_change( assert len(hass.states.async_all()) == 1 # Set an automation with a specific tap switch trigger - hue_tap_device = device_reg.async_get_device( + hue_tap_device = device_registry.async_get_device( identifiers={(hue.DOMAIN, "00:00:00:00:00:44:23:08")} ) assert await async_setup_component( diff --git a/tests/components/hue/test_device_trigger_v2.py b/tests/components/hue/test_device_trigger_v2.py index 0a89b3263c7..0c1ed749ca4 100644 --- a/tests/components/hue/test_device_trigger_v2.py +++ b/tests/components/hue/test_device_trigger_v2.py @@ -8,7 +8,7 @@ from homeassistant.components.device_automation import DeviceAutomationType from homeassistant.components.hue.v2.device import async_setup_devices from homeassistant.components.hue.v2.hue_event import async_setup_hue_events from homeassistant.core import HomeAssistant -from homeassistant.helpers import entity_registry as er +from homeassistant.helpers import device_registry as dr, entity_registry as er from .conftest import setup_platform @@ -50,14 +50,14 @@ async def test_get_triggers( entity_registry: er.EntityRegistry, mock_bridge_v2, v2_resources_test_data, - device_reg, + device_registry: dr.DeviceRegistry, ) -> None: """Test we get the expected triggers from a hue remote.""" await mock_bridge_v2.api.load_test_data(v2_resources_test_data) await setup_platform(hass, mock_bridge_v2, ["binary_sensor", "sensor"]) # Get triggers for `Wall switch with 2 controls` - hue_wall_switch_device = device_reg.async_get_device( + hue_wall_switch_device = device_registry.async_get_device( identifiers={(hue.DOMAIN, "3ff06175-29e8-44a8-8fe7-af591b0025da")} ) hue_bat_sensor = entity_registry.async_get( diff --git a/tests/components/hue/test_sensor_v1.py b/tests/components/hue/test_sensor_v1.py index b1ef94f8ed0..7406d7e27e4 100644 --- a/tests/components/hue/test_sensor_v1.py +++ b/tests/components/hue/test_sensor_v1.py @@ -10,7 +10,7 @@ from homeassistant.components.hue.const import ATTR_HUE_EVENT from homeassistant.components.hue.v1 import sensor_base from homeassistant.const import EntityCategory from homeassistant.core import HomeAssistant -from homeassistant.helpers import entity_registry as er +from homeassistant.helpers import device_registry as dr, entity_registry as er from .conftest import create_mock_bridge, setup_platform @@ -452,7 +452,10 @@ async def test_update_unauthorized(hass: HomeAssistant, mock_bridge_v1) -> None: async def test_hue_events( - hass: HomeAssistant, freezer: FrozenDateTimeFactory, mock_bridge_v1, device_reg + hass: HomeAssistant, + freezer: FrozenDateTimeFactory, + mock_bridge_v1, + device_registry: dr.DeviceRegistry, ) -> None: """Test that hue remotes fire events when pressed.""" mock_bridge_v1.mock_sensor_responses.append(SENSOR_RESPONSE) @@ -464,7 +467,7 @@ async def test_hue_events( assert len(hass.states.async_all()) == 7 assert len(events) == 0 - hue_tap_device = device_reg.async_get_device( + hue_tap_device = device_registry.async_get_device( identifiers={(hue.DOMAIN, "00:00:00:00:00:44:23:08")} ) @@ -495,7 +498,7 @@ async def test_hue_events( "last_updated": "2019-12-28T22:58:03", } - hue_dimmer_device = device_reg.async_get_device( + hue_dimmer_device = device_registry.async_get_device( identifiers={(hue.DOMAIN, "00:17:88:01:10:3e:3a:dc")} ) @@ -594,7 +597,7 @@ async def test_hue_events( async_fire_time_changed(hass) await hass.async_block_till_done() - hue_aurora_device = device_reg.async_get_device( + hue_aurora_device = device_registry.async_get_device( identifiers={(hue.DOMAIN, "ff:ff:00:0f:e7:fd:bc:b7")} )