Implement new tests

Signed-off-by: Daniel Werner <daniel.werner@ise.fraunhofer.de>

Author: fhg-dw

conformance-tests/.gitignore

@@ -0,0 +1,7 @@
+testResults/
+build
+.gradle/
+.idea/
+allure-results/
+.venv/
+testtool-out/

conformance-tests/allowed-licenses.json

@@ -1,19 +1,16 @@
 {
   "allowedLicenses": [
     {
-      "moduleLicense": "The Apache License, Version 2.0",
-      "moduleVersion": "1.12.0",
-      "moduleName": "com.beanit:asn1bean"
+      "moduleLicense": "The Apache License, Version 2.0"
     },
     {
-      "moduleLicense": "The Apache License, Version 2.0",
-      "moduleVersion": "1.9.0",
-      "moduleName": "com.beanit:iec61850bean"
+      "moduleLicense": "Apache License, Version 2.0"
     },
     {
-      "moduleLicense": "Apache License, Version 2.0",
-      "moduleVersion": "2.16.1",
-      "moduleName": "commons-io:commons-io"
+      "moduleLicense": "Apache 2.0"
+    },
+    {
+      "moduleLicense": "The Apache Software License, Version 2.0"
     },
     {
       "comment": "MIT can be included into Apache 2.0 according    https://www.apache.org/legal/resolved.html#category-a (31.1.23)",
@@ -30,6 +27,12 @@
       "comment": "uses dual license, we use Eclipse Public License - v 1.0 which can be included into Apache 2.0 according to https://www.apache.org/legal/resolved.html#category-b (31.1.23)",
       "moduleVersion": "1.5.6",
       "moduleName": "ch.qos.logback:logback-classic"
+    },
+    {
+      "comment": "MIT can be included into Apache 2.0 according    https://www.apache.org/legal/resolved.html#category-a (03.06.2024)",
+      "moduleLicense": "MIT-0",
+      "moduleVersion": "1.0.4",
+      "moduleName": "org.reactivestreams:reactive-streams"
     }
   ]
-}
+}

conformance-tests/build.gradle

@@ -14,13 +14,16 @@ dependencies {
     implementation 'ch.qos.logback:logback-classic:1.5.6'
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.13'
 
+    implementation("com.fasterxml.jackson.core:jackson-databind:2.17.1")
+
     implementation group: 'com.beanit', name: 'iec61850bean', version: '1.9.0'
     implementation group: 'commons-io', name: 'commons-io', version: '2.16.1'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2'
 
+    implementation("com.hivemq:hivemq-mqtt-client:1.3.3")
 }
 
 jar {

conformance-tests/checkLicense.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 # Skript to check proper licensing setup
 
 ./gradlew clean checkLicense

conformance-tests/conformance-tests/.gitignore

@@ -1,3 +1,12 @@
 #!/bin/bash
+
+./gradlew checkLicense
+
+echo TODO: start the below as screen sessions, stop after tests!
+echo "cd ../deployments/n61850-smqtt-ubuntu2004/ && docker-compose up"
+echo "cd ../hedera-61850-gateway/ && docker-compose up"
+echo mosquitto_sub -t fledge/south-schedule -i schedule-subscriber
+echo mosquitto_sub -t fledge/south-command -i cmd-subscriber
+
 ./gradlew test
 echo "All tests run. Please see the logs in testResults/ directory for details"

conformance-tests/run-all-tests.sh

@@ -13,6 +13,8 @@
 
 package org.openmuc.fnn.steuerbox;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import javax.xml.parsers.DocumentBuilderFactory;
 
 /**
@@ -22,7 +24,13 @@ public class Context {
 
     private static final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+
     public static DocumentBuilderFactory getDocumentBuilderFactory() {
         return factory;
     }
+
+    public static ObjectMapper getObjectMapper() {
+        return objectMapper;
+    }
 }

conformance-tests/run-demo-tests.sh

@@ -14,9 +14,9 @@
 package org.openmuc.fnn.steuerbox.models;
 
 import com.beanit.iec61850bean.ServiceError;
-import org.openmuc.fnn.steuerbox.IEC61850Utility;
 import org.openmuc.fnn.steuerbox.scheduling.ScheduleDefinitions;
 import org.openmuc.fnn.steuerbox.scheduling.ScheduleType;
+import org.openmuc.fnn.steuerbox.testutils.IEC61850Utility;
 
 import java.io.IOException;