From 3c0e4b1fd94178ba245ae1fdb0837d78e055288e Mon Sep 17 00:00:00 2001 From: Martin Hjelmare Date: Thu, 29 Jul 2021 21:25:43 +0200 Subject: [PATCH] Fix zwave_js meter sensor state class (#53716) --- homeassistant/components/zwave_js/sensor.py | 3 +-- tests/components/zwave_js/test_sensor.py | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/zwave_js/sensor.py b/homeassistant/components/zwave_js/sensor.py index 39aa2f30604..f4b303aa1af 100644 --- a/homeassistant/components/zwave_js/sensor.py +++ b/homeassistant/components/zwave_js/sensor.py @@ -229,8 +229,6 @@ class ZWaveNumericSensor(ZwaveSensorBase): class ZWaveMeterSensor(ZWaveNumericSensor, RestoreEntity): """Representation of a Z-Wave Meter CC sensor.""" - _attr_state_class = STATE_CLASS_MEASUREMENT - def __init__( self, config_entry: ConfigEntry, @@ -241,6 +239,7 @@ class ZWaveMeterSensor(ZWaveNumericSensor, RestoreEntity): super().__init__(config_entry, client, info) # Entity class attributes + self._attr_state_class = STATE_CLASS_MEASUREMENT self._attr_last_reset = dt.utc_from_timestamp(0) self._attr_device_class = DEVICE_CLASS_POWER if self.info.primary_value.metadata.unit == "kWh": diff --git a/tests/components/zwave_js/test_sensor.py b/tests/components/zwave_js/test_sensor.py index 29fed2b5c55..ebe406fb951 100644 --- a/tests/components/zwave_js/test_sensor.py +++ b/tests/components/zwave_js/test_sensor.py @@ -3,7 +3,7 @@ from unittest.mock import patch from zwave_js_server.event import Event -from homeassistant.components.sensor import ATTR_LAST_RESET +from homeassistant.components.sensor import ATTR_LAST_RESET, STATE_CLASS_MEASUREMENT from homeassistant.components.zwave_js.const import ( ATTR_METER_TYPE, ATTR_VALUE, @@ -62,6 +62,7 @@ async def test_energy_sensors(hass, hank_binary_switch, integration): assert state.state == "0.0" assert state.attributes["unit_of_measurement"] == POWER_WATT assert state.attributes["device_class"] == DEVICE_CLASS_POWER + assert state.attributes["state_class"] == STATE_CLASS_MEASUREMENT state = hass.states.get(ENERGY_SENSOR) @@ -69,6 +70,7 @@ async def test_energy_sensors(hass, hank_binary_switch, integration): assert state.state == "0.16" assert state.attributes["unit_of_measurement"] == ENERGY_KILO_WATT_HOUR assert state.attributes["device_class"] == DEVICE_CLASS_ENERGY + assert state.attributes["state_class"] == STATE_CLASS_MEASUREMENT async def test_disabled_notification_sensor(hass, multisensor_6, integration):