diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/AbstractThingEnforcementTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/AbstractThingEnforcementTest.java index b7b15165f9..e102d71910 100644 --- a/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/AbstractThingEnforcementTest.java +++ b/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/AbstractThingEnforcementTest.java @@ -133,6 +133,16 @@ protected void expectAndAnswerSudoRetrieveThing(final Object sudoRetrieveThingRe thingPersistenceActorProbe.reply(sudoRetrieveThingResponse); } + protected void expectAndAnswerSudoRetrieveThingWithSpecificTimeout(final Object sudoRetrieveThingResponse, + final FiniteDuration timeout) { + + final SudoRetrieveThing sudoRetrieveThing = + thingPersistenceActorProbe.expectMsgClass(timeout, SudoRetrieveThing.class); + assertThat((CharSequence) sudoRetrieveThing.getEntityId()).isEqualTo(THING_ID); + thingPersistenceActorProbe.reply(sudoRetrieveThingResponse); + } + + protected void expectAndAnswerRetrievePolicy(final PolicyId policyId, final Object retrievePolicyResponse) { final var retrievePolicy = policiesShardRegionProbe.expectMsgClass(RetrievePolicy.class); assertThat((CharSequence) retrievePolicy.getEntityId()).isEqualTo(policyId); diff --git a/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/LiveSignalEnforcementTest.java b/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/LiveSignalEnforcementTest.java index 2321885d99..bc2f5a641a 100644 --- a/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/LiveSignalEnforcementTest.java +++ b/things/service/src/test/java/org/eclipse/ditto/things/service/enforcement/LiveSignalEnforcementTest.java @@ -18,6 +18,7 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; import org.eclipse.ditto.base.model.auth.AuthorizationContext; import org.eclipse.ditto.base.model.auth.AuthorizationSubject; @@ -87,7 +88,8 @@ public void rejectMessageCommandByPolicy() { new TestKit(system) {{ supervisor.tell(thingMessageCommand("abc"), getRef()); - expectAndAnswerSudoRetrieveThing(sudoRetrieveThingResponse); + expectAndAnswerSudoRetrieveThingWithSpecificTimeout(sudoRetrieveThingResponse, FiniteDuration.apply(15, + TimeUnit.SECONDS)); TestSetup.fishForMsgClass(this, MessageSendNotAllowedException.class); }}; }