Remove outdated assertions in SearchConsistencyIT.

Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Apr 5, 2022 · 753218e · 753218e
1 parent 81d5191
commit 753218e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 56 deletions.
diff --git a/...vice/src/main/java/org/eclipse/ditto/thingsearch/service/updater/actors/ThingUpdater.java b/...vice/src/main/java/org/eclipse/ditto/thingsearch/service/updater/actors/ThingUpdater.java
@@ -229,10 +229,8 @@ private FSM.State<State, Data> onResult(final Result result, final Data data) {
 
     private FSM.State<State, Data> tick(final Control tick, final Data data) {
         if (shouldPersist(data.metadata(), data.lastWriteModel().getMetadata())) {
-            final var future = Source.single(data)
-                    .via(flow)
-                    .toMat(Sink.head(), Keep.right())
-                    .run(materializer);
+            final var future =
+                    Source.single(data).via(flow).toMat(Sink.head(), Keep.right()).run(materializer);
 
             final var resultFuture = future.handle((result, error) -> {
                 if (error != null || result == null) {

diff --git a/...c/test/java/org/eclipse/ditto/thingsearch/service/updater/actors/SearchConsistencyIT.java b/...c/test/java/org/eclipse/ditto/thingsearch/service/updater/actors/SearchConsistencyIT.java
@@ -224,7 +224,7 @@ private void assertSearchPersisted(final Duration timeout) {
                 .until(() -> {
                     final var persistedDocuments =
                             Source.fromPublisher(mongoClient.getCollection(PersistenceConstants.THINGS_COLLECTION_NAME)
-                                    .find(Filters.eq(PersistenceConstants.FIELD_ID, THING_ID.toString())))
+                                            .find(Filters.eq(PersistenceConstants.FIELD_ID, THING_ID.toString())))
                                     .runWith(Sink.seq(), materializer)
                                     .toCompletableFuture()
                                     .get(timeout.toMillis(), TimeUnit.MILLISECONDS);
@@ -252,7 +252,6 @@ private static AbstractWriteModel getRecoveryWriteModel() {
     private static boolean documentIsExpected(final Map<String, Object> actual) {
         final var sorting = (Document) actual.get(PersistenceConstants.FIELD_THING);
         final var sortingAttributes = (Document) sorting.get(PersistenceConstants.FIELD_ATTRIBUTES);
-        final var internal = (List<Document>) actual.get(PersistenceConstants.FIELD_INTERNAL);
 
         return actual.get(PersistenceConstants.FIELD_ID).equals(THING_ID.toString()) &&
                 actual.get(PersistenceConstants.FIELD_REVISION).equals(REVISION) &&
@@ -266,56 +265,7 @@ private static boolean documentIsExpected(final Map<String, Object> actual) {
                 sorting.get("policyId").equals(POLICY_ID.toString()) &&
                 sorting.get("_modified").equals(MODIFIED.toString()) &&
                 sortingAttributes.get("number").equals(Long.valueOf(EXPECTED_NUMBER).intValue()) &&
-                sortingAttributes.get("char").equals(EXPECTED_CHAR) &&
-                internal.contains(new Document()
-                        .append(PersistenceConstants.FIELD_INTERNAL_KEY,
-                                "/" + PersistenceConstants.FIELD_REVISION)
-                        .append(PersistenceConstants.FIELD_INTERNAL_VALUE, Long.valueOf(REVISION).intValue())
-                        .append(PersistenceConstants.FIELD_GRANTED,
-                                List.of("integration:test"))
-                        .append(PersistenceConstants.FIELD_REVOKED, Collections.emptyList())) &&
-                internal.contains(new Document()
-                        .append(PersistenceConstants.FIELD_INTERNAL_KEY,
-                                "/" + PersistenceConstants.FIELD_NAMESPACE)
-                        .append(PersistenceConstants.FIELD_INTERNAL_VALUE, THING_ID.getNamespace())
-                        .append(PersistenceConstants.FIELD_GRANTED,
-                                List.of("integration:test"))
-                        .append(PersistenceConstants.FIELD_REVOKED, Collections.emptyList())) &&
-                internal.contains(new Document()
-                        .append(PersistenceConstants.FIELD_INTERNAL_KEY,
-                                "/thingId")
-                        .append(PersistenceConstants.FIELD_INTERNAL_VALUE, THING_ID.toString())
-                        .append(PersistenceConstants.FIELD_GRANTED,
-                                List.of("integration:test"))
-                        .append(PersistenceConstants.FIELD_REVOKED, Collections.emptyList())) &&
-                internal.contains(new Document()
-                        .append(PersistenceConstants.FIELD_INTERNAL_KEY,
-                                "/policyId")
-                        .append(PersistenceConstants.FIELD_INTERNAL_VALUE, POLICY_ID.toString())
-                        .append(PersistenceConstants.FIELD_GRANTED,
-                                List.of("integration:test"))
-                        .append(PersistenceConstants.FIELD_REVOKED, Collections.emptyList())) &&
-                internal.contains(new Document()
-                        .append(PersistenceConstants.FIELD_INTERNAL_KEY,
-                                "/attributes/number")
-                        .append(PersistenceConstants.FIELD_INTERNAL_VALUE, Long.valueOf(EXPECTED_NUMBER).intValue())
-                        .append(PersistenceConstants.FIELD_GRANTED,
-                                List.of("integration:test"))
-                        .append(PersistenceConstants.FIELD_REVOKED, Collections.emptyList())) &&
-                internal.contains(new Document()
-                        .append(PersistenceConstants.FIELD_INTERNAL_KEY,
-                                "/attributes/char")
-                        .append(PersistenceConstants.FIELD_INTERNAL_VALUE, EXPECTED_CHAR)
-                        .append(PersistenceConstants.FIELD_GRANTED,
-                                List.of("integration:test"))
-                        .append(PersistenceConstants.FIELD_REVOKED, Collections.emptyList())) &&
-                internal.contains(new Document()
-                        .append(PersistenceConstants.FIELD_INTERNAL_KEY,
-                                "/_modified")
-                        .append(PersistenceConstants.FIELD_INTERNAL_VALUE, MODIFIED.toString())
-                        .append(PersistenceConstants.FIELD_GRANTED,
-                                List.of("integration:test"))
-                        .append(PersistenceConstants.FIELD_REVOKED, Collections.emptyList()));
+                sortingAttributes.get("char").equals(EXPECTED_CHAR);
     }
 
     private static final class UpdaterShardMock extends AbstractActor {