Update Feature Files and Test Agents to 1.5.8

.github/workflows/tck-test.yml

@@ -18,25 +18,25 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v3
-    - name: Build Rust Test Agent
-      uses: actions-rs/cargo@v1
-      with:
-        command: build
-        args: --manifest-path test_agent/rust/Cargo.toml
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-        cache: maven
-    - name: Build up_client_socket_java with Maven
-      working-directory: up_client_socket/java
-      run: |
-            mvn clean install --file pom.xml
-    - name: Build java_test_agent with Maven
-      working-directory: test_agent/java
-      run: |
-            mvn clean install --file pom.xml
+    # - name: Build Rust Test Agent
+    #   uses: actions-rs/cargo@v1
+    #   with:
+    #     command: build
+    #     args: --manifest-path test_agent/rust/Cargo.toml
+    # - name: Set up JDK 11
+    #   uses: actions/setup-java@v3
+    #   with:
+    #     java-version: '11'
+    #     distribution: 'temurin'
+    #     cache: maven
+    # - name: Build up_client_socket_java with Maven
+    #   working-directory: up_client_socket/java
+    #   run: |
+    #         mvn clean install --file pom.xml
+    # - name: Build java_test_agent with Maven
+    #   working-directory: test_agent/java
+    #   run: |
+    #         mvn clean install --file pom.xml
     - name: Set up Python 3.8.7
       uses: actions/setup-python@v3
       with:
@@ -76,19 +76,19 @@ jobs:
 
           var feature_json = JSON.parse(fs.readFileSync('./test_manager/testData/workflow_test_data.json', 'utf8'));
           const command_list = [];
-          for(var feature_file_name in feature_json){
-            for (var language in feature_json[feature_file_name]["ue1"]){
-              for (var transport in feature_json[feature_file_name]["transports"]){
-                var port_language = feature_json[feature_file_name]["ue1"][language]
-                var port_transport = feature_json[feature_file_name]["transports"][transport]
-                if ("ue2" in feature_json[feature_file_name]){
-                  for (var language_two in feature_json[feature_file_name]["ue2"]){
-                    var second_ue = feature_json[feature_file_name]["ue2"][language_two]
-                    var command_str = "behave --define uE1=" + port_language + " --define uE2=" + second_ue + " --define transport=" + port_transport + " --format json --outfile './reports/" + feature_file_name + "_" + port_language + ".json' --format html --outfile './reports/" + feature_file_name + "_" + port_language + ".html' './features/tests/" + feature_json[feature_file_name]["path"] + "/" + feature_file_name + ".feature'"
+          for(var feature of feature_json){
+            for (var language in feature["ue1"]){
+              for (var transport in feature["transports"]){
+                var port_language = feature["ue1"][language]
+                var port_transport = feature["transports"][transport]
+                if ("ue2" in feature){
+                  for (var language_two in feature["ue2"]){
+                    var second_ue = feature["ue2"][language_two]
+                    var command_str = "behave --define uE1=" + port_language + " --define uE2=" + second_ue + " --define transport1=" + port_transport +  " --define transport2=" + port_transport + " --format json --outfile './reports/" + feature["feature_name"] + "_" + port_language + "_" + second_ue + ".json' --format html --outfile './reports/" + feature["feature_name"] + "_" + port_language + "_" + second_ue + ".html' './features/tests/" + feature["path"] + "/" + feature["feature_name"] + ".feature'"
                     command_list.push(command_str);
                   }
                 } else {
-                  var command_str = "behave --define uE1=" + port_language + " --define transport=" + port_transport + " --format json --outfile './reports/" + feature_file_name + "_" + port_language + ".json' --format html --outfile './reports/" + feature_file_name + "_" + port_language + ".html' './features/tests/" + feature_json[feature_file_name]["path"] + "/" + feature_file_name + ".feature'"
+                  var command_str = "behave --define uE1=" + port_language + " --define transport1=" + port_transport + " --format json --outfile './reports/" + feature["feature_name"] + "_" + port_language + ".json' --format html --outfile './reports/" + feature["feature_name"] + "_" + port_language + ".html' './features/tests/" + feature["path"] + "/" + feature["feature_name"] + ".feature'"
                   command_list.push(command_str);
                 }
               }

.gitignore

@@ -21,4 +21,7 @@ MANIFEST
 **/jar_files/**
 *.jar
 **/.DS_Store
-**/target
+**/target
+**/summary.json
+**/up-java/
+**/up-python/

README.adoc

@@ -34,14 +34,24 @@ $ python install_dependencies.py
 ----
 *This will install the up-tck dependencies, making its classes and modules available for import in your python code.*
 
+=== Building Rust Test Agent Executable
+
+1. Go to the rust test agent folder (cd test_agent/rust)
+2. run "cargo build"
+
+
 === Building Java Test Agent Jar
 
 If you would like to run any tests with the Java Test Agent, follow these instructions:
 
-1. Inside a terminal/command prompt, go to up_client_socket folder (cd up_client_socket/java).
-2. Run "mvn clean install".This will install the up-client-socket-java.
-3. Go to test_agent folder (cd test_agent/java) and run "mvn clean install".This will generate the tck-test-agent-java JAR file under the target folder.
+1. Go to the scripts folder and run build_up_java_latest.py
+2. Inside a terminal/command prompt, go to up_client_socket folder (cd up_client_socket/java).
+3. Run "mvn clean install".This will install the up-client-socket-java.
+4. Go to test_agent folder (cd test_agent/java) and run "mvn clean install".This will generate the tck-test-agent-java JAR file under the target folder.
 
 === Running BDD Tests
 
 For information about running BDD Tests, refer to  https://github.com/eclipse-uprotocol/up-tck/blob/main/test_manager/README.adoc[BDD/README.adoc]
+
+=== Sample use cases
+image::screenshots/InteropTestingSDK.drawio.svg[]

dispatcher/dispatcher.py

@@ -104,6 +104,7 @@ def _flood_to_sockets(self, data: bytes):
         """
         # for up_client_socket in self.connected_sockets.copy():  # copy() to avoid RuntimeError
         for up_client_socket in self.connected_sockets:
+            logger.info(f"sending data to {up_client_socket.getpeername()}")
             try:
                 up_client_socket.sendall(data)
             except ConnectionAbortedError as e: