diff --git a/tests/components/mazda/test_sensor.py b/tests/components/mazda/test_sensor.py index 5ecbc848600..b200147f0ca 100644 --- a/tests/components/mazda/test_sensor.py +++ b/tests/components/mazda/test_sensor.py @@ -10,9 +10,8 @@ from homeassistant.const import ( ATTR_FRIENDLY_NAME, ATTR_ICON, ATTR_UNIT_OF_MEASUREMENT, - LENGTH_KILOMETERS, - LENGTH_MILES, PERCENTAGE, + UnitOfLength, UnitOfPressure, ) from homeassistant.helpers import entity_registry as er @@ -50,7 +49,7 @@ async def test_sensors(hass): ) assert state.attributes.get(ATTR_ICON) == "mdi:gas-station" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.DISTANCE - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == LENGTH_KILOMETERS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfLength.KILOMETERS assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT assert state.state == "381" entry = entity_registry.async_get("sensor.my_mazda3_fuel_distance_remaining") @@ -63,7 +62,7 @@ async def test_sensors(hass): assert state.attributes.get(ATTR_FRIENDLY_NAME) == "My Mazda3 Odometer" assert state.attributes.get(ATTR_ICON) == "mdi:speedometer" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.DISTANCE - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == LENGTH_KILOMETERS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfLength.KILOMETERS assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.TOTAL_INCREASING assert state.state == "2795" entry = entity_registry.async_get("sensor.my_mazda3_odometer") @@ -145,13 +144,13 @@ async def test_sensors_us_customary_units(hass): # Fuel Distance Remaining state = hass.states.get("sensor.my_mazda3_fuel_distance_remaining") assert state - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == LENGTH_MILES + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfLength.MILES assert state.state == "237" # Odometer state = hass.states.get("sensor.my_mazda3_odometer") assert state - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == LENGTH_MILES + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfLength.MILES assert state.state == "1737" @@ -188,7 +187,7 @@ async def test_electric_vehicle_sensors(hass): assert state.attributes.get(ATTR_FRIENDLY_NAME) == "My Mazda3 Remaining range" assert state.attributes.get(ATTR_ICON) == "mdi:ev-station" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.DISTANCE - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == LENGTH_KILOMETERS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfLength.KILOMETERS assert state.attributes.get(ATTR_STATE_CLASS) == SensorStateClass.MEASUREMENT assert state.state == "218" entry = entity_registry.async_get("sensor.my_mazda3_remaining_range") diff --git a/tests/components/melissa/test_climate.py b/tests/components/melissa/test_climate.py index 9eb2a9fda78..11bb663b372 100644 --- a/tests/components/melissa/test_climate.py +++ b/tests/components/melissa/test_climate.py @@ -11,7 +11,7 @@ from homeassistant.components.climate import ( ) from homeassistant.components.melissa import DATA_MELISSA, climate as melissa from homeassistant.components.melissa.climate import MelissaClimate -from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS +from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature from tests.common import load_fixture @@ -194,7 +194,7 @@ async def test_temperature_unit(hass): api = melissa_mock() device = (await api.async_fetch_devices())[_SERIAL] thermostat = MelissaClimate(api, _SERIAL, device) - assert thermostat.temperature_unit == TEMP_CELSIUS + assert thermostat.temperature_unit == UnitOfTemperature.CELSIUS async def test_min_temp(hass): diff --git a/tests/components/mfi/test_sensor.py b/tests/components/mfi/test_sensor.py index f8a043eb8fb..771d97a7327 100644 --- a/tests/components/mfi/test_sensor.py +++ b/tests/components/mfi/test_sensor.py @@ -9,7 +9,7 @@ import requests import homeassistant.components.mfi.sensor as mfi import homeassistant.components.sensor as sensor_component from homeassistant.components.sensor import SensorDeviceClass -from homeassistant.const import TEMP_CELSIUS +from homeassistant.const import UnitOfTemperature from homeassistant.setup import async_setup_component PLATFORM = mfi @@ -134,7 +134,7 @@ async def test_name(port, sensor): async def test_uom_temp(port, sensor): """Test the UOM temperature.""" port.tag = "temperature" - assert sensor.unit_of_measurement == TEMP_CELSIUS + assert sensor.unit_of_measurement == UnitOfTemperature.CELSIUS assert sensor.device_class is SensorDeviceClass.TEMPERATURE diff --git a/tests/components/min_max/test_sensor.py b/tests/components/min_max/test_sensor.py index 9ba043427b5..20969cfbc8f 100644 --- a/tests/components/min_max/test_sensor.py +++ b/tests/components/min_max/test_sensor.py @@ -13,8 +13,7 @@ from homeassistant.const import ( SERVICE_RELOAD, STATE_UNAVAILABLE, STATE_UNKNOWN, - TEMP_CELSIUS, - TEMP_FAHRENHEIT, + UnitOfTemperature, ) from homeassistant.core import HomeAssistant import homeassistant.helpers.entity_registry as er @@ -345,17 +344,19 @@ async def test_different_unit_of_measurement(hass: HomeAssistant) -> None: entity_ids = config["sensor"]["entity_ids"] hass.states.async_set( - entity_ids[0], VALUES[0], {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS} + entity_ids[0], VALUES[0], {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS} ) await hass.async_block_till_done() state = hass.states.get("sensor.test") assert str(float(VALUES[0])) == state.state - assert state.attributes.get("unit_of_measurement") == TEMP_CELSIUS + assert state.attributes.get("unit_of_measurement") == UnitOfTemperature.CELSIUS hass.states.async_set( - entity_ids[1], VALUES[1], {ATTR_UNIT_OF_MEASUREMENT: TEMP_FAHRENHEIT} + entity_ids[1], + VALUES[1], + {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.FAHRENHEIT}, ) await hass.async_block_till_done() diff --git a/tests/components/mobile_app/test_sensor.py b/tests/components/mobile_app/test_sensor.py index 13e11db3eff..0e492b4dde6 100644 --- a/tests/components/mobile_app/test_sensor.py +++ b/tests/components/mobile_app/test_sensor.py @@ -9,8 +9,7 @@ from homeassistant.const import ( PERCENTAGE, STATE_UNAVAILABLE, STATE_UNKNOWN, - TEMP_CELSIUS, - TEMP_FAHRENHEIT, + UnitOfTemperature, ) from homeassistant.helpers import device_registry as dr, entity_registry as er from homeassistant.util.unit_system import METRIC_SYSTEM, US_CUSTOMARY_SYSTEM @@ -19,8 +18,8 @@ from homeassistant.util.unit_system import METRIC_SYSTEM, US_CUSTOMARY_SYSTEM @pytest.mark.parametrize( "unit_system, state_unit, state1, state2", ( - (METRIC_SYSTEM, TEMP_CELSIUS, "100", "123"), - (US_CUSTOMARY_SYSTEM, TEMP_FAHRENHEIT, "212", "253"), + (METRIC_SYSTEM, UnitOfTemperature.CELSIUS, "100", "123"), + (US_CUSTOMARY_SYSTEM, UnitOfTemperature.FAHRENHEIT, "212", "253"), ), ) async def test_sensor( @@ -46,7 +45,7 @@ async def test_sensor( "entity_category": "diagnostic", "unique_id": "battery_temp", "state_class": "total", - "unit_of_measurement": TEMP_CELSIUS, + "unit_of_measurement": UnitOfTemperature.CELSIUS, }, }, ) @@ -123,10 +122,22 @@ async def test_sensor( @pytest.mark.parametrize( "unique_id, unit_system, state_unit, state1, state2", ( - ("battery_temperature", METRIC_SYSTEM, TEMP_CELSIUS, "100", "123"), - ("battery_temperature", US_CUSTOMARY_SYSTEM, TEMP_FAHRENHEIT, "212", "253"), + ("battery_temperature", METRIC_SYSTEM, UnitOfTemperature.CELSIUS, "100", "123"), + ( + "battery_temperature", + US_CUSTOMARY_SYSTEM, + UnitOfTemperature.FAHRENHEIT, + "212", + "253", + ), # The unique_id doesn't match that of the mobile app's battery temperature sensor - ("battery_temp", US_CUSTOMARY_SYSTEM, TEMP_FAHRENHEIT, "212", "123"), + ( + "battery_temp", + US_CUSTOMARY_SYSTEM, + UnitOfTemperature.FAHRENHEIT, + "212", + "123", + ), ), ) async def test_sensor_migration( @@ -159,7 +170,7 @@ async def test_sensor_migration( "entity_category": "diagnostic", "unique_id": unique_id, "state_class": "total", - "unit_of_measurement": TEMP_CELSIUS, + "unit_of_measurement": UnitOfTemperature.CELSIUS, }, }, ) diff --git a/tests/components/mold_indicator/test_sensor.py b/tests/components/mold_indicator/test_sensor.py index 04305b724d8..7b6ac955b4a 100644 --- a/tests/components/mold_indicator/test_sensor.py +++ b/tests/components/mold_indicator/test_sensor.py @@ -10,7 +10,7 @@ from homeassistant.const import ( ATTR_UNIT_OF_MEASUREMENT, PERCENTAGE, STATE_UNKNOWN, - TEMP_CELSIUS, + UnitOfTemperature, ) from homeassistant.setup import async_setup_component @@ -19,10 +19,10 @@ from homeassistant.setup import async_setup_component def init_sensors_fixture(hass): """Set up things to be run when tests are started.""" hass.states.async_set( - "test.indoortemp", "20", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS} + "test.indoortemp", "20", {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS} ) hass.states.async_set( - "test.outdoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS} + "test.outdoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS} ) hass.states.async_set( "test.indoorhumidity", "50", {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE} @@ -53,10 +53,10 @@ async def test_setup(hass): async def test_invalidcalib(hass): """Test invalid sensor values.""" hass.states.async_set( - "test.indoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS} + "test.indoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS} ) hass.states.async_set( - "test.outdoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS} + "test.outdoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS} ) hass.states.async_set( "test.indoorhumidity", "0", {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE} @@ -88,10 +88,10 @@ async def test_invalidcalib(hass): async def test_invalidhum(hass): """Test invalid sensor values.""" hass.states.async_set( - "test.indoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS} + "test.indoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS} ) hass.states.async_set( - "test.outdoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS} + "test.outdoortemp", "10", {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS} ) hass.states.async_set( "test.indoorhumidity", "-1", {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE} @@ -131,7 +131,9 @@ async def test_invalidhum(hass): assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None hass.states.async_set( - "test.indoorhumidity", "10", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS} + "test.indoorhumidity", + "10", + {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS}, ) await hass.async_block_till_done() moldind = hass.states.get("sensor.mold_indicator") @@ -199,7 +201,9 @@ async def test_unknown_sensor(hass): await hass.async_start() hass.states.async_set( - "test.indoortemp", STATE_UNKNOWN, {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS} + "test.indoortemp", + STATE_UNKNOWN, + {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS}, ) await hass.async_block_till_done() moldind = hass.states.get("sensor.mold_indicator") @@ -209,10 +213,12 @@ async def test_unknown_sensor(hass): assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None hass.states.async_set( - "test.indoortemp", "30", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS} + "test.indoortemp", "30", {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS} ) hass.states.async_set( - "test.outdoortemp", STATE_UNKNOWN, {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS} + "test.outdoortemp", + STATE_UNKNOWN, + {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS}, ) await hass.async_block_till_done() moldind = hass.states.get("sensor.mold_indicator") @@ -222,7 +228,7 @@ async def test_unknown_sensor(hass): assert moldind.attributes.get(ATTR_CRITICAL_TEMP) is None hass.states.async_set( - "test.outdoortemp", "25", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS} + "test.outdoortemp", "25", {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS} ) hass.states.async_set( "test.indoorhumidity", @@ -273,13 +279,13 @@ async def test_sensor_changed(hass): await hass.async_start() hass.states.async_set( - "test.indoortemp", "30", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS} + "test.indoortemp", "30", {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS} ) await hass.async_block_till_done() assert hass.states.get("sensor.mold_indicator").state == "90" hass.states.async_set( - "test.outdoortemp", "25", {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS} + "test.outdoortemp", "25", {ATTR_UNIT_OF_MEASUREMENT: UnitOfTemperature.CELSIUS} ) await hass.async_block_till_done() assert hass.states.get("sensor.mold_indicator").state == "57" diff --git a/tests/components/mqtt/test_init.py b/tests/components/mqtt/test_init.py index df26f1c489b..219e11cfdfe 100644 --- a/tests/components/mqtt/test_init.py +++ b/tests/components/mqtt/test_init.py @@ -21,8 +21,8 @@ from homeassistant.const import ( ATTR_ASSUMED_STATE, EVENT_HOMEASSISTANT_STARTED, EVENT_HOMEASSISTANT_STOP, - TEMP_CELSIUS, Platform, + UnitOfTemperature, ) import homeassistant.core as ha from homeassistant.core import CoreState, HomeAssistant, callback @@ -816,7 +816,7 @@ async def test_all_subscriptions_run_when_decode_fails( await mqtt.async_subscribe(hass, "test-topic", record_calls, encoding="ascii") await mqtt.async_subscribe(hass, "test-topic", record_calls) - async_fire_mqtt_message(hass, "test-topic", TEMP_CELSIUS) + async_fire_mqtt_message(hass, "test-topic", UnitOfTemperature.CELSIUS) await hass.async_block_till_done() assert len(calls) == 1 diff --git a/tests/components/mqtt/test_number.py b/tests/components/mqtt/test_number.py index e547e8207a7..4eee11a58b4 100644 --- a/tests/components/mqtt/test_number.py +++ b/tests/components/mqtt/test_number.py @@ -25,8 +25,8 @@ from homeassistant.const import ( ATTR_ENTITY_ID, ATTR_MODE, ATTR_UNIT_OF_MEASUREMENT, - TEMP_FAHRENHEIT, Platform, + UnitOfTemperature, ) import homeassistant.core as ha from homeassistant.setup import async_setup_component @@ -88,7 +88,7 @@ async def test_run_number_setup(hass, mqtt_mock_entry_with_yaml_config): "command_topic": topic, "name": "Test Number", "device_class": "temperature", - "unit_of_measurement": TEMP_FAHRENHEIT, + "unit_of_measurement": UnitOfTemperature.FAHRENHEIT, "payload_reset": "reset!", } } @@ -190,7 +190,7 @@ async def test_restore_native_value(hass, mqtt_mock_entry_with_yaml_config): number.DOMAIN: { "command_topic": topic, "device_class": "temperature", - "unit_of_measurement": TEMP_FAHRENHEIT, + "unit_of_measurement": UnitOfTemperature.FAHRENHEIT, "name": "Test Number", } } diff --git a/tests/components/mqtt/test_sensor.py b/tests/components/mqtt/test_sensor.py index d807140962a..3152784018b 100644 --- a/tests/components/mqtt/test_sensor.py +++ b/tests/components/mqtt/test_sensor.py @@ -12,9 +12,8 @@ from homeassistant.const import ( EVENT_STATE_CHANGED, STATE_UNAVAILABLE, STATE_UNKNOWN, - TEMP_CELSIUS, - TEMP_FAHRENHEIT, Platform, + UnitOfTemperature, ) import homeassistant.core as ha from homeassistant.helpers import device_registry as dr @@ -1127,14 +1126,14 @@ async def test_cleanup_triggers_and_restoring_state( config1["expire_after"] = 30 config1["state_topic"] = "test-topic1" config1["device_class"] = "temperature" - config1["unit_of_measurement"] = TEMP_FAHRENHEIT + config1["unit_of_measurement"] = str(UnitOfTemperature.FAHRENHEIT) config2 = copy.deepcopy(DEFAULT_CONFIG[mqtt.DOMAIN][domain]) config2["name"] = "test2" config2["expire_after"] = 5 config2["state_topic"] = "test-topic2" config2["device_class"] = "temperature" - config2["unit_of_measurement"] = TEMP_CELSIUS + config2["unit_of_measurement"] = str(UnitOfTemperature.CELSIUS) freezer.move_to("2022-02-02 12:01:00+01:00") diff --git a/tests/components/mysensors/test_sensor.py b/tests/components/mysensors/test_sensor.py index 7b5854b9efe..30b09a5c25f 100644 --- a/tests/components/mysensors/test_sensor.py +++ b/tests/components/mysensors/test_sensor.py @@ -15,10 +15,9 @@ from homeassistant.const import ( ATTR_DEVICE_CLASS, ATTR_ICON, ATTR_UNIT_OF_MEASUREMENT, - ENERGY_KILO_WATT_HOUR, - POWER_WATT, - TEMP_CELSIUS, - TEMP_FAHRENHEIT, + UnitOfEnergy, + UnitOfPower, + UnitOfTemperature, ) from homeassistant.core import HomeAssistant from homeassistant.util.unit_system import ( @@ -69,7 +68,7 @@ async def test_power_sensor( assert state assert state.state == "1200" assert state.attributes[ATTR_DEVICE_CLASS] == SensorDeviceClass.POWER - assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == POWER_WATT + assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == UnitOfPower.WATT assert state.attributes[ATTR_STATE_CLASS] is SensorStateClass.MEASUREMENT @@ -86,7 +85,7 @@ async def test_energy_sensor( assert state assert state.state == "18000" assert state.attributes[ATTR_DEVICE_CLASS] == SensorDeviceClass.ENERGY - assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == ENERGY_KILO_WATT_HOUR + assert state.attributes[ATTR_UNIT_OF_MEASUREMENT] == UnitOfEnergy.KILO_WATT_HOUR assert state.attributes[ATTR_STATE_CLASS] is SensorStateClass.TOTAL_INCREASING @@ -125,7 +124,10 @@ async def test_distance_sensor( @pytest.mark.parametrize( "unit_system, unit", - [(METRIC_SYSTEM, TEMP_CELSIUS), (US_CUSTOMARY_SYSTEM, TEMP_FAHRENHEIT)], + [ + (METRIC_SYSTEM, UnitOfTemperature.CELSIUS), + (US_CUSTOMARY_SYSTEM, UnitOfTemperature.FAHRENHEIT), + ], ) async def test_temperature_sensor( hass: HomeAssistant, diff --git a/tests/components/nam/test_sensor.py b/tests/components/nam/test_sensor.py index 953e982b3b4..81f114c5a8f 100644 --- a/tests/components/nam/test_sensor.py +++ b/tests/components/nam/test_sensor.py @@ -20,10 +20,10 @@ from homeassistant.const import ( CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, CONCENTRATION_PARTS_PER_MILLION, PERCENTAGE, - PRESSURE_HPA, SIGNAL_STRENGTH_DECIBELS_MILLIWATT, STATE_UNAVAILABLE, - TEMP_CELSIUS, + UnitOfPressure, + UnitOfTemperature, ) from homeassistant.helpers import entity_registry as er from homeassistant.setup import async_setup_component @@ -75,7 +75,7 @@ async def test_sensor(hass): assert state.state == "7.6" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS entry = registry.async_get("sensor.nettigo_air_monitor_bme280_temperature") assert entry @@ -86,7 +86,7 @@ async def test_sensor(hass): assert state.state == "1011" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.PRESSURE assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PRESSURE_HPA + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPressure.HPA entry = registry.async_get("sensor.nettigo_air_monitor_bme280_pressure") assert entry @@ -97,7 +97,7 @@ async def test_sensor(hass): assert state.state == "7.6" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS entry = registry.async_get("sensor.nettigo_air_monitor_bmp180_temperature") assert entry @@ -108,7 +108,7 @@ async def test_sensor(hass): assert state.state == "1032" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.PRESSURE assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PRESSURE_HPA + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPressure.HPA entry = registry.async_get("sensor.nettigo_air_monitor_bmp180_pressure") assert entry @@ -119,7 +119,7 @@ async def test_sensor(hass): assert state.state == "5.6" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS entry = registry.async_get("sensor.nettigo_air_monitor_bmp280_temperature") assert entry @@ -130,7 +130,7 @@ async def test_sensor(hass): assert state.state == "1022" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.PRESSURE assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == PRESSURE_HPA + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfPressure.HPA entry = registry.async_get("sensor.nettigo_air_monitor_bmp280_pressure") assert entry @@ -152,7 +152,7 @@ async def test_sensor(hass): assert state.state == "6.3" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS entry = registry.async_get("sensor.nettigo_air_monitor_sht3x_temperature") assert entry @@ -174,7 +174,7 @@ async def test_sensor(hass): assert state.state == "6.3" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS entry = registry.async_get("sensor.nettigo_air_monitor_dht22_temperature") assert entry @@ -196,7 +196,7 @@ async def test_sensor(hass): assert state.state == "8.0" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE assert state.attributes.get(ATTR_STATE_CLASS) is SensorStateClass.MEASUREMENT - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS entry = registry.async_get("sensor.nettigo_air_monitor_heca_temperature") assert entry @@ -494,7 +494,7 @@ async def test_incompleta_data_after_device_restart(hass): assert state assert state.state == "8.0" assert state.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE - assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == UnitOfTemperature.CELSIUS future = utcnow() + timedelta(minutes=6) update_response = Mock(json=AsyncMock(return_value=INCOMPLETE_NAM_DATA)) diff --git a/tests/components/nest/test_sensor_sdm.py b/tests/components/nest/test_sensor_sdm.py index c3698cf4123..b1dddcd9494 100644 --- a/tests/components/nest/test_sensor_sdm.py +++ b/tests/components/nest/test_sensor_sdm.py @@ -21,7 +21,7 @@ from homeassistant.const import ( ATTR_UNIT_OF_MEASUREMENT, PERCENTAGE, STATE_UNAVAILABLE, - TEMP_CELSIUS, + UnitOfTemperature, ) from homeassistant.core import HomeAssistant from homeassistant.helpers import device_registry as dr, entity_registry as er @@ -60,7 +60,10 @@ async def test_thermostat_device( temperature = hass.states.get("sensor.my_sensor_temperature") assert temperature is not None assert temperature.state == "25.1" - assert temperature.attributes.get(ATTR_UNIT_OF_MEASUREMENT) == TEMP_CELSIUS + assert ( + temperature.attributes.get(ATTR_UNIT_OF_MEASUREMENT) + == UnitOfTemperature.CELSIUS + ) assert ( temperature.attributes.get(ATTR_DEVICE_CLASS) == SensorDeviceClass.TEMPERATURE ) diff --git a/tests/components/nexia/test_sensor.py b/tests/components/nexia/test_sensor.py index ad15fc308f4..a5b39af872f 100644 --- a/tests/components/nexia/test_sensor.py +++ b/tests/components/nexia/test_sensor.py @@ -1,6 +1,6 @@ """The sensor tests for the nexia platform.""" -from homeassistant.const import PERCENTAGE, TEMP_CELSIUS +from homeassistant.const import PERCENTAGE, UnitOfTemperature from .util import async_init_integration @@ -17,7 +17,7 @@ async def test_create_sensors(hass): "attribution": "Data provided by Trane Technologies", "device_class": "temperature", "friendly_name": "Nick Office Temperature", - "unit_of_measurement": TEMP_CELSIUS, + "unit_of_measurement": UnitOfTemperature.CELSIUS, } # Only test for a subset of attributes in case # HA changes the implementation and a new one appears @@ -84,7 +84,7 @@ async def test_create_sensors(hass): "attribution": "Data provided by Trane Technologies", "device_class": "temperature", "friendly_name": "Master Suite Outdoor Temperature", - "unit_of_measurement": TEMP_CELSIUS, + "unit_of_measurement": UnitOfTemperature.CELSIUS, } # Only test for a subset of attributes in case # HA changes the implementation and a new one appears diff --git a/tests/components/nsw_rural_fire_service_feed/test_geo_location.py b/tests/components/nsw_rural_fire_service_feed/test_geo_location.py index d8719578957..0fdbbc56ca2 100644 --- a/tests/components/nsw_rural_fire_service_feed/test_geo_location.py +++ b/tests/components/nsw_rural_fire_service_feed/test_geo_location.py @@ -31,7 +31,7 @@ from homeassistant.const import ( CONF_RADIUS, EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP, - LENGTH_KILOMETERS, + UnitOfLength, ) from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util @@ -155,7 +155,7 @@ async def test_setup(hass): ATTR_TYPE: "Type 1", ATTR_SIZE: "Size 1", ATTR_RESPONSIBLE_AGENCY: "Agency 1", - ATTR_UNIT_OF_MEASUREMENT: LENGTH_KILOMETERS, + ATTR_UNIT_OF_MEASUREMENT: UnitOfLength.KILOMETERS, ATTR_SOURCE: "nsw_rural_fire_service_feed", ATTR_ICON: "mdi:fire", } @@ -170,7 +170,7 @@ async def test_setup(hass): ATTR_LONGITUDE: 150.1, ATTR_FRIENDLY_NAME: "Title 2", ATTR_FIRE: False, - ATTR_UNIT_OF_MEASUREMENT: LENGTH_KILOMETERS, + ATTR_UNIT_OF_MEASUREMENT: UnitOfLength.KILOMETERS, ATTR_SOURCE: "nsw_rural_fire_service_feed", ATTR_ICON: "mdi:alarm-light", } @@ -185,7 +185,7 @@ async def test_setup(hass): ATTR_LONGITUDE: 150.2, ATTR_FRIENDLY_NAME: "Title 3", ATTR_FIRE: True, - ATTR_UNIT_OF_MEASUREMENT: LENGTH_KILOMETERS, + ATTR_UNIT_OF_MEASUREMENT: UnitOfLength.KILOMETERS, ATTR_SOURCE: "nsw_rural_fire_service_feed", ATTR_ICON: "mdi:fire", } diff --git a/tests/components/number/test_init.py b/tests/components/number/test_init.py index e65913f1461..0cb4b5b9818 100644 --- a/tests/components/number/test_init.py +++ b/tests/components/number/test_init.py @@ -25,8 +25,7 @@ from homeassistant.const import ( ATTR_ENTITY_ID, ATTR_UNIT_OF_MEASUREMENT, CONF_PLATFORM, - TEMP_CELSIUS, - TEMP_FAHRENHEIT, + UnitOfTemperature, ) from homeassistant.core import HomeAssistant, State from homeassistant.helpers import entity_registry as er @@ -443,8 +442,8 @@ async def test_deprecated_methods( [ ( US_CUSTOMARY_SYSTEM, - TEMP_FAHRENHEIT, - TEMP_FAHRENHEIT, + UnitOfTemperature.FAHRENHEIT, + UnitOfTemperature.FAHRENHEIT, 100, 100, 50, @@ -458,8 +457,8 @@ async def test_deprecated_methods( ), ( US_CUSTOMARY_SYSTEM, - TEMP_CELSIUS, - TEMP_FAHRENHEIT, + UnitOfTemperature.CELSIUS, + UnitOfTemperature.FAHRENHEIT, 38, 100, 10, @@ -473,8 +472,8 @@ async def test_deprecated_methods( ), ( METRIC_SYSTEM, - TEMP_FAHRENHEIT, - TEMP_CELSIUS, + UnitOfTemperature.FAHRENHEIT, + UnitOfTemperature.CELSIUS, 100, 38, 50, @@ -488,8 +487,8 @@ async def test_deprecated_methods( ), ( METRIC_SYSTEM, - TEMP_CELSIUS, - TEMP_CELSIUS, + UnitOfTemperature.CELSIUS, + UnitOfTemperature.CELSIUS, 38, 38, 10, @@ -610,7 +609,7 @@ async def test_restore_number_save_state( native_max_value=200.0, native_min_value=-10.0, native_step=2.0, - native_unit_of_measurement=TEMP_FAHRENHEIT, + native_unit_of_measurement=UnitOfTemperature.FAHRENHEIT, native_value=123.0, device_class=NumberDeviceClass.TEMPERATURE, ) @@ -705,25 +704,25 @@ async def test_restore_number_restore_state( # Not a supported temperature unit ( NumberDeviceClass.TEMPERATURE, - TEMP_CELSIUS, + UnitOfTemperature.CELSIUS, "my_temperature_unit", - TEMP_CELSIUS, + UnitOfTemperature.CELSIUS, 1000, 1000, ), ( NumberDeviceClass.TEMPERATURE, - TEMP_CELSIUS, - TEMP_FAHRENHEIT, - TEMP_FAHRENHEIT, + UnitOfTemperature.CELSIUS, + UnitOfTemperature.FAHRENHEIT, + UnitOfTemperature.FAHRENHEIT, 37.5, 99.5, ), ( NumberDeviceClass.TEMPERATURE, - TEMP_FAHRENHEIT, - TEMP_CELSIUS, - TEMP_CELSIUS, + UnitOfTemperature.FAHRENHEIT, + UnitOfTemperature.CELSIUS, + UnitOfTemperature.CELSIUS, 100, 38.0, ), @@ -773,25 +772,33 @@ async def test_custom_unit( "native_unit, custom_unit, used_custom_unit, default_unit, native_value, custom_value, default_value", [ ( - TEMP_CELSIUS, - TEMP_FAHRENHEIT, - TEMP_FAHRENHEIT, - TEMP_CELSIUS, + UnitOfTemperature.CELSIUS, + UnitOfTemperature.FAHRENHEIT, + UnitOfTemperature.FAHRENHEIT, + UnitOfTemperature.CELSIUS, 37.5, 99.5, 37.5, ), ( - TEMP_FAHRENHEIT, - TEMP_FAHRENHEIT, - TEMP_FAHRENHEIT, - TEMP_CELSIUS, + UnitOfTemperature.FAHRENHEIT, + UnitOfTemperature.FAHRENHEIT, + UnitOfTemperature.FAHRENHEIT, + UnitOfTemperature.CELSIUS, 100, 100, 38.0, ), # Not a supported temperature unit - (TEMP_CELSIUS, "no_unit", TEMP_CELSIUS, TEMP_CELSIUS, 1000, 1000, 1000), + ( + UnitOfTemperature.CELSIUS, + "no_unit", + UnitOfTemperature.CELSIUS, + UnitOfTemperature.CELSIUS, + 1000, + 1000, + 1000, + ), ], ) async def test_custom_unit_change( diff --git a/tests/components/nzbget/test_sensor.py b/tests/components/nzbget/test_sensor.py index 796c72804aa..524133cf957 100644 --- a/tests/components/nzbget/test_sensor.py +++ b/tests/components/nzbget/test_sensor.py @@ -5,8 +5,8 @@ from unittest.mock import patch from homeassistant.components.sensor import SensorDeviceClass from homeassistant.const import ( ATTR_UNIT_OF_MEASUREMENT, - DATA_MEGABYTES, - DATA_RATE_MEGABYTES_PER_SECOND, + UnitOfDataRate, + UnitOfInformation, ) from homeassistant.helpers import entity_registry as er from homeassistant.util import dt as dt_util @@ -28,32 +28,32 @@ async def test_sensors(hass, nzbget_api) -> None: "article_cache": ( "ArticleCacheMB", "64", - DATA_MEGABYTES, + UnitOfInformation.MEGABYTES, SensorDeviceClass.DATA_SIZE, ), "average_speed": ( "AverageDownloadRate", "1.19", - DATA_RATE_MEGABYTES_PER_SECOND, + UnitOfDataRate.MEGABYTES_PER_SECOND, SensorDeviceClass.DATA_RATE, ), "download_paused": ("DownloadPaused", "False", None, None), "speed": ( "DownloadRate", "2.38", - DATA_RATE_MEGABYTES_PER_SECOND, + UnitOfDataRate.MEGABYTES_PER_SECOND, SensorDeviceClass.DATA_RATE, ), "size": ( "DownloadedSizeMB", "256", - DATA_MEGABYTES, + UnitOfInformation.MEGABYTES, SensorDeviceClass.DATA_SIZE, ), "disk_free": ( "FreeDiskSpaceMB", "1024", - DATA_MEGABYTES, + UnitOfInformation.MEGABYTES, SensorDeviceClass.DATA_SIZE, ), "post_processing_jobs": ("PostJobCount", "2", "Jobs", None), @@ -61,14 +61,14 @@ async def test_sensors(hass, nzbget_api) -> None: "queue_size": ( "RemainingSizeMB", "512", - DATA_MEGABYTES, + UnitOfInformation.MEGABYTES, SensorDeviceClass.DATA_SIZE, ), "uptime": ("UpTimeSec", uptime.isoformat(), None, SensorDeviceClass.TIMESTAMP), "speed_limit": ( "DownloadLimit", "0.95", - DATA_RATE_MEGABYTES_PER_SECOND, + UnitOfDataRate.MEGABYTES_PER_SECOND, SensorDeviceClass.DATA_RATE, ), }