diff --git a/tests/components/daikin/test_init.py b/tests/components/daikin/test_init.py index 3b5f81ae2e5361fafc2506b983b65e7d7f2f7f9f..857d9e399f4abdc87470582c614933444366745e 100644 --- a/tests/components/daikin/test_init.py +++ b/tests/components/daikin/test_init.py @@ -50,7 +50,12 @@ DATA = { INVALID_DATA = {**DATA, "name": None, "mac": HOST} -async def test_duplicate_removal(hass: HomeAssistant, mock_daikin) -> None: +async def test_duplicate_removal( + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + device_registry: dr.DeviceRegistry, + mock_daikin, +) -> None: """Test duplicate device removal.""" config_entry = MockConfigEntry( domain=DOMAIN, @@ -59,8 +64,6 @@ async def test_duplicate_removal(hass: HomeAssistant, mock_daikin) -> None: data={CONF_HOST: HOST, KEY_MAC: HOST}, ) config_entry.add_to_hass(hass) - entity_registry = er.async_get(hass) - device_registry = dr.async_get(hass) type(mock_daikin).mac = PropertyMock(return_value=HOST) type(mock_daikin).values = PropertyMock(return_value=INVALID_DATA) @@ -111,7 +114,12 @@ async def test_duplicate_removal(hass: HomeAssistant, mock_daikin) -> None: assert entity_registry.async_get("switch.none_zone_1").unique_id.startswith(MAC) -async def test_unique_id_migrate(hass: HomeAssistant, mock_daikin) -> None: +async def test_unique_id_migrate( + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + device_registry: dr.DeviceRegistry, + mock_daikin, +) -> None: """Test unique id migration.""" config_entry = MockConfigEntry( domain=DOMAIN, @@ -120,8 +128,6 @@ async def test_unique_id_migrate(hass: HomeAssistant, mock_daikin) -> None: data={CONF_HOST: HOST, KEY_MAC: HOST}, ) config_entry.add_to_hass(hass) - entity_registry = er.async_get(hass) - device_registry = dr.async_get(hass) type(mock_daikin).mac = PropertyMock(return_value=HOST) type(mock_daikin).values = PropertyMock(return_value=INVALID_DATA) @@ -171,7 +177,6 @@ async def test_client_update_connection_error( data={CONF_HOST: HOST, KEY_MAC: MAC}, ) config_entry.add_to_hass(hass) - er.async_get(hass) type(mock_daikin).mac = PropertyMock(return_value=MAC) type(mock_daikin).values = PropertyMock(return_value=DATA) diff --git a/tests/components/derivative/test_init.py b/tests/components/derivative/test_init.py index fef13109007280ac6ce7b0718ab255dc3769b58d..eab8ca67be778cfb34581a02cb816a4cf75272e1 100644 --- a/tests/components/derivative/test_init.py +++ b/tests/components/derivative/test_init.py @@ -11,11 +11,11 @@ from tests.common import MockConfigEntry @pytest.mark.parametrize("platform", ("sensor",)) async def test_setup_and_remove_config_entry( hass: HomeAssistant, + entity_registry: er.EntityRegistry, platform: str, ) -> None: """Test setting up and removing a config entry.""" input_sensor_entity_id = "sensor.input" - registry = er.async_get(hass) derivative_entity_id = f"{platform}.my_derivative" # Setup the config entry @@ -37,7 +37,7 @@ async def test_setup_and_remove_config_entry( await hass.async_block_till_done() # Check the entity is registered in the entity registry - assert registry.async_get(derivative_entity_id) is not None + assert entity_registry.async_get(derivative_entity_id) is not None # Check the platform is setup correctly state = hass.states.get(derivative_entity_id) @@ -58,4 +58,4 @@ async def test_setup_and_remove_config_entry( # Check the state and entity registry entry are removed assert hass.states.get(derivative_entity_id) is None - assert registry.async_get(derivative_entity_id) is None + assert entity_registry.async_get(derivative_entity_id) is None diff --git a/tests/components/derivative/test_sensor.py b/tests/components/derivative/test_sensor.py index 5ba00cabd9d66b980bf03e47e90b33a57ab00ab6..4d954fcbb437883729c428941919239a65af17e7 100644 --- a/tests/components/derivative/test_sensor.py +++ b/tests/components/derivative/test_sensor.py @@ -348,11 +348,12 @@ async def test_suffix(hass: HomeAssistant) -> None: assert round(float(state.state), config["sensor"]["round"]) == 0.0 -async def test_device_id(hass: HomeAssistant) -> None: +async def test_device_id( + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + device_registry: dr.DeviceRegistry, +) -> None: """Test for source entity device for Derivative.""" - device_registry = dr.async_get(hass) - entity_registry = er.async_get(hass) - source_config_entry = MockConfigEntry() source_config_entry.add_to_hass(hass) source_device_entry = device_registry.async_get_or_create( diff --git a/tests/components/device_tracker/test_config_entry.py b/tests/components/device_tracker/test_config_entry.py index f9c259a00f446f7897d918c568b8344bf708c39a..e55a9b5b6b2cef354a7d109b9b70a7ff684979d9 100644 --- a/tests/components/device_tracker/test_config_entry.py +++ b/tests/components/device_tracker/test_config_entry.py @@ -25,33 +25,34 @@ def test_tracker_entity() -> None: async def test_cleanup_legacy( - hass: HomeAssistant, enable_custom_integrations: None + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + device_registry: dr.DeviceRegistry, + enable_custom_integrations: None, ) -> None: """Test we clean up devices created by old device tracker.""" - dev_reg = dr.async_get(hass) - ent_reg = er.async_get(hass) config_entry = MockConfigEntry(domain="test") config_entry.add_to_hass(hass) - device1 = dev_reg.async_get_or_create( + device1 = device_registry.async_get_or_create( config_entry_id=config_entry.entry_id, identifiers={(DOMAIN, "device1")} ) - device2 = dev_reg.async_get_or_create( + device2 = device_registry.async_get_or_create( config_entry_id=config_entry.entry_id, identifiers={(DOMAIN, "device2")} ) - device3 = dev_reg.async_get_or_create( + device3 = device_registry.async_get_or_create( config_entry_id=config_entry.entry_id, identifiers={(DOMAIN, "device3")} ) # Device with light + device tracker entity - entity1a = ent_reg.async_get_or_create( + entity1a = entity_registry.async_get_or_create( DOMAIN, "test", "entity1a-unique", config_entry=config_entry, device_id=device1.id, ) - entity1b = ent_reg.async_get_or_create( + entity1b = entity_registry.async_get_or_create( "light", "test", "entity1b-unique", @@ -59,7 +60,7 @@ async def test_cleanup_legacy( device_id=device1.id, ) # Just device tracker entity - entity2a = ent_reg.async_get_or_create( + entity2a = entity_registry.async_get_or_create( DOMAIN, "test", "entity2a-unique", @@ -67,7 +68,7 @@ async def test_cleanup_legacy( device_id=device2.id, ) # Device with no device tracker entities - entity3a = ent_reg.async_get_or_create( + entity3a = entity_registry.async_get_or_create( "light", "test", "entity3a-unique", @@ -75,14 +76,14 @@ async def test_cleanup_legacy( device_id=device3.id, ) # Device tracker but no device - entity4a = ent_reg.async_get_or_create( + entity4a = entity_registry.async_get_or_create( DOMAIN, "test", "entity4a-unique", config_entry=config_entry, ) # Completely different entity - entity5a = ent_reg.async_get_or_create( + entity5a = entity_registry.async_get_or_create( "light", "test", "entity4a-unique", @@ -93,25 +94,26 @@ async def test_cleanup_legacy( await hass.async_block_till_done() for entity in (entity1a, entity1b, entity3a, entity4a, entity5a): - assert ent_reg.async_get(entity.entity_id) is not None + assert entity_registry.async_get(entity.entity_id) is not None # We've removed device so device ID cleared - assert ent_reg.async_get(entity2a.entity_id).device_id is None + assert entity_registry.async_get(entity2a.entity_id).device_id is None # Removed because only had device tracker entity - assert dev_reg.async_get(device2.id) is None + assert device_registry.async_get(device2.id) is None -async def test_register_mac(hass: HomeAssistant) -> None: +async def test_register_mac( + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + device_registry: dr.DeviceRegistry, +) -> None: """Test registering a mac.""" - dev_reg = dr.async_get(hass) - ent_reg = er.async_get(hass) - config_entry = MockConfigEntry(domain="test") config_entry.add_to_hass(hass) mac1 = "12:34:56:AB:CD:EF" - entity_entry_1 = ent_reg.async_get_or_create( + entity_entry_1 = entity_registry.async_get_or_create( "device_tracker", "test", mac1 + "yo1", @@ -122,29 +124,30 @@ async def test_register_mac(hass: HomeAssistant) -> None: ce._async_register_mac(hass, "test", mac1, mac1 + "yo1") - dev_reg.async_get_or_create( + device_registry.async_get_or_create( config_entry_id=config_entry.entry_id, connections={(dr.CONNECTION_NETWORK_MAC, mac1)}, ) await hass.async_block_till_done() - entity_entry_1 = ent_reg.async_get(entity_entry_1.entity_id) + entity_entry_1 = entity_registry.async_get(entity_entry_1.entity_id) assert entity_entry_1.disabled_by is None -async def test_register_mac_ignored(hass: HomeAssistant) -> None: +async def test_register_mac_ignored( + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + device_registry: dr.DeviceRegistry, +) -> None: """Test ignoring registering a mac.""" - dev_reg = dr.async_get(hass) - ent_reg = er.async_get(hass) - config_entry = MockConfigEntry(domain="test", pref_disable_new_entities=True) config_entry.add_to_hass(hass) mac1 = "12:34:56:AB:CD:EF" - entity_entry_1 = ent_reg.async_get_or_create( + entity_entry_1 = entity_registry.async_get_or_create( "device_tracker", "test", mac1 + "yo1", @@ -155,14 +158,14 @@ async def test_register_mac_ignored(hass: HomeAssistant) -> None: ce._async_register_mac(hass, "test", mac1, mac1 + "yo1") - dev_reg.async_get_or_create( + device_registry.async_get_or_create( config_entry_id=config_entry.entry_id, connections={(dr.CONNECTION_NETWORK_MAC, mac1)}, ) await hass.async_block_till_done() - entity_entry_1 = ent_reg.async_get(entity_entry_1.entity_id) + entity_entry_1 = entity_registry.async_get(entity_entry_1.entity_id) assert entity_entry_1.disabled_by == er.RegistryEntryDisabler.INTEGRATION diff --git a/tests/components/device_tracker/test_entities.py b/tests/components/device_tracker/test_entities.py index 960f9c18b08ca6009d1b37c8515c97507b942b53..45f1b21c89a67e757253c9aad32cf1900bedc710 100644 --- a/tests/components/device_tracker/test_entities.py +++ b/tests/components/device_tracker/test_entities.py @@ -21,13 +21,15 @@ from tests.common import MockConfigEntry async def test_scanner_entity_device_tracker( - hass: HomeAssistant, enable_custom_integrations: None + hass: HomeAssistant, + device_registry: dr.DeviceRegistry, + enable_custom_integrations: None, ) -> None: """Test ScannerEntity based device tracker.""" # Make device tied to other integration so device tracker entities get enabled other_config_entry = MockConfigEntry(domain="not_fake_integration") other_config_entry.add_to_hass(hass) - dr.async_get(hass).async_get_or_create( + device_registry.async_get_or_create( name="Device from other integration", config_entry_id=other_config_entry.entry_id, connections={(dr.CONNECTION_NETWORK_MAC, "ad:de:ef:be:ed:fe")}, diff --git a/tests/components/devolo_home_control/test_init.py b/tests/components/devolo_home_control/test_init.py index 29572f2ece4039686c7ed37c1fac95d6301bdd78..cb4c87aebdc4523dbe8e282edf17c5b061425636 100644 --- a/tests/components/devolo_home_control/test_init.py +++ b/tests/components/devolo_home_control/test_init.py @@ -65,6 +65,7 @@ async def test_unload_entry(hass: HomeAssistant) -> None: async def test_remove_device( hass: HomeAssistant, hass_ws_client: WebSocketGenerator, + device_registry: dr.DeviceRegistry, ) -> None: """Test removing a device.""" assert await async_setup_component(hass, "config", {}) @@ -77,7 +78,6 @@ async def test_remove_device( await hass.config_entries.async_setup(entry.entry_id) await hass.async_block_till_done() - device_registry = dr.async_get(hass) device_entry = device_registry.async_get_device(identifiers={(DOMAIN, "Test")}) assert device_entry diff --git a/tests/components/dhcp/test_init.py b/tests/components/dhcp/test_init.py index 076138080cc73094a9a8691c74c4d884b8850316..47933c3053758bab7d2cb3f57c87fb10421e6711 100644 --- a/tests/components/dhcp/test_init.py +++ b/tests/components/dhcp/test_init.py @@ -213,7 +213,9 @@ async def test_dhcp_renewal_match_hostname_and_macaddress(hass: HomeAssistant) - ) -async def test_registered_devices(hass: HomeAssistant) -> None: +async def test_registered_devices( + hass: HomeAssistant, device_registry: dr.DeviceRegistry +) -> None: """Test discovery flows are created for registered devices.""" integration_matchers = [ {"domain": "not-matching", "registered_devices": True}, @@ -222,10 +224,9 @@ async def test_registered_devices(hass: HomeAssistant) -> None: packet = Ether(RAW_DHCP_RENEWAL) - registry = dr.async_get(hass) config_entry = MockConfigEntry(domain="mock-domain", data={}) config_entry.add_to_hass(hass) - registry.async_get_or_create( + device_registry.async_get_or_create( config_entry_id=config_entry.entry_id, connections={(dr.CONNECTION_NETWORK_MAC, "50147903852c")}, name="name", @@ -233,7 +234,7 @@ async def test_registered_devices(hass: HomeAssistant) -> None: # Not enabled should not get flows config_entry2 = MockConfigEntry(domain="mock-domain-2", data={}) config_entry2.add_to_hass(hass) - registry.async_get_or_create( + device_registry.async_get_or_create( config_entry_id=config_entry2.entry_id, connections={(dr.CONNECTION_NETWORK_MAC, "50147903852c")}, name="name", diff --git a/tests/components/directv/test_media_player.py b/tests/components/directv/test_media_player.py index 8d11dc6c9d0a3a7d96ddb811bd7aaa6e9419f229..5dc76a2170e0d0deacbb57cc534fee0ea7083226 100644 --- a/tests/components/directv/test_media_player.py +++ b/tests/components/directv/test_media_player.py @@ -142,13 +142,13 @@ async def test_setup(hass: HomeAssistant, aioclient_mock: AiohttpClientMocker) - async def test_unique_id( - hass: HomeAssistant, aioclient_mock: AiohttpClientMocker + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + aioclient_mock: AiohttpClientMocker, ) -> None: """Test unique id.""" await setup_integration(hass, aioclient_mock) - entity_registry = er.async_get(hass) - main = entity_registry.async_get(MAIN_ENTITY_ID) assert main.original_device_class == MediaPlayerDeviceClass.RECEIVER assert main.unique_id == "028877455858" diff --git a/tests/components/directv/test_remote.py b/tests/components/directv/test_remote.py index 7a674fefa8c0b73b8a0f5abfc1e84e37bfb4dcbb..9d326903933c988b853034fef184d53d3727aeaf 100644 --- a/tests/components/directv/test_remote.py +++ b/tests/components/directv/test_remote.py @@ -29,13 +29,13 @@ async def test_setup(hass: HomeAssistant, aioclient_mock: AiohttpClientMocker) - async def test_unique_id( - hass: HomeAssistant, aioclient_mock: AiohttpClientMocker + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + aioclient_mock: AiohttpClientMocker, ) -> None: """Test unique id.""" await setup_integration(hass, aioclient_mock) - entity_registry = er.async_get(hass) - main = entity_registry.async_get(MAIN_ENTITY_ID) assert main.unique_id == "028877455858" diff --git a/tests/components/dlink/test_init.py b/tests/components/dlink/test_init.py index dbd4cef0139a7c4edd3e7089e30e27d94af82506..4725d0cd3e8ec2acc2227e06fb1c26ba53d11591 100644 --- a/tests/components/dlink/test_init.py +++ b/tests/components/dlink/test_init.py @@ -59,13 +59,14 @@ async def test_async_setup_entry_not_ready( 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() entry = hass.config_entries.async_entries(DOMAIN)[0] - device_registry = dr.async_get(hass) device = device_registry.async_get_device(identifiers={(DOMAIN, entry.entry_id)}) assert device.connections == {("mac", "aa:bb:cc:dd:ee:ff")} diff --git a/tests/components/dremel_3d_printer/test_init.py b/tests/components/dremel_3d_printer/test_init.py index 2740b638316f5fa55b7da9693951afd4ab524ef8..fa41b74a5d2fbd96ea262fdf1ce51d472dc56cb7 100644 --- a/tests/components/dremel_3d_printer/test_init.py +++ b/tests/components/dremel_3d_printer/test_init.py @@ -74,12 +74,14 @@ async def test_update_failed( async def test_device_info( - hass: HomeAssistant, connection, config_entry: MockConfigEntry + hass: HomeAssistant, + device_registry: dr.DeviceRegistry, + connection, + config_entry: MockConfigEntry, ) -> None: """Test device info.""" await hass.config_entries.async_setup(config_entry.entry_id) assert await async_setup_component(hass, DOMAIN, {}) - device_registry = dr.async_get(hass) device = device_registry.async_get_device( identifiers={(DOMAIN, config_entry.unique_id)} ) diff --git a/tests/components/dsmr/test_init.py b/tests/components/dsmr/test_init.py index 567df0279b6bb7c48d7d2aea76151090ff6db91e..512e08220164302ad99ea97eb860ea78bfc3a55a 100644 --- a/tests/components/dsmr/test_init.py +++ b/tests/components/dsmr/test_init.py @@ -85,6 +85,7 @@ from tests.common import MockConfigEntry ) async def test_migrate_unique_id( hass: HomeAssistant, + entity_registry: er.EntityRegistry, dsmr_connection_fixture: tuple[MagicMock, MagicMock, MagicMock], dsmr_version: str, old_unique_id: str, @@ -109,7 +110,6 @@ async def test_migrate_unique_id( mock_entry.add_to_hass(hass) - entity_registry = er.async_get(hass) entity: er.RegistryEntry = entity_registry.async_get_or_create( suggested_object_id="my_sensor", disabled_by=None, diff --git a/tests/components/dsmr/test_sensor.py b/tests/components/dsmr/test_sensor.py index e7f0e715f59af25ef060d89eaa8391441c8f8b22..1895dd15dd175f7c21656d103f0e1d9c5d18a6d6 100644 --- a/tests/components/dsmr/test_sensor.py +++ b/tests/components/dsmr/test_sensor.py @@ -45,7 +45,9 @@ from homeassistant.helpers import entity_registry as er from tests.common import MockConfigEntry, patch -async def test_default_setup(hass: HomeAssistant, dsmr_connection_fixture) -> None: +async def test_default_setup( + hass: HomeAssistant, entity_registry: er.EntityRegistry, dsmr_connection_fixture +) -> None: """Test the default setup.""" (connection_factory, transport, protocol) = dsmr_connection_fixture @@ -102,13 +104,11 @@ async def test_default_setup(hass: HomeAssistant, dsmr_connection_fixture) -> No # after receiving telegram entities need to have the chance to be created await hass.async_block_till_done() - registry = er.async_get(hass) - - entry = registry.async_get("sensor.electricity_meter_power_consumption") + entry = entity_registry.async_get("sensor.electricity_meter_power_consumption") assert entry assert entry.unique_id == "1234_current_electricity_usage" - entry = registry.async_get("sensor.gas_meter_gas_consumption") + entry = entity_registry.async_get("sensor.gas_meter_gas_consumption") assert entry assert entry.unique_id == "5678_gas_meter_reading" @@ -184,7 +184,9 @@ async def test_default_setup(hass: HomeAssistant, dsmr_connection_fixture) -> No ) -async def test_setup_only_energy(hass: HomeAssistant, dsmr_connection_fixture) -> None: +async def test_setup_only_energy( + hass: HomeAssistant, entity_registry: er.EntityRegistry, dsmr_connection_fixture +) -> None: """Test the default setup.""" (connection_factory, transport, protocol) = dsmr_connection_fixture @@ -232,13 +234,11 @@ async def test_setup_only_energy(hass: HomeAssistant, dsmr_connection_fixture) - # after receiving telegram entities need to have the chance to be created await hass.async_block_till_done() - registry = er.async_get(hass) - - entry = registry.async_get("sensor.electricity_meter_power_consumption") + entry = entity_registry.async_get("sensor.electricity_meter_power_consumption") assert entry assert entry.unique_id == "1234_current_electricity_usage" - entry = registry.async_get("sensor.gas_meter_gas_consumption") + entry = entity_registry.async_get("sensor.gas_meter_gas_consumption") assert not entry diff --git a/tests/components/dynalite/common.py b/tests/components/dynalite/common.py index 446cdc74c0bd01cd16ba71a515a056f94156dab4..355a1285a56d5b912cded199db747b05330385ce 100644 --- a/tests/components/dynalite/common.py +++ b/tests/components/dynalite/common.py @@ -3,7 +3,6 @@ from unittest.mock import AsyncMock, Mock, call, patch from homeassistant.components import dynalite from homeassistant.const import ATTR_SERVICE -from homeassistant.helpers import entity_registry as er from tests.common import MockConfigEntry @@ -23,8 +22,6 @@ def create_mock_device(platform, spec): async def get_entry_id_from_hass(hass): """Get the config entry id from hass.""" - ent_reg = er.async_get(hass) - assert ent_reg conf_entries = hass.config_entries.async_entries(dynalite.DOMAIN) assert len(conf_entries) == 1 return conf_entries[0].entry_id diff --git a/tests/components/easyenergy/test_sensor.py b/tests/components/easyenergy/test_sensor.py index 98e94197db917c671857a52fbc09da241383599f..afc3a12d6a21ebee5ca01cff8b57b2b23c608c60 100644 --- a/tests/components/easyenergy/test_sensor.py +++ b/tests/components/easyenergy/test_sensor.py @@ -32,12 +32,13 @@ from tests.common import MockConfigEntry @pytest.mark.freeze_time("2023-01-19 15:00:00") async def test_energy_usage_today( - hass: HomeAssistant, init_integration: MockConfigEntry + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + device_registry: dr.DeviceRegistry, + init_integration: MockConfigEntry, ) -> None: """Test the easyEnergy - Energy usage sensors.""" entry_id = init_integration.entry_id - entity_registry = er.async_get(hass) - device_registry = dr.async_get(hass) # Current usage energy price sensor state = hass.states.get("sensor.easyenergy_today_energy_usage_current_hour_price") @@ -146,12 +147,13 @@ async def test_energy_usage_today( @pytest.mark.freeze_time("2023-01-19 15:00:00") async def test_energy_return_today( - hass: HomeAssistant, init_integration: MockConfigEntry + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + device_registry: dr.DeviceRegistry, + init_integration: MockConfigEntry, ) -> None: """Test the easyEnergy - Energy return sensors.""" entry_id = init_integration.entry_id - entity_registry = er.async_get(hass) - device_registry = dr.async_get(hass) # Current return energy price sensor state = hass.states.get("sensor.easyenergy_today_energy_return_current_hour_price") @@ -261,12 +263,13 @@ async def test_energy_return_today( @pytest.mark.freeze_time("2023-01-19 10:00:00") async def test_gas_today( - hass: HomeAssistant, init_integration: MockConfigEntry + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + device_registry: dr.DeviceRegistry, + init_integration: MockConfigEntry, ) -> None: """Test the easyEnergy - Gas sensors.""" entry_id = init_integration.entry_id - entity_registry = er.async_get(hass) - device_registry = dr.async_get(hass) # Current gas price sensor state = hass.states.get("sensor.easyenergy_today_gas_current_hour_price") diff --git a/tests/components/efergy/test_init.py b/tests/components/efergy/test_init.py index e82d661592350cc181c6a28f71e2d685cb5638d9..df6d6a7b1120951332d576b243b9b0aca3515bd5 100644 --- a/tests/components/efergy/test_init.py +++ b/tests/components/efergy/test_init.py @@ -47,11 +47,12 @@ async def test_async_setup_entry_auth_failed(hass: HomeAssistant) -> None: 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 setup_platform(hass, aioclient_mock, SENSOR_DOMAIN) - device_registry = dr.async_get(hass) device = device_registry.async_get_device(identifiers={(DOMAIN, entry.entry_id)}) diff --git a/tests/components/efergy/test_sensor.py b/tests/components/efergy/test_sensor.py index f8eb889d3c3ab21c3844a8bedd4b86a9be58218f..45261d4593364399cfb3d7b47bc57f7b7e6733fc 100644 --- a/tests/components/efergy/test_sensor.py +++ b/tests/components/efergy/test_sensor.py @@ -17,7 +17,6 @@ from homeassistant.const import ( ) from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er -from homeassistant.helpers.entity_registry import EntityRegistry import homeassistant.util.dt as dt_util from . import MULTI_SENSOR_TOKEN, mock_responses, setup_platform @@ -27,13 +26,14 @@ from tests.test_util.aiohttp import AiohttpClientMocker async def test_sensor_readings( - hass: HomeAssistant, aioclient_mock: AiohttpClientMocker + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + aioclient_mock: AiohttpClientMocker, ) -> None: """Test for successfully setting up the Efergy platform.""" for description in SENSOR_TYPES: description.entity_registry_enabled_default = True entry = await setup_platform(hass, aioclient_mock, SENSOR_DOMAIN) - ent_reg: EntityRegistry = er.async_get(hass) state = hass.states.get("sensor.efergy_power_usage") assert state.state == "1580" @@ -85,9 +85,9 @@ async def test_sensor_readings( assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.MONETARY assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "EUR" assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING - entity = ent_reg.async_get("sensor.efergy_power_usage_728386") + entity = entity_registry.async_get("sensor.efergy_power_usage_728386") assert entity.disabled_by is er.RegistryEntryDisabler.INTEGRATION - ent_reg.async_update_entity(entity.entity_id, **{"disabled_by": None}) + entity_registry.async_update_entity(entity.entity_id, **{"disabled_by": None}) await hass.config_entries.async_reload(entry.entry_id) await hass.async_block_till_done() state = hass.states.get("sensor.efergy_power_usage_728386") diff --git a/tests/components/energy/test_sensor.py b/tests/components/energy/test_sensor.py index bf1513507f882d6051cbdb388041ea0afbff7f61..f4a1f661f9bee28bb9563b0e0a2c278b5aed0f31 100644 --- a/tests/components/energy/test_sensor.py +++ b/tests/components/energy/test_sensor.py @@ -88,7 +88,10 @@ async def test_cost_sensor_no_states( async def test_cost_sensor_attributes( - setup_integration, hass: HomeAssistant, hass_storage: dict[str, Any] + setup_integration, + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + hass_storage: dict[str, Any], ) -> None: """Test sensor attributes.""" energy_data = data.EnergyManager.default_preferences() @@ -114,9 +117,8 @@ async def test_cost_sensor_attributes( } await setup_integration(hass) - registry = er.async_get(hass) cost_sensor_entity_id = "sensor.energy_consumption_cost" - entry = registry.async_get(cost_sensor_entity_id) + entry = entity_registry.async_get(cost_sensor_entity_id) assert entry.entity_category is None assert entry.disabled_by is None assert entry.hidden_by == er.RegistryEntryHider.INTEGRATION @@ -145,6 +147,7 @@ async def test_cost_sensor_price_entity_total_increasing( hass: HomeAssistant, hass_storage: dict[str, Any], hass_ws_client: WebSocketGenerator, + entity_registry: er.EntityRegistry, initial_energy, initial_cost, price_entity, @@ -237,7 +240,6 @@ async def test_cost_sensor_price_entity_total_increasing( assert state.attributes[ATTR_STATE_CLASS] == SensorStateClass.TOTAL assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == "EUR" - entity_registry = er.async_get(hass) entry = entity_registry.async_get(cost_sensor_entity_id) assert entry postfix = "cost" if flow_type == "flow_from" else "compensation" @@ -357,6 +359,7 @@ async def test_cost_sensor_price_entity_total( hass: HomeAssistant, hass_storage: dict[str, Any], hass_ws_client: WebSocketGenerator, + entity_registry: er.EntityRegistry, initial_energy, initial_cost, price_entity, @@ -451,7 +454,6 @@ async def test_cost_sensor_price_entity_total( assert state.attributes[ATTR_STATE_CLASS] == SensorStateClass.TOTAL assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == "EUR" - entity_registry = er.async_get(hass) entry = entity_registry.async_get(cost_sensor_entity_id) assert entry postfix = "cost" if flow_type == "flow_from" else "compensation" @@ -572,6 +574,7 @@ async def test_cost_sensor_price_entity_total_no_reset( hass: HomeAssistant, hass_storage: dict[str, Any], hass_ws_client: WebSocketGenerator, + entity_registry: er.EntityRegistry, initial_energy, initial_cost, price_entity, @@ -665,7 +668,6 @@ async def test_cost_sensor_price_entity_total_no_reset( assert state.attributes[ATTR_STATE_CLASS] == SensorStateClass.TOTAL assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == "EUR" - entity_registry = er.async_get(hass) entry = entity_registry.async_get(cost_sensor_entity_id) assert entry postfix = "cost" if flow_type == "flow_from" else "compensation" @@ -1156,7 +1158,10 @@ async def test_cost_sensor_state_class_measurement_no_reset( async def test_inherit_source_unique_id( - setup_integration, hass: HomeAssistant, hass_storage: dict[str, Any] + setup_integration, + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + hass_storage: dict[str, Any], ) -> None: """Test sensor inherits unique ID from source.""" energy_data = data.EnergyManager.default_preferences() @@ -1175,7 +1180,6 @@ async def test_inherit_source_unique_id( "data": energy_data, } - entity_registry = er.async_get(hass) source_entry = entity_registry.async_get_or_create( "sensor", "test", "123456", suggested_object_id="gas_consumption" ) diff --git a/tests/components/enocean/test_switch.py b/tests/components/enocean/test_switch.py index a7aafa6fc733b878e156fdd26ebba136648a628a..4ddd54fba0557fb233fbeddf6099909db6ade41c 100644 --- a/tests/components/enocean/test_switch.py +++ b/tests/components/enocean/test_switch.py @@ -22,7 +22,10 @@ SWITCH_CONFIG = { } -async def test_unique_id_migration(hass: HomeAssistant) -> None: +async def test_unique_id_migration( + hass: HomeAssistant, + entity_registry: er.EntityRegistry, +) -> None: """Test EnOcean switch ID migration.""" entity_name = SWITCH_CONFIG["switch"][0]["name"] @@ -30,8 +33,6 @@ async def test_unique_id_migration(hass: HomeAssistant) -> None: dev_id = SWITCH_CONFIG["switch"][0]["id"] channel = SWITCH_CONFIG["switch"][0]["channel"] - ent_reg = er.async_get(hass) - old_unique_id = f"{combine_hex(dev_id)}" entry = MockConfigEntry(domain=ENOCEAN_DOMAIN, data={"device": "/dev/null"}) @@ -39,7 +40,7 @@ async def test_unique_id_migration(hass: HomeAssistant) -> None: entry.add_to_hass(hass) # Add a switch with an old unique_id to the entity registry - entity_entry = ent_reg.async_get_or_create( + entity_entry = entity_registry.async_get_or_create( SWITCH_DOMAIN, ENOCEAN_DOMAIN, old_unique_id, @@ -63,11 +64,13 @@ async def test_unique_id_migration(hass: HomeAssistant) -> None: await hass.async_block_till_done() # Check that new entry has a new unique_id - entity_entry = ent_reg.async_get(switch_entity_id) + entity_entry = entity_registry.async_get(switch_entity_id) new_unique_id = f"{combine_hex(dev_id)}-{channel}" assert entity_entry.unique_id == new_unique_id assert ( - ent_reg.async_get_entity_id(SWITCH_DOMAIN, ENOCEAN_DOMAIN, old_unique_id) + entity_registry.async_get_entity_id( + SWITCH_DOMAIN, ENOCEAN_DOMAIN, old_unique_id + ) is None ) diff --git a/tests/components/esphome/test_entry_data.py b/tests/components/esphome/test_entry_data.py index 64484b91e070fe35e1e77c780fbe1471f185797f..0ba43092d019bba6f252bd1019af8e91ae7df1cc 100644 --- a/tests/components/esphome/test_entry_data.py +++ b/tests/components/esphome/test_entry_data.py @@ -13,12 +13,12 @@ from homeassistant.helpers import entity_registry as er async def test_migrate_entity_unique_id( hass: HomeAssistant, + entity_registry: er.EntityRegistry, mock_client: APIClient, mock_generic_device_entry, ) -> None: """Test a generic sensor entity unique id migration.""" - ent_reg = er.async_get(hass) - ent_reg.async_get_or_create( + entity_registry.async_get_or_create( "sensor", "esphome", "my_sensor", @@ -46,10 +46,9 @@ async def test_migrate_entity_unique_id( state = hass.states.get("sensor.old_sensor") assert state is not None assert state.state == "50" - entity_reg = er.async_get(hass) - entry = entity_reg.async_get("sensor.old_sensor") + entry = entity_registry.async_get("sensor.old_sensor") assert entry is not None - assert entity_reg.async_get_entity_id("sensor", "esphome", "my_sensor") is None + assert entity_registry.async_get_entity_id("sensor", "esphome", "my_sensor") is None # Note that ESPHome includes the EntityInfo type in the unique id # as this is not a 1:1 mapping to the entity platform (ie. text_sensor) assert entry.unique_id == "11:22:33:44:55:aa-sensor-mysensor" @@ -57,19 +56,19 @@ async def test_migrate_entity_unique_id( async def test_migrate_entity_unique_id_downgrade_upgrade( hass: HomeAssistant, + entity_registry: er.EntityRegistry, mock_client: APIClient, mock_generic_device_entry, ) -> None: """Test unique id migration prefers the original entity on downgrade upgrade.""" - ent_reg = er.async_get(hass) - ent_reg.async_get_or_create( + entity_registry.async_get_or_create( "sensor", "esphome", "my_sensor", suggested_object_id="old_sensor", disabled_by=None, ) - ent_reg.async_get_or_create( + entity_registry.async_get_or_create( "sensor", "esphome", "11:22:33:44:55:aa-sensor-mysensor", @@ -97,14 +96,16 @@ async def test_migrate_entity_unique_id_downgrade_upgrade( state = hass.states.get("sensor.new_sensor") assert state is not None assert state.state == "50" - entity_reg = er.async_get(hass) - entry = entity_reg.async_get("sensor.new_sensor") + entry = entity_registry.async_get("sensor.new_sensor") assert entry is not None # Confirm we did not touch the entity that was created # on downgrade so when they upgrade again they can delete the # entity that was only created on downgrade and they keep # the original one. - assert entity_reg.async_get_entity_id("sensor", "esphome", "my_sensor") is not None + assert ( + entity_registry.async_get_entity_id("sensor", "esphome", "my_sensor") + is not None + ) # Note that ESPHome includes the EntityInfo type in the unique id # as this is not a 1:1 mapping to the entity platform (ie. text_sensor) assert entry.unique_id == "11:22:33:44:55:aa-sensor-mysensor"