Fix units for Shelly TopAC EVE01-11 sensors (home-assistant#154740)

Author: bieniu

homeassistant/components/shelly/sensor.py

@@ -1554,8 +1554,7 @@ def __init__(
     "number_energy_charge": RpcSensorDescription(
         key="number",
         sub_key="value",
-        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         suggested_display_precision=2,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL,
@@ -1599,8 +1598,7 @@ def __init__(
         key="object",
         sub_key="value",
         value=lambda status, _: float(status["counter"]["total"]),
-        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         suggested_display_precision=2,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
@@ -1611,8 +1609,7 @@ def __init__(
         sub_key="value",
         name="Total Active Energy",
         value=lambda status, _: float(status["total_act_energy"]),
-        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         suggested_display_precision=2,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
@@ -1623,8 +1620,7 @@ def __init__(
         sub_key="value",
         name="Total Power",
         value=lambda status, _: float(status["total_power"]),
-        native_unit_of_measurement=UnitOfPower.WATT,
-        suggested_unit_of_measurement=UnitOfPower.KILO_WATT,
+        native_unit_of_measurement=UnitOfPower.KILO_WATT,
         suggested_display_precision=2,
         device_class=SensorDeviceClass.POWER,
         state_class=SensorStateClass.MEASUREMENT,

tests/components/shelly/snapshots/test_sensor.ambr

@@ -307,9 +307,6 @@
       'sensor': dict({
         'suggested_display_precision': 2,
       }),
-      'sensor.private': dict({
-        'suggested_unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-      }),
     }),
     'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
     'original_icon': None,

tests/components/shelly/test_sensor.py

@@ -1714,7 +1714,7 @@ async def test_rpc_shelly_ev_sensors(
     }
     config["number:201"] = {
         "name": "Session energy",
-        "meta": {"ui": {"unit": "Wh", "view": "label"}},
+        "meta": {"ui": {"unit": "kWh", "view": "label"}},
         "role": "energy_charge",
     }
     config["number:202"] = {
@@ -1726,7 +1726,7 @@ async def test_rpc_shelly_ev_sensors(
 
     status = deepcopy(mock_rpc_device.status)
     status["number:200"] = {"value": "charger_charging"}
-    status["number:201"] = {"value": 5000}
+    status["number:201"] = {"value": 5.0}
     status["number:202"] = {"value": 60}
     monkeypatch.setattr(mock_rpc_device, "status", status)