From dcae33d8d9a3dcb8a9249d5d33f103f1e97d2e6c Mon Sep 17 00:00:00 2001 From: "waqas.ikram" Date: Tue, 17 Jul 2018 15:35:47 +0100 Subject: Refactoring Metrics test Change-Id: I99290a3dec61b3ce0f4d5fd33d6b429d091b48ca Issue-ID: POLICY-954 Signed-off-by: waqas.ikram --- .../messaging/EndToEndStringMessagingTest.java | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'core/core-infrastructure') diff --git a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/EndToEndStringMessagingTest.java b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/EndToEndStringMessagingTest.java index e18c327c0..21c5ee984 100644 --- a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/EndToEndStringMessagingTest.java +++ b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/EndToEndStringMessagingTest.java @@ -52,18 +52,25 @@ public class EndToEndStringMessagingTest { assertNotNull(server); server.start(new WSStringServerMessageListener()); - client = new WSStringMessageClient("localhost", 44441); - assertNotNull(client); - client.start(new WSStringClientMessageListener()); + try { + client = new WSStringMessageClient("localhost", 44441); + assertNotNull(client); + client.start(new WSStringClientMessageListener()); - client.sendString("Hello, client here"); + client.sendString("Hello, client here"); - while (!finished) { - ThreadUtilities.sleep(50); - } - client.stop(); + while (!finished) { + ThreadUtilities.sleep(50); + } + } finally { + if (client != null) { + client.stop(); + } + if (server != null) { + server.stop(); + } - server.stop(); + } logger.debug("end to end messaging test finished"); } -- cgit 1.2.3-korg