diff options
author | Henry.Sun <henry.a.sun@est.tech> | 2020-03-02 15:47:09 +0800 |
---|---|---|
committer | Henry.Sun <henry.a.sun@est.tech> | 2020-03-04 12:02:42 +0800 |
commit | 153ad0056c3928116d28eb7e1bb14c4a04a76fc2 (patch) | |
tree | 00f973c22492c89633723dcb5f09b448973e9ba4 /examples/examples-aadm/src | |
parent | 27dcbd57cc04c45ba85ff6f4008ef2c1d8f7c050 (diff) |
replace test sleep() with awaitality package
Signed-off-by: Henry.Sun <henry.a.sun@est.tech>
Change-Id: I305771ddef42bd3032ad52f4c5ecd55b01ed5a1a
Issue-ID: POLICY-1914
Signed-off-by: Henry.Sun <henry.a.sun@est.tech>
Diffstat (limited to 'examples/examples-aadm/src')
-rw-r--r-- | examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestApexActionListener.java | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestApexActionListener.java b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestApexActionListener.java index 03372d745..bca901e6b 100644 --- a/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestApexActionListener.java +++ b/examples/examples-aadm/src/test/java/org/onap/policy/apex/examples/aadm/TestApexActionListener.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,10 +23,11 @@ package org.onap.policy.apex.examples.aadm; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.TimeUnit; import org.onap.policy.apex.core.engine.engine.EnEventListener; import org.onap.policy.apex.core.engine.event.EnEvent; -import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities; +import static org.awaitility.Awaitility.await; /** * The listener interface for receiving testApexAction events. The class that is interested in processing a @@ -55,9 +57,7 @@ public class TestApexActionListener implements EnEventListener { * @return the result */ public EnEvent getResult() { - while (resultEvents.isEmpty()) { - ThreadUtilities.sleep(100); - } + await().atLeast(100, TimeUnit.MILLISECONDS).until(() -> !resultEvents.isEmpty()); return resultEvents.remove(0); } @@ -66,12 +66,9 @@ public class TestApexActionListener implements EnEventListener { */ @Override public void onEnEvent(final EnEvent actionEvent) { - ThreadUtilities.sleep(100); - - if (actionEvent != null) { - System.out.println("Action event from engine:" + actionEvent.getName()); - resultEvents.add(actionEvent); - } + await().atLeast(100, TimeUnit.MILLISECONDS).until(() -> actionEvent != null); + System.out.println("Action event from engine:" + actionEvent.getName()); + resultEvents.add(actionEvent); } /** |