Parcourir la source

Use new UnitOfTemperature enum for temperature units.

Issue #260
Jason Rumney il y a 3 ans
Parent
commit
3d0c4bdbff
50 fichiers modifiés avec 169 ajouts et 190 suppressions
  1. 2 2
      custom_components/tuya_local/device.py
  2. 5 6
      custom_components/tuya_local/generic/climate.py
  3. 5 9
      custom_components/tuya_local/generic/water_heater.py
  4. 3 4
      custom_components/tuya_local/helpers/mixin.py
  5. 1 1
      requirements-dev.txt
  6. 2 2
      tests/devices/test_aspen_adv200_fan.py
  7. 4 4
      tests/devices/test_awow_th213_thermostat.py
  8. 4 4
      tests/devices/test_awow_th213v2_thermostat.py
  9. 2 2
      tests/devices/test_beca_bac002_thermostat.py
  10. 3 3
      tests/devices/test_beca_bhp6000_thermostat.py
  11. 2 2
      tests/devices/test_beca_bht002_thermostat.py
  12. 2 2
      tests/devices/test_beca_bht6000_thermostat.py
  13. 3 3
      tests/devices/test_becool_heatpump.py
  14. 5 5
      tests/devices/test_beok_tr9b_thermostat.py
  15. 3 3
      tests/devices/test_carson_cb.py
  16. 3 4
      tests/devices/test_devola_patio_heater.py
  17. 3 3
      tests/devices/test_eberg_cooly_c35hd.py
  18. 3 4
      tests/devices/test_eberg_qubo_q40hd_heatpump.py
  19. 3 4
      tests/devices/test_ecostrad_accentiq_heater.py
  20. 2 2
      tests/devices/test_ecostrad_iqceramic_radiator.py
  21. 3 3
      tests/devices/test_electriq_airflex15w_heatpump.py
  22. 2 2
      tests/devices/test_electriq_cd12_dehumidifier.py
  23. 2 2
      tests/devices/test_electriq_cd20_dehumidifier.py
  24. 2 2
      tests/devices/test_electriq_cd25_dehumidifier.py
  25. 3 4
      tests/devices/test_fairland_iphcr15_heatpump.py
  26. 3 3
      tests/devices/test_fersk_vind_2_climate.py
  27. 3 4
      tests/devices/test_gardenpac_heatpump.py
  28. 2 2
      tests/devices/test_goldair_dehumidifier.py
  29. 2 2
      tests/devices/test_himox_h05_purifier.py
  30. 10 10
      tests/devices/test_hysen_hy08we2_thermostat.py
  31. 2 2
      tests/devices/test_hyundai_sahara_dehumidifier.py
  32. 5 5
      tests/devices/test_inkbird_itc306a_thermostat.py
  33. 7 7
      tests/devices/test_inkbird_itc308_thermostat.py
  34. 3 3
      tests/devices/test_inkbird_sousvide.py
  35. 3 4
      tests/devices/test_ips_pro_heatpump.py
  36. 6 7
      tests/devices/test_jiahong_et72w_thermostat.py
  37. 2 2
      tests/devices/test_jjpro_jpd01_dehumidifier.py
  38. 3 3
      tests/devices/test_kogan_kawfpac09ya_airconditioner.py
  39. 10 11
      tests/devices/test_madimack_elitev3_heatpump.py
  40. 7 8
      tests/devices/test_madimack_heatpump.py
  41. 8 11
      tests/devices/test_minco_mh1823d_thermostat.py
  42. 2 2
      tests/devices/test_moes_temp_humidity.py
  43. 0 3
      tests/devices/test_nashone_mts700wb_thermostat.py
  44. 3 3
      tests/devices/test_owon_pct513_thermostat.py
  45. 2 2
      tests/devices/test_parkside_plgs2012a1_smart_charger.py
  46. 2 2
      tests/devices/test_pc321ty_energy_meter.py
  47. 5 5
      tests/devices/test_saswell_c16_thermostat.py
  48. 3 3
      tests/devices/test_saswell_t29utk_thermostat.py
  49. 2 2
      tests/devices/test_wilfa_haze_hu400bc_humidifier.py
  50. 2 2
      tests/test_device.py

+ 2 - 2
custom_components/tuya_local/device.py

@@ -9,7 +9,7 @@ from threading import Lock, Timer
 from time import time
 
 
-from homeassistant.const import CONF_HOST, CONF_NAME, TEMP_CELSIUS
+from homeassistant.const import CONF_HOST, CONF_NAME, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 
 from .const import (
@@ -43,7 +43,7 @@ class TuyaLocalDevice(object):
 
         self._reset_cached_state()
 
-        self._TEMPERATURE_UNIT = TEMP_CELSIUS
+        self._TEMPERATURE_UNIT = UnitOfTemperature.CELSIUS
         self._hass = hass
 
         # API calls to update Tuya devices are asynchronous and non-blocking.

+ 5 - 6
custom_components/tuya_local/generic/climate.py

@@ -28,9 +28,7 @@ from homeassistant.components.climate.const import (
 )
 from homeassistant.const import (
     ATTR_TEMPERATURE,
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
-    TEMP_KELVIN,
+    UnitOfTemperature,
 )
 
 from ..device import TuyaLocalDevice
@@ -39,12 +37,13 @@ from ..helpers.mixin import TuyaLocalEntity, unit_from_ascii
 
 _LOGGER = logging.getLogger(__name__)
 
-VALID_TEMP_UNIT = [TEMP_CELSIUS, TEMP_FAHRENHEIT, TEMP_KELVIN]
-
 
 def validate_temp_unit(unit):
     unit = unit_from_ascii(unit)
-    return unit if unit in VALID_TEMP_UNIT else None
+    try:
+        return UnitOfTemperature(unit)
+    except ValueError:
+        return None
 
 
 class TuyaLocalClimate(TuyaLocalEntity, ClimateEntity):

+ 5 - 9
custom_components/tuya_local/generic/water_heater.py

@@ -9,12 +9,7 @@ from homeassistant.components.water_heater import (
     WaterHeaterEntity,
     WaterHeaterEntityFeature,
 )
-from homeassistant.const import (
-    ATTR_TEMPERATURE,
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
-    TEMP_KELVIN,
-)
+from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 
 from ..device import TuyaLocalDevice
 from ..helpers.device_config import TuyaEntityConfig
@@ -22,12 +17,13 @@ from ..helpers.mixin import TuyaLocalEntity, unit_from_ascii
 
 _LOGGER = logging.getLogger(__name__)
 
-VALID_TEMP_UNIT = [TEMP_CELSIUS, TEMP_FAHRENHEIT, TEMP_KELVIN]
-
 
 def validate_temp_unit(unit):
     unit = unit_from_ascii(unit)
-    return unit if unit in VALID_TEMP_UNIT else None
+    try:
+        return UnitOfTemperature(unit)
+    except ValueError:
+        return None
 
 
 class TuyaLocalWaterHeater(TuyaLocalEntity, WaterHeaterEntity):

+ 3 - 4
custom_components/tuya_local/helpers/mixin.py

@@ -5,8 +5,7 @@ import logging
 from homeassistant.const import (
     AREA_SQUARE_METERS,
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
+    UnitOfTemperature,
 )
 from homeassistant.helpers.entity import EntityCategory
 
@@ -87,8 +86,8 @@ class TuyaLocalEntity:
 
 
 UNIT_ASCII_MAP = {
-    "C": TEMP_CELSIUS,
-    "F": TEMP_FAHRENHEIT,
+    "C": UnitOfTemperature.CELSIUS,
+    "F": UnitOfTemperature.FAHRENHEIT,
     "ugm3": CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     "m2": AREA_SQUARE_METERS,
 }

+ 1 - 1
requirements-dev.txt

@@ -1,6 +1,6 @@
 black
 isort
-pytest-homeassistant-custom-component>=0.11.19
+pytest-homeassistant-custom-component>=0.12.17
 pytest
 pytest-asyncio
 pytest-cov

+ 2 - 2
tests/devices/test_aspen_adv200_fan.py

@@ -7,7 +7,7 @@ from homeassistant.components.fan import (
     DIRECTION_REVERSE,
     FanEntityFeature,
 )
-from homeassistant.const import TEMP_FAHRENHEIT
+from homeassistant.const import UnitOfTemperature
 
 from ..const import ASPEN_ASP200_FAN_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -148,7 +148,7 @@ class TestAspenASP200Fan(
         self.assertEqual(self.climate.current_temperature, 24)
 
     def test_climate_temperature_unit(self):
-        self.assertEqual(self.climate.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.climate.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
     def test_climate_hvac_mode(self):
         self.dps[SWITCH_DPS] = False

+ 4 - 4
tests/devices/test_awow_th213_thermostat.py

@@ -5,7 +5,7 @@ from homeassistant.components.climate.const import (
 )
 from homeassistant.components.sensor import SensorDeviceClass
 
-from homeassistant.const import TEMP_CELSIUS
+from homeassistant.const import UnitOfTemperature
 
 from ..const import TH213_THERMOSTAT_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -55,7 +55,7 @@ class TestAwowTH213Thermostat(
         self.setUpBasicSensor(
             EXTERNTEMP_DPS,
             self.entities.get("sensor_external_temperature"),
-            unit=TEMP_CELSIUS,
+            unit=UnitOfTemperature.CELSIUS,
             device_class=SensorDeviceClass.TEMPERATURE,
             state_class="measurement",
         )
@@ -75,14 +75,14 @@ class TestAwowTH213Thermostat(
                     "dps": CALIBRATE_DPS,
                     "min": -9,
                     "max": 9,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "number_calibration_swing",
                     "dps": CALIBSWING_DPS,
                     "min": 1,
                     "max": 9,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
             ]
         )

+ 4 - 4
tests/devices/test_awow_th213v2_thermostat.py

@@ -5,7 +5,7 @@ from homeassistant.components.climate.const import (
     HVACMode,
 )
 from homeassistant.components.sensor import SensorDeviceClass
-from homeassistant.const import TEMP_CELSIUS
+from homeassistant.const import UnitOfTemperature
 
 from ..const import TH213V2_THERMOSTAT_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -55,7 +55,7 @@ class TestAwowTH213v2Thermostat(
         self.setUpBasicSensor(
             EXTERNTEMP_DPS,
             self.entities.get("sensor_external_temperature"),
-            unit=TEMP_CELSIUS,
+            unit=UnitOfTemperature.CELSIUS,
             device_class=SensorDeviceClass.TEMPERATURE,
             state_class="measurement",
         )
@@ -81,14 +81,14 @@ class TestAwowTH213v2Thermostat(
                     "dps": CALIBRATE_DPS,
                     "min": -9,
                     "max": 9,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "number_calibration_swing",
                     "dps": CALIBSWING_DPS,
                     "min": 1,
                     "max": 9,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
             ]
         )

+ 2 - 2
tests/devices/test_beca_bac002_thermostat.py

@@ -8,7 +8,7 @@ from homeassistant.components.climate.const import (
     PRESET_COMFORT,
     PRESET_ECO,
 )
-from homeassistant.const import TEMP_CELSIUS
+from homeassistant.const import UnitOfTemperature
 
 from ..const import BECA_BAC002_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -67,7 +67,7 @@ class TestBecaBAC002Thermostat(
         )
 
     def test_temperature_unit_returns_configured_temperature_unit(self):
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
 
     async def test_legacy_set_temperature_with_preset_mode(self):
         async with assert_device_properties_set(

+ 3 - 3
tests/devices/test_beca_bhp6000_thermostat.py

@@ -2,7 +2,7 @@ from homeassistant.components.climate.const import (
     ClimateEntityFeature,
     HVACMode,
 )
-from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT
+from homeassistant.const import UnitOfTemperature
 
 from ..const import BECA_BHP6000_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -52,7 +52,7 @@ class TestBecaBHP6000Thermostat(
         )
 
     def test_temperature_unit_returns_configured_temperature_unit(self):
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
     async def test_legacy_set_temperature_with_preset_mode(self):
         async with assert_device_properties_set(self.subject._device, {PRESET_DPS: 1}):
@@ -161,7 +161,7 @@ class TestBecaBHP6000ThermostatC(TuyaDeviceTestCase):
         self.mark_secondary(["light_display", "lock_child_lock"])
 
     def test_temperature_unit_returns_configured_temperature_unit(self):
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
 
     def test_minimum_target_temperature(self):
         self.assertEqual(self.subject.min_temp, 5)

+ 2 - 2
tests/devices/test_beca_bht002_thermostat.py

@@ -5,7 +5,7 @@ from homeassistant.components.climate.const import (
     PRESET_COMFORT,
 )
 from homeassistant.components.sensor import SensorDeviceClass
-from homeassistant.const import TEMP_CELSIUS
+from homeassistant.const import UnitOfTemperature
 
 from ..const import BECA_BHT002_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -49,7 +49,7 @@ class TestBecaBHT002Thermostat(
         self.setUpBasicSensor(
             FLOOR_DPS,
             self.entities.get("sensor_external_temperature"),
-            unit=TEMP_CELSIUS,
+            unit=UnitOfTemperature.CELSIUS,
             device_class=SensorDeviceClass.TEMPERATURE,
             state_class="measurement",
             testdata=(30, 15),

+ 2 - 2
tests/devices/test_beca_bht6000_thermostat.py

@@ -5,7 +5,7 @@ from homeassistant.components.climate.const import (
     PRESET_COMFORT,
 )
 from homeassistant.components.sensor import SensorDeviceClass
-from homeassistant.const import TEMP_CELSIUS
+from homeassistant.const import UnitOfTemperature
 
 from ..const import BECA_BHT6000_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -46,7 +46,7 @@ class TestBecaBHT6000Thermostat(
         self.setUpBasicSensor(
             FLOOR_DPS,
             self.entities.get("sensor_external_temperature"),
-            unit=TEMP_CELSIUS,
+            unit=UnitOfTemperature.CELSIUS,
             device_class=SensorDeviceClass.TEMPERATURE,
             state_class="measurement",
             testdata=(36, 18),

+ 3 - 3
tests/devices/test_becool_heatpump.py

@@ -2,7 +2,7 @@ from homeassistant.components.climate.const import (
     ClimateEntityFeature,
     HVACMode,
 )
-from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT
+from homeassistant.const import UnitOfTemperature
 
 from ..const import BECOOL_HEATPUMP_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -54,9 +54,9 @@ class TestBWTHeatpump(
 
     def test_temperature_unit(self):
         self.dps[UNIT_DPS] = False
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
         self.dps[UNIT_DPS] = True
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
     def test_hvac_mode(self):
         self.dps[HVACMODE_DPS] = False

+ 5 - 5
tests/devices/test_beok_tr9b_thermostat.py

@@ -3,7 +3,7 @@ from homeassistant.components.climate.const import (
     ClimateEntityFeature,
     HVACMode,
 )
-from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT
+from homeassistant.const import UnitOfTemperature
 
 from ..const import BEOK_TR9B_PAYLOAD
 from ..mixins.climate import TargetTemperatureTests
@@ -106,7 +106,7 @@ class TestBeokTR9BThermostat(
                     "max": 1000.0,
                     "step": 1.0,
                     "scale": 10,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "dps": MAXTEMP_DPS,
@@ -115,7 +115,7 @@ class TestBeokTR9BThermostat(
                     "max": 1000.0,
                     "step": 1.0,
                     "scale": 10,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
             ],
         )
@@ -142,14 +142,14 @@ class TestBeokTR9BThermostat(
         self.dps[UNIT_DPS] = "c"
         self.assertEqual(
             self.subject.temperature_unit,
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
         )
         self.assertEqual(self.subject.target_temperature_step, 0.5)
 
         self.dps[UNIT_DPS] = "f"
         self.assertEqual(
             self.subject.temperature_unit,
-            TEMP_FAHRENHEIT,
+            UnitOfTemperature.FAHRENHEIT,
         )
         self.assertEqual(self.subject.target_temperature_step, 1.0)
 

+ 3 - 3
tests/devices/test_carson_cb.py

@@ -2,7 +2,7 @@ from homeassistant.components.climate.const import (
     ClimateEntityFeature,
     HVACMode,
 )
-from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT
+from homeassistant.const import UnitOfTemperature
 
 from ..const import CARSON_CB_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -61,9 +61,9 @@ class TestCarsonCBHeatpump(TargetTemperatureTests, TuyaDeviceTestCase):
 
     def test_temperature_unit(self):
         self.dps[UNIT_DPS] = "C"
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
         self.dps[UNIT_DPS] = "F"
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
     def test_current_temperature(self):
         self.dps[CURRENTTEMP_DPS] = 25

+ 3 - 4
tests/devices/test_devola_patio_heater.py

@@ -6,8 +6,7 @@ from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
     PERCENTAGE,
     TIME_MINUTES,
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
+    UnitOfTemperature,
 )
 
 from ..const import DEVOLA_PATIO_HEATER_PAYLOAD
@@ -103,12 +102,12 @@ class TestDevolaPatioHeater(
         self.dps[UNIT_DPS] = "c"
         self.assertEqual(
             self.subject.temperature_unit,
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
         )
         self.dps[UNIT_DPS] = "f"
         self.assertEqual(
             self.subject.temperature_unit,
-            TEMP_FAHRENHEIT,
+            UnitOfTemperature.FAHRENHEIT,
         )
 
     async def test_legacy_set_temperature_with_preset_mode(self):

+ 3 - 3
tests/devices/test_eberg_cooly_c35hd.py

@@ -4,7 +4,7 @@ from homeassistant.components.climate.const import (
     SWING_OFF,
     SWING_VERTICAL,
 )
-from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT
+from homeassistant.const import UnitOfTemperature
 
 from ..const import EBERG_COOLY_C35HD_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -79,9 +79,9 @@ class TestEbergCoolyC35HDHeatpump(
 
     def test_temperature_unit(self):
         self.dps[UNIT_DPS] = False
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
         self.dps[UNIT_DPS] = True
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
     def test_minimum_target_temperature_f(self):
         self.dps[UNIT_DPS] = True

+ 3 - 4
tests/devices/test_eberg_qubo_q40hd_heatpump.py

@@ -8,9 +8,8 @@ from homeassistant.components.climate.const import (
     SWING_VERTICAL,
 )
 from homeassistant.const import (
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
     TIME_HOURS,
+    UnitOfTemperature,
 )
 
 from ..const import EBERG_QUBO_Q40HD_PAYLOAD
@@ -80,9 +79,9 @@ class TestEbergQuboQ40HDHeatpump(
 
     def test_temperature_unit(self):
         self.dps[UNIT_DPS] = "c"
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
         self.dps[UNIT_DPS] = "f"
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
     def test_minimum_target_temperature_f(self):
         self.dps[UNIT_DPS] = "f"

+ 3 - 4
tests/devices/test_ecostrad_accentiq_heater.py

@@ -3,9 +3,8 @@ from homeassistant.components.climate.const import (
     HVACMode,
 )
 from homeassistant.const import (
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
     TIME_HOURS,
+    UnitOfTemperature,
 )
 
 from ..const import ECOSTRAD_ACCENTIQ_HEATER_PAYLOAD
@@ -51,9 +50,9 @@ class TestEcostradAccentIqHeater(
 
     def test_temperature_unit(self):
         self.dps[UNIT_DPS] = True
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
         self.dps[UNIT_DPS] = False
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
     def test_current_temperature(self):
         self.dps[CURRENTTEMP_DPS] = 250

+ 2 - 2
tests/devices/test_ecostrad_iqceramic_radiator.py

@@ -2,7 +2,7 @@ from homeassistant.components.climate.const import (
     ClimateEntityFeature,
     HVACMode,
 )
-from homeassistant.const import TEMP_CELSIUS
+from homeassistant.const import UnitOfTemperature
 
 from ..const import ECOSTRAD_IQCERAMIC_RADIATOR_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -53,7 +53,7 @@ class TestEcostradAccentIqHeater(
             self.entities.get("number_calibration_offset"),
             min=-5,
             max=5,
-            unit=TEMP_CELSIUS,
+            unit=UnitOfTemperature.CELSIUS,
         )
         self.setUpBasicSwitch(
             SYNC_DPS, self.entities.get("switch_time_sync"), testdata=("1", "0")

+ 3 - 3
tests/devices/test_electriq_airflex15w_heatpump.py

@@ -2,7 +2,7 @@ from homeassistant.components.climate.const import (
     ClimateEntityFeature,
     HVACMode,
 )
-from homeassistant.const import PERCENTAGE, TEMP_CELSIUS, TEMP_FAHRENHEIT
+from homeassistant.const import PERCENTAGE, UnitOfTemperature
 
 from ..const import ELECTRIQ_AIRFLEX15W_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -83,9 +83,9 @@ class TestElectriqAirflex15WHeatpump(
 
     def test_temperature_unit(self):
         self.dps[UNIT_DPS] = False
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
         self.dps[UNIT_DPS] = True
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
     def test_current_temperature(self):
         self.dps[UNIT_DPS] = False

+ 2 - 2
tests/devices/test_electriq_cd12_dehumidifier.py

@@ -2,7 +2,7 @@ from homeassistant.components.humidifier import HumidifierEntityFeature
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
     PERCENTAGE,
-    TEMP_CELSIUS,
+    UnitOfTemperature,
 )
 
 from ..const import ELECTRIQ_CD12PW_DEHUMIDIFIER_PAYLOAD
@@ -37,7 +37,7 @@ class TestElectriqCD12PWDehumidifier(
                 {
                     "name": "sensor_current_temperature",
                     "dps": CURRENTTEMP_DPS,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                     "device_class": SensorDeviceClass.TEMPERATURE,
                     "state_class": "measurement",
                 },

+ 2 - 2
tests/devices/test_electriq_cd20_dehumidifier.py

@@ -3,7 +3,7 @@ from homeassistant.components.humidifier import HumidifierEntityFeature
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
     PERCENTAGE,
-    TEMP_CELSIUS,
+    UnitOfTemperature,
 )
 
 from ..const import ELECTRIQ_CD20PRO_DEHUMIDIFIER_PAYLOAD
@@ -52,7 +52,7 @@ class TestElectriqCD20ProDehumidifier(
                 {
                     "name": "sensor_current_temperature",
                     "dps": CURRENTTEMP_DPS,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                     "device_class": SensorDeviceClass.TEMPERATURE,
                     "state_class": "measurement",
                 },

+ 2 - 2
tests/devices/test_electriq_cd25_dehumidifier.py

@@ -3,7 +3,7 @@ from homeassistant.components.humidifier import HumidifierEntityFeature
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
     PERCENTAGE,
-    TEMP_CELSIUS,
+    UnitOfTemperature,
 )
 
 from ..const import ELECTRIQ_DEHUMIDIFIER_PAYLOAD
@@ -50,7 +50,7 @@ class TestElectriqCD25ProDehumidifier(
                 {
                     "name": "sensor_current_temperature",
                     "dps": CURRENTTEMP_DPS,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                     "device_class": SensorDeviceClass.TEMPERATURE,
                     "state_class": "measurement",
                 },

+ 3 - 4
tests/devices/test_fairland_iphcr15_heatpump.py

@@ -7,8 +7,7 @@ from homeassistant.components.climate.const import (
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
     PERCENTAGE,
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
+    UnitOfTemperature,
 )
 
 from ..const import GARDENPAC_HEATPUMP_PAYLOAD
@@ -92,9 +91,9 @@ class TestFairlandIPHCR15PoolHeatpump(
 
     def test_temperature_unit(self):
         self.dps[UNITS_DPS] = False
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
         self.dps[UNITS_DPS] = True
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
 
     def test_minimum_fahrenheit_temperature(self):
         self.dps[UNITS_DPS] = False

+ 3 - 3
tests/devices/test_fersk_vind_2_climate.py

@@ -4,7 +4,7 @@ from homeassistant.components.climate.const import (
     SWING_OFF,
     SWING_VERTICAL,
 )
-from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT
+from homeassistant.const import UnitOfTemperature
 
 from ..const import FERSK_VIND2_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -65,9 +65,9 @@ class TestFerskVind2Climate(TargetTemperatureTests, TuyaDeviceTestCase):
 
     def test_temperature_unit(self):
         self.dps[UNIT_DPS] = "C"
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
         self.dps[UNIT_DPS] = "F"
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
     def test_minimum_target_temperature_f(self):
         self.dps[UNIT_DPS] = "F"

+ 3 - 4
tests/devices/test_gardenpac_heatpump.py

@@ -7,8 +7,7 @@ from homeassistant.components.climate.const import (
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
     PERCENTAGE,
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
+    UnitOfTemperature,
 )
 
 from ..const import GARDENPAC_HEATPUMP_PAYLOAD
@@ -85,9 +84,9 @@ class TestGardenPACPoolHeatpump(
 
     def test_temperature_unit(self):
         self.dps[UNITS_DPS] = False
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
         self.dps[UNITS_DPS] = True
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
 
     def test_minimum_fahrenheit_temperature(self):
         self.dps[UNITS_DPS] = False

+ 2 - 2
tests/devices/test_goldair_dehumidifier.py

@@ -3,7 +3,7 @@ from unittest.mock import ANY
 from homeassistant.components.binary_sensor import BinarySensorDeviceClass
 from homeassistant.components.light import ColorMode
 from homeassistant.components.sensor import SensorDeviceClass
-from homeassistant.const import TEMP_CELSIUS, TIME_HOURS
+from homeassistant.const import TIME_HOURS, UnitOfTemperature
 
 from ..const import DEHUMIDIFIER_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -68,7 +68,7 @@ class TestGoldairDehumidifier(
                 {
                     "name": "sensor_current_temperature",
                     "dps": CURRENTTEMP_DPS,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                     "device_class": SensorDeviceClass.TEMPERATURE,
                     "state_class": "measurement",
                 },

+ 2 - 2
tests/devices/test_himox_h05_purifier.py

@@ -5,8 +5,8 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import (
     PERCENTAGE,
-    TEMP_CELSIUS,
     TIME_MINUTES,
+    UnitOfTemperature,
 )
 
 from ..const import HIMOX_H05_PURIFIER_PAYLOAD
@@ -59,7 +59,7 @@ class TestHimoxH05Purifier(
                 {
                     "dps": TEMP_DPS,
                     "name": "sensor_current_temperature",
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                     "device_class": SensorDeviceClass.TEMPERATURE,
                     "state_class": STATE_CLASS_MEASUREMENT,
                 },

+ 10 - 10
tests/devices/test_hysen_hy08we2_thermostat.py

@@ -7,7 +7,7 @@ from homeassistant.components.climate.const import (
     HVACMode,
 )
 from homeassistant.components.sensor import SensorDeviceClass
-from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT, TIME_DAYS
+from homeassistant.const import TIME_DAYS, UnitOfTemperature
 
 from ..const import HYSEN_HY08WE2_THERMOSTAT_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -122,7 +122,7 @@ class TestHysenHY08WE2Thermostat(
             self.entities.get("sensor_external_temperature"),
             device_class=SensorDeviceClass.TEMPERATURE,
             testdata=(205, 20.5),
-            unit=TEMP_CELSIUS,
+            unit=UnitOfTemperature.CELSIUS,
             state_class="measurement",
         )
         self.setUpMultiNumber(
@@ -139,14 +139,14 @@ class TestHysenHY08WE2Thermostat(
                     "name": "number_holiday_temperature",
                     "min": 5,
                     "max": 30,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "dps": CALIBOFFSET_DPS,
                     "name": "number_calibration_offset",
                     "min": -9,
                     "max": 9,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "dps": CALIBSWINGINT_DPS,
@@ -155,7 +155,7 @@ class TestHysenHY08WE2Thermostat(
                     "max": 2.5,
                     "scale": 10,
                     "step": 0.1,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "dps": CALIBSWINGEXT_DPS,
@@ -164,35 +164,35 @@ class TestHysenHY08WE2Thermostat(
                     "max": 1.0,
                     "scale": 10,
                     "step": 0.1,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "dps": HIGHTEMP_DPS,
                     "name": "number_high_temperature_protection",
                     "min": 35,
                     "max": 70,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "dps": LOWTEMP_DPS,
                     "name": "number_low_temperature_protection",
                     "min": 1,
                     "max": 10,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "dps": MINTEMP_DPS,
                     "name": "number_low_temperature_limit",
                     "min": 1,
                     "max": 10,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "dps": MAXTEMP_DPS,
                     "name": "number_high_temperature_limit",
                     "min": 2,
                     "max": 70,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
             ],
         )

+ 2 - 2
tests/devices/test_hyundai_sahara_dehumidifier.py

@@ -2,7 +2,7 @@ from homeassistant.components.binary_sensor import BinarySensorDeviceClass
 from homeassistant.components.fan import FanEntityFeature
 from homeassistant.components.humidifier import HumidifierEntityFeature
 from homeassistant.components.sensor import SensorDeviceClass
-from homeassistant.const import PERCENTAGE, TEMP_CELSIUS
+from homeassistant.const import PERCENTAGE, UnitOfTemperature
 
 from ..const import HYUNDAI_SAHARA_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -60,7 +60,7 @@ class TestHyundaiSaharaDehumidifier(
                     "name": "sensor_current_temperature",
                     "device_class": SensorDeviceClass.TEMPERATURE,
                     "state_class": "measurement",
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
             ]
         )

+ 5 - 5
tests/devices/test_inkbird_itc306a_thermostat.py

@@ -3,7 +3,7 @@ from homeassistant.components.climate.const import (
     ClimateEntityFeature,
     HVACAction,
 )
-from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT, TIME_HOURS
+from homeassistant.const import TIME_HOURS, UnitOfTemperature
 
 
 from ..const import INKBIRD_ITC306A_THERMOSTAT_PAYLOAD
@@ -108,7 +108,7 @@ class TestInkbirdThermostat(
                     "step": 0.1,
                     "min": -40,
                     "max": 100,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "number_low_temperature_limit",
@@ -117,7 +117,7 @@ class TestInkbirdThermostat(
                     "step": 0.1,
                     "min": -40,
                     "max": 100,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
             ]
         )
@@ -236,10 +236,10 @@ class TestInkbirdThermostat(
 
     def test_temperature_unit(self):
         self.dps[UNIT_DPS] = "F"
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
         self.dps[UNIT_DPS] = "C"
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
 
     def test_minimum_target_temperature(self):
         self.dps[UNIT_DPS] = "C"

+ 7 - 7
tests/devices/test_inkbird_itc308_thermostat.py

@@ -3,7 +3,7 @@ from homeassistant.components.climate.const import (
     ClimateEntityFeature,
     HVACAction,
 )
-from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT, TIME_MINUTES
+from homeassistant.const import TIME_MINUTES, UnitOfTemperature
 
 
 from ..const import INKBIRD_ITC308_THERMOSTAT_PAYLOAD
@@ -108,7 +108,7 @@ class TestInkbirdITC308Thermostat(
                     "step": 0.1,
                     "min": -50,
                     "max": 99.9,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "number_low_temperature_limit",
@@ -117,7 +117,7 @@ class TestInkbirdITC308Thermostat(
                     "step": 0.1,
                     "min": -50,
                     "max": 99.9,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "number_cooling_hysteresis",
@@ -126,7 +126,7 @@ class TestInkbirdITC308Thermostat(
                     "step": 0.1,
                     "min": 0.3,
                     "max": 15.0,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "number_heating_hysteresis",
@@ -135,7 +135,7 @@ class TestInkbirdITC308Thermostat(
                     "step": 0.1,
                     "min": 0.3,
                     "max": 15.0,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
             ]
         )
@@ -201,10 +201,10 @@ class TestInkbirdITC308Thermostat(
 
     def test_temperature_unit(self):
         self.dps[UNIT_DPS] = "F"
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
         self.dps[UNIT_DPS] = "C"
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
 
     def test_hvac_action(self):
         self.dps[STATUS_DPS] = "1"

+ 3 - 3
tests/devices/test_inkbird_sousvide.py

@@ -4,7 +4,7 @@ from homeassistant.components.climate.const import (
     HVACAction,
     HVACMode,
 )
-from homeassistant.const import TIME_MINUTES, TEMP_CELSIUS, TEMP_FAHRENHEIT
+from homeassistant.const import TIME_MINUTES, UnitOfTemperature
 
 from ..const import INKBIRD_SOUSVIDE_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -121,9 +121,9 @@ class TestInkbirdSousVideCooker(
 
     def test_temperature_unit(self):
         self.dps[UNIT_DPS] = True
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
         self.dps[UNIT_DPS] = False
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
     def test_current_temperature(self):
         self.dps[CURRENTTEMP_DPS] = 522

+ 3 - 4
tests/devices/test_ips_pro_heatpump.py

@@ -7,8 +7,7 @@ from homeassistant.components.climate.const import (
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
     PERCENTAGE,
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
+    UnitOfTemperature,
 )
 
 from ..const import IPS_HEATPUMP_PAYLOAD
@@ -81,9 +80,9 @@ class TestIpsProHeatpump(
 
     def test_temperature_unit(self):
         self.dps[UNITS_DPS] = False
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
         self.dps[UNITS_DPS] = True
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
 
     def test_minimum_fahrenheit_temperature(self):
         self.dps[UNITS_DPS] = False

+ 6 - 7
tests/devices/test_jiahong_et72w_thermostat.py

@@ -9,8 +9,7 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import (
     ENERGY_KILO_WATT_HOUR,
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
+    UnitOfTemperature,
 )
 from ..const import JIAHONG_ET72W_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -103,7 +102,7 @@ class TestJiahongEt72wThermostat(
             max=40.0,
             step=0.5,
             scale=10,
-            unit=TEMP_CELSIUS,
+            unit=UnitOfTemperature.CELSIUS,
         )
         self.setUpMultiSensors(
             [
@@ -112,7 +111,7 @@ class TestJiahongEt72wThermostat(
                     "name": "sensor_room_temperature",
                     "device_class": SensorDeviceClass.TEMPERATURE,
                     "state_class": STATE_CLASS_MEASUREMENT,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                     "testdata": (195, 19.5),
                 },
                 {
@@ -120,7 +119,7 @@ class TestJiahongEt72wThermostat(
                     "name": "sensor_floor_temperature",
                     "device_class": SensorDeviceClass.TEMPERATURE,
                     "state_class": STATE_CLASS_MEASUREMENT,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                     "testdata": (214, 21.4),
                 },
                 {
@@ -153,14 +152,14 @@ class TestJiahongEt72wThermostat(
         self.dps[UNIT_DPS] = False
         self.assertEqual(
             self.subject.temperature_unit,
-            TEMP_CELSIUS,
+            UnitOfTemperature.CELSIUS,
         )
         self.assertEqual(self.subject.target_temperature_step, 0.5)
 
         self.dps[UNIT_DPS] = True
         self.assertEqual(
             self.subject.temperature_unit,
-            TEMP_FAHRENHEIT,
+            UnitOfTemperature.FAHRENHEIT,
         )
         self.assertEqual(self.subject.target_temperature_step, 3.0)
 

+ 2 - 2
tests/devices/test_jjpro_jpd01_dehumidifier.py

@@ -5,7 +5,7 @@ from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
     PERCENTAGE,
     TIME_HOURS,
-    TEMP_CELSIUS,
+    UnitOfTemperature,
 )
 from ..const import JJPRO_JPD01_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -79,7 +79,7 @@ class TestJJProJPD01Dehumidifier(
                     "name": "sensor_current_temperature",
                     "device_class": SensorDeviceClass.TEMPERATURE,
                     "state_class": "measurement",
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
             ]
         )

+ 3 - 3
tests/devices/test_kogan_kawfpac09ya_airconditioner.py

@@ -2,7 +2,7 @@ from homeassistant.components.climate.const import (
     ClimateEntityFeature,
     HVACMode,
 )
-from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT
+from homeassistant.const import UnitOfTemperature
 
 from ..const import KOGAN_KAWFPAC09YA_AIRCON_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -55,9 +55,9 @@ class TestKoganKAWFPAC09YA(TargetTemperatureTests, TuyaDeviceTestCase):
 
     def test_temperature_unit(self):
         self.dps[UNIT_DPS] = "C"
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
         self.dps[UNIT_DPS] = "F"
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
     def test_minimum_target_temperature_f(self):
         self.dps[UNIT_DPS] = "F"

+ 10 - 11
tests/devices/test_madimack_elitev3_heatpump.py

@@ -5,8 +5,7 @@ from homeassistant.components.climate.const import (
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
     PERCENTAGE,
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
+    UnitOfTemperature,
 )
 
 from ..const import MADIMACK_ELITEV3_HEATPUMP_PAYLOAD
@@ -68,43 +67,43 @@ class TestMadimackEliteV3Heatpump(
                     "name": "sensor_evaporator_coil_pipe_temperature",
                     "dps": COILTEMP_DPS,
                     "device_class": SensorDeviceClass.TEMPERATURE,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "sensor_exhaust_gas_temperature",
                     "dps": EXHAUSTTEMP_DPS,
                     "device_class": SensorDeviceClass.TEMPERATURE,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "sensor_outlet_water_temperature",
                     "dps": OUTLETTEMP_DPS,
                     "device_class": SensorDeviceClass.TEMPERATURE,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "sensor_ambient_temperature",
                     "dps": AMBIENTTEMP_DPS,
                     "device_class": SensorDeviceClass.TEMPERATURE,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "sensor_return_gas_temperature",
                     "dps": RETURNGASTEMP_DPS,
                     "device_class": SensorDeviceClass.TEMPERATURE,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "sensor_cooling_coil_pipe_temperature",
                     "dps": COOLCOILTEMP_DPS,
                     "device_class": SensorDeviceClass.TEMPERATURE,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "sensor_cooling_plate_temperature",
                     "dps": COOLPLATETEMP_DPS,
                     "device_class": SensorDeviceClass.TEMPERATURE,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "sensor_eev_opening",
@@ -148,9 +147,9 @@ class TestMadimackEliteV3Heatpump(
 
     def test_temperature_unit(self):
         self.dps[UNIT_DPS] = "c"
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
         self.dps[UNIT_DPS] = "f"
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
     def test_minimum_target_temperature(self):
         self.dps[TEMPMIN_DPS] = 60

+ 7 - 8
tests/devices/test_madimack_heatpump.py

@@ -7,8 +7,7 @@ from homeassistant.components.climate.const import (
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
     PERCENTAGE,
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
+    UnitOfTemperature,
 )
 
 from ..const import MADIMACK_HEATPUMP_PAYLOAD
@@ -90,19 +89,19 @@ class TestMadimackPoolHeatpump(
                     "dps": COIL_DPS,
                     "name": "sensor_evaporator_coil_pipe_temperature",
                     "device_class": SensorDeviceClass.TEMPERATURE,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "dps": EXHAUST_DPS,
                     "name": "sensor_exhaust_gas_temperature",
                     "device_class": SensorDeviceClass.TEMPERATURE,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "dps": AMBIENT_DPS,
                     "name": "sensor_ambient_temperature",
                     "device_class": SensorDeviceClass.TEMPERATURE,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "dps": COMPRESSOR_DPS,
@@ -114,7 +113,7 @@ class TestMadimackPoolHeatpump(
                     "dps": COOLINGPLATE_DPS,
                     "name": "sensor_cooling_plate_temperature",
                     "device_class": SensorDeviceClass.TEMPERATURE,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "dps": EEV_DPS,
@@ -167,9 +166,9 @@ class TestMadimackPoolHeatpump(
 
     def test_temperature_unit(self):
         self.dps[UNITS_DPS] = False
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
         self.dps[UNITS_DPS] = True
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
 
     def test_minimum_fahrenheit_temperature(self):
         self.dps[UNITS_DPS] = False

+ 8 - 11
tests/devices/test_minco_mh1823d_thermostat.py

@@ -4,10 +4,7 @@ from homeassistant.components.climate.const import (
     HVACMode,
 )
 from homeassistant.components.sensor import SensorDeviceClass
-from homeassistant.const import (
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
-)
+from homeassistant.const import UnitOfTemperature
 
 from ..const import MINCO_MH1823D_THERMOSTAT_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -71,7 +68,7 @@ class TestMincoMH1823DThermostat(
         self.setUpBasicSensor(
             EXTERNTEMP_DPS,
             self.entities.get("sensor_external_temperature"),
-            unit=TEMP_CELSIUS,
+            unit=UnitOfTemperature.CELSIUS,
             device_class=SensorDeviceClass.TEMPERATURE,
             state_class="measurement",
             testdata=(300, 30.0),
@@ -84,28 +81,28 @@ class TestMincoMH1823DThermostat(
                     "dps": CALIBINT_DPS,
                     "min": -9,
                     "max": 9,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "number_calibration_offset_external",
                     "dps": CALIBEXT_DPS,
                     "min": -9,
                     "max": 9,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "number_calibration_swing",
                     "dps": CALIBSWING_DPS,
                     "min": 1,
                     "max": 9,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "number_high_temperature_limit",
                     "dps": TEMPLIMIT_DPS,
                     "min": 5,
                     "max": 65,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
             ]
         )
@@ -173,9 +170,9 @@ class TestMincoMH1823DThermostat(
 
     def test_temperature_unit(self):
         self.dps[UNIT_DPS] = "c"
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
         self.dps[UNIT_DPS] = "f"
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
     def test_target_temperature_f(self):
         self.dps[TEMPF_DPS] = 70

+ 2 - 2
tests/devices/test_moes_temp_humidity.py

@@ -1,5 +1,5 @@
 from homeassistant.components.sensor import SensorDeviceClass
-from homeassistant.const import TEMP_CELSIUS, TIME_SECONDS
+from homeassistant.const import TIME_SECONDS, UnitOfTemperature
 
 from ..const import MOES_TEMP_HUMID_PAYLOAD
 from ..mixins.number import MultiNumberTests
@@ -44,7 +44,7 @@ class TestMoesTempHumidity(
         self.setUpBasicSensor(
             TEMP_DPS,
             self.entities.get("sensor_current_temperature"),
-            unit=TEMP_CELSIUS,
+            unit=UnitOfTemperature.CELSIUS,
             device_class=SensorDeviceClass.TEMPERATURE,
             state_class="measurement",
             testdata=(251, 25.1),

+ 0 - 3
tests/devices/test_nashone_mts700wb_thermostat.py

@@ -1,11 +1,8 @@
 from homeassistant.components.climate.const import (
     ClimateEntityFeature,
-    HVACAction,
     HVACMode,
 )
 from homeassistant.const import (
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
     TIME_MINUTES,
 )
 

+ 3 - 3
tests/devices/test_owon_pct513_thermostat.py

@@ -4,7 +4,7 @@ from homeassistant.components.climate.const import (
     HVACMode,
 )
 
-from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT
+from homeassistant.const import UnitOfTemperature
 
 from ..const import OWON_PCT513_THERMOSTAT_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -75,9 +75,9 @@ class TestOwonPCT513Thermostat(
 
     def test_temperature_unit(self):
         self.dps[UNIT_DPS] = "c"
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
         self.dps[UNIT_DPS] = "f"
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
     def test_current_temperature(self):
         self.dps[UNIT_DPS] = "c"

+ 2 - 2
tests/devices/test_parkside_plgs2012a1_smart_charger.py

@@ -3,8 +3,8 @@ from homeassistant.const import (
     ELECTRIC_CURRENT_MILLIAMPERE,
     ELECTRIC_POTENTIAL_VOLT,
     PERCENTAGE,
-    TEMP_CELSIUS,
     TIME_MINUTES,
+    UnitOfTemperature,
 )
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -106,7 +106,7 @@ class TestParksidePLGS2012A1Charger(
                 {
                     "name": "sensor_current_temperature",
                     "dps": TEMPERATURE_DPS,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                     "device_class": SensorDeviceClass.TEMPERATURE,
                     "state_class": STATE_CLASS_MEASUREMENT,
                 },

+ 2 - 2
tests/devices/test_pc321ty_energy_meter.py

@@ -10,7 +10,7 @@ from homeassistant.const import (
     ENERGY_KILO_WATT_HOUR,
     FREQUENCY_HERTZ,
     POWER_WATT,
-    TEMP_CELSIUS,
+    UnitOfTemperature,
 )
 
 from ..const import PC321TY_POWERCLAMP_PAYLOAD
@@ -196,7 +196,7 @@ class TestPC321TYPowerClamp(MultiSensorTests, TuyaDeviceTestCase):
                 {
                     "dps": TEMPERATURE_DP,
                     "name": "sensor_temperature",
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                     "device_class": SensorDeviceClass.TEMPERATURE,
                     "state_class": STATE_CLASS_MEASUREMENT,
                     "testdata": (234, 23.4),

+ 5 - 5
tests/devices/test_saswell_c16_thermostat.py

@@ -6,7 +6,7 @@ from homeassistant.components.climate.const import (
     PRESET_HOME,
 )
 from homeassistant.components.sensor import SensorDeviceClass
-from homeassistant.const import POWER_WATT, TEMP_CELSIUS
+from homeassistant.const import POWER_WATT, UnitOfTemperature
 
 from ..const import SASWELL_C16_THERMOSTAT_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -69,7 +69,7 @@ class TestSaswellC16Thermostat(
             self.entities.get("sensor_floor_temperature"),
             device_class=SensorDeviceClass.TEMPERATURE,
             state_class="measurement",
-            unit=TEMP_CELSIUS,
+            unit=UnitOfTemperature.CELSIUS,
             testdata=(218, 21.8),
         )
         self.setUpBasicSwitch(ADAPTIVE_DPS, self.entities.get("switch_adaptive"))
@@ -82,7 +82,7 @@ class TestSaswellC16Thermostat(
                     "max": 50.0,
                     "scale": 10,
                     "step": 0.5,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "number_power_rating",
@@ -97,7 +97,7 @@ class TestSaswellC16Thermostat(
                     "max": 5.0,
                     "scale": 10,
                     "step": 0.5,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "name": "number_floor_temperature_calibration",
@@ -106,7 +106,7 @@ class TestSaswellC16Thermostat(
                     "max": 5.0,
                     "scale": 10,
                     "step": 0.5,
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
             ]
         )

+ 3 - 3
tests/devices/test_saswell_t29utk_thermostat.py

@@ -7,7 +7,7 @@ from homeassistant.components.climate.const import (
     PRESET_AWAY,
     PRESET_HOME,
 )
-from homeassistant.const import TEMP_CELSIUS, TEMP_FAHRENHEIT
+from homeassistant.const import UnitOfTemperature
 
 from ..const import SASWELL_T29UTK_THERMOSTAT_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -96,10 +96,10 @@ class TestSaswellT29UTKThermostat(
 
     def test_temperature_unit(self):
         self.dps[UNITS_DPS] = "C"
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
 
         self.dps[UNITS_DPS] = "F"
-        self.assertEqual(self.subject.temperature_unit, TEMP_FAHRENHEIT)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.FAHRENHEIT)
 
     def test_target_temperature_step_f(self):
         self.dps[UNITS_DPS] = "F"

+ 2 - 2
tests/devices/test_wilfa_haze_hu400bc_humidifier.py

@@ -6,7 +6,7 @@ from homeassistant.components.humidifier.const import (
 )
 from homeassistant.components.sensor import SensorDeviceClass
 
-from homeassistant.const import PERCENTAGE, TEMP_CELSIUS
+from homeassistant.const import PERCENTAGE, UnitOfTemperature
 
 from ..const import WILFA_HAZE_HUMIDIFIER_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -109,7 +109,7 @@ class TestWilfaHazeHumidifier(
                     "name": "sensor_current_temperature",
                     "device_class": SensorDeviceClass.TEMPERATURE,
                     "state_class": "measurement",
-                    "unit": TEMP_CELSIUS,
+                    "unit": UnitOfTemperature.CELSIUS,
                 },
                 {
                     "dps": CURRENTHUMID_DPS,

+ 2 - 2
tests/test_device.py

@@ -4,7 +4,7 @@ from time import sleep, time
 from unittest import IsolatedAsyncioTestCase
 from unittest.mock import AsyncMock, call, patch
 
-from homeassistant.const import TEMP_CELSIUS
+from homeassistant.const import UnitOfTemperature
 
 from custom_components.tuya_local.device import TuyaLocalDevice
 
@@ -61,7 +61,7 @@ class TestDevice(IsolatedAsyncioTestCase):
         self.assertFalse(self.subject.has_returned_state)
 
     def test_temperature_unit(self):
-        self.assertEqual(self.subject.temperature_unit, TEMP_CELSIUS)
+        self.assertEqual(self.subject.temperature_unit, UnitOfTemperature.CELSIUS)
 
     async def test_refreshes_state_if_no_cached_state_exists(self):
         self.subject._cached_state = {}