Use new UnitOfEnergy and UnitOfPower enums.

Issue #260

tests/devices/test_compteur_energy_meter.py

@@ -7,8 +7,8 @@ from homeassistant.components.sensor import (
 from homeassistant.const import (
     ELECTRIC_CURRENT_AMPERE,
     ELECTRIC_POTENTIAL_VOLT,
-    ENERGY_KILO_WATT_HOUR,
-    POWER_WATT,
+    UnitOfEnergy,
+    UnitOfPower,
 )
 
 from ..const import COMPTEUR_SMARTMETER_PAYLOAD
@@ -41,7 +41,7 @@ class TestCompteurEnergyMeter(MultiSensorTests, TuyaDeviceTestCase):
                 {
                     "dps": ENERGY_DP,
                     "name": "sensor",
-                    "unit": ENERGY_KILO_WATT_HOUR,
+                    "unit": UnitOfEnergy.KILO_WATT_HOUR,
                     "device_class": SensorDeviceClass.ENERGY,
                     "state_class": STATE_CLASS_TOTAL_INCREASING,
                     "testdata": (12345, 12.345),
@@ -65,7 +65,7 @@ class TestCompteurEnergyMeter(MultiSensorTests, TuyaDeviceTestCase):
                 {
                     "dps": POWER_DP,
                     "name": "sensor_power",
-                    "unit": POWER_WATT,
+                    "unit": UnitOfPower.WATT,
                     "state_class": STATE_CLASS_MEASUREMENT,
                     "device_class": SensorDeviceClass.POWER,
                     "testdata": (890, 89.0),

tests/devices/test_digoo_dgsp202.py

@@ -4,8 +4,8 @@ from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
     ELECTRIC_CURRENT_MILLIAMPERE,
     ELECTRIC_POTENTIAL_VOLT,
-    POWER_WATT,
     TIME_MINUTES,
+    UnitOfPower,
 )
 
 from ..const import DIGOO_DGSP202_SOCKET_PAYLOAD
@@ -84,7 +84,7 @@ class TestDigooDGSP202Switch(
                 {
                     "name": "sensor_power",
                     "dps": POWER_DPS,
-                    "unit": POWER_WATT,
+                    "unit": UnitOfPower.WATT,
                     "device_class": SensorDeviceClass.POWER,
                     "state_class": "measurement",
                     "testdata": (1234, 123.4),

tests/devices/test_energy_monitoring_powerstrip.py

@@ -4,7 +4,7 @@ from homeassistant.components.switch import SwitchDeviceClass
 from homeassistant.const import (
     ELECTRIC_CURRENT_MILLIAMPERE,
     ELECTRIC_POTENTIAL_VOLT,
-    POWER_WATT,
+    UnitOfPower,
 )
 
 from ..const import ENERGY_POWERSTRIP_PAYLOAD
@@ -74,7 +74,7 @@ class TestEnergyMonitoringPowerstrip(
                     "name": "sensor_power",
                     "dps": POWER_DP,
                     "device_class": SensorDeviceClass.POWER,
-                    "unit": POWER_WATT,
+                    "unit": UnitOfPower.WATT,
                     "state_class": STATE_CLASS_MEASUREMENT,
                     "testdata": (1234, 123.4),
                 },

tests/devices/test_grid_connect_double_power_point.py

@@ -4,9 +4,9 @@ from homeassistant.components.switch import SwitchDeviceClass
 from homeassistant.const import (
     ELECTRIC_CURRENT_MILLIAMPERE,
     ELECTRIC_POTENTIAL_VOLT,
-    ENERGY_WATT_HOUR,
-    POWER_WATT,
     TIME_SECONDS,
+    UnitOfEnergy,
+    UnitOfPower,
 )
 
 from ..const import GRIDCONNECT_2SOCKET_PAYLOAD
@@ -90,7 +90,7 @@ class TestGridConnectDoubleSwitch(
                     "name": "sensor_energy",
                     "dps": ENERGY_DPS,
                     "device_class": SensorDeviceClass.ENERGY,
-                    "unit": ENERGY_WATT_HOUR,
+                    "unit": UnitOfEnergy.WATT_HOUR,
                     "state_class": "total_increasing",
                 },
                 {
@@ -104,7 +104,7 @@ class TestGridConnectDoubleSwitch(
                     "name": "sensor_power",
                     "dps": POWER_DPS,
                     "device_class": SensorDeviceClass.POWER,
-                    "unit": POWER_WATT,
+                    "unit": UnitOfPower.WATT,
                     "state_class": "measurement",
                     "testdata": (1234, 123.4),
                 },

tests/devices/test_jiahong_et72w_thermostat.py

@@ -8,7 +8,7 @@ from homeassistant.components.sensor import (
     STATE_CLASS_TOTAL_INCREASING,
 )
 from homeassistant.const import (
-    ENERGY_KILO_WATT_HOUR,
+    UnitOfEnergy,
     UnitOfTemperature,
 )
 from ..const import JIAHONG_ET72W_PAYLOAD
@@ -127,7 +127,7 @@ class TestJiahongEt72wThermostat(
                     "name": "sensor_energy",
                     "device_class": SensorDeviceClass.ENERGY,
                     "state_class": STATE_CLASS_TOTAL_INCREASING,
-                    "unit": ENERGY_KILO_WATT_HOUR,
+                    "unit": UnitOfEnergy.KILO_WATT_HOUR,
                     "testdata": (1234, 123.4),
                 },
             ]

tests/devices/test_moes_rgb_socket.py

@@ -9,8 +9,8 @@ from homeassistant.components.switch import SwitchDeviceClass
 from homeassistant.const import (
     ELECTRIC_CURRENT_MILLIAMPERE,
     ELECTRIC_POTENTIAL_VOLT,
-    POWER_WATT,
     TIME_MINUTES,
+    UnitOfPower,
 )
 
 from ..const import MOES_RGB_SOCKET_PAYLOAD
@@ -83,7 +83,7 @@ class TestMoesRGBWSocket(
                 {
                     "name": "sensor_power",
                     "dps": POWER_DPS,
-                    "unit": POWER_WATT,
+                    "unit": UnitOfPower.WATT,
                     "device_class": SensorDeviceClass.POWER,
                     "state_class": "measurement",
                     "testdata": (1234, 123.4),

tests/devices/test_pc321ty_energy_meter.py

@@ -7,9 +7,9 @@ from homeassistant.components.sensor import (
 from homeassistant.const import (
     ELECTRIC_CURRENT_AMPERE,
     ELECTRIC_POTENTIAL_VOLT,
-    ENERGY_KILO_WATT_HOUR,
     FREQUENCY_HERTZ,
-    POWER_WATT,
+    UnitOfEnergy,
+    UnitOfPower,
     UnitOfTemperature,
 )
 
@@ -52,7 +52,7 @@ class TestPC321TYPowerClamp(MultiSensorTests, TuyaDeviceTestCase):
                 {
                     "dps": TOTALENERGY_DP,
                     "name": "sensor",
-                    "unit": ENERGY_KILO_WATT_HOUR,
+                    "unit": UnitOfEnergy.KILO_WATT_HOUR,
                     "device_class": SensorDeviceClass.ENERGY,
                     "state_class": STATE_CLASS_TOTAL_INCREASING,
                     "testdata": (12345, 123.45),
@@ -76,7 +76,7 @@ class TestPC321TYPowerClamp(MultiSensorTests, TuyaDeviceTestCase):
                 {
                     "dps": POWER1_DP,
                     "name": "sensor_power_a",
-                    "unit": POWER_WATT,
+                    "unit": UnitOfPower.WATT,
                     "state_class": STATE_CLASS_MEASUREMENT,
                     "device_class": SensorDeviceClass.POWER,
                 },
@@ -90,7 +90,7 @@ class TestPC321TYPowerClamp(MultiSensorTests, TuyaDeviceTestCase):
                 {
                     "dps": ENERGY1_DP,
                     "name": "sensor_energy_a",
-                    "unit": ENERGY_KILO_WATT_HOUR,
+                    "unit": UnitOfEnergy.KILO_WATT_HOUR,
                     "device_class": SensorDeviceClass.ENERGY,
                     "state_class": STATE_CLASS_TOTAL_INCREASING,
                     "testdata": (12345, 123.45),
@@ -114,7 +114,7 @@ class TestPC321TYPowerClamp(MultiSensorTests, TuyaDeviceTestCase):
                 {
                     "dps": POWER2_DP,
                     "name": "sensor_power_b",
-                    "unit": POWER_WATT,
+                    "unit": UnitOfPower.WATT,
                     "device_class": SensorDeviceClass.POWER,
                     "state_class": STATE_CLASS_MEASUREMENT,
                 },
@@ -128,7 +128,7 @@ class TestPC321TYPowerClamp(MultiSensorTests, TuyaDeviceTestCase):
                 {
                     "dps": ENERGY2_DP,
                     "name": "sensor_energy_b",
-                    "unit": ENERGY_KILO_WATT_HOUR,
+                    "unit": UnitOfEnergy.KILO_WATT_HOUR,
                     "device_class": SensorDeviceClass.ENERGY,
                     "state_class": STATE_CLASS_TOTAL_INCREASING,
                     "testdata": (12345, 123.45),
@@ -152,7 +152,7 @@ class TestPC321TYPowerClamp(MultiSensorTests, TuyaDeviceTestCase):
                 {
                     "dps": POWER3_DP,
                     "name": "sensor_power_c",
-                    "unit": POWER_WATT,
+                    "unit": UnitOfPower.WATT,
                     "state_class": STATE_CLASS_MEASUREMENT,
                     "device_class": SensorDeviceClass.POWER,
                 },
@@ -166,7 +166,7 @@ class TestPC321TYPowerClamp(MultiSensorTests, TuyaDeviceTestCase):
                 {
                     "dps": ENERGY3_DP,
                     "name": "sensor_energy_c",
-                    "unit": ENERGY_KILO_WATT_HOUR,
+                    "unit": UnitOfEnergy.KILO_WATT_HOUR,
                     "device_class": SensorDeviceClass.ENERGY,
                     "state_class": STATE_CLASS_TOTAL_INCREASING,
                     "testdata": (12345, 123.45),
@@ -182,7 +182,7 @@ class TestPC321TYPowerClamp(MultiSensorTests, TuyaDeviceTestCase):
                 {
                     "dps": TOTALPOWER_DP,
                     "name": "sensor_total_active_power",
-                    "unit": POWER_WATT,
+                    "unit": UnitOfPower.WATT,
                     "state_class": STATE_CLASS_MEASUREMENT,
                     "device_class": SensorDeviceClass.POWER,
                 },

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, UnitOfTemperature
+from homeassistant.const import UnitOfPower, UnitOfTemperature
 
 from ..const import SASWELL_C16_THERMOSTAT_PAYLOAD
 from ..helpers import assert_device_properties_set
@@ -88,7 +88,7 @@ class TestSaswellC16Thermostat(
                     "name": "number_power_rating",
                     "dps": POWERRATING_DPS,
                     "max": 3500,
-                    "unit": POWER_WATT,
+                    "unit": UnitOfPower.WATT,
                 },
                 {
                     "name": "number_room_temperature_calibration",

tests/devices/test_smartmcb_smt006_energymeter.py

@@ -5,9 +5,7 @@ from homeassistant.components.sensor import (
     STATE_CLASS_TOTAL,
     STATE_CLASS_TOTAL_INCREASING,
 )
-from homeassistant.const import (
-    ENERGY_KILO_WATT_HOUR,
-)
+from homeassistant.const import UnitOfEnergy
 
 from ..const import SMARTMCB_SMT006_METER_PAYLOAD
 from ..mixins.binary_sensor import MultiBinarySensorTests
@@ -66,7 +64,7 @@ class TestSmartMcbSMT006EnergyMeter(
                     "name": "sensor_energy",
                     "dps": TOTALENERGY_DPS,
                     "device_class": SensorDeviceClass.ENERGY,
-                    "unit": ENERGY_KILO_WATT_HOUR,
+                    "unit": UnitOfEnergy.KILO_WATT_HOUR,
                     "state_class": STATE_CLASS_TOTAL_INCREASING,
                     "testdata": (123456, 1234.56),
                 },
@@ -74,7 +72,7 @@ class TestSmartMcbSMT006EnergyMeter(
                     "name": "sensor_balance_energy",
                     "dps": BALANCE_DPS,
                     "device_class": SensorDeviceClass.ENERGY,
-                    "unit": ENERGY_KILO_WATT_HOUR,
+                    "unit": UnitOfEnergy.KILO_WATT_HOUR,
                     "state_class": STATE_CLASS_TOTAL,
                     "testdata": (123456, 1234.56),
                 },
@@ -183,7 +181,7 @@ class TestSmartMcbSMT006EnergyMeter(
                     "dps": ERROR_DPS,
                     "device_class": BinarySensorDeviceClass.PLUG,
                     "testdata": (0, 65536),
-                    "unit": ENERGY_KILO_WATT_HOUR,
+                    "unit": UnitOfEnergy.KILO_WATT_HOUR,
                 },
             ],
         )

tests/devices/test_smartplugv1.py

@@ -4,8 +4,8 @@ from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
     ELECTRIC_CURRENT_MILLIAMPERE,
     ELECTRIC_POTENTIAL_VOLT,
-    POWER_WATT,
     TIME_MINUTES,
+    UnitOfPower,
 )
 
 from ..const import KOGAN_SOCKET_PAYLOAD
@@ -57,7 +57,7 @@ class TestKoganSwitch(
                 {
                     "name": "sensor_power",
                     "dps": POWER_DPS,
-                    "unit": POWER_WATT,
+                    "unit": UnitOfPower.WATT,
                     "device_class": SensorDeviceClass.POWER,
                     "state_class": "measurement",
                     "testdata": (1234, 123.4),

tests/devices/test_smartplugv2.py

@@ -4,8 +4,8 @@ from homeassistant.components.switch import SwitchDeviceClass
 from homeassistant.const import (
     ELECTRIC_CURRENT_MILLIAMPERE,
     ELECTRIC_POTENTIAL_VOLT,
-    POWER_WATT,
     TIME_MINUTES,
+    UnitOfPower,
 )
 
 from ..const import KOGAN_SOCKET_PAYLOAD2
@@ -57,7 +57,7 @@ class TestSwitchV2(
                 {
                     "name": "sensor_power",
                     "dps": POWER_DPS,
-                    "unit": POWER_WATT,
+                    "unit": UnitOfPower.WATT,
                     "device_class": SensorDeviceClass.POWER,
                     "state_class": "measurement",
                     "testdata": (1234, 123.4),

tests/devices/test_smartplugv2_energy.py

@@ -5,9 +5,9 @@ from homeassistant.components.switch import SwitchDeviceClass
 from homeassistant.const import (
     ELECTRIC_CURRENT_MILLIAMPERE,
     ELECTRIC_POTENTIAL_VOLT,
-    ENERGY_WATT_HOUR,
-    POWER_WATT,
     TIME_MINUTES,
+    UnitOfEnergy,
+    UnitOfPower,
 )
 
 from ..const import SMARTSWITCH_ENERGY_PAYLOAD
@@ -88,7 +88,7 @@ class TestSwitchV2Energy(
                 {
                     "name": "sensor_energy",
                     "dps": ENERGY_DPS,
-                    "unit": ENERGY_WATT_HOUR,
+                    "unit": UnitOfEnergy.WATT_HOUR,
                     "device_class": SensorDeviceClass.ENERGY,
                     "state_class": "total_increasing",
                 },
@@ -110,7 +110,7 @@ class TestSwitchV2Energy(
                 {
                     "name": "sensor_power",
                     "dps": POWER_DPS,
-                    "unit": POWER_WATT,
+                    "unit": UnitOfPower.WATT,
                     "device_class": SensorDeviceClass.POWER,
                     "state_class": "measurement",
                     "testdata": (1234, 123.4),