fixed unit test

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · Jul 7, 2022 · f91f5d8 · f91f5d8
1 parent 449108e
commit f91f5d8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/Enforcer.java b/policies/model/src/main/java/org/eclipse/ditto/policies/model/enforcers/Enforcer.java
@@ -291,7 +291,7 @@ default JsonObject buildJsonView(final ResourceKey resourceKey,
         if (isAuthorizationSubjectRelevant) {
             final JsonObject inputJsonObject = JsonFactory.newObject(jsonFields);
             final JsonObject allowedJsonView = inputJsonObject.get(allowlist);
-            return JsonFactory.newObject(allowedJsonView, enforcedJsonView); // TODO TJ in which way to merge??
+            return JsonFactory.newObject(allowedJsonView, enforcedJsonView);
         } else {
             return enforcedJsonView;
         }

diff --git a/...c/test/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcementTest.java b/...c/test/java/org/eclipse/ditto/things/service/enforcement/ThingCommandEnforcementTest.java
@@ -307,7 +307,13 @@ public void acceptByPolicyWithRevokeOnAttribute() {
 
             expectAndAnswerSudoRetrieveThing(sudoRetrieveThingResponse);
 
-            final JsonObject jsonObjectWithoutAttr = thingWithPolicy.remove(attributePointer);
+            final JsonObject jsonObjectWithoutAttr = JsonObject.newBuilder()
+                    .set("thingId", "thing:id") // this is re-added as first field being a "special" field always visible after enforcement
+                    .set("_revision", 1)
+                    .set("_namespace", "thing")
+                    .set("policyId","policy:id")
+                    .set("attributes",JsonObject.empty())
+                    .build();
             final RetrieveThingResponse retrieveThingResponseWithoutAttr =
                     RetrieveThingResponse.of(THING_ID, jsonObjectWithoutAttr, headers());
             expectMsg(retrieveThingResponseWithoutAttr);