Remove Ohme energy sensor (#174664)

homeassistant/components/ohme/sensor.py

@@ -17,7 +17,6 @@ from homeassistant.const import (
     STATE_UNKNOWN,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
-    UnitOfEnergy,
     UnitOfPower,
 )
 from homeassistant.core import HomeAssistant
@@ -60,15 +59,6 @@ SENSORS = [
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda client: client.power.watts,
     ),
-    OhmeSensorDescription(
-        key="energy",
-        device_class=SensorDeviceClass.ENERGY,
-        native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        suggested_display_precision=1,
-        state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda client: client.energy,
-    ),
     OhmeSensorDescription(
         key="voltage",
         device_class=SensorDeviceClass.VOLTAGE,

tests/components/ohme/conftest.py

@@ -63,7 +63,6 @@ def mock_client():
         client.ct_connected = True
         client.cap_available = True
         client.cap_enabled = True
-        client.energy = 1000
         client.device_info = {
             "name": "Ohme Home Pro",
             "model": "Home Pro",

tests/components/ohme/snapshots/test_sensor.ambr

@@ -107,67 +107,6 @@
     'state': '0',
   })
 # ---
-# name: test_sensors[sensor.ohme_home_pro_energy-entry]
-  EntityRegistryEntrySnapshot({
-    'aliases': list([
-      None,
-    ]),
-    'area_id': None,
-    'capabilities': dict({
-      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-    }),
-    'config_entry_id': <ANY>,
-    'config_subentry_id': <ANY>,
-    'device_class': None,
-    'device_id': <ANY>,
-    'disabled_by': None,
-    'domain': 'sensor',
-    'entity_category': None,
-    'entity_id': 'sensor.ohme_home_pro_energy',
-    'has_entity_name': True,
-    'hidden_by': None,
-    'icon': None,
-    'id': <ANY>,
-    'labels': set({
-    }),
-    'name': None,
-    'object_id_base': 'Energy',
-    'options': dict({
-      'sensor': dict({
-        'suggested_display_precision': 1,
-      }),
-      'sensor.private': dict({
-        'suggested_unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-      }),
-    }),
-    'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
-    'original_icon': None,
-    'original_name': 'Energy',
-    'platform': 'ohme',
-    'previous_unique_id': None,
-    'suggested_object_id': None,
-    'supported_features': 0,
-    'translation_key': None,
-    'unique_id': 'chargerid_energy',
-    'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-  })
-# ---
-# name: test_sensors[sensor.ohme_home_pro_energy-state]
-  StateSnapshot({
-    'attributes': ReadOnlyDict({
-      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'energy',
-      <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Ohme Home Pro Energy',
-      <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
-    }),
-    'context': <ANY>,
-    'entity_id': 'sensor.ohme_home_pro_energy',
-    'last_changed': <ANY>,
-    'last_reported': <ANY>,
-    'last_updated': <ANY>,
-    'state': '1.0',
-  })
-# ---
 # name: test_sensors[sensor.ohme_home_pro_power-entry]
   EntityRegistryEntrySnapshot({
     'aliases': list([

tests/components/ohme/test_sensor.py

@@ -41,15 +41,15 @@ async def test_sensors_unavailable(
     """Test that sensors show as unavailable after a coordinator failure."""
     await setup_integration(hass, mock_config_entry)
 
-    state = hass.states.get("sensor.ohme_home_pro_energy")
-    assert state.state == "1.0"
+    state = hass.states.get("sensor.ohme_home_pro_status")
+    assert state.state == "charging"
 
     mock_client.async_get_charge_session.side_effect = ApiException
     freezer.tick(timedelta(seconds=60))
     async_fire_time_changed(hass)
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    state = hass.states.get("sensor.ohme_home_pro_energy")
+    state = hass.states.get("sensor.ohme_home_pro_status")
     assert state.state == STATE_UNAVAILABLE
 
     mock_client.async_get_charge_session.side_effect = None
@@ -57,5 +57,5 @@ async def test_sensors_unavailable(
     async_fire_time_changed(hass)
     await hass.async_block_till_done(wait_background_tasks=True)
 
-    state = hass.states.get("sensor.ohme_home_pro_energy")
-    assert state.state == "1.0"
+    state = hass.states.get("sensor.ohme_home_pro_status")
+    assert state.state == "charging"