Fix intermittent unit test failures reseterquestor

When consumers and producers are paired as in the case of the REST
Rquestor, both sides must come up and be wired together in the
initiation phase of apex-pdp before the consumers and producers start
handling envents.

In the ApexActivator class, the consumers were started immediately after
they were initialized meaning that a consumer could return events to a
producer that had not started yet.

This change fixes the ApexActivator so that it waits until all consumers
and producers are initialized before starting event handling.

It also fixes the timings on RestRequestor tests and tidies up the unit
tests.

Issue-ID: POLICY-2469
Change-Id: Ib66d9531bf21f2a879ab33795aded4f48e7bfbc6
Signed-off-by: liamfallon <liam.fallon@est.tech>

5 files changed, 135 insertions, 224 deletions

diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumerTest.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumerTest.java
index 0c6067a75..a1dc0b468 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumerTest.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumerTest.java
@@ -21,10 +21,10 @@
 
 package org.onap.policy.apex.plugins.event.carrier.restrequestor;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.awaitility.Awaitility.await;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
 
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
@@ -54,41 +54,29 @@ public class ApexRestRequestorConsumerTest {
         EventHandlerParameters consumerParameters = new EventHandlerParameters();
         ApexEventReceiver incomingEventReceiver = null;
 
-        try {
+        assertThatThrownBy(() -> {
             consumer.init(CONSUMER_NAME, consumerParameters, incomingEventReceiver);
-            fail("test should throw an exception here");
-        } catch (ApexEventException aee) {
-            assertEquals("specified consumer properties are not applicable to REST Requestor consumer (ConsumerName)",
-                    aee.getMessage());
-        }
+        }).hasMessage("specified consumer properties are not applicable to REST Requestor consumer (ConsumerName)");
 
         RestRequestorCarrierTechnologyParameters rrctp = new RestRequestorCarrierTechnologyParameters();
         consumerParameters.setCarrierTechnologyParameters(rrctp);
-        try {
+        assertThatThrownBy(() -> {
             consumer.init(CONSUMER_NAME, consumerParameters, incomingEventReceiver);
-            fail("test should throw an exception here");
-        } catch (ApexEventException aee) {
-            assertEquals("REST Requestor consumer (ConsumerName) must run in peered requestor mode "
-                    + "with a REST Requestor producer", aee.getMessage());
-        }
+        }).hasMessage("REST Requestor consumer (ConsumerName) must run in peered requestor mode "
+            + "with a REST Requestor producer");
 
         consumerParameters.setPeeredMode(EventHandlerPeeredMode.REQUESTOR, true);
         rrctp.setHttpMethod(null);
-        try {
+
+        assertThatThrownBy(() -> {
             consumer.init(CONSUMER_NAME, consumerParameters, incomingEventReceiver);
-            fail("test should throw an exception here");
-        } catch (ApexEventException aee) {
-            assertEquals("no URL has been specified on REST Requestor consumer (ConsumerName)", aee.getMessage());
-        }
+        }).hasMessage("no URL has been specified on REST Requestor consumer (ConsumerName)");
 
         rrctp.setHttpMethod(RestRequestorCarrierTechnologyParameters.HttpMethod.GET);
         rrctp.setUrl("ZZZZ");
-        try {
+        assertThatThrownBy(() -> {
             consumer.init(CONSUMER_NAME, consumerParameters, incomingEventReceiver);
-            fail("test should throw an exception here");
-        } catch (ApexEventException aee) {
-            assertEquals("invalid URL has been specified on REST Requestor consumer (ConsumerName)", aee.getMessage());
-        }
+        }).hasMessage("invalid URL has been specified on REST Requestor consumer (ConsumerName)");
 
         rrctp.setHttpMethod(RestRequestorCarrierTechnologyParameters.HttpMethod.GET);
         rrctp.setUrl("http://www.onap.org");
@@ -97,12 +85,9 @@ public class ApexRestRequestorConsumerTest {
 
         consumer.init(CONSUMER_NAME, consumerParameters, incomingEventReceiver);
 
-        try {
+        assertThatThrownBy(() -> {
             consumer.processRestRequest(null);
-            fail("test should throw an exception here");
-        } catch (Exception ex) {
-            assertEquals("could not queue request \"null\" on REST Requestor consumer (ConsumerName)", ex.getMessage());
-        }
+        }).hasMessage("could not queue request \"null\" on REST Requestor consumer (ConsumerName)");
 
         assertEquals(CONSUMER_NAME, consumer.getName());
         assertEquals(0, consumer.getEventsReceived());
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducerTest.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducerTest.java
index d168f2444..450a21f01 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducerTest.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorProducerTest.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 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.
@@ -20,6 +21,7 @@
 
 package org.onap.policy.apex.plugins.event.carrier.restrequestor;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
@@ -47,41 +49,30 @@ public class ApexRestRequestorProducerTest {
 
         EventHandlerParameters producerParameters = new EventHandlerParameters();
 
-        try {
+        assertThatThrownBy(() -> {
             producer.init(PRODUCER_NAME, producerParameters);
-        } catch (ApexEventException aee) {
-            assertEquals("specified producer properties are not applicable to REST requestor producer (ProducerName)",
-                            aee.getMessage());
-        }
+        }).hasMessage("specified producer properties are not applicable to REST requestor producer (ProducerName)");
 
         RestRequestorCarrierTechnologyParameters rrctp = new RestRequestorCarrierTechnologyParameters();
         producerParameters.setCarrierTechnologyParameters(rrctp);
-        try {
+        assertThatThrownBy(() -> {
             producer.init(PRODUCER_NAME, producerParameters);
-            fail("test should throw an exception here");
-        } catch (ApexEventException aee) {
-            assertEquals("REST Requestor producer (ProducerName) must run in peered requestor mode "
-                            + "with a REST Requestor consumer", aee.getMessage());
-        }
+        }).hasMessage("REST Requestor producer (ProducerName) must run in peered requestor mode "
+            + "with a REST Requestor consumer");
 
         producerParameters.setPeeredMode(EventHandlerPeeredMode.REQUESTOR, true);
         rrctp.setUrl("ZZZZ");
-        try {
+        assertThatThrownBy(() -> {
             producer.init(PRODUCER_NAME, producerParameters);
-            fail("test should throw an exception here");
-        } catch (ApexEventException aee) {
-            assertEquals("URL may not be specified on REST Requestor producer (ProducerName)", aee.getMessage());
-        }
+        }).hasMessage("URL may not be specified on REST Requestor producer (ProducerName)");
 
         rrctp.setUrl(null);
         rrctp.setHttpMethod(RestRequestorCarrierTechnologyParameters.HttpMethod.GET);
-        try {
+
+        assertThatThrownBy(() -> {
             producer.init(PRODUCER_NAME, producerParameters);
             fail("test should throw an exception here");
-        } catch (ApexEventException aee) {
-            assertEquals("HTTP method may not be specified on REST Requestor producer (ProducerName)",
-                            aee.getMessage());
-        }
+        }).hasMessage("HTTP method may not be specified on REST Requestor producer (ProducerName)");
 
         rrctp.setHttpMethod(null);
         producer.init(PRODUCER_NAME, producerParameters);
@@ -109,28 +100,20 @@ public class ApexRestRequestorProducerTest {
         String eventName = "EventName";
         String event = "This is the event";
 
-        try {
+        assertThatThrownBy(() -> {
             producer.sendEvent(12345, null, eventName, event);
-            fail("test should throw an exception here");
-        } catch (Exception aee) {
-            assertEquals("send of event to URL \"null\" failed, REST response consumer is not defined\n"
-                            + "This is the event", aee.getMessage());
-        }
+        }).hasMessage("send of event failed, REST response consumer is not defined\n" + "This is the event");
 
         ApexEventConsumer consumer = new ApexFileEventConsumer();
-        SynchronousEventCache eventCache = new SynchronousEventCache(EventHandlerPeeredMode.SYNCHRONOUS, consumer,
-                        producer, 1000);
+        SynchronousEventCache eventCache =
+            new SynchronousEventCache(EventHandlerPeeredMode.SYNCHRONOUS, consumer, producer, 1000);
         producer.setPeeredReference(EventHandlerPeeredMode.SYNCHRONOUS, eventCache);
 
         PeeredReference peeredReference = new PeeredReference(EventHandlerPeeredMode.REQUESTOR, consumer, producer);
         producer.setPeeredReference(EventHandlerPeeredMode.REQUESTOR, peeredReference);
-        try {
+        assertThatThrownBy(() -> {
             producer.sendEvent(12345, null, eventName, event);
-            fail("test should throw an exception here");
-        } catch (Exception aee) {
-            assertEquals("send of event to URL \"null\" failed, REST response consumer "
-                            + "is not an instance of ApexRestRequestorConsumer\n" + "This is the event",
-                            aee.getMessage());
-        }
+        }).hasMessage("send of event failed, REST response consumer "
+            + "is not an instance of ApexRestRequestorConsumer\n" + "This is the event");
     }
 }
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParametersTest.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParametersTest.java
index b9b997f09..1e0006811 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParametersTest.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorCarrierTechnologyParametersTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-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.
@@ -21,10 +21,10 @@
 
 package org.onap.policy.apex.plugins.event.carrier.restrequestor;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.util.Set;
 
@@ -45,13 +45,9 @@ public class RestRequestorCarrierTechnologyParametersTest {
         arguments.setConfigurationFilePath("src/test/resources/prodcons/RESTRequestorWithHTTPHeaderBadList.json");
         arguments.setRelativeFileRoot(".");
 
-        try {
+        assertThatThrownBy(() -> {
             new ApexParameterHandler().getParameters(arguments);
-            fail("test should throw an exception here");
-        } catch (ParameterException pe) {
-            assertTrue(pe.getMessage().contains("HTTP header array entry is null\n    parameter"));
-            assertTrue(pe.getMessage().trim().endsWith("HTTP header array entry is null"));
-        }
+        }).hasMessageContaining("HTTP header array entry is null\n    parameter");
     }
 
     @Test
@@ -60,15 +56,9 @@ public class RestRequestorCarrierTechnologyParametersTest {
         arguments.setConfigurationFilePath("src/test/resources/prodcons/RESTRequestorWithHTTPHeaderNotKvPairs.json");
         arguments.setRelativeFileRoot(".");
 
-        try {
+        assertThatThrownBy(() -> {
             new ApexParameterHandler().getParameters(arguments);
-            fail("test should throw an exception here");
-        } catch (ParameterException pe) {
-            assertTrue(pe.getMessage()
-                    .contains("HTTP header array entries must have one key and one value: [aaa, bbb, ccc]"));
-            assertTrue(pe.getMessage().trim()
-                    .endsWith("HTTP header array entries must have one key and one value: [aaa]"));
-        }
+        }).hasMessageContaining("HTTP header array entries must have one key and one value: [aaa, bbb, ccc]");
     }
 
     @Test
@@ -77,13 +67,9 @@ public class RestRequestorCarrierTechnologyParametersTest {
         arguments.setConfigurationFilePath("src/test/resources/prodcons/RESTRequestorWithHTTPHeaderNulls.json");
         arguments.setRelativeFileRoot(".");
 
-        try {
+        assertThatThrownBy(() -> {
             new ApexParameterHandler().getParameters(arguments);
-            fail("test should throw an exception here");
-        } catch (ParameterException pe) {
-            assertTrue(pe.getMessage().contains("HTTP header key is null or blank: [null, bbb]"));
-            assertTrue(pe.getMessage().trim().endsWith("HTTP header value is null or blank: [ccc, null]"));
-        }
+        }).hasMessageContaining("HTTP header key is null or blank: [null, bbb]");
     }
 
     @Test
@@ -95,11 +81,11 @@ public class RestRequestorCarrierTechnologyParametersTest {
         ApexParameters parameters = new ApexParameterHandler().getParameters(arguments);
 
         RestRequestorCarrierTechnologyParameters rrctp0 = (RestRequestorCarrierTechnologyParameters) parameters
-                .getEventInputParameters().get("RestRequestorConsumer0").getCarrierTechnologyParameters();
+            .getEventInputParameters().get("RestRequestorConsumer0").getCarrierTechnologyParameters();
         assertEquals(0, rrctp0.getHttpHeaders().length);
 
         RestRequestorCarrierTechnologyParameters rrctp1 = (RestRequestorCarrierTechnologyParameters) parameters
-                .getEventInputParameters().get("RestRequestorConsumer1").getCarrierTechnologyParameters();
+            .getEventInputParameters().get("RestRequestorConsumer1").getCarrierTechnologyParameters();
         assertEquals(3, rrctp1.getHttpHeaders().length);
         assertEquals("bbb", rrctp1.getHttpHeadersAsMultivaluedMap().get("aaa").get(0));
         assertEquals("ddd", rrctp1.getHttpHeadersAsMultivaluedMap().get("ccc").get(0));
@@ -112,16 +98,13 @@ public class RestRequestorCarrierTechnologyParametersTest {
         arguments.setConfigurationFilePath("src/test/resources/prodcons/RESTClientWithHTTPFilterInvalid.json");
         arguments.setRelativeFileRoot(".");
 
-        try {
+        assertThatThrownBy(() -> {
             new ApexParameterHandler().getParameters(arguments);
             ApexParameters parameters = new ApexParameterHandler().getParameters(arguments);
 
             parameters.getEventInputParameters().get("RestRequestorConsumer0").getCarrierTechnologyParameters();
-            fail("test should throw an exception here");
-        } catch (ParameterException pe) {
-            assertTrue(pe.getMessage().contains(
-                    "Invalid HTTP code filter, the filter must be specified as a three digit regular expression: "));
-        }
+        }).hasMessageContaining(
+            "Invalid HTTP code filter, the filter must be specified as a three digit regular expression: ");
     }
 
     @Test
@@ -163,8 +146,8 @@ public class RestRequestorCarrierTechnologyParametersTest {
         assertEquals(RestRequestorCarrierTechnologyParameters.HttpMethod.DELETE, rrctp.getHttpMethod());
 
         assertEquals("RESTREQUESTORCarrierTechnologyParameters "
-                + "[url=http://some.where, httpMethod=DELETE, httpHeaders=[[aaa, bbb], [ccc, ddd]],"
-                + " httpCodeFilter=[1-5][0][0-5]]", rrctp.toString());
+            + "[url=http://some.where, httpMethod=DELETE, httpHeaders=[[aaa, bbb], [ccc, ddd]],"
+            + " httpCodeFilter=[1-5][0][0-5]]", rrctp.toString());
     }
 
     @Test
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorTest.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorTest.java
index 326be511c..cbb81f9da 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorTest.java
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/RestRequestorTest.java
@@ -21,6 +21,7 @@
 
 package org.onap.policy.apex.plugins.event.carrier.restrequestor;
 
+import static org.awaitility.Awaitility.await;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -30,6 +31,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
@@ -40,7 +42,6 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.apex.core.infrastructure.messaging.MessagingException;
-import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
 import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
 import org.onap.policy.apex.service.engine.main.ApexMain;
 import org.onap.policy.common.endpoints.http.server.HttpServletServer;
@@ -105,47 +106,23 @@ public class RestRequestorTest {
      * Test rest requestor get.
      *
      * @throws MessagingException the messaging exception
-     * @throws ApexException the apex exception
-     * @throws IOException Signals that an I/O exception has occurred.
+     * @throws Exception an exception
      */
     @Test
-    public void testRestRequestorGet() throws MessagingException, ApexException, IOException {
+    public void testRestRequestorGet() throws Exception {
         final Client client = ClientBuilder.newClient();
 
         final String[] args = {"src/test/resources/prodcons/File2RESTRequest2FileGet.json"};
         final ApexMain apexMain = new ApexMain(args);
+        await().atMost(2, TimeUnit.SECONDS).until(() -> apexMain.isAlive());
 
-        Response response = null;
-
-        // Wait for the required amount of events to be received or for 10 seconds
-        Double getsSoFar = 0.0;
-        for (int i = 0; i < 40; i++) {
-            ThreadUtilities.sleep(100);
-
-            response = client.target("http://localhost:32801/TestRESTRequestor/apex/event/Stats")
-                .request("application/json").get();
-
-            if (Response.Status.OK.getStatusCode() != response.getStatus()) {
-                break;
-            }
-
-            final String responseString = response.readEntity(String.class);
-
-            @SuppressWarnings("unchecked")
-            final Map<String, Object> jsonMap = new Gson().fromJson(responseString, Map.class);
-            getsSoFar = Double.valueOf(jsonMap.get("GET").toString());
-
-            if (getsSoFar >= 50.0) {
-                break;
-            }
-        }
+        await().pollInterval(300, TimeUnit.MILLISECONDS).atMost(10, TimeUnit.SECONDS)
+            .until(() -> getStatsFromServer(client, "GET") >= 50.0);
 
         apexMain.shutdown();
-        client.close();
-
-        assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        await().atMost(2, TimeUnit.SECONDS).until(() -> !apexMain.isAlive());
 
-        assertEquals(Double.valueOf(50.0), getsSoFar);
+        client.close();
     }
 
     /**
@@ -161,14 +138,13 @@ public class RestRequestorTest {
 
         final String[] args = {"src/test/resources/prodcons/File2RESTRequest2FileGetEmpty.json"};
         final ApexMain apexMain = new ApexMain(args);
+        await().atMost(2, TimeUnit.SECONDS).until(() -> apexMain.isAlive());
 
         Response response = null;
 
         // Wait for the required amount of events to be received or for 10 seconds
         Double getsSoFar = 0.0;
         for (int i = 0; i < 40; i++) {
-            ThreadUtilities.sleep(100);
-
             response = client.target("http://localhost:32801/TestRESTRequestor/apex/event/Stats")
                 .request("application/json").get();
 
@@ -188,6 +164,8 @@ public class RestRequestorTest {
         }
 
         apexMain.shutdown();
+        await().atMost(2, TimeUnit.SECONDS).until(() -> !apexMain.isAlive());
+
         client.close();
 
         assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
@@ -206,37 +184,15 @@ public class RestRequestorTest {
 
         final String[] args = {"src/test/resources/prodcons/File2RESTRequest2FilePut.json"};
         final ApexMain apexMain = new ApexMain(args);
+        await().atMost(2, TimeUnit.SECONDS).until(() -> apexMain.isAlive());
 
-        // Wait for the required amount of events to be received or for 10 seconds
-        Double putsSoFar = 0.0;
-
-        Response response = null;
-        for (int i = 0; i < 40; i++) {
-            ThreadUtilities.sleep(100);
-
-            response = client.target("http://localhost:32801/TestRESTRequestor/apex/event/Stats")
-                .request("application/json").get();
-
-            if (Response.Status.OK.getStatusCode() != response.getStatus()) {
-                break;
-            }
-
-            final String responseString = response.readEntity(String.class);
-
-            @SuppressWarnings("unchecked")
-            final Map<String, Object> jsonMap = new Gson().fromJson(responseString, Map.class);
-            putsSoFar = Double.valueOf(jsonMap.get("PUT").toString());
-
-            if (putsSoFar >= 50.0) {
-                break;
-            }
-        }
+        await().pollInterval(300, TimeUnit.MILLISECONDS).atMost(10, TimeUnit.SECONDS)
+            .until(() -> getStatsFromServer(client, "PUT") >= 50.0);
 
         apexMain.shutdown();
-        client.close();
+        await().atMost(2, TimeUnit.SECONDS).until(() -> !apexMain.isAlive());
 
-        assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
-        assertEquals(Double.valueOf(50.0), putsSoFar);
+        client.close();
     }
 
     /**
@@ -252,31 +208,15 @@ public class RestRequestorTest {
 
         final String[] args = {"src/test/resources/prodcons/File2RESTRequest2FilePost.json"};
         final ApexMain apexMain = new ApexMain(args);
+        await().atMost(2, TimeUnit.SECONDS).until(() -> apexMain.isAlive());
 
-        // Wait for the required amount of events to be received or for 10 seconds
-        Double postsSoFar = 0.0;
-        for (int i = 0; i < 40; i++) {
-            ThreadUtilities.sleep(100);
-
-            final Response response = client.target("http://localhost:32801/TestRESTRequestor/apex/event/Stats")
-                .request("application/json").get();
-
-            assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
-            final String responseString = response.readEntity(String.class);
-
-            @SuppressWarnings("unchecked")
-            final Map<String, Object> jsonMap = new Gson().fromJson(responseString, Map.class);
-            postsSoFar = Double.valueOf(jsonMap.get("POST").toString());
-
-            if (postsSoFar >= 50.0) {
-                break;
-            }
-        }
+        await().pollInterval(300, TimeUnit.MILLISECONDS).atMost(10, TimeUnit.SECONDS)
+            .until(() -> getStatsFromServer(client, "POST") >= 50.0);
 
         apexMain.shutdown();
-        client.close();
+        await().atMost(2, TimeUnit.SECONDS).until(() -> !apexMain.isAlive());
 
-        assertEquals(Double.valueOf(50.0), postsSoFar);
+        client.close();
     }
 
     /**
@@ -292,31 +232,16 @@ public class RestRequestorTest {
 
         final String[] args = {"src/test/resources/prodcons/File2RESTRequest2FileDelete.json"};
         final ApexMain apexMain = new ApexMain(args);
+        await().atMost(2, TimeUnit.SECONDS).until(() -> apexMain.isAlive());
 
-        // Wait for the required amount of events to be received or for 10 seconds
-        Double deletesSoFar = 0.0;
-        for (int i = 0; i < 40; i++) {
-            ThreadUtilities.sleep(100);
-
-            final Response response = client.target("http://localhost:32801/TestRESTRequestor/apex/event/Stats")
-                .request("application/json").get();
-
-            assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
-            final String responseString = response.readEntity(String.class);
-
-            @SuppressWarnings("unchecked")
-            final Map<String, Object> jsonMap = new Gson().fromJson(responseString, Map.class);
-            deletesSoFar = Double.valueOf(jsonMap.get("DELETE").toString());
-
-            if (deletesSoFar >= 50.0) {
-                break;
-            }
-        }
+        // Wait for the required amount of events to be received
+        await().pollInterval(300, TimeUnit.MILLISECONDS).atMost(10, TimeUnit.SECONDS)
+            .until(() -> getStatsFromServer(client, "DELETE") >= 50.0);
 
         apexMain.shutdown();
-        client.close();
+        await().atMost(2, TimeUnit.SECONDS).until(() -> !apexMain.isAlive());
 
-        assertEquals(Double.valueOf(50.0), deletesSoFar);
+        client.close();
     }
 
     /**
@@ -332,31 +257,15 @@ public class RestRequestorTest {
 
         final String[] args = {"src/test/resources/prodcons/File2RESTRequest2FileGetMulti.json"};
         final ApexMain apexMain = new ApexMain(args);
+        await().atMost(10, TimeUnit.SECONDS).until(() -> apexMain.isAlive());
 
-        // Wait for the required amount of events to be received or for 10 seconds
-        Double getsSoFar = 0.0;
-        for (int i = 0; i < 40; i++) {
-            ThreadUtilities.sleep(100);
-
-            final Response response = client.target("http://localhost:32801/TestRESTRequestor/apex/event/Stats")
-                .request("application/json").get();
-
-            assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
-            final String responseString = response.readEntity(String.class);
-
-            @SuppressWarnings("unchecked")
-            final Map<String, Object> jsonMap = new Gson().fromJson(responseString, Map.class);
-            getsSoFar = Double.valueOf(jsonMap.get("GET").toString());
-
-            if (getsSoFar >= 8.0) {
-                break;
-            }
-        }
+        await().pollInterval(300, TimeUnit.MILLISECONDS).atMost(10, TimeUnit.SECONDS)
+            .until(() -> getStatsFromServer(client, "GET") >= 8.0);
 
         apexMain.shutdown();
-        client.close();
+        await().atMost(2, TimeUnit.SECONDS).until(() -> !apexMain.isAlive());
 
-        assertEquals(Double.valueOf(8.0), getsSoFar);
+        client.close();
     }
 
     /**
@@ -373,8 +282,7 @@ public class RestRequestorTest {
 
         final String[] args = {"src/test/resources/prodcons/File2RESTRequest2FileGetProducerAlone.json"};
 
-        final ApexMain apexMain = new ApexMain(args);
-        ThreadUtilities.sleep(200);
+        ApexMain apexMain = new ApexMain(args);
         apexMain.shutdown();
 
         final String outString = outContent.toString();
@@ -400,8 +308,7 @@ public class RestRequestorTest {
 
         final String[] args = {"src/test/resources/prodcons/File2RESTRequest2FileGetConsumerAlone.json"};
 
-        final ApexMain apexMain = new ApexMain(args);
-        ThreadUtilities.sleep(200);
+        ApexMain apexMain = new ApexMain(args);
         apexMain.shutdown();
 
         final String outString = outContent.toString();
@@ -412,4 +319,16 @@ public class RestRequestorTest {
         assertTrue(outString.contains("peer \"RestRequestorProducer for peered mode REQUESTOR "
             + "does not exist or is not defined with the same peered mode"));
     }
+
+    private Double getStatsFromServer(final Client client, final String statToGet) {
+        final Response response = client.target("http://localhost:32801/TestRESTRequestor/apex/event/Stats")
+            .request("application/json").get();
+
+        assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        final String responseString = response.readEntity(String.class);
+
+        @SuppressWarnings("unchecked")
+        final Map<String, Object> jsonMap = new Gson().fromJson(responseString, Map.class);
+        return Double.valueOf(jsonMap.get(statToGet).toString());
+    }
 }
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/logback-test.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/logback-test.xml
new file mode 100644
index 000000000..f0fd0b100
--- /dev/null
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/test/resources/logback-test.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ============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.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+
+<configuration>
+    <contextName>Apex</contextName>
+    <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
+
+    <!-- USE FOR STD OUT ONLY -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern>
+        </encoder>
+    </appender>
+
+    <root level="ERROR">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+    <logger name="org.onap.policy.apex.plugins.event.carrier.restrequestor" level="ERROR" additivity="false">
+        <appender-ref ref="STDOUT" />
+    </logger>
+</configuration>