Squashed commit of the following:

commit 47cac61
Author: drc38 <[email protected]>
Date:   Sat Jul 17 09:04:56 2021 +1200

    tests: tidy up assert

commit 5c2b08e
Merge: 0af91cf 60a64d5
Author: drc38 <[email protected]>
Date:   Sat Jul 17 08:59:18 2021 +1200

    Merge branch 'major-update' of https://github.com/drc38/ocpp into major-update

commit 0af91cf
Author: drc38 <[email protected]>
Date:   Sat Jul 17 08:57:59 2021 +1200

    tests: fix trigger calls

commit 60a64d5
Merge: 67cd8d6 deb01b9
Author: drc38 <[email protected]>
Date:   Sat Jul 17 08:54:31 2021 +1200

    Merge branch 'main' into major-update

commit 67cd8d6
Author: drc38 <[email protected]>
Date:   Sat Jul 17 08:48:29 2021 +1200

    tests: improve to over 80%

commit 14081bb
Author: drc38 <[email protected]>
Date:   Fri Jul 16 17:50:55 2021 +1200

    ocpp: significant repo update

commit deb01b9
Author: drc38 <[email protected]>
Date:   Fri Jul 16 17:22:21 2021 +1200

    Update api.py

commit e80d69c
Author: drc38 <[email protected]>
Date:   Fri Jul 16 16:50:37 2021 +1200

    Update setup.cfg

commit 0283134
Author: drc38 <[email protected]>
Date:   Fri Jul 16 16:42:23 2021 +1200

    Update test_charge_point.py

commit f72c508
Author: drc38 <[email protected]>
Date:   Fri Jul 16 16:34:09 2021 +1200

    Update test_charge_point.py

commit 0e60917
Author: drc38 <[email protected]>
Date:   Fri Jul 16 16:24:11 2021 +1200

    Update test_charge_point.py

commit 12992d4
Author: drc38 <[email protected]>
Date:   Fri Jul 16 16:02:39 2021 +1200

    Update test_charge_point.py

commit d09878d
Author: drc38 <[email protected]>
Date:   Fri Jul 16 15:56:58 2021 +1200

    Update test_charge_point.py

commit bb08b5d
Author: drc38 <[email protected]>
Date:   Fri Jul 16 15:48:51 2021 +1200

    Update test_charge_point.py

commit 0effff5
Author: drc38 <[email protected]>
Date:   Fri Jul 16 15:44:27 2021 +1200

    Update test_charge_point.py

commit 6913595
Author: drc38 <[email protected]>
Date:   Fri Jul 16 15:40:45 2021 +1200

    Update test_charge_point.py

commit eb12215
Author: drc38 <[email protected]>
Date:   Fri Jul 16 15:38:17 2021 +1200

    Update test_charge_point.py

commit 4bde0cf
Author: drc38 <[email protected]>
Date:   Fri Jul 16 15:34:14 2021 +1200

    Update test_charge_point.py

commit 7ce9b2c
Author: drc38 <[email protected]>
Date:   Fri Jul 16 15:31:43 2021 +1200

    Update test_charge_point.py

commit 25c31ad
Author: drc38 <[email protected]>
Date:   Fri Jul 16 15:29:31 2021 +1200

    Update test_charge_point.py

commit 60641dc
Author: drc38 <[email protected]>
Date:   Fri Jul 16 15:27:45 2021 +1200

    Update api.py

commit 8c09c17
Author: drc38 <[email protected]>
Date:   Fri Jul 16 15:21:14 2021 +1200

    Update test_charge_point.py

commit 09625d9
Author: drc38 <[email protected]>
Date:   Fri Jul 16 15:17:34 2021 +1200

    Update test_charge_point.py

commit 9c8f389
Author: drc38 <[email protected]>
Date:   Fri Jul 16 15:13:46 2021 +1200

    Update test_charge_point.py

commit 5399b58
Author: drc38 <[email protected]>
Date:   Fri Jul 16 15:10:12 2021 +1200

    Update test_charge_point.py

commit 77988c8
Author: drc38 <[email protected]>
Date:   Fri Jul 16 15:04:21 2021 +1200

    Update test_charge_point.py

commit 3aae34c
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:58:38 2021 +1200

    Update test_charge_point.py

commit 79891ac
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:54:57 2021 +1200

    Update test_charge_point.py

commit 5e6798a
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:51:37 2021 +1200

    Update test_charge_point.py

commit 26da8a6
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:50:22 2021 +1200

    Update test_charge_point.py

commit d0ac452
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:44:32 2021 +1200

    Update test_charge_point.py

commit db1d4eb
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:39:54 2021 +1200

    Update test_charge_point.py

commit 8b30b10
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:36:42 2021 +1200

    Update test_charge_point.py

commit e100517
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:36:00 2021 +1200

    Update test_charge_point.py

commit 577bb85
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:31:34 2021 +1200

    Update test_charge_point.py

commit 2621610
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:25:53 2021 +1200

    Update test_charge_point.py

commit a9ff941
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:21:21 2021 +1200

    Update test_charge_point.py

commit b1ea16c
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:19:00 2021 +1200

    Update test_switch.py

commit 59187f4
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:14:06 2021 +1200

    Update setup.cfg

commit 5431db1
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:12:43 2021 +1200

    Update const.py

commit 7d47a22
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:08:02 2021 +1200

    Update test_switch.py

commit 2bf5b19
Author: drc38 <[email protected]>
Date:   Fri Jul 16 14:07:38 2021 +1200

    Update const.py

commit 07f4120
Author: drc38 <[email protected]>
Date:   Fri Jul 16 13:54:10 2021 +1200

    Update test_charge_point.py

commit a889e9c
Author: drc38 <[email protected]>
Date:   Fri Jul 16 13:46:46 2021 +1200

    Update test_charge_point.py

commit 2b618ab
Author: drc38 <[email protected]>
Date:   Fri Jul 16 13:37:22 2021 +1200

    Update test_charge_point.py

commit f4c9187
Author: drc38 <[email protected]>
Date:   Fri Jul 16 13:29:23 2021 +1200

    Update test_charge_point.py

commit 76646a8
Author: drc38 <[email protected]>
Date:   Fri Jul 16 13:27:20 2021 +1200

    Update test_charge_point.py

commit 2e4269d
Author: drc38 <[email protected]>
Date:   Fri Jul 16 13:26:28 2021 +1200

    Update test_charge_point.py

commit 45d231c
Author: drc38 <[email protected]>
Date:   Fri Jul 16 13:22:04 2021 +1200

    Update test_charge_point.py

commit 0025979
Author: drc38 <[email protected]>
Date:   Fri Jul 16 13:05:38 2021 +1200

    Update test_charge_point.py

commit 6bc5b57
Author: drc38 <[email protected]>
Date:   Fri Jul 16 13:01:41 2021 +1200

    Update test_charge_point.py

commit 3716aee
Author: drc38 <[email protected]>
Date:   Fri Jul 16 12:52:02 2021 +1200

    Update test_charge_point.py

commit 35c7c34
Author: drc38 <[email protected]>
Date:   Fri Jul 16 12:45:24 2021 +1200

    Update test_charge_point.py

commit 6d50a60
Author: drc38 <[email protected]>
Date:   Fri Jul 16 12:38:02 2021 +1200

    Update test_charge_point.py

commit a83f983
Author: drc38 <[email protected]>
Date:   Fri Jul 16 12:32:29 2021 +1200

    Update test_charge_point.py

commit 25535a7
Author: drc38 <[email protected]>
Date:   Fri Jul 16 12:28:41 2021 +1200

    Update test_charge_point.py

commit c06e1f4
Author: drc38 <[email protected]>
Date:   Fri Jul 16 12:14:44 2021 +1200

    Update test_charge_point.py

commit 0e55e74
Author: drc38 <[email protected]>
Date:   Fri Jul 16 12:03:39 2021 +1200

    Update test_charge_point.py

commit 356512f
Author: drc38 <[email protected]>
Date:   Fri Jul 16 11:54:32 2021 +1200

    Update test_charge_point.py

commit 7a83ad5
Author: drc38 <[email protected]>
Date:   Fri Jul 16 11:21:34 2021 +1200

    Update test_charge_point.py

commit 6b5ccc7
Author: drc38 <[email protected]>
Date:   Fri Jul 16 11:01:49 2021 +1200

    Update test_charge_point.py

commit 0ed369a
Author: drc38 <[email protected]>
Date:   Fri Jul 16 10:54:39 2021 +1200

    Update test_charge_point.py

commit 77e42f7
Author: drc38 <[email protected]>
Date:   Fri Jul 16 10:48:44 2021 +1200

    Update test_charge_point.py

commit 576b3a5
Author: drc38 <[email protected]>
Date:   Fri Jul 16 10:35:56 2021 +1200

    Update test_charge_point.py

commit fe4abd8
Author: drc38 <[email protected]>
Date:   Fri Jul 16 10:26:41 2021 +1200

    Update test_charge_point.py

commit 53bd34f
Author: drc38 <[email protected]>
Date:   Fri Jul 16 10:26:20 2021 +1200

    Update api.py

commit f91279f
Author: drc38 <[email protected]>
Date:   Fri Jul 16 10:12:14 2021 +1200

    Update test_charge_point.py

commit 32f0893
Author: drc38 <[email protected]>
Date:   Fri Jul 16 09:41:10 2021 +1200

    Update api.py

commit 5a22f63
Author: drc38 <[email protected]>
Date:   Fri Jul 16 09:33:25 2021 +1200

    Update test_charge_point.py

commit c2ae42f
Author: drc38 <[email protected]>
Date:   Fri Jul 16 09:27:05 2021 +1200

    Update test_charge_point.py

commit e8841e1
Author: drc38 <[email protected]>
Date:   Fri Jul 16 09:20:13 2021 +1200

    Update api.py

commit ba7d88b
Author: drc38 <[email protected]>
Date:   Fri Jul 16 09:16:29 2021 +1200

    Update test_charge_point.py

commit c716197
Author: drc38 <[email protected]>
Date:   Fri Jul 16 09:01:55 2021 +1200

    Update test_charge_point.py

commit b687f5e
Author: drc38 <[email protected]>
Date:   Thu Jul 15 23:38:59 2021 +1200

    Update test_charge_point.py

commit 85924d5
Author: drc38 <[email protected]>
Date:   Thu Jul 15 23:31:30 2021 +1200

    Update test_charge_point.py

commit 40700a3
Author: drc38 <[email protected]>
Date:   Thu Jul 15 23:24:58 2021 +1200

    Update test_charge_point.py

commit a290024
Author: drc38 <[email protected]>
Date:   Thu Jul 15 23:16:23 2021 +1200

    Update test_charge_point.py

commit 2d4d753
Author: drc38 <[email protected]>
Date:   Thu Jul 15 23:05:30 2021 +1200

    Update api.py

commit 3d842cc
Author: drc38 <[email protected]>
Date:   Thu Jul 15 22:37:10 2021 +1200

    Update test_charge_point.py

commit 6fd5a84
Author: drc38 <[email protected]>
Date:   Thu Jul 15 22:02:47 2021 +1200

    Update test_charge_point.py

commit 015ab34
Author: drc38 <[email protected]>
Date:   Thu Jul 15 21:57:20 2021 +1200

    Update test_charge_point.py

commit 3664eb9
Author: drc38 <[email protected]>
Date:   Thu Jul 15 21:50:21 2021 +1200

    Update test_charge_point.py

commit 037faa2
Author: drc38 <[email protected]>
Date:   Thu Jul 15 21:23:24 2021 +1200

    Update conftest.py

commit bb35bd7
Author: drc38 <[email protected]>
Date:   Thu Jul 15 21:17:20 2021 +1200

    Update test_config_flow.py

commit 68f0cf1
Merge: 9c59d1a 28e7446
Author: drc38 <[email protected]>
Date:   Thu Jul 15 21:07:56 2021 +1200

    Merge pull request #8 from drc38/services

    Services

commit 28e7446
Author: drc38 <[email protected]>
Date:   Thu Jul 15 20:47:44 2021 +1200

    ocpp: add custom services

commit 6ca3e21
Author: drc38 <[email protected]>
Date:   Thu Jul 15 20:40:26 2021 +1200

    tests: extend charger testing

commit f2d1832
Author: drc38 <[email protected]>
Date:   Mon Jul 12 18:21:29 2021 +1200

    tests: create charge point test

commit 9c59d1a
Merge: 4104b05 474bcce
Author: drc38 <[email protected]>
Date:   Fri Jul 9 22:42:29 2021 +1200

    Merge pull request #4 from drc38/dev3

    change to True

commit 474bcce
Author: drc38 <[email protected]>
Date:   Fri Jul 9 22:41:34 2021 +1200

    change to True

commit 4104b05
Merge: 048d665 ea99d9c
Author: drc38 <[email protected]>
Date:   Fri Jul 9 22:33:50 2021 +1200

    Merge pull request #3 from drc38/dev3

    add error config

commit ea99d9c
Author: drc38 <[email protected]>
Date:   Fri Jul 9 22:32:50 2021 +1200

    add error config

commit 048d665
Merge: 4d4d630 bfbd382
Author: drc38 <[email protected]>
Date:   Fri Jul 9 22:28:12 2021 +1200

    Merge pull request #2 from drc38/dev3

    add extra test measurand

commit bfbd382
Author: drc38 <[email protected]>
Date:   Fri Jul 9 22:26:31 2021 +1200

    add extra test measurand

commit 4d4d630
Merge: 2c1c64d 64cc9c6
Author: drc38 <[email protected]>
Date:   Fri Jul 9 22:19:49 2021 +1200

    Merge pull request #1 from drc38/dev3

    Dev3

commit 64cc9c6
Author: drc38 <[email protected]>
Date:   Fri Jul 9 22:10:53 2021 +1200

    improve testing coverage

commit e71d11a
Merge: 5995468 2b5d7b3
Author: drc38 <[email protected]>
Date:   Fri Jul 9 20:37:08 2021 +1200

    Merge remote-tracking branch 'upstream/main' into dev3

commit 5995468
Author: drc38 <[email protected]>
Date:   Fri Jul 9 17:41:39 2021 +1200

    comment out patch ocppApiClient in test_switch

commit 749b52d
Author: drc38 <[email protected]>
Date:   Fri Jul 9 15:07:23 2021 +1200

    comment out ConfigEntryNotReady exception test

commit 7fdb5c2
Author: drc38 <[email protected]>
Date:   Fri Jul 9 14:46:52 2021 +1200

    fix enum variables

commit d39568b
Author: drc38 <[email protected]>
Date:   Fri Jul 9 13:00:30 2021 +1200

    fix switch mock config

commit 73b454c
Author: drc38 <[email protected]>
Date:   Fri Jul 9 12:56:23 2021 +1200

    fix test_init

commit 9c10abe
Author: drc38 <[email protected]>
Date:   Fri Jul 9 12:40:05 2021 +1200

    fix assert for measurand form

commit 2492aac
Author: drc38 <[email protected]>
Date:   Fri Jul 9 12:36:46 2021 +1200

    manual mock_config_2

commit f6b2b4a
Author: drc38 <[email protected]>
Date:   Fri Jul 9 12:21:51 2021 +1200

    use vol.schema for mock_config_2 generation

commit 400a5db
Author: drc38 <[email protected]>
Date:   Fri Jul 9 11:15:26 2021 +1200

    update mock_config_2

commit 0bf58a5
Author: drc38 <[email protected]>
Date:   Fri Jul 9 11:06:02 2021 +1200

    comment out expected data result assertion

commit ffaf99b
Author: drc38 <[email protected]>
Date:   Fri Jul 9 10:41:29 2021 +1200

    update measurands step user data take 2

commit ff1d115
Author: drc38 <[email protected]>
Date:   Fri Jul 9 10:14:44 2021 +1200

    update measurands step user data

commit 4895eba
Author: drc38 <[email protected]>
Date:   Fri Jul 9 10:01:06 2021 +1200

    comment out test failed config flow and  options flow

commit 8906da4
Author: drc38 <[email protected]>
Date:   Thu Jul 8 23:35:43 2021 +1200

    remove CONF_NAME

commit 4be1f8b
Author: drc38 <[email protected]>
Date:   Thu Jul 8 23:31:20 2021 +1200

    enable_custom_integration for tests

commit 0a2f383
Author: drc38 <[email protected]>
Date:   Thu Jul 8 22:26:58 2021 +1200

    update mock_config with required params

commit 323bc5e
Author: drc38 <[email protected]>
Date:   Thu Jul 8 21:50:18 2021 +1200

    match test_charge_point port

commit 2847635
Author: drc38 <[email protected]>
Date:   Thu Jul 8 21:25:05 2021 +1200

    revert handler

commit c6a8c31
Author: drc38 <[email protected]>
Date:   Thu Jul 8 21:20:46 2021 +1200

    try resolving test, flow errors

commit a4e70c4
Author: drc38 <[email protected]>
Date:   Thu Jul 8 21:03:46 2021 +1200

    add ocpp to tests

commit dff83bb
Author: drc38 <[email protected]>
Date:   Thu Jul 8 20:59:58 2021 +1200

    change pip version

commit b7018e8
Merge: 6454550 0485356
Author: drc38 <[email protected]>
Date:   Thu Jul 8 20:55:09 2021 +1200

    Merge branch 'dev3' of https://github.com/drc38/ocpp into dev3

commit 6454550
Author: drc38 <[email protected]>
Date:   Thu Jul 8 20:47:48 2021 +1200

    add websockets for testing

commit 0485356
Author: drc38 <[email protected]>
Date:   Thu Jul 8 20:13:37 2021 +1200

    add websockets for testing

commit 2c1c64d
Merge: d0c8974 1f7caf8
Author: drc38 <[email protected]>
Date:   Thu Jul 8 13:24:24 2021 +1200

    Merge branch 'lbbrhzn:main' into main

commit 3ddadf8
Merge: c59f39a 1f7caf8
Author: drc38 <[email protected]>
Date:   Wed Jul 7 19:46:16 2021 +1200

    Merge remote-tracking branch 'upstream/main' into dev3

commit c59f39a
Author: drc38 <[email protected]>
Date:   Wed Jul 7 19:36:14 2021 +1200

    ocpp: fix formatting

commit 43d0123
Author: drc38 <[email protected]>
Date:   Wed Jul 7 18:37:56 2021 +1200

    ocpp: revise approach to measurand metrics reading

commit d0c8974
Author: drc38 <[email protected]>
Date:   Sat Jul 3 09:39:53 2021 +1200

    ocpp: remove DOMAIN from naming

commit e329fa9
Author: drc38 <[email protected]>
Date:   Mon Jun 28 22:53:30 2021 +1200

    ocpp: add switches for basic functions

Author: drc38

setup.cfg

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

tests/test_charge_point.py

@@ -99,7 +99,7 @@ def on_get_configuration(self, key, **kwargs):
                     {
                         "key": key[0],
                         "readonly": False,
-                        "value": "Core,FirmwareManagement,SmartCharging",
+                        "value": "Core,FirmwareManagement,RemoteTrigger,SmartCharging",
                     }
                 ]
             )
@@ -222,7 +222,8 @@ async def send_firmware_status(self):
         request = call.FirmwareStatusNotificationPayload(
             status=FirmwareStatus.downloaded
         )
-        await self.call(request)
+        resp = await self.call(request)
+        assert resp is not None
 
     async def send_data_transfer(self):
         """Send a data transfer."""
@@ -257,8 +258,8 @@ async def send_status_notification(self):
             vendor_id="The Mobility House",
             vendor_error_code="Test error",
         )
-        await self.call(request)
-        # check an error is not thrown?
+        resp = await self.call(request)
+        assert resp is not None
 
     async def send_meter_data(self):
         """Send meter data notification."""
@@ -409,8 +410,8 @@ async def send_meter_data(self):
                 }
             ],
         )
-        await self.call(request)
-        # check an error is not thrown?
+        resp = await self.call(request)
+        assert resp is not None
 
     async def send_stop_transaction(self):
         """Send a stop transaction notification."""