jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 11:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated battery properties from demo vacuum (#147980)

Browse Source
This commit is contained in:
G Johansson 2025-07-02 21:49:12 +02:00 committed by GitHub
parent a748525e03
commit 78c39f8a06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
homeassistant/components/demo/vacuum.py
View File

@ -19,10 +19,7 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
SUPPORT_MINIMAL_SERVICES = VacuumEntityFeature.TURN_ON | VacuumEntityFeature.TURN_OFF SUPPORT_MINIMAL_SERVICES = VacuumEntityFeature.TURN_ON | VacuumEntityFeature.TURN_OFF
SUPPORT_BASIC_SERVICES = ( SUPPORT_BASIC_SERVICES = (
VacuumEntityFeature.STATE VacuumEntityFeature.STATE | VacuumEntityFeature.START | VacuumEntityFeature.STOP
| VacuumEntityFeature.START
| VacuumEntityFeature.STOP
| VacuumEntityFeature.BATTERY
) )
SUPPORT_MOST_SERVICES = ( SUPPORT_MOST_SERVICES = (
@ -31,7 +28,6 @@ SUPPORT_MOST_SERVICES = (
| VacuumEntityFeature.STOP | VacuumEntityFeature.STOP
| VacuumEntityFeature.PAUSE | VacuumEntityFeature.PAUSE
| VacuumEntityFeature.RETURN_HOME | VacuumEntityFeature.RETURN_HOME
| VacuumEntityFeature.BATTERY
| VacuumEntityFeature.FAN_SPEED | VacuumEntityFeature.FAN_SPEED
) )
@ -46,7 +42,6 @@ SUPPORT_ALL_SERVICES = (
| VacuumEntityFeature.SEND_COMMAND | VacuumEntityFeature.SEND_COMMAND
| VacuumEntityFeature.LOCATE | VacuumEntityFeature.LOCATE
| VacuumEntityFeature.STATUS | VacuumEntityFeature.STATUS
| VacuumEntityFeature.BATTERY
| VacuumEntityFeature.LOCATE | VacuumEntityFeature.LOCATE
| VacuumEntityFeature.MAP | VacuumEntityFeature.MAP
| VacuumEntityFeature.CLEAN_SPOT | VacuumEntityFeature.CLEAN_SPOT
@ -90,12 +85,6 @@ class StateDemoVacuum(StateVacuumEntity):
self._attr_activity = VacuumActivity.DOCKED self._attr_activity = VacuumActivity.DOCKED
self._fan_speed = FAN_SPEEDS[1] self._fan_speed = FAN_SPEEDS[1]
self._cleaned_area: float = 0 self._cleaned_area: float = 0
self._battery_level = 100
@property
def battery_level(self) -> int:
"""Return the current battery level of the vacuum."""
return max(0, min(100, self._battery_level))
@property @property
def fan_speed(self) -> str: def fan_speed(self) -> str:
@ -117,7 +106,6 @@ class StateDemoVacuum(StateVacuumEntity):
if self._attr_activity != VacuumActivity.CLEANING: if self._attr_activity != VacuumActivity.CLEANING:
self._attr_activity = VacuumActivity.CLEANING self._attr_activity = VacuumActivity.CLEANING
self._cleaned_area += 1.32 self._cleaned_area += 1.32
self._battery_level -= 1
self.schedule_update_ha_state() self.schedule_update_ha_state()
def pause(self) -> None: def pause(self) -> None:
@ -142,7 +130,6 @@ class StateDemoVacuum(StateVacuumEntity):
"""Perform a spot clean-up.""" """Perform a spot clean-up."""
self._attr_activity = VacuumActivity.CLEANING self._attr_activity = VacuumActivity.CLEANING
self._cleaned_area += 1.32 self._cleaned_area += 1.32
self._battery_level -= 1
self.schedule_update_ha_state() self.schedule_update_ha_state()
def set_fan_speed(self, fan_speed: str, **kwargs: Any) -> None: def set_fan_speed(self, fan_speed: str, **kwargs: Any) -> None:

13
tests/components/demo/test_vacuum.py
View File

@ -14,7 +14,6 @@ from homeassistant.components.demo.vacuum import (
FAN_SPEEDS, FAN_SPEEDS,
) )
from homeassistant.components.vacuum import ( from homeassistant.components.vacuum import (
ATTR_BATTERY_LEVEL,
ATTR_COMMAND, ATTR_COMMAND,
ATTR_FAN_SPEED, ATTR_FAN_SPEED,
ATTR_FAN_SPEED_LIST, ATTR_FAN_SPEED_LIST,
@ -67,36 +66,31 @@ async def setup_demo_vacuum(hass: HomeAssistant, vacuum_only: None):
async def test_supported_features(hass: HomeAssistant) -> None: async def test_supported_features(hass: HomeAssistant) -> None:
"""Test vacuum supported features.""" """Test vacuum supported features."""
state = hass.states.get(ENTITY_VACUUM_COMPLETE) state = hass.states.get(ENTITY_VACUUM_COMPLETE)
assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 16380 assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 16316
assert state.attributes.get(ATTR_BATTERY_LEVEL) == 100
assert state.attributes.get(ATTR_FAN_SPEED) == "medium" assert state.attributes.get(ATTR_FAN_SPEED) == "medium"
assert state.attributes.get(ATTR_FAN_SPEED_LIST) == FAN_SPEEDS assert state.attributes.get(ATTR_FAN_SPEED_LIST) == FAN_SPEEDS
assert state.state == VacuumActivity.DOCKED assert state.state == VacuumActivity.DOCKED
state = hass.states.get(ENTITY_VACUUM_MOST) state = hass.states.get(ENTITY_VACUUM_MOST)
assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 12412 assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 12348
assert state.attributes.get(ATTR_BATTERY_LEVEL) == 100
assert state.attributes.get(ATTR_FAN_SPEED) == "medium" assert state.attributes.get(ATTR_FAN_SPEED) == "medium"
assert state.attributes.get(ATTR_FAN_SPEED_LIST) == FAN_SPEEDS assert state.attributes.get(ATTR_FAN_SPEED_LIST) == FAN_SPEEDS
assert state.state == VacuumActivity.DOCKED assert state.state == VacuumActivity.DOCKED
state = hass.states.get(ENTITY_VACUUM_BASIC) state = hass.states.get(ENTITY_VACUUM_BASIC)
assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 12360 assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 12296
assert state.attributes.get(ATTR_BATTERY_LEVEL) == 100
assert state.attributes.get(ATTR_FAN_SPEED) is None assert state.attributes.get(ATTR_FAN_SPEED) is None
assert state.attributes.get(ATTR_FAN_SPEED_LIST) is None assert state.attributes.get(ATTR_FAN_SPEED_LIST) is None
assert state.state == VacuumActivity.DOCKED assert state.state == VacuumActivity.DOCKED
state = hass.states.get(ENTITY_VACUUM_MINIMAL) state = hass.states.get(ENTITY_VACUUM_MINIMAL)
assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 3 assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 3
assert state.attributes.get(ATTR_BATTERY_LEVEL) is None
assert state.attributes.get(ATTR_FAN_SPEED) is None assert state.attributes.get(ATTR_FAN_SPEED) is None
assert state.attributes.get(ATTR_FAN_SPEED_LIST) is None assert state.attributes.get(ATTR_FAN_SPEED_LIST) is None
assert state.state == VacuumActivity.DOCKED assert state.state == VacuumActivity.DOCKED
state = hass.states.get(ENTITY_VACUUM_NONE) state = hass.states.get(ENTITY_VACUUM_NONE)
assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 0 assert state.attributes.get(ATTR_SUPPORTED_FEATURES) == 0
assert state.attributes.get(ATTR_BATTERY_LEVEL) is None
assert state.attributes.get(ATTR_FAN_SPEED) is None assert state.attributes.get(ATTR_FAN_SPEED) is None
assert state.attributes.get(ATTR_FAN_SPEED_LIST) is None assert state.attributes.get(ATTR_FAN_SPEED_LIST) is None
assert state.state == VacuumActivity.DOCKED assert state.state == VacuumActivity.DOCKED
@ -116,7 +110,6 @@ async def test_methods(hass: HomeAssistant) -> None:
state = hass.states.get(ENTITY_VACUUM_COMPLETE) state = hass.states.get(ENTITY_VACUUM_COMPLETE)
await hass.async_block_till_done() await hass.async_block_till_done()
assert state.attributes.get(ATTR_BATTERY_LEVEL) == 100
assert state.state == VacuumActivity.DOCKED assert state.state == VacuumActivity.DOCKED
await async_setup_component(hass, "notify", {}) await async_setup_component(hass, "notify", {})