Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve Ecovacs naming #109372

Merged
merged 2 commits into from Feb 2, 2024
Merged

Improve Ecovacs naming #109372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
411c199
Improve Ecovacs naming
edenhaus Feb 2, 2024
a1dde1a
Update tests and remove sortign of entity_ids
edenhaus Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions homeassistant/components/ecovacs/strings.json
View file
Open in desktop
Expand Up @@ -47,13 +47,13 @@
"name": "Relocate"
},
"reset_lifespan_brush": {
"name": "Reset brush lifespan"
"name": "Reset main brush lifespan"
},
"reset_lifespan_filter": {
"name": "Reset filter lifespan"
},
"reset_lifespan_side_brush": {
"name": "Reset side brush lifespan"
"name": "Reset side brushes lifespan"
}
},
"image": {
Expand All @@ -79,13 +79,13 @@
}
},
"lifespan_brush": {
"name": "Brush lifespan"
"name": "Main brush lifespan"
},
"lifespan_filter": {
"name": "Filter lifespan"
},
"lifespan_side_brush": {
"name": "Side brush lifespan"
"name": "Side brushes lifespan"
},
"network_ip": {
"name": "IP address"
Expand All @@ -100,7 +100,7 @@
"name": "Area cleaned"
},
"stats_time": {
"name": "Time cleaned"
"name": "Cleaning duration"
},
"total_stats_area": {
"name": "Total area cleaned"
Expand All @@ -109,12 +109,12 @@
"name": "Total cleanings"
},
"total_stats_time": {
"name": "Total time cleaned"
"name": "Total cleaning duration"
}
},
"select": {
"water_amount": {
"name": "Water amount",
"name": "Water flow level",
"state": {
"high": "High",
"low": "Low",
Expand All @@ -137,7 +137,7 @@
"name": "Advanced mode"
},
"carpet_auto_fan_boost": {
"name": "Carpet auto fan speed boost"
"name": "Carpet auto-boost suction"
},
"clean_preference": {
"name": "Clean preference"
Expand Down
44 changes: 22 additions & 22 deletions tests/components/ecovacs/snapshots/test_button.ambr
View file
Open in desktop
Expand Up @@ -42,7 +42,7 @@
'state': '2024-01-01T00:00:00+00:00',
})
# ---
# name: test_buttons[yna5x1][button.ozmo_950_reset_brush_lifespan:entity-registry]
# name: test_buttons[yna5x1][button.ozmo_950_reset_filter_lifespan:entity-registry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
Expand All @@ -54,7 +54,7 @@
'disabled_by': None,
'domain': 'button',
'entity_category': <EntityCategory.CONFIG: 'config'>,
'entity_id': 'button.ozmo_950_reset_brush_lifespan',
'entity_id': 'button.ozmo_950_reset_filter_lifespan',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
Expand All @@ -64,28 +64,28 @@
}),
'original_device_class': None,
'original_icon': None,
'original_name': 'Reset brush lifespan',
'original_name': 'Reset filter lifespan',
'platform': 'ecovacs',
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'reset_lifespan_brush',
'unique_id': 'E1234567890000000001_reset_lifespan_brush',
'translation_key': 'reset_lifespan_filter',
'unique_id': 'E1234567890000000001_reset_lifespan_filter',
'unit_of_measurement': None,
})
# ---
# name: test_buttons[yna5x1][button.ozmo_950_reset_brush_lifespan:state]
# name: test_buttons[yna5x1][button.ozmo_950_reset_filter_lifespan:state]
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Ozmo 950 Reset brush lifespan',
'friendly_name': 'Ozmo 950 Reset filter lifespan',
}),
'context': <ANY>,
'entity_id': 'button.ozmo_950_reset_brush_lifespan',
'entity_id': 'button.ozmo_950_reset_filter_lifespan',
'last_changed': <ANY>,
'last_updated': <ANY>,
'state': '2024-01-01T00:00:00+00:00',
})
# ---
# name: test_buttons[yna5x1][button.ozmo_950_reset_filter_lifespan:entity-registry]
# name: test_buttons[yna5x1][button.ozmo_950_reset_main_brush_lifespan:entity-registry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
Expand All @@ -97,7 +97,7 @@
'disabled_by': None,
'domain': 'button',
'entity_category': <EntityCategory.CONFIG: 'config'>,
'entity_id': 'button.ozmo_950_reset_filter_lifespan',
'entity_id': 'button.ozmo_950_reset_main_brush_lifespan',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
Expand All @@ -107,28 +107,28 @@
}),
'original_device_class': None,
'original_icon': None,
'original_name': 'Reset filter lifespan',
'original_name': 'Reset main brush lifespan',
'platform': 'ecovacs',
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'reset_lifespan_filter',
'unique_id': 'E1234567890000000001_reset_lifespan_filter',
'translation_key': 'reset_lifespan_brush',
'unique_id': 'E1234567890000000001_reset_lifespan_brush',
'unit_of_measurement': None,
})
# ---
# name: test_buttons[yna5x1][button.ozmo_950_reset_filter_lifespan:state]
# name: test_buttons[yna5x1][button.ozmo_950_reset_main_brush_lifespan:state]
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Ozmo 950 Reset filter lifespan',
'friendly_name': 'Ozmo 950 Reset main brush lifespan',
}),
'context': <ANY>,
'entity_id': 'button.ozmo_950_reset_filter_lifespan',
'entity_id': 'button.ozmo_950_reset_main_brush_lifespan',
'last_changed': <ANY>,
'last_updated': <ANY>,
'state': '2024-01-01T00:00:00+00:00',
})
# ---
# name: test_buttons[yna5x1][button.ozmo_950_reset_side_brush_lifespan:entity-registry]
# name: test_buttons[yna5x1][button.ozmo_950_reset_side_brushes_lifespan:entity-registry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
Expand All @@ -140,7 +140,7 @@
'disabled_by': None,
'domain': 'button',
'entity_category': <EntityCategory.CONFIG: 'config'>,
'entity_id': 'button.ozmo_950_reset_side_brush_lifespan',
'entity_id': 'button.ozmo_950_reset_side_brushes_lifespan',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
Expand All @@ -150,7 +150,7 @@
}),
'original_device_class': None,
'original_icon': None,
'original_name': 'Reset side brush lifespan',
'original_name': 'Reset side brushes lifespan',
'platform': 'ecovacs',
'previous_unique_id': None,
'supported_features': 0,
Expand All @@ -159,13 +159,13 @@
'unit_of_measurement': None,
})
# ---
# name: test_buttons[yna5x1][button.ozmo_950_reset_side_brush_lifespan:state]
# name: test_buttons[yna5x1][button.ozmo_950_reset_side_brushes_lifespan:state]
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Ozmo 950 Reset side brush lifespan',
'friendly_name': 'Ozmo 950 Reset side brushes lifespan',
}),
'context': <ANY>,
'entity_id': 'button.ozmo_950_reset_side_brush_lifespan',
'entity_id': 'button.ozmo_950_reset_side_brushes_lifespan',
'last_changed': <ANY>,
'last_updated': <ANY>,
'state': '2024-01-01T00:00:00+00:00',
Expand Down
12 changes: 6 additions & 6 deletions tests/components/ecovacs/snapshots/test_select.ambr
View file
Open in desktop
@@ -1,5 +1,5 @@
# serializer version: 1
# name: test_selects[yna5x1-entity_ids0][select.ozmo_950_water_amount:entity-registry]
# name: test_selects[yna5x1-entity_ids0][select.ozmo_950_water_flow_level:entity-registry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
Expand All @@ -18,7 +18,7 @@
'disabled_by': None,
'domain': 'select',
'entity_category': <EntityCategory.CONFIG: 'config'>,
'entity_id': 'select.ozmo_950_water_amount',
'entity_id': 'select.ozmo_950_water_flow_level',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
Expand All @@ -28,7 +28,7 @@
}),
'original_device_class': None,
'original_icon': None,
'original_name': 'Water amount',
'original_name': 'Water flow level',
'platform': 'ecovacs',
'previous_unique_id': None,
'supported_features': 0,
Expand All @@ -37,10 +37,10 @@
'unit_of_measurement': None,
})
# ---
# name: test_selects[yna5x1-entity_ids0][select.ozmo_950_water_amount:state]
# name: test_selects[yna5x1-entity_ids0][select.ozmo_950_water_flow_level:state]
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Ozmo 950 Water amount',
'friendly_name': 'Ozmo 950 Water flow level',
'options': list([
'low',
'medium',
Expand All @@ -49,7 +49,7 @@
]),
}),
'context': <ANY>,
'entity_id': 'select.ozmo_950_water_amount',
'entity_id': 'select.ozmo_950_water_flow_level',
'last_changed': <ANY>,
'last_updated': <ANY>,
'state': 'ultrahigh',
Expand Down