Merge pull request #3874 from reubenmiller/tests-fix-te-to-c8y-example

tests: update flow for measurement unit transformation to always output c8y compatible measurements

Author: reubenmiller

tests/RobotFramework/tests/tedge_flows/flows/measurements.samples

@@ -1,6 +1,6 @@
 # The default is to have no units
-INPUT: [te/device/main///m/] {"temperature": 25, "time":"2025-06-27T13:33:53.493Z"}
-OUTPUT: [c8y/measurement/measurements/create] {"type":"ThinEdgeMeasurement","temperature":{"temperature":25},"time":"2025-06-27T13:33:53.493Z"}
+INPUT: [te/device/main///m/] {"temperature": 25,"outside":{"humidity":85}, "time":"2025-06-27T13:33:53.493Z"}
+OUTPUT: [c8y/measurement/measurements/create] {"type":"ThinEdgeMeasurement","temperature":{"temperature":{"value":25}},"outside":{"humidity":{"value":85}},"time":"2025-06-27T13:33:53.493Z"}
 
 # Units can be set using the meta topic
 INPUT: [te/device/main///m//meta] {"temperature": { "unit": "°C" }}
@@ -17,7 +17,7 @@ OUTPUT: [c8y/measurement/measurements/create] {"type":"ThinEdgeMeasurement","tem
 # Units can be set to across measurement types
 INPUT: [te/device/main///m/environment/meta] { "temperature": { "unit": "°C" }, "location": { "altitude": { "unit": "m" } }, "pressure": { "unit": "pascal" } }
 INPUT: [te/device/main///m/environment] {"time":"2025-06-27T08:11:05.301804125Z", "temperature": 25, "location": {"latitude": 32.54, "longitude": -117.67, "altitude": 98.6 }, "pressure": 98}
-OUTPUT: [c8y/measurement/measurements/create] {"type":"environment","time":"2025-06-27T08:11:05.301804125Z","temperature":{"temperature":{"value":25,"unit":"°C"}},"location":{"latitude":32.54,"longitude":-117.67,"altitude":{"value":98.6,"unit":"m"}},"pressure":{"pressure":{"value":98,"unit":"pascal"}}}
+OUTPUT: [c8y/measurement/measurements/create] {"type":"environment","time":"2025-06-27T08:11:05.301804125Z","temperature":{"temperature":{"value":25,"unit":"°C"}},"location":{"latitude":{"value":32.54},"longitude":{"value":-117.67},"altitude":{"value":98.6,"unit":"m"}},"pressure":{"pressure":{"value":98,"unit":"pascal"}}}
 
 # For the default type °F are still used, while changed to °C for environment measurements
 INPUT: [te/device/main///m/] {"temperature": 77, "time":"2025-06-27T12:40:24.122Z"}

tests/RobotFramework/tests/tedge_flows/flows/te_to_c8y.js

@@ -66,6 +66,8 @@ export function onMessage(message, config) {
     else if (typeof(v) === "number") {
       if (Object.keys(k_meta).length>0) {
         v = { value: v, ...k_meta }
+      } else {
+        v = { value: v }
       }
       let fragment = { [k]: { [k]: v } }
       Object.assign(c8y_msg, fragment)
@@ -76,6 +78,8 @@ export function onMessage(message, config) {
         if (typeof(sub_v) === "number") {
           if (sub_k_meta) {
             sub_v = { value: sub_v, ...sub_k_meta }
+          } else {
+            sub_v = { value: sub_v }
           }
           let sub_fragment = { [sub_k]: sub_v }
           Object.assign(fragment, sub_fragment)

tests/RobotFramework/tests/tedge_flows/tedge_flows.robot

@@ -47,7 +47,7 @@ Translate complex tedge json to c8y json
     ...    strip=True
     Should Be Equal
     ...    ${transformed_msg}
-    ...    [c8y/measurement/measurements/create] {"type":"environment","time":"2025-06-27T08:11:05.301804125Z","temperature":{"temperature":258},"location":{"latitude":32.54,"longitude":-117.67,"altitude":98.6},"pressure":{"pressure":98}}
+    ...    [c8y/measurement/measurements/create] {"type":"environment","time":"2025-06-27T08:11:05.301804125Z","temperature":{"temperature":{"value":258}},"location":{"latitude":{"value":32.54},"longitude":{"value":-117.67},"altitude":{"value":98.6}},"pressure":{"pressure":{"value":98}}}
 
 Using base64 to encode tedge flows input
     ${encoded_input}    Execute Command
@@ -57,11 +57,11 @@ Using base64 to encode tedge flows input
     ...    strip=True
     Should Be Equal
     ...    ${transformed_msg}
-    ...    [c8y/measurement/measurements/create] {"type":"env","time":"2025-06-27T08:11:05.301804125Z","temperature":{"temperature":258}}
+    ...    [c8y/measurement/measurements/create] {"type":"env","time":"2025-06-27T08:11:05.301804125Z","temperature":{"temperature":{"value":258}}}
 
 Using base64 to encode tedge flows output
     ${encoded_output}    Execute Command
-    ...    echo -n '{"type":"env","time":"2025-06-27T08:11:05.301804125Z","temperature":{"temperature":258}}' | base64 --wrap\=0
+    ...    echo -n '{"type":"env","time":"2025-06-27T08:11:05.301804125Z","temperature":{"temperature":{"value":258}}}' | base64 --wrap\=0
     ${transformed_msg}    Execute Command
     ...    tedge flows test --base64-output te/device/main///m/env '{"time":"2025-06-27T08:11:05.301804125Z", "temperature": 258}'
     ...    strip=True