stabilize unit test

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
eclipse-ditto · May 19, 2022 · 6bbc972 · 6bbc972
1 parent bd7d2d9
commit 6bbc972
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...src/test/java/org/eclipse/ditto/things/service/enforcement/LiveSignalEnforcementTest.java b/...src/test/java/org/eclipse/ditto/things/service/enforcement/LiveSignalEnforcementTest.java
@@ -243,16 +243,16 @@ public void correlationIdSameAfterResponseSuccessful() {
 
             // Second message right after the response for the first was sent, should have the same correlation-id (Not suffixed).
             supervisor.tell(readResponse, getRef());
-            final RetrieveThingResponse retrieveThingResponse =
-                    TestSetup.fishForMsgClass(this, RetrieveThingResponse.class);
+            final RetrieveThingResponse retrieveThingResponse = expectMsgClass(RetrieveThingResponse.class);
             assertThat(retrieveThingResponse.getDittoHeaders().getCorrelationId()).isEqualTo(
                     read.getDittoHeaders().getCorrelationId());
 
             supervisor.tell(read, getRef());
 
+            expectPubsubLiveCommandPublish("publish live read command", read.getEntityId());
+
             supervisor.tell(readResponse, getRef());
-            final RetrieveThingResponse retrieveThingResponse2 =
-                    TestSetup.fishForMsgClass(this, RetrieveThingResponse.class);
+            final RetrieveThingResponse retrieveThingResponse2 = expectMsgClass(RetrieveThingResponse.class);
             assertThat(retrieveThingResponse2.getDittoHeaders().getCorrelationId()).isEqualTo(
                     read.getDittoHeaders().getCorrelationId());
         }};

diff --git a/things/service/src/test/resources/logback-test.xml b/things/service/src/test/resources/logback-test.xml
@@ -20,7 +20,7 @@
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%-5level] %logger{15} - %msg%n%rEx</pattern>
+            <pattern>%date{ISO8601} %-5level [%X{x-correlation-id}] %logger{20‚} - %msg%n%rEx</pattern>
         </encoder>
     </appender>