Use device class enum in Rituals (#60767)

This commit is contained in:
Milan Meulemans 2021-12-01 17:34:30 +01:00 committed by GitHub
parent 7363033ada
commit b154f43657
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 17 deletions

View File

@ -4,7 +4,7 @@ from __future__ import annotations
from pyrituals import Diffuser from pyrituals import Diffuser
from homeassistant.components.binary_sensor import ( from homeassistant.components.binary_sensor import (
DEVICE_CLASS_BATTERY_CHARGING, BinarySensorDeviceClass,
BinarySensorEntity, BinarySensorEntity,
) )
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
@ -38,7 +38,7 @@ async def async_setup_entry(
class DiffuserBatteryChargingBinarySensor(DiffuserEntity, BinarySensorEntity): class DiffuserBatteryChargingBinarySensor(DiffuserEntity, BinarySensorEntity):
"""Representation of a diffuser battery charging binary sensor.""" """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 _attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC
def __init__( def __init__(

View File

@ -3,14 +3,9 @@ from __future__ import annotations
from pyrituals import Diffuser 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.config_entries import ConfigEntry
from homeassistant.const import ( from homeassistant.const import ENTITY_CATEGORY_DIAGNOSTIC, PERCENTAGE
DEVICE_CLASS_BATTERY,
DEVICE_CLASS_SIGNAL_STRENGTH,
ENTITY_CATEGORY_DIAGNOSTIC,
PERCENTAGE,
)
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
@ -91,7 +86,7 @@ class DiffuserFillSensor(DiffuserEntity, SensorEntity):
class DiffuserBatterySensor(DiffuserEntity, SensorEntity): class DiffuserBatterySensor(DiffuserEntity, SensorEntity):
"""Representation of a diffuser battery sensor.""" """Representation of a diffuser battery sensor."""
_attr_device_class = DEVICE_CLASS_BATTERY _attr_device_class = SensorDeviceClass.BATTERY
_attr_native_unit_of_measurement = PERCENTAGE _attr_native_unit_of_measurement = PERCENTAGE
_attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC _attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC
@ -110,7 +105,7 @@ class DiffuserBatterySensor(DiffuserEntity, SensorEntity):
class DiffuserWifiSensor(DiffuserEntity, SensorEntity): class DiffuserWifiSensor(DiffuserEntity, SensorEntity):
"""Representation of a diffuser wifi sensor.""" """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_native_unit_of_measurement = PERCENTAGE
_attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC _attr_entity_category = ENTITY_CATEGORY_DIAGNOSTIC

View File

@ -1,5 +1,5 @@
"""Tests for the Rituals Perfume Genie binary sensor platform.""" """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.components.rituals_perfume_genie.binary_sensor import CHARGING_SUFFIX
from homeassistant.const import ATTR_DEVICE_CLASS, ENTITY_CATEGORY_DIAGNOSTIC, STATE_ON from homeassistant.const import ATTR_DEVICE_CLASS, ENTITY_CATEGORY_DIAGNOSTIC, STATE_ON
from homeassistant.core import HomeAssistant 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") state = hass.states.get("binary_sensor.genie_battery_charging")
assert state assert state
assert state.state == STATE_ON 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") entry = registry.async_get("binary_sensor.genie_battery_charging")
assert entry assert entry

View File

@ -4,13 +4,12 @@ from homeassistant.components.rituals_perfume_genie.sensor import (
FILL_SUFFIX, FILL_SUFFIX,
PERFUME_SUFFIX, PERFUME_SUFFIX,
WIFI_SUFFIX, WIFI_SUFFIX,
SensorDeviceClass,
) )
from homeassistant.const import ( from homeassistant.const import (
ATTR_DEVICE_CLASS, ATTR_DEVICE_CLASS,
ATTR_ICON, ATTR_ICON,
ATTR_UNIT_OF_MEASUREMENT, ATTR_UNIT_OF_MEASUREMENT,
DEVICE_CLASS_BATTERY,
DEVICE_CLASS_SIGNAL_STRENGTH,
ENTITY_CATEGORY_DIAGNOSTIC, ENTITY_CATEGORY_DIAGNOSTIC,
PERCENTAGE, PERCENTAGE,
) )
@ -54,7 +53,7 @@ async def test_sensors_diffuser_v1_battery_cartridge(hass: HomeAssistant) -> Non
state = hass.states.get("sensor.genie_battery") state = hass.states.get("sensor.genie_battery")
assert state assert state
assert state.state == str(diffuser.battery_percentage) 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 assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PERCENTAGE
entry = registry.async_get("sensor.genie_battery") 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") state = hass.states.get("sensor.genie_wifi")
assert state assert state
assert state.state == str(diffuser.wifi_percentage) 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 assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PERCENTAGE
entry = registry.async_get("sensor.genie_wifi") entry = registry.async_get("sensor.genie_wifi")