From 28505830855d62ebb81b479172d58bc6dd5ad040 Mon Sep 17 00:00:00 2001 From: Michael <35783820+mib1185@users.noreply.github.com> Date: Sun, 15 Jan 2023 14:44:01 +0100 Subject: [PATCH] Replace the usage of unit constants by enumerations in Tests [a-e] (#85932) --- tests/components/abode/test_sensor.py | 4 +- tests/components/accuweather/test_sensor.py | 68 ++++++++++++------- tests/components/airly/test_sensor.py | 8 +-- tests/components/alexa/test_capabilities.py | 24 ++++--- tests/components/alexa/test_smart_home.py | 7 +- tests/components/awair/test_sensor.py | 4 +- tests/components/balboa/test_climate.py | 6 +- tests/components/blebox/test_sensor.py | 6 +- .../test_passive_update_processor.py | 6 +- tests/components/canary/test_sensor.py | 4 +- .../components/climate/test_device_trigger.py | 6 +- tests/components/demo/test_geo_location.py | 4 +- tests/components/derivative/test_sensor.py | 34 ++++++---- tests/components/dsmr/test_sensor.py | 57 ++++++++++------ tests/components/efergy/test_sensor.py | 22 +++--- tests/components/energy/test_sensor.py | 14 ++-- tests/components/energyzero/test_sensor.py | 12 ++-- 17 files changed, 164 insertions(+), 122 deletions(-) diff --git a/tests/components/abode/test_sensor.py b/tests/components/abode/test_sensor.py index ba163ba87d9..5d074de214f 100644 --- a/tests/components/abode/test_sensor.py +++ b/tests/components/abode/test_sensor.py @@ -6,7 +6,7 @@ from homeassistant.const import ( ATTR_FRIENDLY_NAME, ATTR_UNIT_OF_MEASUREMENT, PERCENTAGE, - TEMP_CELSIUS, + UnitOfTemperature, ) from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er @@ -44,4 +44,4 @@ async def test_attributes(hass: HomeAssistant) -> None: state = hass.states.get("sensor.environment_sensor_temperature") # Abodepy device JSON reports 19.5, but Home Assistant shows 19.4 assert state.state == "19.4" - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS diff --git a/tests/components/accuweather/test_sensor.py b/tests/components/accuweather/test_sensor.py index 251f5a16932..26d9834e078 100644 --- a/tests/components/accuweather/test_sensor.py +++ b/tests/components/accuweather/test_sensor.py @@ -17,15 +17,13 @@ from homeassistant.const import ( ATTR_ICON, ATTR_UNIT_OF_MEASUREMENT, CONCENTRATION_PARTS_PER_CUBIC_METER, - LENGTH_FEET, - LENGTH_METERS, - LENGTH_MILLIMETERS, PERCENTAGE, - SPEED_KILOMETERS_PER_HOUR, STATE_UNAVAILABLE, - TEMP_CELSIUS, - TIME_HOURS, UV_INDEX, + UnitOfLength, + UnitOfSpeed, + UnitOfTemperature, + UnitOfTime, ) from homeassistant.helpers import entity_registry as er from homeassistant.setup import async_setup_component @@ -47,7 +45,7 @@ async def test_sensor_without_forecast(hass): assert state.state == "3200" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION assert state.attributes.get(ATTR_ICON) == "mdi:weather-fog" - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == LENGTH_METERS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfLength.METERS assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.DISTANCE @@ -59,7 +57,7 @@ async def test_sensor_without_forecast(hass): assert state assert state.state == "0.0" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == LENGTH_MILLIMETERS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfLength.MILLIMETERS assert state.attributes.get(ATTR_ICON) is None assert state.attributes.get("type") is None assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT @@ -86,7 +84,7 @@ async def test_sensor_without_forecast(hass): assert state assert state.state == "25.1" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT @@ -117,7 +115,7 @@ async def test_sensor_with_forecast(hass): assert state.state == "7.2" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION assert state.attributes.get(ATTR_ICON) == "mdi:weather-partly-cloudy" - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TIME_HOURS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTime.HOURS assert state.attributes.get(ATTR_STATE_CLASS) is None entry = registry.async_get("sensor.home_hours_of_sun_0d") @@ -128,7 +126,7 @@ async def test_sensor_with_forecast(hass): assert state assert state.state == "29.8" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) is None @@ -139,7 +137,7 @@ async def test_sensor_with_forecast(hass): assert state assert state.state == "15.1" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) is None @@ -363,7 +361,7 @@ async def test_sensor_enabled_without_forecast(hass): assert state assert state.state == "22.8" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT @@ -387,7 +385,7 @@ async def test_sensor_enabled_without_forecast(hass): assert state assert state.state == "16.2" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT @@ -399,7 +397,7 @@ async def test_sensor_enabled_without_forecast(hass): assert state assert state.state == "21.1" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT @@ -411,7 +409,7 @@ async def test_sensor_enabled_without_forecast(hass): assert state assert state.state == "18.6" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT @@ -423,7 +421,7 @@ async def test_sensor_enabled_without_forecast(hass): assert state assert state.state == "22.8" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT @@ -435,7 +433,10 @@ async def test_sensor_enabled_without_forecast(hass): assert state assert state.state == "20.3" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == SPEED_KILOMETERS_PER_HOUR + assert ( + state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfSpeed.KILOMETERS_PER_HOUR + ) assert state.attributes.get(ATTR_ICON) is None assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.WIND_SPEED @@ -448,7 +449,10 @@ async def test_sensor_enabled_without_forecast(hass): assert state assert state.state == "14.5" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == SPEED_KILOMETERS_PER_HOUR + assert ( + state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfSpeed.KILOMETERS_PER_HOUR + ) assert state.attributes.get(ATTR_ICON) is None assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.WIND_SPEED @@ -542,7 +546,7 @@ async def test_sensor_enabled_without_forecast(hass): assert state assert state.state == "28.0" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) is None @@ -554,7 +558,7 @@ async def test_sensor_enabled_without_forecast(hass): assert state assert state.state == "15.1" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE entry = registry.async_get("sensor.home_realfeel_temperature_shade_min_0d") @@ -581,7 +585,10 @@ async def test_sensor_enabled_without_forecast(hass): assert state assert state.state == "13.0" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == SPEED_KILOMETERS_PER_HOUR + assert ( + state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfSpeed.KILOMETERS_PER_HOUR + ) assert state.attributes.get("direction") == "SSE" assert state.attributes.get(ATTR_ICON) is None assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.WIND_SPEED @@ -594,7 +601,10 @@ async def test_sensor_enabled_without_forecast(hass): assert state assert state.state == "7.4" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == SPEED_KILOMETERS_PER_HOUR + assert ( + state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfSpeed.KILOMETERS_PER_HOUR + ) assert state.attributes.get("direction") == "WNW" assert state.attributes.get(ATTR_ICON) is None assert state.attributes.get(ATTR_STATE_CLASS) is None @@ -608,7 +618,10 @@ async def test_sensor_enabled_without_forecast(hass): assert state assert state.state == "29.6" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == SPEED_KILOMETERS_PER_HOUR + assert ( + state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfSpeed.KILOMETERS_PER_HOUR + ) assert state.attributes.get("direction") == "S" assert state.attributes.get(ATTR_ICON) is None assert state.attributes.get(ATTR_STATE_CLASS) is None @@ -622,7 +635,10 @@ async def test_sensor_enabled_without_forecast(hass): assert state assert state.state == "18.5" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == SPEED_KILOMETERS_PER_HOUR + assert ( + state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfSpeed.KILOMETERS_PER_HOUR + ) assert state.attributes.get("direction") == "WSW" assert state.attributes.get(ATTR_ICON) is None assert state.attributes.get(ATTR_STATE_CLASS) is None @@ -714,7 +730,7 @@ async def test_sensor_imperial_units(hass): assert state.state == "10500" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION assert state.attributes.get(ATTR_ICON) == "mdi:weather-fog" - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == LENGTH_FEET + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfLength.FEET async def test_state_update(hass): diff --git a/tests/components/airly/test_sensor.py b/tests/components/airly/test_sensor.py index 0d333fba756..bdc1e909f35 100644 --- a/tests/components/airly/test_sensor.py +++ b/tests/components/airly/test_sensor.py @@ -18,9 +18,9 @@ from homeassistant.const import ( ATTR_UNIT_OF_MEASUREMENT, CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, PERCENTAGE, - PRESSURE_HPA, STATE_UNAVAILABLE, - TEMP_CELSIUS, + UnitOfPressure, + UnitOfTemperature, ) from homeassistant.helpers import entity_registry as er from homeassistant.setup import async_setup_component @@ -167,7 +167,7 @@ async def test_sensor(hass, aioclient_mock): assert state assert state.state == "1020" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PRESSURE_HPA + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPressure.HPA assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.PRESSURE assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT @@ -179,7 +179,7 @@ async def test_sensor(hass, aioclient_mock): assert state assert state.state == "14.4" assert state.attributes.get(ATTR_ATTRIBUTION) == ATTRIBUTION - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT diff --git a/tests/components/alexa/test_capabilities.py b/tests/components/alexa/test_capabilities.py index 13d095f1cc6..71d4d3a5585 100644 --- a/tests/components/alexa/test_capabilities.py +++ b/tests/components/alexa/test_capabilities.py @@ -18,7 +18,7 @@ from homeassistant.const import ( STATE_UNAVAILABLE, STATE_UNKNOWN, STATE_UNLOCKED, - TEMP_CELSIUS, + UnitOfTemperature, ) from .test_common import ( @@ -639,7 +639,7 @@ async def test_report_climate_state(hass): "friendly_name": "Climate Downstairs", "supported_features": 91, ATTR_CURRENT_TEMPERATURE: 34, - ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS, + ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS, }, ) properties = await reported_properties(hass, "climate.downstairs") @@ -658,7 +658,7 @@ async def test_report_climate_state(hass): "friendly_name": "Climate Downstairs", "supported_features": 91, ATTR_CURRENT_TEMPERATURE: 34, - ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS, + ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS, }, ) properties = await reported_properties(hass, "climate.downstairs") @@ -677,7 +677,7 @@ async def test_report_climate_state(hass): "friendly_name": "Climate Downstairs", "supported_features": 91, ATTR_CURRENT_TEMPERATURE: 34, - ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS, + ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS, }, ) properties = await reported_properties(hass, "climate.downstairs") @@ -694,7 +694,7 @@ async def test_report_climate_state(hass): "friendly_name": "Climate Downstairs", "supported_features": 91, ATTR_CURRENT_TEMPERATURE: 31, - ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS, + ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS, }, ) properties = await reported_properties(hass, "climate.downstairs") @@ -710,7 +710,7 @@ async def test_report_climate_state(hass): "friendly_name": "Climate Heat", "supported_features": 91, ATTR_CURRENT_TEMPERATURE: 34, - ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS, + ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS, }, ) properties = await reported_properties(hass, "climate.heat") @@ -726,7 +726,7 @@ async def test_report_climate_state(hass): "friendly_name": "Climate Cool", "supported_features": 91, ATTR_CURRENT_TEMPERATURE: 34, - ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS, + ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS, }, ) properties = await reported_properties(hass, "climate.cool") @@ -753,7 +753,7 @@ async def test_report_climate_state(hass): "friendly_name": "Climate Unsupported", "supported_features": 91, ATTR_CURRENT_TEMPERATURE: 34, - ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS, + ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS, }, ) msg = await reported_properties(hass, "climate.unsupported", True) @@ -767,14 +767,16 @@ async def test_temperature_sensor_sensor(hass): hass.states.async_set( "sensor.temp_living_room", bad_value, - {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS}, + {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS}, ) properties = await reported_properties(hass, "sensor.temp_living_room") properties.assert_not_has_property("Alexa.TemperatureSensor", "temperature") hass.states.async_set( - "sensor.temp_living_room", "34", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS} + "sensor.temp_living_room", + "34", + {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS}, ) properties = await reported_properties(hass, "sensor.temp_living_room") properties.assert_equal( @@ -990,7 +992,7 @@ async def test_get_property_blowup(hass, caplog): "friendly_name": "Climate Downstairs", "supported_features": 91, ATTR_CURRENT_TEMPERATURE: 34, - ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS, + ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS, }, ) with patch( diff --git a/tests/components/alexa/test_smart_home.py b/tests/components/alexa/test_smart_home.py index 3b76654f312..5ccac23a2fd 100644 --- a/tests/components/alexa/test_smart_home.py +++ b/tests/components/alexa/test_smart_home.py @@ -26,7 +26,7 @@ from homeassistant.components.media_player import ( ) import homeassistant.components.vacuum as vacuum from homeassistant.config import async_process_ha_core_config -from homeassistant.const import STATE_UNKNOWN, TEMP_FAHRENHEIT +from homeassistant.const import STATE_UNKNOWN, UnitOfTemperature from homeassistant.core import Context from homeassistant.helpers import entityfilter from homeassistant.setup import async_setup_component @@ -1987,7 +1987,10 @@ async def test_temp_sensor(hass): device = ( "sensor.test_temp", "42", - {"friendly_name": "Test Temp Sensor", "unit_of_measurement": TEMP_FAHRENHEIT}, + { + "friendly_name": "Test Temp Sensor", + "unit_of_measurement": UnitOfTemperature.FAHRENHEIT, + }, ) appliance = await discovery_test(device, hass) diff --git a/tests/components/awair/test_sensor.py b/tests/components/awair/test_sensor.py index 32a4578bebc..8122948bff9 100644 --- a/tests/components/awair/test_sensor.py +++ b/tests/components/awair/test_sensor.py @@ -23,7 +23,7 @@ from homeassistant.const import ( LIGHT_LUX, PERCENTAGE, STATE_UNAVAILABLE, - TEMP_CELSIUS, + UnitOfTemperature, ) from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er @@ -84,7 +84,7 @@ async def test_awair_gen1_sensors(hass: HomeAssistant, user, cloud_devices, gen1 "sensor.living_room_temperature", f"{AWAIR_UUID}_{SENSOR_TYPES_MAP[API_TEMP].unique_id_tag}", "21.8", - {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS, "awair_index": 1.0}, + {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS, "awair_index": 1.0}, ) assert_expected_properties( diff --git a/tests/components/balboa/test_climate.py b/tests/components/balboa/test_climate.py index 571ec1f432e..50ca33c5209 100644 --- a/tests/components/balboa/test_climate.py +++ b/tests/components/balboa/test_climate.py @@ -21,7 +21,7 @@ from homeassistant.components.climate import ( HVACAction, HVACMode, ) -from homeassistant.const import ATTR_TEMPERATURE, TEMP_FAHRENHEIT +from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature from homeassistant.core import HomeAssistant from . import init_integration @@ -130,7 +130,9 @@ async def test_spa_temperature(hass: HomeAssistant, client: MagicMock) -> None: async def test_spa_temperature_unit(hass: HomeAssistant, client: MagicMock) -> None: """Test temperature unit conversions.""" - with patch.object(hass.config.units, "temperature_unit", TEMP_FAHRENHEIT): + with patch.object( + hass.config.units, "temperature_unit", UnitOfTemperature.FAHRENHEIT + ): config_entry = await init_integration(hass) state = await _patch_spa_settemp(hass, config_entry, 0, 15.4, client) diff --git a/tests/components/blebox/test_sensor.py b/tests/components/blebox/test_sensor.py index dd54e5272e2..4645a853071 100644 --- a/tests/components/blebox/test_sensor.py +++ b/tests/components/blebox/test_sensor.py @@ -11,7 +11,7 @@ from homeassistant.const import ( ATTR_UNIT_OF_MEASUREMENT, CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, STATE_UNKNOWN, - TEMP_CELSIUS, + UnitOfTemperature, ) from homeassistant.helpers import device_registry as dr @@ -66,7 +66,7 @@ async def test_init(tempsensor, hass): assert state.name == "tempSensor-0.temperature" assert state.attributes[ATTR_DEVICE_CLASS] == SensorDeviceClass.TEMPERATURE - assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == TEMP_CELSIUS + assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == UnitOfTemperature.CELSIUS assert state.state == STATE_UNKNOWN device_registry = dr.async_get(hass) @@ -91,7 +91,7 @@ async def test_update(tempsensor, hass): await async_setup_entity(hass, entity_id) state = hass.states.get(entity_id) - assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == TEMP_CELSIUS + assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == UnitOfTemperature.CELSIUS assert state.state == "25.18" diff --git a/tests/components/bluetooth/test_passive_update_processor.py b/tests/components/bluetooth/test_passive_update_processor.py index a594267da96..9f72146f364 100644 --- a/tests/components/bluetooth/test_passive_update_processor.py +++ b/tests/components/bluetooth/test_passive_update_processor.py @@ -29,7 +29,7 @@ from homeassistant.components.bluetooth.passive_update_processor import ( PassiveBluetoothProcessorEntity, ) from homeassistant.components.sensor import SensorDeviceClass, SensorEntityDescription -from homeassistant.const import TEMP_CELSIUS +from homeassistant.const import UnitOfTemperature from homeassistant.core import CoreState, callback from homeassistant.helpers.entity import DeviceInfo from homeassistant.setup import async_setup_component @@ -87,7 +87,7 @@ GENERIC_PASSIVE_BLUETOOTH_DATA_UPDATE = PassiveBluetoothDataUpdate( entity_descriptions={ PassiveBluetoothEntityKey("temperature", None): SensorEntityDescription( key="temperature", - native_unit_of_measurement=TEMP_CELSIUS, + native_unit_of_measurement=UnitOfTemperature.CELSIUS, device_class=SensorDeviceClass.TEMPERATURE, ), PassiveBluetoothEntityKey("pressure", None): SensorEntityDescription( @@ -898,7 +898,7 @@ NO_DEVICES_PASSIVE_BLUETOOTH_DATA_UPDATE = PassiveBluetoothDataUpdate( PassiveBluetoothEntityKey("temperature", None): SensorEntityDescription( key="temperature", name="Temperature", - native_unit_of_measurement=TEMP_CELSIUS, + native_unit_of_measurement=UnitOfTemperature.CELSIUS, device_class=SensorDeviceClass.TEMPERATURE, ), PassiveBluetoothEntityKey("pressure", None): SensorEntityDescription( diff --git a/tests/components/canary/test_sensor.py b/tests/components/canary/test_sensor.py index d9946cab6a0..0a895dbe297 100644 --- a/tests/components/canary/test_sensor.py +++ b/tests/components/canary/test_sensor.py @@ -14,7 +14,7 @@ from homeassistant.const import ( ATTR_UNIT_OF_MEASUREMENT, PERCENTAGE, SIGNAL_STRENGTH_DECIBELS_MILLIWATT, - TEMP_CELSIUS, + UnitOfTemperature, ) from homeassistant.helpers.entity_component import async_update_entity from homeassistant.setup import async_setup_component @@ -53,7 +53,7 @@ async def test_sensors_pro(hass, canary) -> None: "home_dining_room_temperature": ( "20_temperature", "21.12", - TEMP_CELSIUS, + UnitOfTemperature.CELSIUS, SensorDeviceClass.TEMPERATURE, None, ), diff --git a/tests/components/climate/test_device_trigger.py b/tests/components/climate/test_device_trigger.py index 00099538a6f..48399f2373e 100644 --- a/tests/components/climate/test_device_trigger.py +++ b/tests/components/climate/test_device_trigger.py @@ -11,7 +11,7 @@ from homeassistant.components.climate import ( device_trigger, ) from homeassistant.components.device_automation import DeviceAutomationType -from homeassistant.const import TEMP_CELSIUS +from homeassistant.const import UnitOfTemperature from homeassistant.helpers import config_validation as cv, device_registry from homeassistant.helpers.entity import EntityCategory from homeassistant.helpers.entity_registry import RegistryEntryHider @@ -311,13 +311,13 @@ async def test_get_trigger_capabilities_temp_humid(hass, type): capabilities["extra_fields"], custom_serializer=cv.custom_serializer ) == [ { - "description": {"suffix": TEMP_CELSIUS}, + "description": {"suffix": UnitOfTemperature.CELSIUS}, "name": "above", "optional": True, "type": "float", }, { - "description": {"suffix": TEMP_CELSIUS}, + "description": {"suffix": UnitOfTemperature.CELSIUS}, "name": "below", "optional": True, "type": "float", diff --git a/tests/components/demo/test_geo_location.py b/tests/components/demo/test_geo_location.py index b75a896256c..3f12cfcffd1 100644 --- a/tests/components/demo/test_geo_location.py +++ b/tests/components/demo/test_geo_location.py @@ -11,7 +11,7 @@ from homeassistant.const import ( ATTR_LATITUDE, ATTR_LONGITUDE, ATTR_UNIT_OF_MEASUREMENT, - LENGTH_KILOMETERS, + UnitOfLength, ) from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util @@ -45,7 +45,7 @@ async def test_setup_platform(hass): continue assert abs(state.attributes[ATTR_LATITUDE] - hass.config.latitude) < 1.0 assert abs(state.attributes[ATTR_LONGITUDE] - hass.config.longitude) < 1.0 - assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == LENGTH_KILOMETERS + assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == UnitOfLength.KILOMETERS # Update (replaces 1 device). async_fire_time_changed(hass, utcnow + DEFAULT_UPDATE_INTERVAL) diff --git a/tests/components/derivative/test_sensor.py b/tests/components/derivative/test_sensor.py index b93aef50774..eef452d71cb 100644 --- a/tests/components/derivative/test_sensor.py +++ b/tests/components/derivative/test_sensor.py @@ -4,7 +4,7 @@ from math import sin import random from unittest.mock import patch -from homeassistant.const import POWER_WATT, TIME_HOURS, TIME_MINUTES, TIME_SECONDS +from homeassistant.const import UnitOfPower, UnitOfTime from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util @@ -85,7 +85,7 @@ async def test_dataSet1(hass): """Test derivative sensor state.""" await setup_tests( hass, - {"unit_time": TIME_SECONDS}, + {"unit_time": UnitOfTime.SECONDS}, times=[20, 30, 40, 50], values=[10, 30, 5, 0], expected_state=-0.5, @@ -96,7 +96,7 @@ async def test_dataSet2(hass): """Test derivative sensor state.""" await setup_tests( hass, - {"unit_time": TIME_SECONDS}, + {"unit_time": UnitOfTime.SECONDS}, times=[20, 30], values=[5, 0], expected_state=-0.5, @@ -107,20 +107,20 @@ async def test_dataSet3(hass): """Test derivative sensor state.""" state = await setup_tests( hass, - {"unit_time": TIME_SECONDS}, + {"unit_time": UnitOfTime.SECONDS}, times=[20, 30], values=[5, 10], expected_state=0.5, ) - assert state.attributes.get("unit_of_measurement") == f"/{TIME_SECONDS}" + assert state.attributes.get("unit_of_measurement") == f"/{UnitOfTime.SECONDS}" async def test_dataSet4(hass): """Test derivative sensor state.""" await setup_tests( hass, - {"unit_time": TIME_SECONDS}, + {"unit_time": UnitOfTime.SECONDS}, times=[20, 30], values=[5, 5], expected_state=0, @@ -131,7 +131,7 @@ async def test_dataSet5(hass): """Test derivative sensor state.""" await setup_tests( hass, - {"unit_time": TIME_SECONDS}, + {"unit_time": UnitOfTime.SECONDS}, times=[20, 30], values=[10, -10], expected_state=-2, @@ -162,7 +162,7 @@ async def test_data_moving_average_for_discrete_sensor(hass): hass, { "time_window": {"seconds": time_window}, - "unit_time": TIME_MINUTES, + "unit_time": UnitOfTime.MINUTES, "round": 1, }, ) # two minute window @@ -205,7 +205,7 @@ async def test_data_moving_average_for_irregular_times(hass): hass, { "time_window": {"seconds": time_window}, - "unit_time": TIME_MINUTES, + "unit_time": UnitOfTime.MINUTES, "round": 3, }, ) @@ -245,7 +245,7 @@ async def test_double_signal_after_delay(hass): hass, { "time_window": {"seconds": time_window}, - "unit_time": TIME_MINUTES, + "unit_time": UnitOfTime.MINUTES, "round": 3, }, ) @@ -285,13 +285,19 @@ async def test_prefix(hass): with patch("homeassistant.util.dt.utcnow") as now: now.return_value = base hass.states.async_set( - entity_id, 1000, {"unit_of_measurement": POWER_WATT}, force_update=True + entity_id, + 1000, + {"unit_of_measurement": UnitOfPower.WATT}, + force_update=True, ) await hass.async_block_till_done() now.return_value += timedelta(seconds=3600) hass.states.async_set( - entity_id, 1000, {"unit_of_measurement": POWER_WATT}, force_update=True + entity_id, + 1000, + {"unit_of_measurement": UnitOfPower.WATT}, + force_update=True, ) await hass.async_block_till_done() @@ -300,7 +306,7 @@ async def test_prefix(hass): # Testing a power sensor at 1000 Watts for 1hour = 0kW/h assert round(float(state.state), config["sensor"]["round"]) == 0.0 - assert state.attributes.get("unit_of_measurement") == f"kW/{TIME_HOURS}" + assert state.attributes.get("unit_of_measurement") == f"kW/{UnitOfTime.HOURS}" async def test_suffix(hass): @@ -312,7 +318,7 @@ async def test_suffix(hass): "source": "sensor.bytes_per_second", "round": 2, "unit_prefix": "k", - "unit_time": TIME_SECONDS, + "unit_time": UnitOfTime.SECONDS, } } diff --git a/tests/components/dsmr/test_sensor.py b/tests/components/dsmr/test_sensor.py index ac4b9587ec7..01d45287c28 100644 --- a/tests/components/dsmr/test_sensor.py +++ b/tests/components/dsmr/test_sensor.py @@ -22,12 +22,11 @@ from homeassistant.const import ( ATTR_DEVICE_CLASS, ATTR_ICON, ATTR_UNIT_OF_MEASUREMENT, - ENERGY_KILO_WATT_HOUR, STATE_UNAVAILABLE, STATE_UNKNOWN, - VOLUME_CUBIC_METERS, UnitOfEnergy, UnitOfPower, + UnitOfVolume, ) from homeassistant.helpers import entity_registry as er @@ -65,7 +64,7 @@ async def test_default_setup(hass, dsmr_connection_fixture): GAS_METER_READING: MBusObject( [ {"value": datetime.datetime.fromtimestamp(1551642213)}, - {"value": Decimal(745.695), "unit": VOLUME_CUBIC_METERS}, + {"value": Decimal(745.695), "unit": UnitOfVolume.CUBIC_METERS}, ] ), } @@ -133,7 +132,8 @@ async def test_default_setup(hass, dsmr_connection_fixture): == SensorStateClass.TOTAL_INCREASING ) assert ( - gas_consumption.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == VOLUME_CUBIC_METERS + gas_consumption.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfVolume.CUBIC_METERS ) @@ -228,13 +228,17 @@ async def test_v4_meter(hass, dsmr_connection_fixture): gas_consumption = hass.states.get("sensor.gas_meter_gas_consumption") assert gas_consumption.state == "745.695" assert gas_consumption.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.GAS - assert gas_consumption.attributes.get("unit_of_measurement") == VOLUME_CUBIC_METERS + assert ( + gas_consumption.attributes.get("unit_of_measurement") + == UnitOfVolume.CUBIC_METERS + ) assert ( gas_consumption.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING ) assert ( - gas_consumption.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == VOLUME_CUBIC_METERS + gas_consumption.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfVolume.CUBIC_METERS ) @@ -305,7 +309,8 @@ async def test_v5_meter(hass, dsmr_connection_fixture): == SensorStateClass.TOTAL_INCREASING ) assert ( - gas_consumption.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == VOLUME_CUBIC_METERS + gas_consumption.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfVolume.CUBIC_METERS ) @@ -340,10 +345,10 @@ async def test_luxembourg_meter(hass, dsmr_connection_fixture): ] ), ELECTRICITY_IMPORTED_TOTAL: CosemObject( - [{"value": Decimal(123.456), "unit": ENERGY_KILO_WATT_HOUR}] + [{"value": Decimal(123.456), "unit": UnitOfEnergy.KILO_WATT_HOUR}] ), ELECTRICITY_EXPORTED_TOTAL: CosemObject( - [{"value": Decimal(654.321), "unit": ENERGY_KILO_WATT_HOUR}] + [{"value": Decimal(654.321), "unit": UnitOfEnergy.KILO_WATT_HOUR}] ), } @@ -373,12 +378,16 @@ async def test_luxembourg_meter(hass, dsmr_connection_fixture): == SensorStateClass.TOTAL_INCREASING ) assert ( - active_tariff.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == ENERGY_KILO_WATT_HOUR + active_tariff.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfEnergy.KILO_WATT_HOUR ) active_tariff = hass.states.get("sensor.electricity_meter_energy_production_total") assert active_tariff.state == "654.321" - assert active_tariff.attributes.get("unit_of_measurement") == ENERGY_KILO_WATT_HOUR + assert ( + active_tariff.attributes.get("unit_of_measurement") + == UnitOfEnergy.KILO_WATT_HOUR + ) # check if gas consumption is parsed correctly gas_consumption = hass.states.get("sensor.gas_meter_gas_consumption") @@ -389,7 +398,8 @@ async def test_luxembourg_meter(hass, dsmr_connection_fixture): == SensorStateClass.TOTAL_INCREASING ) assert ( - gas_consumption.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == VOLUME_CUBIC_METERS + gas_consumption.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfVolume.CUBIC_METERS ) @@ -460,7 +470,8 @@ async def test_belgian_meter(hass, dsmr_connection_fixture): == SensorStateClass.TOTAL_INCREASING ) assert ( - gas_consumption.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == VOLUME_CUBIC_METERS + gas_consumption.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfVolume.CUBIC_METERS ) @@ -536,10 +547,10 @@ async def test_swedish_meter(hass, dsmr_connection_fixture): telegram = { ELECTRICITY_IMPORTED_TOTAL: CosemObject( - [{"value": Decimal(123.456), "unit": ENERGY_KILO_WATT_HOUR}] + [{"value": Decimal(123.456), "unit": UnitOfEnergy.KILO_WATT_HOUR}] ), ELECTRICITY_EXPORTED_TOTAL: CosemObject( - [{"value": Decimal(654.321), "unit": ENERGY_KILO_WATT_HOUR}] + [{"value": Decimal(654.321), "unit": UnitOfEnergy.KILO_WATT_HOUR}] ), } @@ -569,7 +580,8 @@ async def test_swedish_meter(hass, dsmr_connection_fixture): == SensorStateClass.TOTAL_INCREASING ) assert ( - active_tariff.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == ENERGY_KILO_WATT_HOUR + active_tariff.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfEnergy.KILO_WATT_HOUR ) active_tariff = hass.states.get("sensor.electricity_meter_energy_production_total") @@ -579,7 +591,8 @@ async def test_swedish_meter(hass, dsmr_connection_fixture): == SensorStateClass.TOTAL_INCREASING ) assert ( - active_tariff.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == ENERGY_KILO_WATT_HOUR + active_tariff.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfEnergy.KILO_WATT_HOUR ) @@ -607,10 +620,10 @@ async def test_easymeter(hass, dsmr_connection_fixture): telegram = { ELECTRICITY_IMPORTED_TOTAL: CosemObject( - [{"value": Decimal(54184.6316), "unit": ENERGY_KILO_WATT_HOUR}] + [{"value": Decimal(54184.6316), "unit": UnitOfEnergy.KILO_WATT_HOUR}] ), ELECTRICITY_EXPORTED_TOTAL: CosemObject( - [{"value": Decimal(19981.1069), "unit": ENERGY_KILO_WATT_HOUR}] + [{"value": Decimal(19981.1069), "unit": UnitOfEnergy.KILO_WATT_HOUR}] ), } @@ -643,7 +656,8 @@ async def test_easymeter(hass, dsmr_connection_fixture): == SensorStateClass.TOTAL_INCREASING ) assert ( - active_tariff.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == ENERGY_KILO_WATT_HOUR + active_tariff.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfEnergy.KILO_WATT_HOUR ) active_tariff = hass.states.get("sensor.electricity_meter_energy_production_total") @@ -653,7 +667,8 @@ async def test_easymeter(hass, dsmr_connection_fixture): == SensorStateClass.TOTAL_INCREASING ) assert ( - active_tariff.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == ENERGY_KILO_WATT_HOUR + active_tariff.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfEnergy.KILO_WATT_HOUR ) diff --git a/tests/components/efergy/test_sensor.py b/tests/components/efergy/test_sensor.py index 4df383a5487..6692b320b4d 100644 --- a/tests/components/efergy/test_sensor.py +++ b/tests/components/efergy/test_sensor.py @@ -11,9 +11,9 @@ from homeassistant.components.sensor import ( from homeassistant.const import ( ATTR_DEVICE_CLASS, ATTR_UNIT_OF_MEASUREMENT, - ENERGY_KILO_WATT_HOUR, - POWER_WATT, STATE_UNAVAILABLE, + UnitOfEnergy, + UnitOfPower, ) from homeassistant.core import HomeAssistant from homeassistant.helpers import entity_registry as er @@ -38,7 +38,7 @@ async def test_sensor_readings( state = hass.states.get("sensor.power_usage") assert state.state == "1580" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == POWER_WATT + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT state = hass.states.get("sensor.energy_budget") assert state.state == "ok" @@ -48,22 +48,22 @@ async def test_sensor_readings( state = hass.states.get("sensor.daily_consumption") assert state.state == "38.21" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == ENERGY_KILO_WATT_HOUR + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING state = hass.states.get("sensor.weekly_consumption") assert state.state == "267.47" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == ENERGY_KILO_WATT_HOUR + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING state = hass.states.get("sensor.monthly_consumption") assert state.state == "1069.88" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == ENERGY_KILO_WATT_HOUR + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING state = hass.states.get("sensor.yearly_consumption") assert state.state == "13373.50" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.ENERGY - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == ENERGY_KILO_WATT_HOUR + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfEnergy.KILO_WATT_HOUR assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING state = hass.states.get("sensor.daily_energy_cost") assert state.state == "5.27" @@ -93,7 +93,7 @@ async def test_sensor_readings( state = hass.states.get("sensor.power_usage_728386") assert state.state == "1628" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == POWER_WATT + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT @@ -107,17 +107,17 @@ async def test_multi_sensor_readings( state = hass.states.get("sensor.power_usage_728386") assert state.state == "218" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == POWER_WATT + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT state = hass.states.get("sensor.power_usage_0") assert state.state == "1808" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == POWER_WATT + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT state = hass.states.get("sensor.power_usage_728387") assert state.state == "312" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.POWER - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == POWER_WATT + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPower.WATT assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT diff --git a/tests/components/energy/test_sensor.py b/tests/components/energy/test_sensor.py index bb93c58f763..6ea606a4344 100644 --- a/tests/components/energy/test_sensor.py +++ b/tests/components/energy/test_sensor.py @@ -19,10 +19,8 @@ from homeassistant.const import ( ATTR_DEVICE_CLASS, ATTR_UNIT_OF_MEASUREMENT, STATE_UNKNOWN, - VOLUME_CUBIC_FEET, - VOLUME_CUBIC_METERS, - VOLUME_GALLONS, UnitOfEnergy, + UnitOfVolume, ) from homeassistant.helpers import entity_registry as er from homeassistant.setup import async_setup_component @@ -857,7 +855,7 @@ async def test_cost_sensor_handle_price_units( @pytest.mark.parametrize( "unit", - (VOLUME_CUBIC_FEET, VOLUME_CUBIC_METERS), + (UnitOfVolume.CUBIC_FEET, UnitOfVolume.CUBIC_METERS), ) async def test_cost_sensor_handle_gas( setup_integration, hass, hass_storage, unit @@ -963,9 +961,9 @@ async def test_cost_sensor_handle_gas_kwh( "unit_system,usage_unit,growth", ( # 1 cubic foot = 7.47 gl, 100 ft3 growth @ 0.5/ft3: - (US_CUSTOMARY_SYSTEM, VOLUME_CUBIC_FEET, 374.025974025974), - (US_CUSTOMARY_SYSTEM, VOLUME_GALLONS, 50.0), - (METRIC_SYSTEM, VOLUME_CUBIC_METERS, 50.0), + (US_CUSTOMARY_SYSTEM, UnitOfVolume.CUBIC_FEET, 374.025974025974), + (US_CUSTOMARY_SYSTEM, UnitOfVolume.GALLONS, 50.0), + (METRIC_SYSTEM, UnitOfVolume.CUBIC_METERS, 50.0), ), ) async def test_cost_sensor_handle_water( @@ -1165,7 +1163,7 @@ async def test_inherit_source_unique_id(setup_integration, hass, hass_storage): "sensor.gas_consumption", 100, { - ATTR_UNIT_OF_MEASUREMENT: VOLUME_CUBIC_METERS, + ATTR_UNIT_OF_MEASUREMENT: UnitOfVolume.CUBIC_METERS, ATTR_STATE_CLASS: SensorStateClass.TOTAL_INCREASING, }, ) diff --git a/tests/components/energyzero/test_sensor.py b/tests/components/energyzero/test_sensor.py index ed9b87db73e..e1773e5349c 100644 --- a/tests/components/energyzero/test_sensor.py +++ b/tests/components/energyzero/test_sensor.py @@ -19,9 +19,9 @@ from homeassistant.const import ( ATTR_ICON, ATTR_UNIT_OF_MEASUREMENT, CURRENCY_EURO, - ENERGY_KILO_WATT_HOUR, STATE_UNKNOWN, - VOLUME_CUBIC_METERS, + UnitOfEnergy, + UnitOfVolume, ) from homeassistant.core import HomeAssistant from homeassistant.helpers import device_registry as dr, entity_registry as er @@ -53,7 +53,7 @@ async def test_energy_today( ) assert ( state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) - == f"{CURRENCY_EURO}/{ENERGY_KILO_WATT_HOUR}" + == f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}" ) assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT assert ATTR_DEVICE_CLASS not in state.attributes @@ -72,7 +72,7 @@ async def test_energy_today( ) assert ( state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) - == f"{CURRENCY_EURO}/{ENERGY_KILO_WATT_HOUR}" + == f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}" ) assert ATTR_DEVICE_CLASS not in state.attributes assert ATTR_ICON not in state.attributes @@ -90,7 +90,7 @@ async def test_energy_today( ) assert ( state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) - == f"{CURRENCY_EURO}/{ENERGY_KILO_WATT_HOUR}" + == f"{CURRENCY_EURO}/{UnitOfEnergy.KILO_WATT_HOUR}" ) assert ATTR_DEVICE_CLASS not in state.attributes assert ATTR_ICON not in state.attributes @@ -141,7 +141,7 @@ async def test_gas_today( assert state.attributes.get(ATTR_FRIENDLY_NAME) == "Gas market price Current hour" assert ( state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) - == f"{CURRENCY_EURO}/{VOLUME_CUBIC_METERS}" + == f"{CURRENCY_EURO}/{UnitOfVolume.CUBIC_METERS}" ) assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT assert ATTR_DEVICE_CLASS not in state.attributes