fix 2: system test

Signed-off-by: Aleksandar Stanchev <[email protected]>

Author: alstanchev

system/src/test/java/org/eclipse/ditto/testing/system/connectivity/AbstractConnectivityResponseDiversionITestCases.java

@@ -39,6 +39,8 @@
 import org.eclipse.ditto.connectivity.model.Target;
 import org.eclipse.ditto.testing.common.categories.RequireSource;
 import org.eclipse.ditto.testing.common.matcher.StatusCodeSuccessfulMatcher;
+import org.eclipse.ditto.things.model.ThingBuilder;
+import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.things.model.signals.commands.ThingErrorResponse;
 import org.eclipse.ditto.things.model.signals.commands.modify.CreateThing;
 import org.eclipse.ditto.things.model.signals.commands.modify.CreateThingResponse;
@@ -129,12 +131,12 @@ public void divertResponseBasedOnConnectionHeaderMapping()
         // Given
         final String sendingConnectionName = cf.connectionName1;
         final String divertedConnectionName = cf.connectionName2;
-        final CreateThing createThing = newCreateThing(sendingConnectionName, false);
-        sendSignal(sendingConnectionName, createThing);
+        final ThingId thingId = sendCreateThingAndEnsureResponseIsSentBack(cf.connectionName1,
+                ThingBuilder.FromScratch::build);
 
         final String correlationId = UUID.randomUUID().toString();
         // When: Send command with divert-response-to-connection header
-        final RetrieveThing retrieveThing = RetrieveThing.of(createThing.getEntityId(),
+        final RetrieveThing retrieveThing = RetrieveThing.of(thingId,
                 DittoHeaders.newBuilder()
                         .correlationId(correlationId)
                         .schemaVersion(JsonSchemaVersion.V_2)
@@ -167,12 +169,12 @@ public void divertAndPreserveOriginalResponseInSourceConnection()
         // Given
         final String sendingConnectionName = cf.connectionName1;
         final String divertedConnectionName = cf.connectionName2;
-        final CreateThing createThing = newCreateThing(sendingConnectionName, false);
-        sendSignal(sendingConnectionName, createThing);
+        final ThingId thingId = sendCreateThingAndEnsureResponseIsSentBack(sendingConnectionName,
+                ThingBuilder.FromScratch::build);
 
         final String correlationId = UUID.randomUUID().toString();
         // When: Send command with divert-response-to-connection header
-        final RetrieveThing retrieveThing = RetrieveThing.of(createThing.getEntityId(),
+        final RetrieveThing retrieveThing = RetrieveThing.of(thingId,
                 DittoHeaders.newBuilder()
                         .correlationId(correlationId)
                         .schemaVersion(JsonSchemaVersion.V_2)
@@ -214,13 +216,13 @@ public void divertResponseBasedOnHeaderInTheMessageItself()
         // Given
         final String sendingConnectionName = cf.connectionName1;
         final String divertedConnectionName = cf.connectionName2;
-        final CreateThing createThing = newCreateThing(sendingConnectionName, false);
-        sendSignal(sendingConnectionName, createThing);
+        final ThingId thingId = sendCreateThingAndEnsureResponseIsSentBack(cf.connectionName1,
+                ThingBuilder.FromScratch::build);
 
         final String correlationId = UUID.randomUUID().toString();
         final String divertAddress = getTargetAddress(targetConnection);
         // When: Send command with divert-response-to-connection header
-        final RetrieveThing retrieveThing = RetrieveThing.of(createThing.getEntityId(),
+        final RetrieveThing retrieveThing = RetrieveThing.of(thingId,
                 DittoHeaders.newBuilder()
                         .correlationId(correlationId)
                         .schemaVersion(JsonSchemaVersion.V_2)
@@ -251,14 +253,14 @@ public void doNotPublishDivertedResponseIfNotAuthorized()
         // Given
         final String sendingConnectionName = cf.connectionName1;
         final String divertedConnectionName = cf.connectionName2;
-        final CreateThing createThing = newCreateThing(sendingConnectionName, false);
-        sendSignal(sendingConnectionName, createThing);
+        final ThingId thingId = sendCreateThingAndEnsureResponseIsSentBack(cf.connectionName1,
+                ThingBuilder.FromScratch::build);
 
         prepareConnectionsForDiversion(sourceConnection, false, false, targetConnection, true);
 
         final String correlationId = UUID.randomUUID().toString();
         final String divertAddress = getTargetAddress(targetConnection);
-        final RetrieveThing retrieveThing = RetrieveThing.of(createThing.getEntityId(),
+        final RetrieveThing retrieveThing = RetrieveThing.of(thingId,
                 DittoHeaders.newBuilder()
                         .correlationId(correlationId)
                         .schemaVersion(JsonSchemaVersion.V_2)
@@ -282,20 +284,11 @@ public void testErrorResponseDiversion() throws ExecutionException, InterruptedE
         final Connection sourceConnection = getConnectionExistingByNameForUser(DIVERSION_SOURCE, getUsername());
         prepareConnectionsForDiversion(sourceConnection, true, false, targetConnection, true);
 
-        final CreateThing createThing = newCreateThing(cf.connectionName2, true);
-
-        final String correlationId = createThing.getDittoHeaders().getCorrelationId().get();
-        final C responseConsumer = initResponseConsumer(cf.connectionName2, correlationId);
-        sendSignal(cf.connectionName2, createThing);
-        final M createResponse = consumeResponse(correlationId, responseConsumer);
-        assertThat(createResponse).isNotNull();
-
-        final Signal<?> signal = PROTOCOL_ADAPTER.fromAdaptable(jsonifiableAdaptableFrom(createResponse));
-        assertThat(signal).isInstanceOf(CreateThingResponse.class);
-
+        final ThingId thingId = sendCreateThingAndEnsureResponseIsSentBack(cf.connectionName1,
+                ThingBuilder.FromScratch::build);
 
         // Send command that will fail
-        final RetrieveThing retrieveThing = RetrieveThing.of(createThing.getEntityId(),
+        final RetrieveThing retrieveThing = RetrieveThing.of(thingId,
                 DittoHeaders.newBuilder()
                         .correlationId(createNewCorrelationId())
                         .schemaVersion(JsonSchemaVersion.V_2)