Update RegisterAndSend to 1.5.8

* Update registerandsend feature file to 1.5.8
* update step implementations to support updates to 1.5.8

Author: matthewd0123

.github/workflows/tck-test.yml

@@ -88,7 +88,7 @@ jobs:
                 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 transport=" + 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'"
+                    var command_str = "behave --define uE1=" + port_language + " --define uE2=" + second_ue + " --define transport=" + 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 {

test_manager/features/steps/tck_step_implementations.py

@@ -376,13 +376,14 @@ def receive_value_as_bytes(context, sender_sdk_name: str, field_name: str, expec
     try:
         expected_value = expected_value.strip()
         context.logger.info(f"getting on_receive_msg from {sender_sdk_name}")
+        if sender_sdk_name == "uE1":
+            sender_sdk_name = context.config.userdata["uE1"]
         on_receive_msg: Dict[str, Any] = context.tm.get_onreceive(sender_sdk_name)
         context.logger.info(f"got on_receive_msg:  {on_receive_msg}")
         if sender_sdk_name == "rust":
-            val = on_receive_msg["data"]["data"]
+            val = on_receive_msg["data"]["payload"]
             rec_field_value = bytes(
-                val.split("value")[1]
-                .replace('"', "")
+                val.replace('"', "")
                 .replace(":", "")
                 .replace("\\", "")
                 .replace("x", "\\x")

test_manager/features/tests/transport_rpc/register_and_send.feature

@@ -25,58 +25,37 @@
 Feature: Testing Publish and Subscribe Functionality
 
   Scenario Outline: To test the registerlistener and send apis
-    Given "<uE1>" creates data for "registerlistener"
-    And sets "entity.name" to "body.access"
-    And sets "entity.id" to "12345"
-    And sets "entity.version_major" to "1"
-    And sets "resource.name" to "door"
-    And sets "resource.id" to "12345"
-    And sets "resource.instance" to "front_left"
-    And sets "resource.message" to "Door"
+    Given "uE1" creates data for "registerlistener"
+    And sets "ue_id" to "12345"
+    And sets "ue_version_major" to "1"
+    And sets "resource_id" to "32769"
 
     When sends "registerlistener" request
     Then the status received with "code" is "OK"
 
-    When "<uE2>" creates data for "send"
+    When "uE2" creates data for "send"
     And sets "attributes.id.msb" to "112128268635242497"
     And sets "attributes.id.lsb" to "11155833020022798372"
-    And sets "attributes.source.entity.name" to "body.access"
-    And sets "attributes.source.entity.id" to "12345"
-    And sets "attributes.source.entity.version_major" to "1"
-    And sets "attributes.source.resource.name" to "door"
-    And sets "attributes.source.resource.id" to "12345"
-    And sets "attributes.source.resource.instance" to "front_left"
-    And sets "attributes.source.resource.message" to "Door"
+    And sets "attributes.source.ue_id" to "12345"
+    And sets "attributes.source.ue_version_major" to "1"
+    And sets "attributes.source.resource_id" to "32769"
     And sets "attributes.priority" to "UPRIORITY_CS1"
     And sets "attributes.type" to "UMESSAGE_TYPE_PUBLISH"
-    And sets "payload.format" to "UPAYLOAD_FORMAT_PROTOBUF_WRAPPED_IN_ANY"
-    And sets "payload.value" to b".type.googleapis.com/google.protobuf.Int32Value\x12\x02\x08\x03"
+    And sets "payload" to b".type.googleapis.com/google.protobuf.Int32Value\x12\x02\x08\x03"
     And sends "send" request
 
     Then the status received with "code" is "OK"
-      And "<uE1>" sends onreceive message with field "payload.value" as b"type.googleapis.com/google.protobuf.Int32Value\x12\x02\x08\x03"
+      And "uE1" sends onreceive message with field "payload" as b"type.googleapis.com/google.protobuf.Int32Value\x12\x02\x08\x03"
 
     # Unregister in the end for cleanup
-    When "<uE1>" creates data for "unregisterlistener"
-      And sets "entity.name" to "body.access"
-      And sets "entity.id" to "12345"
-      And sets "entity.version_major" to "1"
-      And sets "resource.name" to "door"
-      And sets "resource.id" to "12345"
-      And sets "resource.instance" to "front_left"
-      And sets "resource.message" to "Door"
+    When "uE1" creates data for "unregisterlistener"
+      And sets "ue_id" to "12345"
+      And sets "ue_version_major" to "1"
+      And sets "resource_id" to "32769"
       And sends "unregisterlistener" request
 
     Then the status received with "code" is "OK"
 
     Examples:
-      | uE1    | uE2    |
-      | rust   | rust   |
-      | rust   | python |
-      | python | rust   |
-      | rust   | java   |
-      | java   | rust   |
-      | python | python |
-      | java   | java   |
-      | java   | python |
-      | python | java   |
+      | ignore | ignore |
+      | ignore | ignore |

test_manager/testData/workflow_test_data.json

@@ -11,6 +11,20 @@
         "ue1": ["rust"],
         "transports": ["zenoh"]
     },
+    {
+        "feature_name" : "register_and_send",
+        "path": "transport_rpc",
+        "ue1": ["python", "java"],
+        "ue2": ["python", "java"],
+        "transports": ["socket"]
+    },
+    {
+        "feature_name" : "register_and_send",
+        "path": "transport_rpc",
+        "ue1": ["rust"],
+        "ue2": ["rust"],
+        "transports": ["zenoh"]
+    },
     {
         "feature_name" : "uri_deserializer",
         "path": "serializers",