From d96ef9e9376bf684ad70537a1ee41919e0759cc3 Mon Sep 17 00:00:00 2001 From: SirWayne Date: Tue, 18 Apr 2017 13:46:08 +0200 Subject: [PATCH] Wait until the action update event is processed Signed-off-by: SirWayne --- ...pMessageHandlerServiceIntegrationTest.java | 21 ++++++++++++++++--- .../AmqpServiceIntegrationTest.java | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java b/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java index 98ecf833b..c1f42e8a5 100644 --- a/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java +++ b/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java @@ -9,8 +9,10 @@ package org.eclipse.hawkbit.integration; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; import java.util.List; +import java.util.Optional; import java.util.UUID; import java.util.stream.Collectors; @@ -595,10 +597,23 @@ public class AmqpMessageHandlerServiceIntegrationTest extends AmqpServiceIntegra } private void assertAction(final Long actionId, final Status... expectedActionStates) { - final Action action = waitUntilIsPresent(() -> controllerManagement.findActionWithDetails(actionId)); - final List status = action.getActionStatus().stream().map(actionStatus -> actionStatus.getStatus()) + createConditionFactory().await().until(() -> { + try { + securityRule.runAsPrivileged(() -> { + final Optional findActionWithDetails = controllerManagement.findActionWithDetails(actionId); + assertThat(findActionWithDetails).isPresent(); + assertThat(convertStatusList(findActionWithDetails.get())).containsOnly(expectedActionStates); + return null; + }); + } catch (final Exception e) { + fail(e.getMessage()); + } + }); + } + + private List convertStatusList(Action action) { + return action.getActionStatus().stream().map(actionStatus -> actionStatus.getStatus()) .collect(Collectors.toList()); - assertThat(status).containsOnly(expectedActionStates); } private Message createEventMessage(final String tenant, final EventTopic eventTopic, final Object payload) { diff --git a/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpServiceIntegrationTest.java b/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpServiceIntegrationTest.java index 88988709b..757254543 100644 --- a/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpServiceIntegrationTest.java +++ b/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpServiceIntegrationTest.java @@ -78,7 +78,7 @@ public abstract class AmqpServiceIntegrationTest extends AbstractAmqpIntegration }); try { - return callable.call().get(); + return securityRule.runAsPrivileged(() -> callable.call().get()); } catch (final Exception e) { return null; }