From b154f43657d502425929b16d5ba917930ea429d6 Mon Sep 17 00:00:00 2001 From: Milan Meulemans Date: Wed, 1 Dec 2021 17:34:30 +0100 Subject: [PATCH] Use device class enum in Rituals (#60767) --- .../rituals_perfume_genie/binary_sensor.py | 4 ++-- .../components/rituals_perfume_genie/sensor.py | 13 ++++--------- .../rituals_perfume_genie/test_binary_sensor.py | 6 ++++-- .../components/rituals_perfume_genie/test_sensor.py | 7 +++---- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/homeassistant/components/rituals_perfume_genie/binary_sensor.py b/homeassistant/components/rituals_perfume_genie/binary_sensor.py index be251b86311..4c51f6c16bd 100644 --- a/homeassistant/components/rituals_perfume_genie/binary_sensor.py +++ b/homeassistant/components/rituals_perfume_genie/binary_sensor.py @@ -4,7 +4,7 @@ from __future__ import annotations from pyrituals import Diffuser from homeassistant.components.binary_sensor import ( - DEVICE_CLASS_BATTERY_CHARGING, + BinarySensorDeviceClass, BinarySensorEntity, ) from homeassistant.config_entries import ConfigEntry @@ -38,7 +38,7 @@ async def async_setup_entry( class DiffuserBatteryChargingBinarySensor(DiffuserEntity, BinarySensorEntity): """Representation of a diffuser battery charging binary sensor.""" - _attr_device_class = DEVICE_CLASS_BATTERY_CHARGING + _attr_device_class = BinarySensorDeviceClass.BATTERY_CHARGING _attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC def __init__( diff --git a/homeassistant/components/rituals_perfume_genie/sensor.py b/homeassistant/components/rituals_perfume_genie/sensor.py index 5299539bcd9..f5cd2f144e5 100644 --- a/homeassistant/components/rituals_perfume_genie/sensor.py +++ b/homeassistant/components/rituals_perfume_genie/sensor.py @@ -3,14 +3,9 @@ from __future__ import annotations from pyrituals import Diffuser -from homeassistant.components.sensor import SensorEntity +from homeassistant.components.sensor import SensorDeviceClass, SensorEntity from homeassistant.config_entries import ConfigEntry -from homeassistant.const import ( - DEVICE_CLASS_BATTERY, - DEVICE_CLASS_SIGNAL_STRENGTH, - ENTITY_CATEGORY_DIAGNOSTIC, - PERCENTAGE, -) +from homeassistant.const import ENTITY_CATEGORY_DIAGNOSTIC, PERCENTAGE from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddEntitiesCallback @@ -91,7 +86,7 @@ class DiffuserFillSensor(DiffuserEntity, SensorEntity): class DiffuserBatterySensor(DiffuserEntity, SensorEntity): """Representation of a diffuser battery sensor.""" - _attr_device_class = DEVICE_CLASS_BATTERY + _attr_device_class = SensorDeviceClass.BATTERY _attr_native_unit_of_measurement = PERCENTAGE _attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC @@ -110,7 +105,7 @@ class DiffuserBatterySensor(DiffuserEntity, SensorEntity): class DiffuserWifiSensor(DiffuserEntity, SensorEntity): """Representation of a diffuser wifi sensor.""" - _attr_device_class = DEVICE_CLASS_SIGNAL_STRENGTH + _attr_device_class = SensorDeviceClass.SIGNAL_STRENGTH _attr_native_unit_of_measurement = PERCENTAGE _attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC diff --git a/tests/components/rituals_perfume_genie/test_binary_sensor.py b/tests/components/rituals_perfume_genie/test_binary_sensor.py index 769384dbbf8..cef9a8e85c4 100644 --- a/tests/components/rituals_perfume_genie/test_binary_sensor.py +++ b/tests/components/rituals_perfume_genie/test_binary_sensor.py @@ -1,5 +1,5 @@ """Tests for the Rituals Perfume Genie binary sensor platform.""" -from homeassistant.components.binary_sensor import DEVICE_CLASS_BATTERY_CHARGING +from homeassistant.components.binary_sensor import BinarySensorDeviceClass from homeassistant.components.rituals_perfume_genie.binary_sensor import CHARGING_SUFFIX from homeassistant.const import ATTR_DEVICE_CLASS, ENTITY_CATEGORY_DIAGNOSTIC, STATE_ON from homeassistant.core import HomeAssistant @@ -23,7 +23,9 @@ async def test_binary_sensors(hass: HomeAssistant) -> None: state = hass.states.get("binary_sensor.genie_battery_charging") assert state assert state.state == STATE_ON - assert state.attributes[ATTR_DEVICE_CLASS] == DEVICE_CLASS_BATTERY_CHARGING + assert ( + state.attributes[ATTR_DEVICE_CLASS] == BinarySensorDeviceClass.BATTERY_CHARGING + ) entry = registry.async_get("binary_sensor.genie_battery_charging") assert entry diff --git a/tests/components/rituals_perfume_genie/test_sensor.py b/tests/components/rituals_perfume_genie/test_sensor.py index a76cf0d6c46..a6c89bd6620 100644 --- a/tests/components/rituals_perfume_genie/test_sensor.py +++ b/tests/components/rituals_perfume_genie/test_sensor.py @@ -4,13 +4,12 @@ from homeassistant.components.rituals_perfume_genie.sensor import ( FILL_SUFFIX, PERFUME_SUFFIX, WIFI_SUFFIX, + SensorDeviceClass, ) from homeassistant.const import ( ATTR_DEVICE_CLASS, ATTR_ICON, ATTR_UNIT_OF_MEASUREMENT, - DEVICE_CLASS_BATTERY, - DEVICE_CLASS_SIGNAL_STRENGTH, ENTITY_CATEGORY_DIAGNOSTIC, PERCENTAGE, ) @@ -54,7 +53,7 @@ async def test_sensors_diffuser_v1_battery_cartridge(hass: HomeAssistant) -> Non state = hass.states.get("sensor.genie_battery") assert state assert state.state == str(diffuser.battery_percentage) - assert state.attributes.get(ATTR_DEVICE_CLASS) == DEVICE_CLASS_BATTERY + assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.BATTERY assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PERCENTAGE entry = registry.async_get("sensor.genie_battery") @@ -65,7 +64,7 @@ async def test_sensors_diffuser_v1_battery_cartridge(hass: HomeAssistant) -> Non state = hass.states.get("sensor.genie_wifi") assert state assert state.state == str(diffuser.wifi_percentage) - assert state.attributes.get(ATTR_DEVICE_CLASS) == DEVICE_CLASS_SIGNAL_STRENGTH + assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.SIGNAL_STRENGTH assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PERCENTAGE entry = registry.async_get("sensor.genie_wifi")