Skip to content

Utility meter, add STATE_CLASS_TOTAL_INCREASING #54871

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

Merged
emontnemery merged 3 commits into from
Aug 25, 2021
Merged

Utility meter, add STATE_CLASS_TOTAL_INCREASING #54871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92e3e78
Utility meter, STATE_CLASS_TOTAL_INCREASING
Danielhiversen Aug 19, 2021
b589473
update test
Danielhiversen Aug 19, 2021
066c0d5
update test
Danielhiversen Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions homeassistant/components/utility_meter/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@

import voluptuous as vol

from homeassistant.components.sensor import STATE_CLASS_MEASUREMENT, SensorEntity
from homeassistant.components.sensor import (
STATE_CLASS_MEASUREMENT,
STATE_CLASS_TOTAL_INCREASING,
SensorEntity,
)
from homeassistant.const import (
ATTR_UNIT_OF_MEASUREMENT,
CONF_NAME,
Expand Down Expand Up @@ -330,7 +334,11 @@ def device_class(self):
@property
def state_class(self):
"""Return the device class of the sensor."""
return STATE_CLASS_MEASUREMENT
return (
STATE_CLASS_MEASUREMENT
if self._sensor_net_consumption
else STATE_CLASS_TOTAL_INCREASING
)

@property
def native_unit_of_measurement(self):
Expand Down
11 changes: 8 additions & 3 deletions tests/components/utility_meter/test_sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
from datetime import timedelta
from unittest.mock import patch

from homeassistant.components.sensor import ATTR_STATE_CLASS, STATE_CLASS_MEASUREMENT
from homeassistant.components.sensor import (
ATTR_STATE_CLASS,
STATE_CLASS_MEASUREMENT,
STATE_CLASS_TOTAL_INCREASING,
)
from homeassistant.components.utility_meter.const import (
ATTR_TARIFF,
ATTR_VALUE,
Expand Down Expand Up @@ -165,6 +169,7 @@ async def test_device_class(hass):
"utility_meter": {
"energy_meter": {
"source": "sensor.energy",
"net_consumption": True,
},
"gas_meter": {
"source": "sensor.gas",
Expand Down Expand Up @@ -197,7 +202,7 @@ async def test_device_class(hass):
assert state is not None
assert state.state == "0"
assert state.attributes.get(ATTR_DEVICE_CLASS) is None
assert state.attributes.get(ATTR_STATE_CLASS) == STATE_CLASS_MEASUREMENT
assert state.attributes.get(ATTR_STATE_CLASS) == STATE_CLASS_TOTAL_INCREASING
assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) is None

hass.states.async_set(
Expand All @@ -219,7 +224,7 @@ async def test_device_class(hass):
assert state is not None
assert state.state == "1"
assert state.attributes.get(ATTR_DEVICE_CLASS) is None
assert state.attributes.get(ATTR_STATE_CLASS) == STATE_CLASS_MEASUREMENT
assert state.attributes.get(ATTR_STATE_CLASS) == STATE_CLASS_TOTAL_INCREASING
assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == "some_archaic_unit"


Expand Down