fix unit tests

Signed-off-by: Stanchev Aleksandar <aleksandar.stanchev@bosch.com>
eclipse-ditto · Aug 28, 2023 · 0ca675c · 0ca675c
1 parent 7558cf5
commit 0ca675c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/.../test/java/org/eclipse/ditto/things/service/enforcement/AbstractThingEnforcementTest.java b/.../test/java/org/eclipse/ditto/things/service/enforcement/AbstractThingEnforcementTest.java
@@ -130,7 +130,7 @@ public <S extends ThingEvent<?>> Object wrapForPublicationWithAcks(final S messa
                 null,
                 policyEnforcerProvider,
                 Mockito.mock(MongoReadJournal.class)
-        ).withDispatcher("org.apache.pekko.actor.default-dispatcher"), system.guardian(),
+        ).withDispatcher("pekko.actor.default-dispatcher"), system.guardian(),
                 URLEncoder.encode(THING_ID.toString(), Charset.defaultCharset()));
         // Actors using "stash()" require the above dispatcher to be configured, otherwise stash() and unstashAll() won't
         // work like in the "normal" actor!

diff --git a/...java/org/eclipse/ditto/things/service/persistence/testhelper/ThingsJournalTestHelper.java b/...java/org/eclipse/ditto/things/service/persistence/testhelper/ThingsJournalTestHelper.java
@@ -29,7 +29,7 @@
 
 import org.apache.pekko.NotUsed;
 import org.apache.pekko.actor.ActorSystem;
-//import org.apache.pekko.persistence.inmemory.query.javadsl.InMemoryReadJournal;
+import org.apache.pekko.persistence.inmemory.query.javadsl.InMemoryReadJournal;
 import org.apache.pekko.persistence.query.EventEnvelope;
 import org.apache.pekko.persistence.query.PersistenceQuery;
 import org.apache.pekko.stream.javadsl.Sink;
@@ -46,7 +46,7 @@ public final class ThingsJournalTestHelper<J> {
     private static final int WAIT_TIMEOUT = 3;
     private final Function<ThingId, String> domainIdToPersistenceId;
     private final BiFunction<BsonDocument, Long, J> journalEntryToDomainObject;
-//    private final InMemoryReadJournal readJournal;
+    private final InMemoryReadJournal readJournal;
     private final ActorSystem actorSystem;
 
     /**
@@ -64,8 +64,8 @@ public ThingsJournalTestHelper(final ActorSystem actorSystem,
         this.journalEntryToDomainObject = requireNonNull(journalEntryToDomainObject);
         this.domainIdToPersistenceId = requireNonNull(domainIdToPersistenceId);
 
-//        readJournal = PersistenceQuery.get(actorSystem).
-//                getReadJournalFor(InMemoryReadJournal.class, InMemoryReadJournal.Identifier());
+        readJournal = PersistenceQuery.get(actorSystem).
+                getReadJournalFor(InMemoryReadJournal.class, InMemoryReadJournal.Identifier());
         this.actorSystem = actorSystem;
     }
 
@@ -83,8 +83,7 @@ public List<J> getAllEvents(final ThingId thingId) {
     }
 
     private List<EventEnvelope> getAllEventEnvelopes(final String persistenceId) {
-        return null;
-//        return runBlockingWithReturn(readJournal.currentEventsByPersistenceId(persistenceId, 0, Long.MAX_VALUE));
+       return runBlockingWithReturn(readJournal.currentEventsByPersistenceId(persistenceId, 0, Long.MAX_VALUE));
     }
 
     private J convertEventEnvelopeToDomainObject(final EventEnvelope eventEnvelope) {

diff --git a/things/service/src/test/resources/test.conf b/things/service/src/test/resources/test.conf
@@ -130,7 +130,7 @@ pekko.persistence {
 }
 
 pekko-contrib-mongodb-persistence-things-journal {
-  class = "pekko.persistence.inmemory.journal.InMemoryAsyncWriteJournal"
+  class = "org.apache.pekko.persistence.inmemory.journal.InMemoryAsyncWriteJournal"
   plugin-dispatcher = "thing-persistence-dispatcher"
 
   ask-timeout = 10s

diff --git a/thingsearch/service/src/test/resources/test.conf b/thingsearch/service/src/test/resources/test.conf
@@ -66,7 +66,7 @@ pekko {
       json = "org.eclipse.ditto.internal.utils.cluster.JsonJsonifiableSerializer"
       cbor = "org.eclipse.ditto.internal.utils.cluster.CborJsonifiableSerializer"
       cbor-json-value = "org.eclipse.ditto.internal.utils.cluster.CborJsonValueSerializer"
-      jackson-cbor = "pekko.serialization.jackson.JacksonCborSerializer"
+      jackson-cbor = "org.apache.pekko.serialization.jackson.JacksonCborSerializer"
     }
 
     serialization-bindings {