Merge pull request #103 from drc38/tests

tests: improve switch testing

Author: drc38

custom_components/ocpp/const.py

@@ -1,7 +1,9 @@
 """Define constants for OCPP integration."""
 import homeassistant.const as ha
 
-from ocpp.v16.enums import Measurand, UnitOfMeasure
+from ocpp.v16.enums import ChargePointStatus, Measurand, UnitOfMeasure
+
+from .enums import HAChargerServices, HAChargerStatuses
 
 DOMAIN = "ocpp"
 CONF_METER_INTERVAL = "meter_interval"
@@ -63,26 +65,32 @@
 HA_ENERGY_UNIT = UnitOfMeasure.kwh.value
 HA_POWER_UNIT = UnitOfMeasure.kw.value
 
-# Additional conditions/states to monitor
-CONDITIONS = [
-    "Status",
-    "Heartbeat",
-    "Error.Code",
-    "Stop.Reason",
-    "FW.Status",
-    "Session.Time",  # in min
-    "Session.Energy",  # in kWh
-    "Meter.Start",  # in kWh
-]
-
-# Additional general information to report
-GENERAL = [
-    "ID",
-    "Model",
-    "Vendor",
-    "Serial",
-    "FW.Version",
-    "Features",
-    "Connectors",
-    "Transaction.Id",
-]
+# Switch configuration definitions
+# At a minimum define switch name and on service call, pulse used to call a service once such as reset
+# metric and condition combination can be used to drive switch state, use default to set initial state to True
+SWITCH_CHARGE = {
+    "name": "Charge_Control",
+    "on": HAChargerServices.service_charge_start.name,
+    "off": HAChargerServices.service_charge_stop.name,
+    "metric": HAChargerStatuses.status.value,
+    "condition": ChargePointStatus.charging.value,
+}
+SWITCH_AVAILABILITY = {
+    "name": "Availability",
+    "on": HAChargerServices.service_availability.name,
+    "off": HAChargerServices.service_availability.name,
+    "default": True,
+    "metric": HAChargerStatuses.status.value,
+    "condition": ChargePointStatus.available.value,
+}
+SWITCH_RESET = {
+    "name": "Reset",
+    "on": HAChargerServices.service_reset.name,
+    "pulse": True,
+}
+SWITCH_UNLOCK = {
+    "name": "Unlock",
+    "on": HAChargerServices.service_unlock.name,
+    "pulse": True,
+}
+SWITCHES = [SWITCH_CHARGE, SWITCH_RESET, SWITCH_UNLOCK, SWITCH_AVAILABILITY]

custom_components/ocpp/switch.py

@@ -3,39 +3,8 @@
 
 from homeassistant.components.switch import SwitchEntity
 
-from ocpp.v16.enums import ChargePointStatus
-
 from .api import CentralSystem
-from .const import CONF_CPID, DOMAIN, ICON
-from .enums import HAChargerServices, HAChargerStatuses
-
-# At a minimum define switch name and on service call, pulse used to call a service once such as reset
-# metric and condition combination can be used to drive switch state, use default to set initial state to True
-SWITCH_CHARGE = {
-    "name": "Charge_Control",
-    "on": HAChargerServices.service_charge_start.name,
-    "off": HAChargerServices.service_charge_stop.name,
-    "metric": HAChargerStatuses.status.value,
-    "condition": ChargePointStatus.charging.value,
-}
-SWITCH_AVAILABILITY = {
-    "name": "Availability",
-    "on": HAChargerServices.service_availability.name,
-    "off": HAChargerServices.service_availability.name,
-    "default": True,
-    "metric": HAChargerStatuses.status.value,
-    "condition": ChargePointStatus.available.value,
-}
-SWITCH_RESET = {
-    "name": "Reset",
-    "on": HAChargerServices.service_reset.name,
-    "pulse": True,
-}
-SWITCH_UNLOCK = {
-    "name": "Unlock",
-    "on": HAChargerServices.service_unlock.name,
-    "pulse": True,
-}
+from .const import CONF_CPID, DOMAIN, ICON, SWITCHES
 
 
 async def async_setup_entry(hass, entry, async_add_devices):
@@ -45,7 +14,7 @@ async def async_setup_entry(hass, entry, async_add_devices):
 
     entities = []
 
-    for ent in [SWITCH_CHARGE, SWITCH_AVAILABILITY, SWITCH_RESET, SWITCH_UNLOCK]:
+    for ent in SWITCHES:
         entities.append(ChargePointSwitch(central_system, cp_id, ent))
 
     async_add_devices(entities, False)

setup.cfg

@@ -41,5 +41,5 @@ branch = False
 
 [coverage:report]
 show_missing = true
-fail_under = 80
+fail_under = 85
 

tests/test_charge_point.py

@@ -2,11 +2,13 @@
 import asyncio
 from datetime import datetime, timezone  # timedelta,
 
+from homeassistant.components.switch import SERVICE_TURN_OFF, SERVICE_TURN_ON
+from homeassistant.const import ATTR_ENTITY_ID
 from pytest_homeassistant_custom_component.common import MockConfigEntry
 import websockets
 
 from custom_components.ocpp import async_setup_entry, async_unload_entry
-from custom_components.ocpp.const import DOMAIN
+from custom_components.ocpp.const import DOMAIN, SWITCH, SWITCHES
 from custom_components.ocpp.enums import ConfigurationKey
 from ocpp.routing import on
 from ocpp.v16 import ChargePoint as cpclass, call, call_result
@@ -33,6 +35,31 @@
 
 async def test_cms_responses(hass):
     """Test central system responses to a charger."""
+
+    async def test_switches(hass):
+        """Test switch operations."""
+
+        for switch in SWITCHES:
+            result = await hass.services.async_call(
+                SWITCH,
+                SERVICE_TURN_ON,
+                service_data={
+                    ATTR_ENTITY_ID: f"{SWITCH}.test_cpid_{switch['name'].lower()}"
+                },
+                blocking=True,
+            )
+            assert result
+
+            result = await hass.services.async_call(
+                SWITCH,
+                SERVICE_TURN_OFF,
+                service_data={
+                    ATTR_ENTITY_ID: f"{SWITCH}.test_cpid_{switch['name'].lower()}"
+                },
+                blocking=True,
+            )
+            assert result
+
     # Create a mock entry so we don't have to go through config flow
     config_entry = MockConfigEntry(
         domain=DOMAIN, data=MOCK_CONFIG_DATA, entry_id="test_cms"
@@ -69,8 +96,9 @@ async def test_cms_responses(hass):
                         "http://www.charger.com/file.bin"
                     ),
                     cs.charge_points["test_cpid"].unlock(),
+                    test_switches(hass),
                 ),
-                timeout=7,
+                timeout=5,
             )
         except asyncio.TimeoutError:
             pass
@@ -175,6 +203,11 @@ def on_remote_start_transaction(self, **kwargs):
         """Handle remote start request."""
         return call_result.RemoteStartTransactionPayload(RemoteStartStopStatus.accepted)
 
+    @on(Action.RemoteStopTransaction)
+    def on_remote_stop_transaction(self, **kwargs):
+        """Handle remote stop request."""
+        return call_result.RemoteStopTransactionPayload(RemoteStartStopStatus.accepted)
+
     @on(Action.SetChargingProfile)
     def on_set_charging_profile(self, **kwargs):
         """Handle set charging profile request."""