fixed NormalizedMessageMapperTest, including new "value" field to exp…

…ectations Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
eclipse-ditto · Oct 15, 2023 · 4404e59 · 4404e59
1 parent 3cc6bb9
commit 4404e59
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...test/java/org/eclipse/ditto/connectivity/service/mapping/NormalizedMessageMapperTest.java b/...test/java/org/eclipse/ditto/connectivity/service/mapping/NormalizedMessageMapperTest.java
@@ -17,6 +17,7 @@
 import java.time.Instant;
 import java.util.Map;
 
+import org.apache.pekko.actor.ActorSystem;
 import org.assertj.core.api.Assertions;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.signals.Signal;
@@ -46,7 +47,6 @@
 import org.eclipse.ditto.things.model.FeatureProperties;
 import org.eclipse.ditto.things.model.Features;
 import org.eclipse.ditto.things.model.Thing;
-import org.eclipse.ditto.things.model.ThingDefinition;
 import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.things.model.ThingsModelFactory;
 import org.eclipse.ditto.things.model.signals.commands.modify.DeleteThing;
@@ -67,8 +67,6 @@
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
-import org.apache.pekko.actor.ActorSystem;
-
 /**
  * Tests {@link NormalizedMessageMapper}.
  */
@@ -133,6 +131,7 @@ public void thingCreated() {
                         "  \"_context\": {\n" +
                         "    \"topic\": \"thing/created/things/twin/events/created\",\n" +
                         "    \"path\": \"/\",\n" +
+                        "    \"value\":{\"thingId\":\"thing:created\",\"policyId\":\"thing:created\",\"attributes\":{\"x\":5},\"features\":{\"feature\":{\"properties\":{\"y\":6}}}},\n" +
                         "    \"headers\": {\n" +
                         "      \"response-required\": \"false\",\n" +
                         "      \"content-type\": \"application/json\"\n" +
@@ -174,6 +173,7 @@ public void thingMerged() {
                         "  \"_context\": {\n" +
                         "    \"topic\": \"thing/merged/things/twin/events/merged\",\n" +
                         "    \"path\": \"/\",\n" +
+                        "    \"value\":{\"thingId\":\"thing:merged\",\"attributes\":{\"x\":5},\"features\":{\"feature\":{\"properties\":{\"y\":6}}}},\n" +
                         "    \"headers\": {\n" +
                         "      \"response-required\": \"false\",\n" +
                         "      \"content-type\": \"application/merge-patch+json\"\n" +
@@ -218,6 +218,7 @@ public void thingMergedWithNullValues() {
                         "  \"_context\": {\n" +
                         "    \"topic\": \"thing/merged/things/twin/events/merged\",\n" +
                         "    \"path\": \"/\",\n" +
+                        "    \"value\":{\"thingId\":\"thing:merged\",\"attributes\":{\"x\":5},\"features\":{\"feature\":{\"properties\":{\"y\":6}}}},\n" +
                         "    \"headers\": {\n" +
                         "      \"response-required\": \"false\",\n" +
                         "      \"content-type\": \"application/merge-patch+json\"\n" +
@@ -251,6 +252,7 @@ public void thingMergedWithOnlyNullValues() {
                         "  \"_context\": {\n" +
                         "    \"topic\": \"thing/merged/things/twin/events/merged\",\n" +
                         "    \"path\": \"/\",\n" +
+                        "    \"value\":{\"thingId\":\"thing:merged\"},\n" +
                         "    \"headers\": {\n" +
                         "      \"response-required\": \"false\",\n" +
                         "      \"content-type\": \"application/merge-patch+json\"\n" +
@@ -309,6 +311,7 @@ public void thingMergedWithExtraFields() {
                 .set("_context", JsonObject.newBuilder()
                         .set("topic", "the.namespace/the-thing-id/things/twin/events/merged")
                         .set("path", "/features/transmission")
+                        .set("value", JsonFactory.readFrom("{\"properties\":{\"cur_speed\":80}}"))
                         .set("headers", JsonObject.newBuilder()
                                 .set("response-required", "false")
                                 .set("content-type", "application/merge-patch+json")
@@ -345,6 +348,7 @@ public void featurePropertyModified() {
                         "  \"_context\": {\n" +
                         "    \"topic\": \"thing/id/things/twin/events/modified\",\n" +
                         "    \"path\": \"/features/featureId/properties/the/quick/brown/fox/jumps/over/the/lazy/dog\",\n" +
+                        "    \"value\":9,\n" +
                         "    \"headers\": {\n" +
                         "      \"response-required\": \"false\",\n" +
                         "      \"content-type\": \"application/json\"\n" +