evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support to entity registry for overriding device_class (#59985)

Browse source
This commit is contained in:
Erik Montnemery 2021-11-22 17:38:06 +01:00 • committed by GitHub
parent 67e13b35db
commit 49a27e12ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 136 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

59
tests/helpers/test_entity_registry.py
View file

@ -74,10 +74,10 @@ def test_get_or_create_updates_data(registry):
area_id="mock-area-id",
capabilities={"max": 100},
config_entry=orig_config_entry,
device_class="mock-device-class",
device_id="mock-dev-id",
disabled_by=er.DISABLED_HASS,
entity_category="config",
original_device_class="mock-device-class",
original_icon="initial-original_icon",
original_name="initial-original_name",
supported_features=5,
@ -91,12 +91,13 @@ def test_get_or_create_updates_data(registry):
area_id="mock-area-id",
capabilities={"max": 100},
config_entry_id=orig_config_entry.entry_id,
device_class="mock-device-class",
device_class=None,
device_id="mock-dev-id",
disabled_by=er.DISABLED_HASS,
entity_category="config",
icon=None,
name=None,
original_device_class="mock-device-class",
original_icon="initial-original_icon",
original_name="initial-original_name",
supported_features=5,
@ -112,10 +113,10 @@ def test_get_or_create_updates_data(registry):
area_id="new-mock-area-id",
capabilities={"new-max": 100},
config_entry=new_config_entry,
device_class="new-mock-device-class",
device_id="new-mock-dev-id",
disabled_by=er.DISABLED_USER,
entity_category=None,
original_device_class="new-mock-device-class",
original_icon="updated-original_icon",
original_name="updated-original_name",
supported_features=10,
@ -129,12 +130,13 @@ def test_get_or_create_updates_data(registry):
area_id="new-mock-area-id",
capabilities={"new-max": 100},
config_entry_id=new_config_entry.entry_id,
device_class="new-mock-device-class",
device_class=None,
device_id="new-mock-dev-id",
disabled_by=er.DISABLED_HASS, # Should not be updated
entity_category="config",
icon=None,
name=None,
original_device_class="new-mock-device-class",
original_icon="updated-original_icon",
original_name="updated-original_name",
supported_features=10,
@ -182,17 +184,20 @@ async def test_loading_saving_data(hass, registry):
area_id="mock-area-id",
capabilities={"max": 100},
config_entry=mock_config,
device_class="mock-device-class",
device_id="mock-dev-id",
disabled_by=er.DISABLED_HASS,
entity_category="config",
original_device_class="mock-device-class",
original_icon="hass:original-icon",
original_name="Original Name",
supported_features=5,
unit_of_measurement="initial-unit_of_measurement",
)
orig_entry2 = registry.async_update_entity(
orig_entry2.entity_id, name="User Name", icon="hass:user-icon"
orig_entry2.entity_id,
device_class="user-class",
name="User Name",
icon="hass:user-icon",
)
assert len(registry.entities) == 2
@ -213,12 +218,13 @@ async def test_loading_saving_data(hass, registry):
assert new_entry2.area_id == "mock-area-id"
assert new_entry2.capabilities == {"max": 100}
assert new_entry2.config_entry_id == mock_config.entry_id
assert new_entry2.device_class == "mock-device-class"
assert new_entry2.device_class == "user-class"
assert new_entry2.device_id == "mock-dev-id"
assert new_entry2.disabled_by == er.DISABLED_HASS
assert new_entry2.entity_category == "config"
assert new_entry2.icon == "hass:user-icon"
assert new_entry2.name == "User Name"
assert new_entry2.original_device_class == "mock-device-class"
assert new_entry2.original_icon == "hass:original-icon"
assert new_entry2.original_name == "Original Name"
assert new_entry2.supported_features == 5
@ -411,6 +417,33 @@ async def test_migration_yaml_to_json(hass):
assert entry.config_entry_id == "test-config-id"
@pytest.mark.parametrize("load_registries", [False])
async def test_migration_1_1_to_1_2(hass, hass_storage):
"""Test migration from version 1.1 to 1.2."""
hass_storage[er.STORAGE_KEY] = {
"version": 1,
"minor_version": 1,
"data": {
"entities": [
{
"device_class": "best_class",
"entity_id": "test.entity",
"platform": "super_platform",
"unique_id": "very_unique",
},
]
},
}
await er.async_load(hass)
registry = er.async_get(hass)
entry = registry.async_get_or_create("test", "super_platform", "very_unique")
assert entry.device_class is None
assert entry.original_device_class == "best_class"
@pytest.mark.parametrize("load_registries", [False])
async def test_loading_invalid_entity_id(hass, hass_storage):
"""Test we skip entities with invalid entity IDs."""
@ -599,7 +632,7 @@ async def test_restore_states(hass):
suggested_object_id="all_info_set",
capabilities={"max": 100},
supported_features=5,
device_class="mock-device-class",
original_device_class="mock-device-class",
original_name="Mock Original Name",
original_icon="hass:original-icon",
)
@ -649,14 +682,14 @@ async def test_async_get_device_class_lookup(hass):
"light",
"battery_charging",
device_id="light_device_entry_id",
device_class="battery_charging",
original_device_class="battery_charging",
)
ent_reg.async_get_or_create(
"sensor",
"light",
"battery",
device_id="light_device_entry_id",
device_class="battery",
original_device_class="battery",
)
ent_reg.async_get_or_create(
"light", "light", "demo", device_id="light_device_entry_id"
@ -666,14 +699,14 @@ async def test_async_get_device_class_lookup(hass):
"vacuum",
"battery_charging",
device_id="vacuum_device_entry_id",
device_class="battery_charging",
original_device_class="battery_charging",
)
ent_reg.async_get_or_create(
"sensor",
"vacuum",
"battery",
device_id="vacuum_device_entry_id",
device_class="battery",
original_device_class="battery",
)
ent_reg.async_get_or_create(
"vacuum", "vacuum", "demo", device_id="vacuum_device_entry_id"
@ -683,7 +716,7 @@ async def test_async_get_device_class_lookup(hass):
"remote",
"battery_charging",
device_id="remote_device_entry_id",
device_class="battery_charging",
original_device_class="battery_charging",
)
ent_reg.async_get_or_create(
"remote", "remote", "demo", device_id="remote_device_entry_id"