Adapt to EVerest/everest-utils#76 (#331)

* Adapt to EVerest/everest-utils#76

Signed-off-by: aw <aw@pionix.de>

* Require everest-framework 0.6.2

Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>

* Add convenience target for integration tests

Add everest-utils to dependencies.yaml to be able to use it for testing

Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>

* Bump josev dependency

Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>

---------

Signed-off-by: aw <aw@pionix.de>
Signed-off-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>
Co-authored-by: Kai-Uwe Hermann <kai-uwe.hermann@pionix.de>

Author: a-w50

CMakeLists.txt

@@ -126,3 +126,17 @@ if(BUILD_TESTING)
 else()
     message("Not running unit tests")
 endif()
+
+# convenience target for integration tests
+add_custom_target(install_everest_testing
+    COMMAND
+        if [ -z "${CPM_PACKAGE_everest-utils_SOURCE_DIR}" ] \;
+        then echo "Could not determine location of everest-utils, please install everest-testing manually!" \;
+        else echo "Found everest-utils at ${CPM_PACKAGE_everest-utils_SOURCE_DIR}" \;
+             ${PYTHON_EXECUTABLE} -m pip install "${CPM_PACKAGE_everest-utils_SOURCE_DIR}/everest-testing" \;
+        fi\;
+    DEPENDS
+        everestpy_pip_install_dist iso15118_pip_install_dist iso15118_requirements_pip_install_dist
+    COMMENT
+        "Installing dependencies for testing EVerest"
+)

dependencies.yaml

@@ -1,7 +1,7 @@
 ---
 everest-framework:
   git: https://github.com/EVerest/everest-framework.git
-  git_tag: v0.6.1
+  git_tag: v0.6.2
 sigslot:
   git: https://github.com/palacaze/sigslot
   git_tag: v1.2.0
@@ -42,7 +42,7 @@ libocpp:
 # Josev
 Josev:
   git: https://github.com/EVerest/ext-switchev-iso15118.git
-  git_tag: 43828f6
+  git_tag: 646ceca
 # OpenV2G
 ext-openv2g:
   git: https://github.com/EVerest/ext-openv2g.git
@@ -52,3 +52,8 @@ ext-mbedtls:
   git: https://github.com/EVerest/ext-mbedtls.git
   git_tag: 8b3f26a
   options: ["ENABLE_PROGRAMS OFF", "ENABLE_TESTING OFF"]
+
+# everest-testing
+everest-utils:
+  git: https://github.com/EVerest/everest-utils.git
+  git_tag: v0.1.4

modules/CMakeLists.txt

@@ -22,7 +22,6 @@ ev_add_module(PersistentStore)
 ev_add_module(PN532TokenProvider)
 ev_add_module(PyEvJosev)
 ev_add_module(PyJosev)
-ev_add_module(PyProbeModule)
 ev_add_module(Setup)
 ev_add_module(SerialCommHub)
 ev_add_module(Store)

modules/PyProbeModule/CMakeLists.txt

@@ -11,6 +11,12 @@ cd ~/checkout/everest-workspace/everest-utils/everest-testing
 python3 -m pip install .
 ```
 
+You can also use the following cmake target to install everest-testing and its dependencies:
+```bash
+cd everest-core
+cmake --build build --target install_everest_testing
+```
+
 ## Execute locally
 
 To start you should try executing the available basic tests:
@@ -83,4 +89,4 @@ For the moment, there is a *workaround available:* Use a new test-set (another p
 
 **Cause:** Currently there is a bug in the EVSE manager implementation in everest-core, causing a race-condition between resetting the "amount charged" parameter and the event reporting for a "*transaction_finished*" event. Sometimes it reports correctly, other times it reports a value of 0.0kWh charged.
 
-**Solution:** This problem is known and a fix is under way. For the moment, just re-run the test. Usually, this should then produce a passing result.
+**Solution:** This problem is known and a fix is under way. For the moment, just re-run the test. Usually, this should then produce a passing result.

modules/PyProbeModule/manifest.yaml

@@ -10,7 +10,7 @@
 import queue
 
 from everest.testing.core_utils.fixtures import *
-from everest.testing.core_utils.everest_core import EverestCore, TestControlModuleConnection
+from everest.testing.core_utils.everest_core import EverestCore, Requirement
 
 from everest.framework import Module, RuntimeSession
 
@@ -23,7 +23,7 @@ async def test_000_startup_check(everest_core: EverestCore):
 
 class ProbeModule:
     def __init__(self, session: RuntimeSession):
-        m = Module('probe_module', session)
+        m = Module('probe', session)
         self._setup = m.say_hello()
 
         # subscribe to session events
@@ -76,13 +76,18 @@ def test(self, timeout: float) -> bool:
 
         return True
 
+
 @pytest.mark.everest_core_config('config-sil.yaml')
 @pytest.mark.asyncio
 async def test_001_start_test_module(everest_core: EverestCore):
     logging.info(">>>>>>>>> test_001_start_test_module <<<<<<<<<")
 
-    everest_core.start(standalone_module='probe_module', modules_to_test=[
-                       TestControlModuleConnection(evse_manager_id="connector_1", car_simulator_id="car_simulator", ocpp_id=None)])
+    test_connections = {
+        'test_control': [Requirement('car_simulator', 'main')],
+        'connector_1': [Requirement('connector_1', 'evse')]
+    }
+
+    everest_core.start(standalone_module='probe', test_connections=test_connections)
     logging.info("everest-core ready, waiting for probe module")
 
     session = RuntimeSession(str(everest_core.prefix_path), str(everest_core.everest_config_path))