diff --git a/tests/components/fibaro/test_scene.py b/tests/components/fibaro/test_scene.py
index 0ce618e903c21ca87d00b5375ce2c4701b698d13..e07face3ac00aa6257376ca68648726dc56dfb3f 100644
--- a/tests/components/fibaro/test_scene.py
+++ b/tests/components/fibaro/test_scene.py
@@ -13,6 +13,7 @@ from tests.common import MockConfigEntry
async def test_entity_attributes(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
mock_fibaro_client: Mock,
mock_config_entry: MockConfigEntry,
mock_scene: Mock,
@@ -22,7 +23,6 @@ async def test_entity_attributes(
# Arrange
mock_fibaro_client.read_rooms.return_value = [mock_room]
mock_fibaro_client.read_scenes.return_value = [mock_scene]
- entity_registry = er.async_get(hass)
# Act
await init_integration(hass, mock_config_entry)
# Assert
@@ -35,6 +35,7 @@ async def test_entity_attributes(
async def test_entity_attributes_without_room(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
mock_fibaro_client: Mock,
mock_config_entry: MockConfigEntry,
mock_scene: Mock,
@@ -45,7 +46,6 @@ async def test_entity_attributes_without_room(
mock_room.name = None
mock_fibaro_client.read_rooms.return_value = [mock_room]
mock_fibaro_client.read_scenes.return_value = [mock_scene]
- entity_registry = er.async_get(hass)
# Act
await init_integration(hass, mock_config_entry)
# Assert
diff --git a/tests/components/filter/test_sensor.py b/tests/components/filter/test_sensor.py
index 26df432a2705308b05f0b3198f8da95fadb64a4e..1f93875a001cd8b82873cc4d39f24bbc2de7bb46 100644
--- a/tests/components/filter/test_sensor.py
+++ b/tests/components/filter/test_sensor.py
@@ -249,7 +249,9 @@ async def test_history_time(recorder_mock: Recorder, hass: HomeAssistant) -> Non
assert state.state == "18.0"
-async def test_setup(recorder_mock: Recorder, hass: HomeAssistant) -> None:
+async def test_setup(
+ recorder_mock: Recorder, hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test if filter attributes are inherited."""
config = {
"sensor": {
@@ -284,8 +286,7 @@ async def test_setup(recorder_mock: Recorder, hass: HomeAssistant) -> None:
assert state.attributes[ATTR_STATE_CLASS] is SensorStateClass.TOTAL_INCREASING
assert state.state == "1.0"
- entity_reg = er.async_get(hass)
- entity_id = entity_reg.async_get_entity_id(
+ entity_id = entity_registry.async_get_entity_id(
"sensor", DOMAIN, "uniqueid_sensor_test"
)
assert entity_id == "sensor.test"
diff --git a/tests/components/fitbit/test_sensor.py b/tests/components/fitbit/test_sensor.py
index 9aa6f633e631a3072a183da24f2fabd365fb424b..08c9761bce24e9dcf4084b7d5b559ae91733ad53 100644
--- a/tests/components/fitbit/test_sensor.py
+++ b/tests/components/fitbit/test_sensor.py
@@ -279,7 +279,6 @@ async def test_device_battery(
"type": "scale",
}
- entity_registry = er.async_get(hass)
entry = entity_registry.async_get("sensor.aria_air_battery")
assert entry
assert entry.unique_id == f"{PROFILE_USER_ID}_devices/battery_016713257"
diff --git a/tests/components/flic/test_binary_sensor.py b/tests/components/flic/test_binary_sensor.py
index 41d2bf97c8e36ed6c6bd61acd920605f325dfb33..2fa703348f9a6db0169c7487e42c6530b5d0abb3 100644
--- a/tests/components/flic/test_binary_sensor.py
+++ b/tests/components/flic/test_binary_sensor.py
@@ -29,7 +29,9 @@ class _MockFlicClient:
self.channel = channel
-async def test_button_uid(hass: HomeAssistant) -> None:
+async def test_button_uid(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test UID assignment for Flic buttons."""
address_to_name = {
"80:e4:da:78:6e:11": "binary_sensor.flic_80e4da786e11",
@@ -53,7 +55,6 @@ async def test_button_uid(hass: HomeAssistant) -> None:
await hass.async_block_till_done()
- entity_registry = er.async_get(hass)
for address, name in address_to_name.items():
state = hass.states.get(name)
assert state
diff --git a/tests/components/flux_led/test_init.py b/tests/components/flux_led/test_init.py
index 969704edd18d30525305c18de5d64c04e2bf7462..7c709bafe732975686c4359ac6b7a9fa1833ef65 100644
--- a/tests/components/flux_led/test_init.py
+++ b/tests/components/flux_led/test_init.py
@@ -139,7 +139,7 @@ async def test_config_entry_retry_right_away_on_discovery(hass: HomeAssistant) -
async def test_coordinator_retry_right_away_on_discovery_already_setup(
- hass: HomeAssistant,
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
) -> None:
"""Test discovery makes the coordinator force poll if its already setup."""
config_entry = MockConfigEntry(
@@ -156,7 +156,6 @@ async def test_coordinator_retry_right_away_on_discovery_already_setup(
assert config_entry.state == ConfigEntryState.LOADED
entity_id = "light.bulb_rgbcw_ddeeff"
- entity_registry = er.async_get(hass)
assert entity_registry.async_get(entity_id).unique_id == MAC_ADDRESS
state = hass.states.get(entity_id)
assert state.state == STATE_ON
@@ -241,7 +240,9 @@ async def test_time_sync_startup_and_next_day(hass: HomeAssistant) -> None:
assert len(bulb.async_set_time.mock_calls) == 2
-async def test_unique_id_migrate_when_mac_discovered(hass: HomeAssistant) -> None:
+async def test_unique_id_migrate_when_mac_discovered(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test unique id migrated when mac discovered."""
config_entry = MockConfigEntry(
domain=DOMAIN,
@@ -260,7 +261,6 @@ async def test_unique_id_migrate_when_mac_discovered(hass: HomeAssistant) -> Non
await hass.async_block_till_done()
assert not config_entry.unique_id
- entity_registry = er.async_get(hass)
assert (
entity_registry.async_get("light.bulb_rgbcw_ddeeff").unique_id
== config_entry.entry_id
@@ -285,7 +285,7 @@ async def test_unique_id_migrate_when_mac_discovered(hass: HomeAssistant) -> Non
async def test_unique_id_migrate_when_mac_discovered_via_discovery(
- hass: HomeAssistant,
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
) -> None:
"""Test unique id migrated when mac discovered via discovery and the mac address from dhcp was one off."""
config_entry = MockConfigEntry(
@@ -306,7 +306,6 @@ async def test_unique_id_migrate_when_mac_discovered_via_discovery(
await hass.async_block_till_done()
assert config_entry.unique_id == MAC_ADDRESS_ONE_OFF
- entity_registry = er.async_get(hass)
assert (
entity_registry.async_get("light.bulb_rgbcw_ddeeff").unique_id
== MAC_ADDRESS_ONE_OFF
diff --git a/tests/components/flux_led/test_light.py b/tests/components/flux_led/test_light.py
index 171112c90975eb262937a6edb3843375dac27bc0..974a029d14306fd1a9cf05107ba95c22d986d233 100644
--- a/tests/components/flux_led/test_light.py
+++ b/tests/components/flux_led/test_light.py
@@ -81,7 +81,9 @@ from . import (
from tests.common import MockConfigEntry, async_fire_time_changed
-async def test_light_unique_id(hass: HomeAssistant) -> None:
+async def test_light_unique_id(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test a light unique id."""
config_entry = MockConfigEntry(
domain=DOMAIN,
@@ -95,13 +97,14 @@ async def test_light_unique_id(hass: HomeAssistant) -> None:
await hass.async_block_till_done()
entity_id = "light.bulb_rgbcw_ddeeff"
- entity_registry = er.async_get(hass)
assert entity_registry.async_get(entity_id).unique_id == MAC_ADDRESS
state = hass.states.get(entity_id)
assert state.state == STATE_ON
-async def test_light_goes_unavailable_and_recovers(hass: HomeAssistant) -> None:
+async def test_light_goes_unavailable_and_recovers(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test a light goes unavailable and then recovers."""
config_entry = MockConfigEntry(
domain=DOMAIN,
@@ -115,7 +118,6 @@ async def test_light_goes_unavailable_and_recovers(hass: HomeAssistant) -> None:
await hass.async_block_till_done()
entity_id = "light.bulb_rgbcw_ddeeff"
- entity_registry = er.async_get(hass)
assert entity_registry.async_get(entity_id).unique_id == MAC_ADDRESS
state = hass.states.get(entity_id)
assert state.state == STATE_ON
@@ -135,7 +137,9 @@ async def test_light_goes_unavailable_and_recovers(hass: HomeAssistant) -> None:
assert state.state == STATE_ON
-async def test_light_mac_address_not_found(hass: HomeAssistant) -> None:
+async def test_light_mac_address_not_found(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test a light when we cannot discover the mac address."""
config_entry = MockConfigEntry(
domain=DOMAIN, data={CONF_HOST: IP_ADDRESS, CONF_NAME: DEFAULT_ENTRY_TITLE}
@@ -147,7 +151,6 @@ async def test_light_mac_address_not_found(hass: HomeAssistant) -> None:
await hass.async_block_till_done()
entity_id = "light.bulb_rgbcw_ddeeff"
- entity_registry = er.async_get(hass)
assert entity_registry.async_get(entity_id).unique_id == config_entry.entry_id
state = hass.states.get(entity_id)
assert state.state == STATE_ON
@@ -161,7 +164,12 @@ async def test_light_mac_address_not_found(hass: HomeAssistant) -> None:
],
)
async def test_light_device_registry(
- hass: HomeAssistant, protocol: str, sw_version: int, model_num: int, model: str
+ hass: HomeAssistant,
+ device_registry: dr.DeviceRegistry,
+ protocol: str,
+ sw_version: int,
+ model_num: int,
+ model: str,
) -> None:
"""Test a light device registry entry."""
config_entry = MockConfigEntry(
@@ -180,7 +188,6 @@ async def test_light_device_registry(
await async_setup_component(hass, flux_led.DOMAIN, {flux_led.DOMAIN: {}})
await hass.async_block_till_done()
- device_registry = dr.async_get(hass)
device = device_registry.async_get_device(
connections={(dr.CONNECTION_NETWORK_MAC, MAC_ADDRESS)}
)
diff --git a/tests/components/flux_led/test_number.py b/tests/components/flux_led/test_number.py
index ff288c777df74e781bc0d78ad6ed1a4c85f0f22d..83bd0d1d51738ca22664a7aed6e1dd0aa7c4f0ce 100644
--- a/tests/components/flux_led/test_number.py
+++ b/tests/components/flux_led/test_number.py
@@ -41,7 +41,9 @@ from . import (
from tests.common import MockConfigEntry
-async def test_effects_speed_unique_id(hass: HomeAssistant) -> None:
+async def test_effects_speed_unique_id(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test a number unique id."""
config_entry = MockConfigEntry(
domain=DOMAIN,
@@ -55,11 +57,12 @@ async def test_effects_speed_unique_id(hass: HomeAssistant) -> None:
await hass.async_block_till_done()
entity_id = "number.bulb_rgbcw_ddeeff_effect_speed"
- entity_registry = er.async_get(hass)
assert entity_registry.async_get(entity_id).unique_id == MAC_ADDRESS
-async def test_effects_speed_unique_id_no_discovery(hass: HomeAssistant) -> None:
+async def test_effects_speed_unique_id_no_discovery(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test a number unique id."""
config_entry = MockConfigEntry(
domain=DOMAIN,
@@ -72,7 +75,6 @@ async def test_effects_speed_unique_id_no_discovery(hass: HomeAssistant) -> None
await hass.async_block_till_done()
entity_id = "number.bulb_rgbcw_ddeeff_effect_speed"
- entity_registry = er.async_get(hass)
assert entity_registry.async_get(entity_id).unique_id == config_entry.entry_id
diff --git a/tests/components/flux_led/test_select.py b/tests/components/flux_led/test_select.py
index 91be62e5ab7d679a86cf313c1cbd3aa6f02fe2ba..c8fd64c6811f75c4d280953ccaff80c498f751f1 100644
--- a/tests/components/flux_led/test_select.py
+++ b/tests/components/flux_led/test_select.py
@@ -68,7 +68,9 @@ async def test_switch_power_restore_state(hass: HomeAssistant) -> None:
)
-async def test_power_restored_unique_id(hass: HomeAssistant) -> None:
+async def test_power_restored_unique_id(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test a select unique id."""
config_entry = MockConfigEntry(
domain=DOMAIN,
@@ -82,14 +84,15 @@ async def test_power_restored_unique_id(hass: HomeAssistant) -> None:
await hass.async_block_till_done()
entity_id = "select.bulb_rgbcw_ddeeff_power_restored"
- entity_registry = er.async_get(hass)
assert (
entity_registry.async_get(entity_id).unique_id
== f"{MAC_ADDRESS}_power_restored"
)
-async def test_power_restored_unique_id_no_discovery(hass: HomeAssistant) -> None:
+async def test_power_restored_unique_id_no_discovery(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test a select unique id."""
config_entry = MockConfigEntry(
domain=DOMAIN,
@@ -102,7 +105,6 @@ async def test_power_restored_unique_id_no_discovery(hass: HomeAssistant) -> Non
await hass.async_block_till_done()
entity_id = "select.bulb_rgbcw_ddeeff_power_restored"
- entity_registry = er.async_get(hass)
assert (
entity_registry.async_get(entity_id).unique_id
== f"{config_entry.entry_id}_power_restored"
diff --git a/tests/components/flux_led/test_switch.py b/tests/components/flux_led/test_switch.py
index cb0034f8d36b191a4bee3150bece882e5bd71b85..5d025a4cab0883fcbe1c9c64ec47ce402960958b 100644
--- a/tests/components/flux_led/test_switch.py
+++ b/tests/components/flux_led/test_switch.py
@@ -71,7 +71,9 @@ async def test_switch_on_off(hass: HomeAssistant) -> None:
assert hass.states.get(entity_id).state == STATE_ON
-async def test_remote_access_unique_id(hass: HomeAssistant) -> None:
+async def test_remote_access_unique_id(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test a remote access switch unique id."""
config_entry = MockConfigEntry(
domain=DOMAIN,
@@ -91,13 +93,14 @@ async def test_remote_access_unique_id(hass: HomeAssistant) -> None:
await hass.async_block_till_done()
entity_id = "switch.bulb_rgbcw_ddeeff_remote_access"
- entity_registry = er.async_get(hass)
assert (
entity_registry.async_get(entity_id).unique_id == f"{MAC_ADDRESS}_remote_access"
)
-async def test_effects_speed_unique_id_no_discovery(hass: HomeAssistant) -> None:
+async def test_effects_speed_unique_id_no_discovery(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test a remote access switch unique id when discovery fails."""
config_entry = MockConfigEntry(
domain=DOMAIN,
@@ -116,7 +119,6 @@ async def test_effects_speed_unique_id_no_discovery(hass: HomeAssistant) -> None
await hass.async_block_till_done()
entity_id = "switch.bulb_rgbcw_ddeeff_remote_access"
- entity_registry = er.async_get(hass)
assert (
entity_registry.async_get(entity_id).unique_id
== f"{config_entry.entry_id}_remote_access"
diff --git a/tests/components/forecast_solar/test_sensor.py b/tests/components/forecast_solar/test_sensor.py
index 4539619febc558160f450f156453be0507abbcb2..8faec950eb788d79c08227ce90421e8ed641e0b3 100644
--- a/tests/components/forecast_solar/test_sensor.py
+++ b/tests/components/forecast_solar/test_sensor.py
@@ -26,12 +26,12 @@ from tests.common import MockConfigEntry
async def test_sensors(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ device_registry: dr.DeviceRegistry,
init_integration: MockConfigEntry,
) -> None:
"""Test the Forecast.Solar sensors."""
entry_id = init_integration.entry_id
- entity_registry = er.async_get(hass)
- device_registry = dr.async_get(hass)
state = hass.states.get("sensor.energy_production_today")
entry = entity_registry.async_get("sensor.energy_production_today")
@@ -173,11 +173,12 @@ async def test_sensors(
),
)
async def test_disabled_by_default(
- hass: HomeAssistant, init_integration: MockConfigEntry, entity_id: str
+ hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ init_integration: MockConfigEntry,
+ entity_id: str,
) -> None:
"""Test the Forecast.Solar sensors that are disabled by default."""
- entity_registry = er.async_get(hass)
-
state = hass.states.get(entity_id)
assert state is None
@@ -209,6 +210,7 @@ async def test_disabled_by_default(
)
async def test_enabling_disable_by_default(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
mock_config_entry: MockConfigEntry,
mock_forecast_solar: MagicMock,
key: str,
@@ -218,7 +220,6 @@ async def test_enabling_disable_by_default(
"""Test the Forecast.Solar sensors that are disabled by default."""
entry_id = mock_config_entry.entry_id
entity_id = f"{SENSOR_DOMAIN}.{key}"
- entity_registry = er.async_get(hass)
# Pre-create registry entry for disabled by default sensor
entity_registry.async_get_or_create(
diff --git a/tests/components/freedompro/test_binary_sensor.py b/tests/components/freedompro/test_binary_sensor.py
index 5efa5ca96f7edb59a7adc27e2c77d73da3c124e8..84e421a86539906f2bb079021b21b7234ad925f2 100644
--- a/tests/components/freedompro/test_binary_sensor.py
+++ b/tests/components/freedompro/test_binary_sensor.py
@@ -45,6 +45,8 @@ from tests.common import async_fire_time_changed
)
async def test_binary_sensor_get_state(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ device_registry: dr.DeviceRegistry,
init_integration,
entity_id: str,
uid: str,
@@ -53,10 +55,8 @@ async def test_binary_sensor_get_state(
) -> None:
"""Test states of the binary_sensor."""
init_integration
- registry = er.async_get(hass)
- registry_device = dr.async_get(hass)
- device = registry_device.async_get_device(identifiers={("freedompro", uid)})
+ device = device_registry.async_get_device(identifiers={("freedompro", uid)})
assert device is not None
assert device.identifiers == {("freedompro", uid)}
assert device.manufacturer == "Freedompro"
@@ -67,7 +67,7 @@ async def test_binary_sensor_get_state(
assert state
assert state.attributes.get("friendly_name") == name
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
@@ -84,7 +84,7 @@ async def test_binary_sensor_get_state(
assert state
assert state.attributes.get("friendly_name") == name
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
@@ -110,7 +110,7 @@ async def test_binary_sensor_get_state(
assert state
assert state.attributes.get("friendly_name") == name
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
diff --git a/tests/components/freedompro/test_climate.py b/tests/components/freedompro/test_climate.py
index 41a550b3c508d6f10138a7c616ed94794670e112..581c6d054484cf0fa14e294453692b99823ffba0 100644
--- a/tests/components/freedompro/test_climate.py
+++ b/tests/components/freedompro/test_climate.py
@@ -28,11 +28,13 @@ from tests.common import async_fire_time_changed
uid = "3WRRJR6RCZQZSND8VP0YTO3YXCSOFPKBMW8T51TU-LQ*TWMYQKL3UVED4HSIIB9GXJWJZBQCXG-9VE-N2IUAIWI"
-async def test_climate_get_state(hass: HomeAssistant, init_integration) -> None:
+async def test_climate_get_state(
+ hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ device_registry: dr.DeviceRegistry,
+ init_integration,
+) -> None:
"""Test states of the climate."""
- entity_registry = er.async_get(hass)
- device_registry = dr.async_get(hass)
-
device = device_registry.async_get_device(identifiers={("freedompro", uid)})
assert device is not None
assert device.identifiers == {("freedompro", uid)}
@@ -84,10 +86,11 @@ async def test_climate_get_state(hass: HomeAssistant, init_integration) -> None:
assert state.attributes[ATTR_CURRENT_TEMPERATURE] == 20
-async def test_climate_set_off(hass: HomeAssistant, init_integration) -> None:
+async def test_climate_set_off(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
+) -> None:
"""Test set off climate."""
init_integration
- entity_registry = er.async_get(hass)
entity_id = "climate.thermostat"
state = hass.states.get(entity_id)
@@ -115,11 +118,10 @@ async def test_climate_set_off(hass: HomeAssistant, init_integration) -> None:
async def test_climate_set_unsupported_hvac_mode(
- hass: HomeAssistant, init_integration
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
) -> None:
"""Test set unsupported hvac mode climate."""
init_integration
- entity_registry = er.async_get(hass)
entity_id = "climate.thermostat"
state = hass.states.get(entity_id)
@@ -139,10 +141,11 @@ async def test_climate_set_unsupported_hvac_mode(
)
-async def test_climate_set_temperature(hass: HomeAssistant, init_integration) -> None:
+async def test_climate_set_temperature(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
+) -> None:
"""Test set temperature climate."""
init_integration
- entity_registry = er.async_get(hass)
entity_id = "climate.thermostat"
state = hass.states.get(entity_id)
@@ -185,11 +188,10 @@ async def test_climate_set_temperature(hass: HomeAssistant, init_integration) ->
async def test_climate_set_temperature_unsupported_hvac_mode(
- hass: HomeAssistant, init_integration
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
) -> None:
"""Test set temperature climate unsupported hvac mode."""
init_integration
- entity_registry = er.async_get(hass)
entity_id = "climate.thermostat"
state = hass.states.get(entity_id)
diff --git a/tests/components/freedompro/test_cover.py b/tests/components/freedompro/test_cover.py
index af54b1c2793a2a17cb97d3532b8c9b2d70658f56..a4c837194fe1b573f243932e86bbe462965f8bf1 100644
--- a/tests/components/freedompro/test_cover.py
+++ b/tests/components/freedompro/test_cover.py
@@ -36,6 +36,8 @@ from tests.common import async_fire_time_changed
)
async def test_cover_get_state(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ device_registry: dr.DeviceRegistry,
init_integration,
entity_id: str,
uid: str,
@@ -44,10 +46,8 @@ async def test_cover_get_state(
) -> None:
"""Test states of the cover."""
init_integration
- registry = er.async_get(hass)
- registry_device = dr.async_get(hass)
- device = registry_device.async_get_device(identifiers={("freedompro", uid)})
+ device = device_registry.async_get_device(identifiers={("freedompro", uid)})
assert device is not None
assert device.identifiers == {("freedompro", uid)}
assert device.manufacturer == "Freedompro"
@@ -59,7 +59,7 @@ async def test_cover_get_state(
assert state.state == STATE_CLOSED
assert state.attributes.get("friendly_name") == name
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
@@ -76,7 +76,7 @@ async def test_cover_get_state(
assert state
assert state.attributes.get("friendly_name") == name
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
@@ -96,6 +96,7 @@ async def test_cover_get_state(
)
async def test_cover_set_position(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
init_integration,
entity_id: str,
uid: str,
@@ -104,14 +105,13 @@ async def test_cover_set_position(
) -> None:
"""Test set position of the cover."""
init_integration
- registry = er.async_get(hass)
state = hass.states.get(entity_id)
assert state
assert state.state == STATE_CLOSED
assert state.attributes.get("friendly_name") == name
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
@@ -151,6 +151,7 @@ async def test_cover_set_position(
)
async def test_cover_close(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
init_integration,
entity_id: str,
uid: str,
@@ -159,7 +160,6 @@ async def test_cover_close(
) -> None:
"""Test close cover."""
init_integration
- registry = er.async_get(hass)
states_response = get_states_response_for_uid(uid)
states_response[0]["state"]["position"] = 100
@@ -176,7 +176,7 @@ async def test_cover_close(
assert state.state == STATE_OPEN
assert state.attributes.get("friendly_name") == name
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
@@ -214,6 +214,7 @@ async def test_cover_close(
)
async def test_cover_open(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
init_integration,
entity_id: str,
uid: str,
@@ -222,14 +223,13 @@ async def test_cover_open(
) -> None:
"""Test open cover."""
init_integration
- registry = er.async_get(hass)
state = hass.states.get(entity_id)
assert state
assert state.state == STATE_CLOSED
assert state.attributes.get("friendly_name") == name
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
diff --git a/tests/components/freedompro/test_fan.py b/tests/components/freedompro/test_fan.py
index b5acf3e496ac819a30f3f6fd570c8f7655f2642a..80b1e5613ebd0b30e051fa6ad79fc486671e2d00 100644
--- a/tests/components/freedompro/test_fan.py
+++ b/tests/components/freedompro/test_fan.py
@@ -21,13 +21,16 @@ from tests.common import async_fire_time_changed
uid = "3WRRJR6RCZQZSND8VP0YTO3YXCSOFPKBMW8T51TU-LQ*ILYH1E3DWZOVMNEUIMDYMNLOW-LFRQFDPWWJOVHVDOS"
-async def test_fan_get_state(hass: HomeAssistant, init_integration) -> None:
+async def test_fan_get_state(
+ hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ device_registry: dr.DeviceRegistry,
+ init_integration,
+) -> None:
"""Test states of the fan."""
init_integration
- registry = er.async_get(hass)
- registry_device = dr.async_get(hass)
- device = registry_device.async_get_device(identifiers={("freedompro", uid)})
+ device = device_registry.async_get_device(identifiers={("freedompro", uid)})
assert device is not None
assert device.identifiers == {("freedompro", uid)}
assert device.manufacturer == "Freedompro"
@@ -41,7 +44,7 @@ async def test_fan_get_state(hass: HomeAssistant, init_integration) -> None:
assert state.attributes[ATTR_PERCENTAGE] == 0
assert state.attributes.get("friendly_name") == "bedroom"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
@@ -59,7 +62,7 @@ async def test_fan_get_state(hass: HomeAssistant, init_integration) -> None:
assert state
assert state.attributes.get("friendly_name") == "bedroom"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
@@ -67,10 +70,11 @@ async def test_fan_get_state(hass: HomeAssistant, init_integration) -> None:
assert state.attributes[ATTR_PERCENTAGE] == 50
-async def test_fan_set_off(hass: HomeAssistant, init_integration) -> None:
+async def test_fan_set_off(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
+) -> None:
"""Test turn off the fan."""
init_integration
- registry = er.async_get(hass)
entity_id = "fan.bedroom"
@@ -91,7 +95,7 @@ async def test_fan_set_off(hass: HomeAssistant, init_integration) -> None:
assert state.attributes[ATTR_PERCENTAGE] == 50
assert state.attributes.get("friendly_name") == "bedroom"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
@@ -120,10 +124,11 @@ async def test_fan_set_off(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_OFF
-async def test_fan_set_on(hass: HomeAssistant, init_integration) -> None:
+async def test_fan_set_on(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
+) -> None:
"""Test turn on the fan."""
init_integration
- registry = er.async_get(hass)
entity_id = "fan.bedroom"
state = hass.states.get(entity_id)
@@ -132,7 +137,7 @@ async def test_fan_set_on(hass: HomeAssistant, init_integration) -> None:
assert state.attributes[ATTR_PERCENTAGE] == 0
assert state.attributes.get("friendly_name") == "bedroom"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
@@ -160,10 +165,11 @@ async def test_fan_set_on(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_ON
-async def test_fan_set_percent(hass: HomeAssistant, init_integration) -> None:
+async def test_fan_set_percent(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
+) -> None:
"""Test turn on the fan."""
init_integration
- registry = er.async_get(hass)
entity_id = "fan.bedroom"
state = hass.states.get(entity_id)
@@ -172,7 +178,7 @@ async def test_fan_set_percent(hass: HomeAssistant, init_integration) -> None:
assert state.attributes[ATTR_PERCENTAGE] == 0
assert state.attributes.get("friendly_name") == "bedroom"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
diff --git a/tests/components/freedompro/test_light.py b/tests/components/freedompro/test_light.py
index 1b06abd1e850576e425d4e56089eab2c0e34b7b6..53cb59d5646167aa160e05ba65088913ebdacc55 100644
--- a/tests/components/freedompro/test_light.py
+++ b/tests/components/freedompro/test_light.py
@@ -21,10 +21,11 @@ def mock_freedompro_put_state():
yield
-async def test_light_get_state(hass: HomeAssistant, init_integration) -> None:
+async def test_light_get_state(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
+) -> None:
"""Test states of the light."""
init_integration
- registry = er.async_get(hass)
entity_id = "light.lightbulb"
state = hass.states.get(entity_id)
@@ -32,7 +33,7 @@ async def test_light_get_state(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_ON
assert state.attributes.get("friendly_name") == "lightbulb"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert (
entry.unique_id
@@ -40,10 +41,11 @@ async def test_light_get_state(hass: HomeAssistant, init_integration) -> None:
)
-async def test_light_set_on(hass: HomeAssistant, init_integration) -> None:
+async def test_light_set_on(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
+) -> None:
"""Test set on of the light."""
init_integration
- registry = er.async_get(hass)
entity_id = "light.lightbulb"
state = hass.states.get(entity_id)
@@ -51,7 +53,7 @@ async def test_light_set_on(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_ON
assert state.attributes.get("friendly_name") == "lightbulb"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert (
entry.unique_id
@@ -70,10 +72,11 @@ async def test_light_set_on(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_ON
-async def test_light_set_off(hass: HomeAssistant, init_integration) -> None:
+async def test_light_set_off(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
+) -> None:
"""Test set off of the light."""
init_integration
- registry = er.async_get(hass)
entity_id = "light.bedroomlight"
state = hass.states.get(entity_id)
@@ -81,7 +84,7 @@ async def test_light_set_off(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_OFF
assert state.attributes.get("friendly_name") == "bedroomlight"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert (
entry.unique_id
@@ -100,10 +103,11 @@ async def test_light_set_off(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_OFF
-async def test_light_set_brightness(hass: HomeAssistant, init_integration) -> None:
+async def test_light_set_brightness(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
+) -> None:
"""Test set brightness of the light."""
init_integration
- registry = er.async_get(hass)
entity_id = "light.lightbulb"
state = hass.states.get(entity_id)
@@ -111,7 +115,7 @@ async def test_light_set_brightness(hass: HomeAssistant, init_integration) -> No
assert state.state == STATE_ON
assert state.attributes.get("friendly_name") == "lightbulb"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert (
entry.unique_id
@@ -131,10 +135,11 @@ async def test_light_set_brightness(hass: HomeAssistant, init_integration) -> No
assert int(state.attributes[ATTR_BRIGHTNESS]) == 0
-async def test_light_set_hue(hass: HomeAssistant, init_integration) -> None:
+async def test_light_set_hue(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
+) -> None:
"""Test set brightness of the light."""
init_integration
- registry = er.async_get(hass)
entity_id = "light.lightbulb"
state = hass.states.get(entity_id)
@@ -142,7 +147,7 @@ async def test_light_set_hue(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_ON
assert state.attributes.get("friendly_name") == "lightbulb"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert (
entry.unique_id
diff --git a/tests/components/freedompro/test_lock.py b/tests/components/freedompro/test_lock.py
index c9f75e6b59416a1a473a11097259514a0d5146ac..37145d6fe95ec6a81c0b9e0204b85567531e5386 100644
--- a/tests/components/freedompro/test_lock.py
+++ b/tests/components/freedompro/test_lock.py
@@ -20,13 +20,16 @@ from tests.common import async_fire_time_changed
uid = "2WRRJR6RCZQZSND8VP0YTO3YXCSOFPKBMW8T51TU-LQ*2VAS3HTWINNZ5N6HVEIPDJ6NX85P2-AM-GSYWUCNPU0"
-async def test_lock_get_state(hass: HomeAssistant, init_integration) -> None:
+async def test_lock_get_state(
+ hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ device_registry: dr.DeviceRegistry,
+ init_integration,
+) -> None:
"""Test states of the lock."""
init_integration
- registry = er.async_get(hass)
- registry_device = dr.async_get(hass)
- device = registry_device.async_get_device(identifiers={("freedompro", uid)})
+ device = device_registry.async_get_device(identifiers={("freedompro", uid)})
assert device is not None
assert device.identifiers == {("freedompro", uid)}
assert device.manufacturer == "Freedompro"
@@ -39,7 +42,7 @@ async def test_lock_get_state(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_UNLOCKED
assert state.attributes.get("friendly_name") == "lock"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
@@ -56,17 +59,18 @@ async def test_lock_get_state(hass: HomeAssistant, init_integration) -> None:
assert state
assert state.attributes.get("friendly_name") == "lock"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
assert state.state == STATE_LOCKED
-async def test_lock_set_unlock(hass: HomeAssistant, init_integration) -> None:
+async def test_lock_set_unlock(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
+) -> None:
"""Test set on of the lock."""
init_integration
- registry = er.async_get(hass)
entity_id = "lock.lock"
@@ -85,7 +89,7 @@ async def test_lock_set_unlock(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_LOCKED
assert state.attributes.get("friendly_name") == "lock"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
@@ -111,10 +115,11 @@ async def test_lock_set_unlock(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_UNLOCKED
-async def test_lock_set_lock(hass: HomeAssistant, init_integration) -> None:
+async def test_lock_set_lock(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
+) -> None:
"""Test set on of the lock."""
init_integration
- registry = er.async_get(hass)
entity_id = "lock.lock"
state = hass.states.get(entity_id)
@@ -122,7 +127,7 @@ async def test_lock_set_lock(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_UNLOCKED
assert state.attributes.get("friendly_name") == "lock"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
diff --git a/tests/components/freedompro/test_sensor.py b/tests/components/freedompro/test_sensor.py
index 89acfb3cc320ea19a4c195fcb7f76044eb8b3bb3..c06ce5b079430e25b4c2fdd2d0a078b2f5f02820 100644
--- a/tests/components/freedompro/test_sensor.py
+++ b/tests/components/freedompro/test_sensor.py
@@ -34,17 +34,21 @@ from tests.common import async_fire_time_changed
],
)
async def test_sensor_get_state(
- hass: HomeAssistant, init_integration, entity_id: str, uid: str, name: str
+ hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ init_integration,
+ entity_id: str,
+ uid: str,
+ name: str,
) -> None:
"""Test states of the sensor."""
init_integration
- registry = er.async_get(hass)
state = hass.states.get(entity_id)
assert state
assert state.attributes.get("friendly_name") == name
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
@@ -68,7 +72,7 @@ async def test_sensor_get_state(
assert state
assert state.attributes.get("friendly_name") == name
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
diff --git a/tests/components/freedompro/test_switch.py b/tests/components/freedompro/test_switch.py
index 03647e4389d66cf04582acd4596f51a5dba33e40..7d72a87a7b5a1804983c8459131f8ca35b550204 100644
--- a/tests/components/freedompro/test_switch.py
+++ b/tests/components/freedompro/test_switch.py
@@ -16,10 +16,11 @@ from tests.common import async_fire_time_changed
uid = "3WRRJR6RCZQZSND8VP0YTO3YXCSOFPKBMW8T51TU-LQ*1JKU1MVWHQL-Z9SCUS85VFXMRGNDCDNDDUVVDKBU31W"
-async def test_switch_get_state(hass: HomeAssistant, init_integration) -> None:
+async def test_switch_get_state(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
+) -> None:
"""Test states of the switch."""
init_integration
- registry = er.async_get(hass)
entity_id = "switch.irrigation_switch"
state = hass.states.get(entity_id)
@@ -27,7 +28,7 @@ async def test_switch_get_state(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_OFF
assert state.attributes.get("friendly_name") == "Irrigation switch"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
@@ -44,17 +45,18 @@ async def test_switch_get_state(hass: HomeAssistant, init_integration) -> None:
assert state
assert state.attributes.get("friendly_name") == "Irrigation switch"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
assert state.state == STATE_ON
-async def test_switch_set_off(hass: HomeAssistant, init_integration) -> None:
+async def test_switch_set_off(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
+) -> None:
"""Test set off of the switch."""
init_integration
- registry = er.async_get(hass)
entity_id = "switch.irrigation_switch"
@@ -73,7 +75,7 @@ async def test_switch_set_off(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_ON
assert state.attributes.get("friendly_name") == "Irrigation switch"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
@@ -101,10 +103,11 @@ async def test_switch_set_off(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_OFF
-async def test_switch_set_on(hass: HomeAssistant, init_integration) -> None:
+async def test_switch_set_on(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, init_integration
+) -> None:
"""Test set on of the switch."""
init_integration
- registry = er.async_get(hass)
entity_id = "switch.irrigation_switch"
state = hass.states.get(entity_id)
@@ -112,7 +115,7 @@ async def test_switch_set_on(hass: HomeAssistant, init_integration) -> None:
assert state.state == STATE_OFF
assert state.attributes.get("friendly_name") == "Irrigation switch"
- entry = registry.async_get(entity_id)
+ entry = entity_registry.async_get(entity_id)
assert entry
assert entry.unique_id == uid
diff --git a/tests/components/fritzbox/test_init.py b/tests/components/fritzbox/test_init.py
index b07b8225c3e037f1b2a47dd5c45d5dd0ac2580b8..5c8d30772f0b74879de7a7cfdfaab5a393d683d4 100644
--- a/tests/components/fritzbox/test_init.py
+++ b/tests/components/fritzbox/test_init.py
@@ -72,6 +72,7 @@ async def test_setup(hass: HomeAssistant, fritz: Mock) -> None:
)
async def test_update_unique_id(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
fritz: Mock,
entitydata: dict,
old_unique_id: str,
@@ -85,7 +86,6 @@ async def test_update_unique_id(
)
entry.add_to_hass(hass)
- entity_registry = er.async_get(hass)
entity: er.RegistryEntry = entity_registry.async_get_or_create(
**entitydata,
config_entry=entry,
@@ -131,6 +131,7 @@ async def test_update_unique_id(
)
async def test_update_unique_id_no_change(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
fritz: Mock,
entitydata: dict,
unique_id: str,
@@ -143,7 +144,6 @@ async def test_update_unique_id_no_change(
)
entry.add_to_hass(hass)
- entity_registry = er.async_get(hass)
entity = entity_registry.async_get_or_create(
**entitydata,
config_entry=entry,
diff --git a/tests/components/fritzbox/test_sensor.py b/tests/components/fritzbox/test_sensor.py
index b4c0209e9af8ac8727f8c4fa2e108545abbc8aea..b363d966c0132bc4c234e551e54c6687e6467044 100644
--- a/tests/components/fritzbox/test_sensor.py
+++ b/tests/components/fritzbox/test_sensor.py
@@ -26,7 +26,9 @@ from tests.common import async_fire_time_changed
ENTITY_ID = f"{DOMAIN}.{CONF_FAKE_NAME}"
-async def test_setup(hass: HomeAssistant, fritz: Mock) -> None:
+async def test_setup(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, fritz: Mock
+) -> None:
"""Test setup of platform."""
device = FritzDeviceSensorMock()
assert await setup_config_entry(
@@ -61,7 +63,6 @@ async def test_setup(hass: HomeAssistant, fritz: Mock) -> None:
],
)
- entity_registry = er.async_get(hass)
for sensor in sensors:
state = hass.states.get(sensor[0])
assert state
diff --git a/tests/components/fritzbox/test_switch.py b/tests/components/fritzbox/test_switch.py
index 53cdf5147fcf37b232bd6fabc24534fad6bee1f3..4ed1a88190ac63fe9c4d909c689ea1740cadcb63 100644
--- a/tests/components/fritzbox/test_switch.py
+++ b/tests/components/fritzbox/test_switch.py
@@ -39,7 +39,9 @@ from tests.common import async_fire_time_changed
ENTITY_ID = f"{DOMAIN}.{CONF_FAKE_NAME}"
-async def test_setup(hass: HomeAssistant, fritz: Mock) -> None:
+async def test_setup(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, fritz: Mock
+) -> None:
"""Test setup of platform."""
device = FritzDeviceSwitchMock()
assert await setup_config_entry(
@@ -98,7 +100,6 @@ async def test_setup(hass: HomeAssistant, fritz: Mock) -> None:
],
)
- entity_registry = er.async_get(hass)
for sensor in sensors:
state = hass.states.get(sensor[0])
assert state
diff --git a/tests/components/fronius/test_init.py b/tests/components/fronius/test_init.py
index d46c60c3cb398b85a45159a4bdce8c6c9898b10e..cc56fea24b28fb7397444d44f333863aaca5bd4a 100644
--- a/tests/components/fronius/test_init.py
+++ b/tests/components/fronius/test_init.py
@@ -60,7 +60,9 @@ async def test_inverter_error(
async def test_inverter_night_rescan(
- hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+ hass: HomeAssistant,
+ device_registry: dr.DeviceRegistry,
+ aioclient_mock: AiohttpClientMocker,
) -> None:
"""Test dynamic adding of an inverter discovered automatically after a Home Assistant reboot during the night."""
mock_responses(aioclient_mock, fixture_set="igplus_v2", night=True)
@@ -79,7 +81,6 @@ async def test_inverter_night_rescan(
await hass.async_block_till_done()
# We expect our inverter to be present now
- device_registry = dr.async_get(hass)
inverter_1 = device_registry.async_get_device(identifiers={(DOMAIN, "203200")})
assert inverter_1.manufacturer == "Fronius"
@@ -93,13 +94,14 @@ async def test_inverter_night_rescan(
async def test_inverter_rescan_interruption(
- hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+ hass: HomeAssistant,
+ device_registry: dr.DeviceRegistry,
+ aioclient_mock: AiohttpClientMocker,
) -> None:
"""Test interruption of re-scan during runtime to process further."""
mock_responses(aioclient_mock, fixture_set="igplus_v2", night=True)
config_entry = await setup_fronius_integration(hass, is_logger=True)
assert config_entry.state is ConfigEntryState.LOADED
- device_registry = dr.async_get(hass)
# Expect 1 devices during the night, logger
assert (
len(dr.async_entries_for_config_entry(device_registry, config_entry.entry_id))
diff --git a/tests/components/fully_kiosk/test_binary_sensor.py b/tests/components/fully_kiosk/test_binary_sensor.py
index db37139b0ba1f7067bbd5617e59275ab0f019288..cc003199f265a80ea1ee7630ff983579d3d7accc 100644
--- a/tests/components/fully_kiosk/test_binary_sensor.py
+++ b/tests/components/fully_kiosk/test_binary_sensor.py
@@ -22,14 +22,13 @@ from tests.common import MockConfigEntry, async_fire_time_changed
async def test_binary_sensors(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ device_registry: dr.DeviceRegistry,
freezer: FrozenDateTimeFactory,
mock_fully_kiosk: MagicMock,
init_integration: MockConfigEntry,
) -> None:
"""Test standard Fully Kiosk binary sensors."""
- entity_registry = er.async_get(hass)
- device_registry = dr.async_get(hass)
-
state = hass.states.get("binary_sensor.amazon_fire_plugged_in")
assert state
assert state.state == STATE_ON
diff --git a/tests/components/fully_kiosk/test_button.py b/tests/components/fully_kiosk/test_button.py
index fee39be302ec5977803cf63522ae51941c6cdfe3..f04935aed0ef4b851783ce5262b88bfcdc6b7d87 100644
--- a/tests/components/fully_kiosk/test_button.py
+++ b/tests/components/fully_kiosk/test_button.py
@@ -12,13 +12,12 @@ from tests.common import MockConfigEntry
async def test_buttons(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ device_registry: dr.DeviceRegistry,
mock_fully_kiosk: MagicMock,
init_integration: MockConfigEntry,
) -> None:
"""Test standard Fully Kiosk buttons."""
- entity_registry = er.async_get(hass)
- device_registry = dr.async_get(hass)
-
entry = entity_registry.async_get("button.amazon_fire_restart_browser")
assert entry
assert entry.unique_id == "abcdef-123456-restartApp"
diff --git a/tests/components/fully_kiosk/test_diagnostics.py b/tests/components/fully_kiosk/test_diagnostics.py
index b1b30bda669b943bcf683940022d560e425cb40a..e48867739e8525240d8c6c49143a27a2ec58d497 100644
--- a/tests/components/fully_kiosk/test_diagnostics.py
+++ b/tests/components/fully_kiosk/test_diagnostics.py
@@ -17,13 +17,12 @@ from tests.typing import ClientSessionGenerator
async def test_diagnostics(
hass: HomeAssistant,
+ device_registry: dr.DeviceRegistry,
hass_client: ClientSessionGenerator,
mock_fully_kiosk: MagicMock,
init_integration: MockConfigEntry,
) -> None:
"""Test Fully Kiosk diagnostics."""
-
- device_registry = dr.async_get(hass)
device = device_registry.async_get_device(identifiers={(DOMAIN, "abcdef-123456")})
diagnostics = await get_diagnostics_for_device(
diff --git a/tests/components/fully_kiosk/test_init.py b/tests/components/fully_kiosk/test_init.py
index c53e416873336fa44ccd814819bc4d11814e6383..5c77b8a9d065f293c88a6e23ef0f6c1409c10e7e 100644
--- a/tests/components/fully_kiosk/test_init.py
+++ b/tests/components/fully_kiosk/test_init.py
@@ -81,11 +81,10 @@ async def _load_config(
async def test_multiple_kiosk_with_empty_mac(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ device_registry: dr.DeviceRegistry,
) -> None:
"""Test that multiple kiosk devices with empty MAC don't get merged."""
- entity_registry = er.async_get(hass)
- device_registry = dr.async_get(hass)
-
config_entry1 = MockConfigEntry(
title="Test device 1",
domain=DOMAIN,
diff --git a/tests/components/fully_kiosk/test_media_player.py b/tests/components/fully_kiosk/test_media_player.py
index 403b9e2651104a45f18fe632bc73adf27de7fe87..4cae64e641e686635b7aa1dc0ce3a87423b6ecb2 100644
--- a/tests/components/fully_kiosk/test_media_player.py
+++ b/tests/components/fully_kiosk/test_media_player.py
@@ -15,13 +15,12 @@ from tests.typing import WebSocketGenerator
async def test_media_player(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ device_registry: dr.DeviceRegistry,
mock_fully_kiosk: MagicMock,
init_integration: MockConfigEntry,
) -> None:
"""Test standard Fully Kiosk media player."""
- entity_registry = er.async_get(hass)
- device_registry = dr.async_get(hass)
-
state = hass.states.get("media_player.amazon_fire")
assert state
diff --git a/tests/components/fully_kiosk/test_number.py b/tests/components/fully_kiosk/test_number.py
index 4843e72465c590452cc971aebc9973311b90ebe8..286ca7fc0cb4b5862448dba01330753f4a47613b 100644
--- a/tests/components/fully_kiosk/test_number.py
+++ b/tests/components/fully_kiosk/test_number.py
@@ -13,13 +13,12 @@ from tests.common import MockConfigEntry, async_fire_time_changed
async def test_numbers(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ device_registry: dr.DeviceRegistry,
mock_fully_kiosk: MagicMock,
init_integration: MockConfigEntry,
) -> None:
"""Test standard Fully Kiosk numbers."""
- entity_registry = er.async_get(hass)
- device_registry = dr.async_get(hass)
-
state = hass.states.get("number.amazon_fire_screensaver_timer")
assert state
assert state.state == "900"
diff --git a/tests/components/fully_kiosk/test_sensor.py b/tests/components/fully_kiosk/test_sensor.py
index 05fd002a2051f3b643331984b5f788cc6c638976..40912f0f56840943f87f83b51d01380a568baf0c 100644
--- a/tests/components/fully_kiosk/test_sensor.py
+++ b/tests/components/fully_kiosk/test_sensor.py
@@ -26,14 +26,13 @@ from tests.common import MockConfigEntry, async_fire_time_changed
async def test_sensors_sensors(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ device_registry: dr.DeviceRegistry,
freezer: FrozenDateTimeFactory,
mock_fully_kiosk: MagicMock,
init_integration: MockConfigEntry,
) -> None:
"""Test standard Fully Kiosk sensors."""
- entity_registry = er.async_get(hass)
- device_registry = dr.async_get(hass)
-
state = hass.states.get("sensor.amazon_fire_battery")
assert state
assert state.state == "100"
diff --git a/tests/components/fully_kiosk/test_services.py b/tests/components/fully_kiosk/test_services.py
index 11d5a74f3d7d28effaac60bd23756a9e157b271c..af6199f34d9b7708194dc75048504a11bb8d3505 100644
--- a/tests/components/fully_kiosk/test_services.py
+++ b/tests/components/fully_kiosk/test_services.py
@@ -23,11 +23,11 @@ from tests.common import MockConfigEntry
async def test_services(
hass: HomeAssistant,
+ device_registry: dr.DeviceRegistry,
mock_fully_kiosk: MagicMock,
init_integration: MockConfigEntry,
) -> None:
"""Test the Fully Kiosk Browser services."""
- device_registry = dr.async_get(hass)
device_entry = device_registry.async_get_device(
identifiers={(DOMAIN, "abcdef-123456")}
)
@@ -103,13 +103,13 @@ async def test_services(
async def test_service_unloaded_entry(
hass: HomeAssistant,
+ device_registry: dr.DeviceRegistry,
mock_fully_kiosk: MagicMock,
init_integration: MockConfigEntry,
) -> None:
"""Test service not called when config entry unloaded."""
await init_integration.async_unload(hass)
- device_registry = dr.async_get(hass)
device_entry = device_registry.async_get_device(
identifiers={(DOMAIN, "abcdef-123456")}
)
@@ -156,12 +156,11 @@ async def test_service_bad_device_id(
async def test_service_called_with_non_fkb_target_devices(
hass: HomeAssistant,
+ device_registry: dr.DeviceRegistry,
mock_fully_kiosk: MagicMock,
init_integration: MockConfigEntry,
) -> None:
"""Services raise exception when no valid devices provided."""
- device_registry = dr.async_get(hass)
-
other_domain = "NotFullyKiosk"
other_config_id = "555"
await hass.config_entries.async_add(
diff --git a/tests/components/fully_kiosk/test_switch.py b/tests/components/fully_kiosk/test_switch.py
index 8da01ff2fe998bdab099cf7f3f481810b3f92d2e..4cbdad8d63a03b04f3751bb08aa292ca2a2daff8 100644
--- a/tests/components/fully_kiosk/test_switch.py
+++ b/tests/components/fully_kiosk/test_switch.py
@@ -11,12 +11,13 @@ from tests.common import MockConfigEntry
async def test_switches(
- hass: HomeAssistant, mock_fully_kiosk: MagicMock, init_integration: MockConfigEntry
+ hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ device_registry: dr.DeviceRegistry,
+ mock_fully_kiosk: MagicMock,
+ init_integration: MockConfigEntry,
) -> None:
"""Test Fully Kiosk switches."""
- entity_registry = er.async_get(hass)
- device_registry = dr.async_get(hass)
-
entity = hass.states.get("switch.amazon_fire_screensaver")
assert entity
assert entity.state == "off"
diff --git a/tests/components/gardena_bluetooth/test_init.py b/tests/components/gardena_bluetooth/test_init.py
index b09d2177c22dab0f024e2c3f9db25b378123efe5..1f294c6169d23a116aa68cfd30905c1a7787d52f 100644
--- a/tests/components/gardena_bluetooth/test_init.py
+++ b/tests/components/gardena_bluetooth/test_init.py
@@ -20,6 +20,7 @@ from tests.common import MockConfigEntry, async_fire_time_changed
async def test_setup(
hass: HomeAssistant,
+ device_registry: dr.DeviceRegistry,
mock_entry: MockConfigEntry,
mock_read_char_raw: dict[str, bytes],
snapshot: SnapshotAssertion,
@@ -34,7 +35,6 @@ async def test_setup(
assert mock_entry.state is ConfigEntryState.LOADED
- device_registry = dr.async_get(hass)
device = device_registry.async_get_device(
identifiers={(DOMAIN, WATER_TIMER_SERVICE_INFO.address)}
)
diff --git a/tests/components/gdacs/test_geo_location.py b/tests/components/gdacs/test_geo_location.py
index d279fe981d4e04612a65b95514c524fdce10e1ef..dfdce7635df8f364d1f78239a72142cf9e24d831 100644
--- a/tests/components/gdacs/test_geo_location.py
+++ b/tests/components/gdacs/test_geo_location.py
@@ -44,7 +44,7 @@ from tests.common import async_fire_time_changed
CONFIG = {gdacs.DOMAIN: {CONF_RADIUS: 200}}
-async def test_setup(hass: HomeAssistant) -> None:
+async def test_setup(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
"""Test the general setup of the integration."""
# Set up some mock feed entries for this test.
mock_entry_1 = _generate_mock_feed_entry(
@@ -106,7 +106,6 @@ async def test_setup(hass: HomeAssistant) -> None:
+ len(hass.states.async_entity_ids("sensor"))
== 4
)
- entity_registry = er.async_get(hass)
assert len(entity_registry.entities) == 4
state = hass.states.get("geo_location.drought_name_1")
diff --git a/tests/components/generic_hygrostat/test_humidifier.py b/tests/components/generic_hygrostat/test_humidifier.py
index bd97a683989f7721dc9a10c86a20fe7518142342..9c0fa7ddaef88df62e163bdd58a7bc2bc27051fc 100644
--- a/tests/components/generic_hygrostat/test_humidifier.py
+++ b/tests/components/generic_hygrostat/test_humidifier.py
@@ -170,7 +170,9 @@ async def test_humidifier_switch(
assert hass.states.get(ENTITY).attributes.get("action") == "humidifying"
-async def test_unique_id(hass: HomeAssistant, setup_comp_1) -> None:
+async def test_unique_id(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, setup_comp_1
+) -> None:
"""Test setting a unique ID."""
unique_id = "some_unique_id"
_setup_sensor(hass, 18)
@@ -190,8 +192,6 @@ async def test_unique_id(hass: HomeAssistant, setup_comp_1) -> None:
)
await hass.async_block_till_done()
- entity_registry = er.async_get(hass)
-
entry = entity_registry.async_get(ENTITY)
assert entry
assert entry.unique_id == unique_id
diff --git a/tests/components/generic_thermostat/test_climate.py b/tests/components/generic_thermostat/test_climate.py
index 2a406ddbd794569b8ed6fde801390959cf869e42..47a3cdc30af941a84a3faea09c9e58028854024e 100644
--- a/tests/components/generic_thermostat/test_climate.py
+++ b/tests/components/generic_thermostat/test_climate.py
@@ -173,7 +173,9 @@ async def test_heater_switch(
assert hass.states.get(heater_switch).state == STATE_ON
-async def test_unique_id(hass: HomeAssistant, setup_comp_1) -> None:
+async def test_unique_id(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, setup_comp_1
+) -> None:
"""Test setting a unique ID."""
unique_id = "some_unique_id"
_setup_sensor(hass, 18)
@@ -193,8 +195,6 @@ async def test_unique_id(hass: HomeAssistant, setup_comp_1) -> None:
)
await hass.async_block_till_done()
- entity_registry = er.async_get(hass)
-
entry = entity_registry.async_get(ENTITY)
assert entry
assert entry.unique_id == unique_id
diff --git a/tests/components/geofency/test_init.py b/tests/components/geofency/test_init.py
index 72f862f585a19aa27dfa5f727ab133dd25655277..d5ababaee416f4dd931c9b105b79f954e466687d 100644
--- a/tests/components/geofency/test_init.py
+++ b/tests/components/geofency/test_init.py
@@ -184,7 +184,11 @@ async def test_data_validation(geofency_client, webhook_id) -> None:
async def test_gps_enter_and_exit_home(
- hass: HomeAssistant, geofency_client, webhook_id
+ hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ device_registry: dr.DeviceRegistry,
+ geofency_client,
+ webhook_id,
) -> None:
"""Test GPS based zone enter and exit."""
url = f"/api/webhook/{webhook_id}"
@@ -223,11 +227,8 @@ async def test_gps_enter_and_exit_home(
]
assert current_longitude == NOT_HOME_LONGITUDE
- dev_reg = dr.async_get(hass)
- assert len(dev_reg.devices) == 1
-
- ent_reg = er.async_get(hass)
- assert len(ent_reg.entities) == 1
+ assert len(device_registry.devices) == 1
+ assert len(entity_registry.entities) == 1
async def test_beacon_enter_and_exit_home(
diff --git a/tests/components/geonetnz_quakes/test_geo_location.py b/tests/components/geonetnz_quakes/test_geo_location.py
index bfe94bbf304f215acf4a1d8571bacecbea4feebf..561d9aaedeb19703382735d58fcc66c76b9de4f9 100644
--- a/tests/components/geonetnz_quakes/test_geo_location.py
+++ b/tests/components/geonetnz_quakes/test_geo_location.py
@@ -38,7 +38,7 @@ from tests.common import async_fire_time_changed
CONFIG = {geonetnz_quakes.DOMAIN: {CONF_RADIUS: 200}}
-async def test_setup(hass: HomeAssistant) -> None:
+async def test_setup(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
"""Test the general setup of the integration."""
# Set up some mock feed entries for this test.
mock_entry_1 = _generate_mock_feed_entry(
@@ -80,7 +80,6 @@ async def test_setup(hass: HomeAssistant) -> None:
+ len(hass.states.async_entity_ids("sensor"))
== 4
)
- entity_registry = er.async_get(hass)
assert len(entity_registry.entities) == 4
state = hass.states.get("geo_location.title_1")
diff --git a/tests/components/gios/test_init.py b/tests/components/gios/test_init.py
index ab73fc1e75fa93139358595be36fb76a98a1c0be..0d4484c6d0d1fd9cf9beb8a15fade0947d40b872 100644
--- a/tests/components/gios/test_init.py
+++ b/tests/components/gios/test_init.py
@@ -100,11 +100,11 @@ async def test_migrate_device_and_config_entry(
assert device_entry.id == migrated_device_entry.id
-async def test_remove_air_quality_entities(hass: HomeAssistant) -> None:
+async def test_remove_air_quality_entities(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test remove air_quality entities from registry."""
- registry = er.async_get(hass)
-
- registry.async_get_or_create(
+ entity_registry.async_get_or_create(
AIR_QUALITY_PLATFORM,
DOMAIN,
"123",
@@ -114,5 +114,5 @@ async def test_remove_air_quality_entities(hass: HomeAssistant) -> None:
await init_integration(hass)
- entry = registry.async_get("air_quality.home")
+ entry = entity_registry.async_get("air_quality.home")
assert entry is None
diff --git a/tests/components/gios/test_sensor.py b/tests/components/gios/test_sensor.py
index 82027d2bdb9ba9f4998820d7c262f621622170ef..e14b4548d863a25a73bc4ac14098b8fca12d264d 100644
--- a/tests/components/gios/test_sensor.py
+++ b/tests/components/gios/test_sensor.py
@@ -30,10 +30,9 @@ from . import init_integration
from tests.common import async_fire_time_changed, load_fixture
-async def test_sensor(hass: HomeAssistant) -> None:
+async def test_sensor(hass: HomeAssistant, entity_registry: er.EntityRegistry) -> None:
"""Test states of the sensor."""
await init_integration(hass)
- registry = er.async_get(hass)
state = hass.states.get("sensor.home_benzene")
assert state
@@ -46,7 +45,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
)
assert state.attributes.get(ATTR_ICON) == "mdi:molecule"
- entry = registry.async_get("sensor.home_benzene")
+ entry = entity_registry.async_get("sensor.home_benzene")
assert entry
assert entry.unique_id == "123-c6h6"
@@ -61,7 +60,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
== CONCENTRATION_MICROGRAMS_PER_CUBIC_METER
)
- entry = registry.async_get("sensor.home_carbon_monoxide")
+ entry = entity_registry.async_get("sensor.home_carbon_monoxide")
assert entry
assert entry.unique_id == "123-co"
@@ -76,7 +75,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
== CONCENTRATION_MICROGRAMS_PER_CUBIC_METER
)
- entry = registry.async_get("sensor.home_nitrogen_dioxide")
+ entry = entity_registry.async_get("sensor.home_nitrogen_dioxide")
assert entry
assert entry.unique_id == "123-no2"
@@ -94,7 +93,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
"very_good",
]
- entry = registry.async_get("sensor.home_nitrogen_dioxide_index")
+ entry = entity_registry.async_get("sensor.home_nitrogen_dioxide_index")
assert entry
assert entry.unique_id == "123-no2-index"
@@ -109,7 +108,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
== CONCENTRATION_MICROGRAMS_PER_CUBIC_METER
)
- entry = registry.async_get("sensor.home_ozone")
+ entry = entity_registry.async_get("sensor.home_ozone")
assert entry
assert entry.unique_id == "123-o3"
@@ -127,7 +126,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
"very_good",
]
- entry = registry.async_get("sensor.home_ozone_index")
+ entry = entity_registry.async_get("sensor.home_ozone_index")
assert entry
assert entry.unique_id == "123-o3-index"
@@ -142,7 +141,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
== CONCENTRATION_MICROGRAMS_PER_CUBIC_METER
)
- entry = registry.async_get("sensor.home_pm10")
+ entry = entity_registry.async_get("sensor.home_pm10")
assert entry
assert entry.unique_id == "123-pm10"
@@ -160,7 +159,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
"very_good",
]
- entry = registry.async_get("sensor.home_pm10_index")
+ entry = entity_registry.async_get("sensor.home_pm10_index")
assert entry
assert entry.unique_id == "123-pm10-index"
@@ -175,7 +174,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
== CONCENTRATION_MICROGRAMS_PER_CUBIC_METER
)
- entry = registry.async_get("sensor.home_pm2_5")
+ entry = entity_registry.async_get("sensor.home_pm2_5")
assert entry
assert entry.unique_id == "123-pm25"
@@ -193,7 +192,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
"very_good",
]
- entry = registry.async_get("sensor.home_pm2_5_index")
+ entry = entity_registry.async_get("sensor.home_pm2_5_index")
assert entry
assert entry.unique_id == "123-pm25-index"
@@ -208,7 +207,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
== CONCENTRATION_MICROGRAMS_PER_CUBIC_METER
)
- entry = registry.async_get("sensor.home_sulphur_dioxide")
+ entry = entity_registry.async_get("sensor.home_sulphur_dioxide")
assert entry
assert entry.unique_id == "123-so2"
@@ -226,7 +225,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
"very_good",
]
- entry = registry.async_get("sensor.home_sulphur_dioxide_index")
+ entry = entity_registry.async_get("sensor.home_sulphur_dioxide_index")
assert entry
assert entry.unique_id == "123-so2-index"
@@ -245,7 +244,7 @@ async def test_sensor(hass: HomeAssistant) -> None:
"very_good",
]
- entry = registry.async_get("sensor.home_air_quality_index")
+ entry = entity_registry.async_get("sensor.home_air_quality_index")
assert entry
assert entry.unique_id == "123-aqi"
@@ -365,11 +364,11 @@ async def test_invalid_indexes(hass: HomeAssistant) -> None:
assert state is None
-async def test_unique_id_migration(hass: HomeAssistant) -> None:
+async def test_unique_id_migration(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test states of the unique_id migration."""
- registry = er.async_get(hass)
-
- registry.async_get_or_create(
+ entity_registry.async_get_or_create(
PLATFORM,
DOMAIN,
"123-pm2.5",
@@ -379,6 +378,6 @@ async def test_unique_id_migration(hass: HomeAssistant) -> None:
await init_integration(hass)
- entry = registry.async_get("sensor.home_pm2_5")
+ entry = entity_registry.async_get("sensor.home_pm2_5")
assert entry
assert entry.unique_id == "123-pm25"
diff --git a/tests/components/github/test_init.py b/tests/components/github/test_init.py
index f4557632d60b36ad27654bceaa3ee2411ab9c97b..612c65796397f900d36aeb48918ea75be46a679d 100644
--- a/tests/components/github/test_init.py
+++ b/tests/components/github/test_init.py
@@ -15,6 +15,7 @@ from tests.test_util.aiohttp import AiohttpClientMocker
@pytest.mark.parametrize("expected_lingering_tasks", [True])
async def test_device_registry_cleanup(
hass: HomeAssistant,
+ device_registry: dr.DeviceRegistry,
mock_config_entry: MockConfigEntry,
aioclient_mock: AiohttpClientMocker,
caplog: pytest.LogCaptureFixture,
@@ -23,7 +24,6 @@ async def test_device_registry_cleanup(
mock_config_entry.options = {CONF_REPOSITORIES: ["home-assistant/core"]}
await setup_github_integration(hass, mock_config_entry, aioclient_mock)
- device_registry = dr.async_get(hass)
devices = dr.async_entries_for_config_entry(
registry=device_registry,
config_entry_id=mock_config_entry.entry_id,
diff --git a/tests/components/glances/test_sensor.py b/tests/components/glances/test_sensor.py
index d77058547208532d9eedd9a3a5eb98162998991a..095c034abe0e3b27d2b408e088cab330612f0c19 100644
--- a/tests/components/glances/test_sensor.py
+++ b/tests/components/glances/test_sensor.py
@@ -61,16 +61,18 @@ async def test_sensor_states(hass: HomeAssistant) -> None:
],
)
async def test_migrate_unique_id(
- hass: HomeAssistant, object_id: str, old_unique_id: str, new_unique_id: str
+ hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ object_id: str,
+ old_unique_id: str,
+ new_unique_id: str,
) -> None:
"""Test unique id migration."""
old_config_data = {**MOCK_USER_INPUT, "name": "Glances"}
entry = MockConfigEntry(domain=DOMAIN, data=old_config_data)
entry.add_to_hass(hass)
- ent_reg = er.async_get(hass)
-
- entity: er.RegistryEntry = ent_reg.async_get_or_create(
+ entity: er.RegistryEntry = entity_registry.async_get_or_create(
suggested_object_id=object_id,
disabled_by=None,
domain=SENSOR_DOMAIN,
@@ -83,6 +85,6 @@ async def test_migrate_unique_id(
assert await hass.config_entries.async_setup(entry.entry_id)
await hass.async_block_till_done()
- entity_migrated = ent_reg.async_get(entity.entity_id)
+ entity_migrated = entity_registry.async_get(entity.entity_id)
assert entity_migrated
assert entity_migrated.unique_id == f"{entry.entry_id}-{new_unique_id}"
diff --git a/tests/components/goalzero/test_init.py b/tests/components/goalzero/test_init.py
index 287af75c9cd8fb87bb36323937f0c4a94d6bb774..539da7e91a223c429f5c8cf5b8297b7c2f4fcca1 100644
--- a/tests/components/goalzero/test_init.py
+++ b/tests/components/goalzero/test_init.py
@@ -66,11 +66,12 @@ async def test_update_failed(
async def test_device_info(
- hass: HomeAssistant, aioclient_mock: AiohttpClientMocker
+ hass: HomeAssistant,
+ device_registry: dr.DeviceRegistry,
+ aioclient_mock: AiohttpClientMocker,
) -> None:
"""Test device info."""
entry = await async_init_integration(hass, aioclient_mock)
- device_registry = dr.async_get(hass)
device = device_registry.async_get_device(identifiers={(DOMAIN, entry.entry_id)})
diff --git a/tests/components/google/test_calendar.py b/tests/components/google/test_calendar.py
index 3a9673441c0ae4c5888983042b015a929b26e551..3617456c9e676d46ab5fca35cbab481e7e83313e 100644
--- a/tests/components/google/test_calendar.py
+++ b/tests/components/google/test_calendar.py
@@ -653,6 +653,7 @@ async def test_future_event_offset_update_behavior(
async def test_unique_id(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
mock_events_list_items,
component_setup,
config_entry,
@@ -661,7 +662,6 @@ async def test_unique_id(
mock_events_list_items([])
assert await component_setup()
- entity_registry = er.async_get(hass)
registry_entries = er.async_entries_for_config_entry(
entity_registry, config_entry.entry_id
)
@@ -675,14 +675,13 @@ async def test_unique_id(
)
async def test_unique_id_migration(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
mock_events_list_items,
component_setup,
config_entry,
old_unique_id,
) -> None:
"""Test that old unique id format is migrated to the new format that supports multiple accounts."""
- entity_registry = er.async_get(hass)
-
# Create an entity using the old unique id format
entity_registry.async_get_or_create(
DOMAIN,
@@ -730,14 +729,13 @@ async def test_unique_id_migration(
)
async def test_invalid_unique_id_cleanup(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
mock_events_list_items,
component_setup,
config_entry,
mock_calendars_yaml,
) -> None:
"""Test that old unique id format that is not actually unique is removed."""
- entity_registry = er.async_get(hass)
-
# Create an entity using the old unique id format
entity_registry.async_get_or_create(
DOMAIN,
diff --git a/tests/components/google_mail/test_init.py b/tests/components/google_mail/test_init.py
index 4882fd10e80bb77b3547ac8ddff32822e91f2097..ef2f1475dadd69d97ea092cb2e592acef376d53f 100644
--- a/tests/components/google_mail/test_init.py
+++ b/tests/components/google_mail/test_init.py
@@ -121,11 +121,12 @@ async def test_expired_token_refresh_client_error(
async def test_device_info(
- hass: HomeAssistant, setup_integration: ComponentSetup
+ hass: HomeAssistant,
+ device_registry: dr.DeviceRegistry,
+ setup_integration: ComponentSetup,
) -> None:
"""Test device info."""
await setup_integration()
- device_registry = dr.async_get(hass)
entry = hass.config_entries.async_entries(DOMAIN)[0]
device = device_registry.async_get_device(identifiers={(DOMAIN, entry.entry_id)})
diff --git a/tests/components/gpslogger/test_init.py b/tests/components/gpslogger/test_init.py
index 22c3830abf8332acf52550f14f2fba82cc82322b..a9fc5312bbad5e0a7bf81a1b8ccf26215e61bc79 100644
--- a/tests/components/gpslogger/test_init.py
+++ b/tests/components/gpslogger/test_init.py
@@ -100,7 +100,11 @@ async def test_missing_data(hass: HomeAssistant, gpslogger_client, webhook_id) -
async def test_enter_and_exit(
- hass: HomeAssistant, gpslogger_client, webhook_id
+ hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ device_registry: dr.DeviceRegistry,
+ gpslogger_client,
+ webhook_id,
) -> None:
"""Test when there is a known zone."""
url = f"/api/webhook/{webhook_id}"
@@ -131,11 +135,8 @@ async def test_enter_and_exit(
state_name = hass.states.get(f"{DEVICE_TRACKER_DOMAIN}.{data['device']}").state
assert state_name == STATE_NOT_HOME
- dev_reg = dr.async_get(hass)
- assert len(dev_reg.devices) == 1
-
- ent_reg = er.async_get(hass)
- assert len(ent_reg.entities) == 1
+ assert len(device_registry.devices) == 1
+ assert len(entity_registry.entities) == 1
async def test_enter_with_attrs(
diff --git a/tests/components/group/test_binary_sensor.py b/tests/components/group/test_binary_sensor.py
index 15198ac7c5baad2cb786255003e5e734c0d3e495..10c1d58d3d2be8af02236e35ceda1fc1b9fcf87a 100644
--- a/tests/components/group/test_binary_sensor.py
+++ b/tests/components/group/test_binary_sensor.py
@@ -13,7 +13,9 @@ from homeassistant.helpers import entity_registry as er
from homeassistant.setup import async_setup_component
-async def test_default_state(hass: HomeAssistant) -> None:
+async def test_default_state(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test binary_sensor group default state."""
hass.states.async_set("binary_sensor.kitchen", "on")
hass.states.async_set("binary_sensor.bedroom", "on")
@@ -42,7 +44,6 @@ async def test_default_state(hass: HomeAssistant) -> None:
"binary_sensor.bedroom",
]
- entity_registry = er.async_get(hass)
entry = entity_registry.async_get("binary_sensor.bedroom_group")
assert entry
assert entry.unique_id == "unique_identifier"
@@ -145,7 +146,9 @@ async def test_state_reporting_all(hass: HomeAssistant) -> None:
)
-async def test_state_reporting_any(hass: HomeAssistant) -> None:
+async def test_state_reporting_any(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test the state reporting in 'any' mode.
The group state is unavailable if all group members are unavailable.
@@ -171,7 +174,6 @@ async def test_state_reporting_any(hass: HomeAssistant) -> None:
await hass.async_start()
await hass.async_block_till_done()
- entity_registry = er.async_get(hass)
entry = entity_registry.async_get("binary_sensor.binary_sensor_group")
assert entry
assert entry.unique_id == "unique_identifier"
diff --git a/tests/components/group/test_config_flow.py b/tests/components/group/test_config_flow.py
index 1c8275c7f2deb5910ff01a79125662c32328f342..3189e344c62b44e39c74d0da3af92e7998774a30 100644
--- a/tests/components/group/test_config_flow.py
+++ b/tests/components/group/test_config_flow.py
@@ -144,18 +144,22 @@ async def test_config_flow(
),
)
async def test_config_flow_hides_members(
- hass: HomeAssistant, group_type, extra_input, hide_members, hidden_by
+ hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
+ group_type,
+ extra_input,
+ hide_members,
+ hidden_by,
) -> None:
"""Test the config flow hides members if requested."""
fake_uuid = "a266a680b608c32770e6c45bfe6b8411"
- registry = er.async_get(hass)
- entry = registry.async_get_or_create(
+ entry = entity_registry.async_get_or_create(
group_type, "test", "unique", suggested_object_id="one"
)
assert entry.entity_id == f"{group_type}.one"
assert entry.hidden_by is None
- entry = registry.async_get_or_create(
+ entry = entity_registry.async_get_or_create(
group_type, "test", "unique3", suggested_object_id="three"
)
assert entry.entity_id == f"{group_type}.three"
@@ -188,8 +192,8 @@ async def test_config_flow_hides_members(
assert result["type"] == FlowResultType.CREATE_ENTRY
- assert registry.async_get(f"{group_type}.one").hidden_by == hidden_by
- assert registry.async_get(f"{group_type}.three").hidden_by == hidden_by
+ assert entity_registry.async_get(f"{group_type}.one").hidden_by == hidden_by
+ assert entity_registry.async_get(f"{group_type}.three").hidden_by == hidden_by
def get_suggested(schema, key):
@@ -402,6 +406,7 @@ async def test_all_options(
)
async def test_options_flow_hides_members(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
group_type,
extra_input,
hide_members,
@@ -410,8 +415,7 @@ async def test_options_flow_hides_members(
) -> None:
"""Test the options flow hides or unhides members if requested."""
fake_uuid = "a266a680b608c32770e6c45bfe6b8411"
- registry = er.async_get(hass)
- entry = registry.async_get_or_create(
+ entry = entity_registry.async_get_or_create(
group_type,
"test",
"unique1",
@@ -420,7 +424,7 @@ async def test_options_flow_hides_members(
)
assert entry.entity_id == f"{group_type}.one"
- entry = registry.async_get_or_create(
+ entry = entity_registry.async_get_or_create(
group_type,
"test",
"unique3",
@@ -462,8 +466,8 @@ async def test_options_flow_hides_members(
assert result["type"] == FlowResultType.CREATE_ENTRY
- assert registry.async_get(f"{group_type}.one").hidden_by == hidden_by
- assert registry.async_get(f"{group_type}.three").hidden_by == hidden_by
+ assert entity_registry.async_get(f"{group_type}.one").hidden_by == hidden_by
+ assert entity_registry.async_get(f"{group_type}.three").hidden_by == hidden_by
COVER_ATTRS = [{"supported_features": 0}, {}]
diff --git a/tests/components/group/test_cover.py b/tests/components/group/test_cover.py
index 4e0ddc19a312af7906bde495aee8295a07c9f391..d0eb37887638fd07f44c8d207b6735c64406624f 100644
--- a/tests/components/group/test_cover.py
+++ b/tests/components/group/test_cover.py
@@ -249,7 +249,9 @@ async def test_state(hass: HomeAssistant, setup_comp) -> None:
@pytest.mark.parametrize("config_count", [(CONFIG_ATTRIBUTES, 1)])
-async def test_attributes(hass: HomeAssistant, setup_comp) -> None:
+async def test_attributes(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, setup_comp
+) -> None:
"""Test handling of state attributes."""
state = hass.states.get(COVER_GROUP)
assert state.state == STATE_UNAVAILABLE
@@ -407,7 +409,6 @@ async def test_attributes(hass: HomeAssistant, setup_comp) -> None:
assert ATTR_ASSUMED_STATE not in state.attributes
# Test entity registry integration
- entity_registry = er.async_get(hass)
entry = entity_registry.async_get(COVER_GROUP)
assert entry
assert entry.unique_id == "unique_identifier"
diff --git a/tests/components/group/test_event.py b/tests/components/group/test_event.py
index 16ea11fe3111cd59eed43970354ff4dcc7d9cbf0..f82cc8f314b3d2f7b7a317a900815e327984ec0b 100644
--- a/tests/components/group/test_event.py
+++ b/tests/components/group/test_event.py
@@ -16,7 +16,9 @@ from homeassistant.helpers import entity_registry as er
from homeassistant.setup import async_setup_component
-async def test_default_state(hass: HomeAssistant) -> None:
+async def test_default_state(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test event group default state."""
await async_setup_component(
hass,
@@ -132,7 +134,6 @@ async def test_default_state(hass: HomeAssistant) -> None:
assert state is not None
assert state.state == STATE_UNAVAILABLE
- entity_registry = er.async_get(hass)
entry = entity_registry.async_get("event.remote_control")
assert entry
assert entry.unique_id == "unique_identifier"
diff --git a/tests/components/group/test_fan.py b/tests/components/group/test_fan.py
index 2272a29f6edf3fa133ab9def41fc58f46477b45d..2a1baef679861da8c2c218b366090cf2923ada46 100644
--- a/tests/components/group/test_fan.py
+++ b/tests/components/group/test_fan.py
@@ -112,7 +112,9 @@ async def setup_comp(hass, config_count):
@pytest.mark.parametrize("config_count", [(CONFIG_ATTRIBUTES, 1)])
-async def test_state(hass: HomeAssistant, setup_comp) -> None:
+async def test_state(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry, setup_comp
+) -> None:
"""Test handling of state.
The group state is on if at least one group member is on.
@@ -201,7 +203,6 @@ async def test_state(hass: HomeAssistant, setup_comp) -> None:
assert state.attributes[ATTR_SUPPORTED_FEATURES] == 0
# Test entity registry integration
- entity_registry = er.async_get(hass)
entry = entity_registry.async_get(FAN_GROUP)
assert entry
assert entry.unique_id == "unique_identifier"
diff --git a/tests/components/group/test_init.py b/tests/components/group/test_init.py
index c439506b52a8466c1a11a5bc87a103bb066e7b96..5c48385c91e4d9a4969bea24efff1553a97f9177 100644
--- a/tests/components/group/test_init.py
+++ b/tests/components/group/test_init.py
@@ -1641,13 +1641,12 @@ async def test_plant_group(hass: HomeAssistant) -> None:
)
async def test_setup_and_remove_config_entry(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
group_type: str,
member_state: str,
extra_options: dict[str, Any],
) -> None:
"""Test removing a config entry."""
- registry = er.async_get(hass)
-
members1 = [f"{group_type}.one", f"{group_type}.two"]
for member in members1:
@@ -1672,7 +1671,7 @@ async def test_setup_and_remove_config_entry(
# Check the state and entity registry entry are present
state = hass.states.get(f"{group_type}.bed_room")
assert state.attributes["entity_id"] == members1
- assert registry.async_get(f"{group_type}.bed_room") is not None
+ assert entity_registry.async_get(f"{group_type}.bed_room") is not None
# Remove the config entry
assert await hass.config_entries.async_remove(group_config_entry.entry_id)
@@ -1680,7 +1679,7 @@ async def test_setup_and_remove_config_entry(
# Check the state and entity registry entry are removed
assert hass.states.get(f"{group_type}.bed_room") is None
- assert registry.async_get(f"{group_type}.bed_room") is None
+ assert entity_registry.async_get(f"{group_type}.bed_room") is None
@pytest.mark.parametrize(
@@ -1706,6 +1705,7 @@ async def test_setup_and_remove_config_entry(
)
async def test_unhide_members_on_remove(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
group_type: str,
extra_options: dict[str, Any],
hide_members: bool,
@@ -1713,10 +1713,7 @@ async def test_unhide_members_on_remove(
hidden_by: str,
) -> None:
"""Test removing a config entry."""
- registry = er.async_get(hass)
-
- registry = er.async_get(hass)
- entry1 = registry.async_get_or_create(
+ entry1 = entity_registry.async_get_or_create(
group_type,
"test",
"unique1",
@@ -1725,7 +1722,7 @@ async def test_unhide_members_on_remove(
)
assert entry1.entity_id == f"{group_type}.one"
- entry3 = registry.async_get_or_create(
+ entry3 = entity_registry.async_get_or_create(
group_type,
"test",
"unique3",
@@ -1734,7 +1731,7 @@ async def test_unhide_members_on_remove(
)
assert entry3.entity_id == f"{group_type}.three"
- entry4 = registry.async_get_or_create(
+ entry4 = entity_registry.async_get_or_create(
group_type,
"test",
"unique4",
@@ -1766,12 +1763,12 @@ async def test_unhide_members_on_remove(
# Remove one entity registry entry, to make sure this does not trip up config entry
# removal
- registry.async_remove(entry4.entity_id)
+ entity_registry.async_remove(entry4.entity_id)
# Remove the config entry
assert await hass.config_entries.async_remove(group_config_entry.entry_id)
await hass.async_block_till_done()
# Check the group members are unhidden
- assert registry.async_get(f"{group_type}.one").hidden_by == hidden_by
- assert registry.async_get(f"{group_type}.three").hidden_by == hidden_by
+ assert entity_registry.async_get(f"{group_type}.one").hidden_by == hidden_by
+ assert entity_registry.async_get(f"{group_type}.three").hidden_by == hidden_by
diff --git a/tests/components/group/test_light.py b/tests/components/group/test_light.py
index 062cf161bb99c6de3a4de7f8cbfa51c1552da9b2..3051ec502a0e9f55dce24999109826370fa5f3b1 100644
--- a/tests/components/group/test_light.py
+++ b/tests/components/group/test_light.py
@@ -49,7 +49,9 @@ from homeassistant.setup import async_setup_component
from tests.common import async_capture_events, get_fixture_path
-async def test_default_state(hass: HomeAssistant) -> None:
+async def test_default_state(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test light group default state."""
hass.states.async_set("light.kitchen", "on")
await async_setup_component(
@@ -80,7 +82,6 @@ async def test_default_state(hass: HomeAssistant) -> None:
assert state.attributes.get(ATTR_EFFECT_LIST) is None
assert state.attributes.get(ATTR_EFFECT) is None
- entity_registry = er.async_get(hass)
entry = entity_registry.async_get("light.bedroom_group")
assert entry
assert entry.unique_id == "unique_identifier"
diff --git a/tests/components/group/test_lock.py b/tests/components/group/test_lock.py
index b8a1838bca51ab818c98a7cc8905ac5ab4817b38..c8102b79ff930b2c1fcc019134ed626069052e96 100644
--- a/tests/components/group/test_lock.py
+++ b/tests/components/group/test_lock.py
@@ -31,7 +31,9 @@ from homeassistant.setup import async_setup_component
from tests.common import get_fixture_path
-async def test_default_state(hass: HomeAssistant) -> None:
+async def test_default_state(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test lock group default state."""
hass.states.async_set("lock.front", "locked")
await async_setup_component(
@@ -55,7 +57,6 @@ async def test_default_state(hass: HomeAssistant) -> None:
assert state.state == STATE_LOCKED
assert state.attributes.get(ATTR_ENTITY_ID) == ["lock.front", "lock.back"]
- entity_registry = er.async_get(hass)
entry = entity_registry.async_get("lock.door_group")
assert entry
assert entry.unique_id == "unique_identifier"
diff --git a/tests/components/group/test_media_player.py b/tests/components/group/test_media_player.py
index e1f269a947d2eaf77ad70d9568aa18fcd7825992..9f36693d9efed85ab86e47ce03901fd26f2be84d 100644
--- a/tests/components/group/test_media_player.py
+++ b/tests/components/group/test_media_player.py
@@ -58,7 +58,9 @@ def media_player_media_seek_fixture():
yield seek
-async def test_default_state(hass: HomeAssistant) -> None:
+async def test_default_state(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test media group default state."""
hass.states.async_set("media_player.player_1", "on")
await async_setup_component(
@@ -86,7 +88,6 @@ async def test_default_state(hass: HomeAssistant) -> None:
"media_player.player_2",
]
- entity_registry = er.async_get(hass)
entry = entity_registry.async_get("media_player.media_group")
assert entry
assert entry.unique_id == "unique_identifier"
diff --git a/tests/components/group/test_sensor.py b/tests/components/group/test_sensor.py
index 39c9b788d566fe6e19bef3111497fd3778cb5cc6..71a530429388f9419ff8ec08f880459cfb902756 100644
--- a/tests/components/group/test_sensor.py
+++ b/tests/components/group/test_sensor.py
@@ -64,6 +64,7 @@ PRODUCT_VALUE = prod(VALUES)
)
async def test_sensors(
hass: HomeAssistant,
+ entity_registry: er.EntityRegistry,
sensor_type: str,
result: str,
attributes: dict[str, Any],
@@ -107,8 +108,7 @@ async def test_sensors(
assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT
assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "L"
- entity_reg = er.async_get(hass)
- entity = entity_reg.async_get(f"sensor.sensor_group_{sensor_type}")
+ entity = entity_registry.async_get(f"sensor.sensor_group_{sensor_type}")
assert entity.unique_id == "very_unique_id"
diff --git a/tests/components/group/test_switch.py b/tests/components/group/test_switch.py
index bc9a05f4754f58c3d7d226c191c5e759d1e3d488..86f6eb43ed9fd674bde616223cab6d2f858d89d1 100644
--- a/tests/components/group/test_switch.py
+++ b/tests/components/group/test_switch.py
@@ -24,7 +24,9 @@ from homeassistant.setup import async_setup_component
from tests.common import get_fixture_path
-async def test_default_state(hass: HomeAssistant) -> None:
+async def test_default_state(
+ hass: HomeAssistant, entity_registry: er.EntityRegistry
+) -> None:
"""Test switch group default state."""
hass.states.async_set("switch.tv", "on")
await async_setup_component(
@@ -49,7 +51,6 @@ async def test_default_state(hass: HomeAssistant) -> None:
assert state.state == STATE_ON
assert state.attributes.get(ATTR_ENTITY_ID) == ["switch.tv", "switch.soundbar"]
- entity_registry = er.async_get(hass)
entry = entity_registry.async_get("switch.multimedia_group")
assert entry
assert entry.unique_id == "unique_identifier"