(#547) Applied changes from review

citrusframework · Dec 17, 2018 · b5daaf9 · b5daaf9
1 parent e4609b8
commit b5daaf9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 24 deletions.
diff --git a/modules/citrus-integration/src/it/java/com/consol/citrus/javadsl/design/WaitJavaIT.java b/modules/citrus-integration/src/it/java/com/consol/citrus/javadsl/design/WaitJavaIT.java
@@ -34,9 +34,6 @@
 @Test
 public class WaitJavaIT extends TestNGCitrusTestDesigner {
 
-    /** Random http server port */
-    private final static int serverPort = SocketUtils.findAvailableTcpPort();
-
     @CitrusEndpoint(name = "waitHttpServer")
     @HttpServerConfig
     private HttpServer httpServer;
@@ -52,9 +49,7 @@ public void waitFile() throws IOException {
     public void waitHttpDeprecated() {
 
         //GIVEN
-        String server = String.format("http://localhost:%s", serverPort);
-        httpServer.setPort(serverPort);
-        start(httpServer);
+        String server = startHttpServerAndGetUrl();
 
         parallel().actions(
                 sequential().actions(
@@ -78,9 +73,7 @@ public void waitHttpDeprecated() {
     public void waitHttpAsAction() {
 
         //GIVEN
-        String server = String.format("http://localhost:%s", serverPort);
-        httpServer.setPort(serverPort);
-        start(httpServer);
+        String server = startHttpServerAndGetUrl();
 
         parallel().actions(
                 sequential().actions(
@@ -104,9 +97,7 @@ public void waitHttpAsAction() {
     public void waitHttp() {
 
         //GIVEN
-        String server = String.format("http://localhost:%s", serverPort);
-        httpServer.setPort(serverPort);
-        start(httpServer);
+        String server = startHttpServerAndGetUrl();
 
         parallel().actions(
                 sequential().actions(
@@ -151,4 +142,12 @@ public void apply() {
             }
         });
     }
+
+    private String startHttpServerAndGetUrl() {
+        final int serverPort = SocketUtils.findAvailableTcpPort();
+        String server = String.format("http://localhost:%s", serverPort);
+        httpServer.setPort(serverPort);
+        start(httpServer);
+        return server;
+    }
 }
diff --git a/...les/citrus-integration/src/it/java/com/consol/citrus/javadsl/runner/WaitTestRunnerIT.java b/...les/citrus-integration/src/it/java/com/consol/citrus/javadsl/runner/WaitTestRunnerIT.java
@@ -33,9 +33,6 @@
 @Test
 public class WaitTestRunnerIT extends TestNGCitrusTestRunner {
 
-    /** Random http server port */
-    private final static int serverPort = SocketUtils.findAvailableTcpPort();
-
     @CitrusEndpoint(name = "waitHttpServer")
     @HttpServerConfig
     private HttpServer httpServer;
@@ -51,9 +48,7 @@ public void waitFile() throws IOException {
     public void waitHttpDeprecated() {
 
         //GIVEN
-        String server = String.format("http://localhost:%s", serverPort);
-        httpServer.setPort(serverPort);
-        start(httpServer);
+        String server = startHttpServerAndGetUrl();
 
         parallel().actions(
                 sequential().actions(
@@ -77,9 +72,7 @@ public void waitHttpDeprecated() {
     public void waitHttpAsAction() {
 
         //GIVEN
-        String server = String.format("http://localhost:%s", serverPort);
-        httpServer.setPort(serverPort);
-        start(httpServer);
+        String server = startHttpServerAndGetUrl();
 
         parallel().actions(
                 sequential().actions(
@@ -103,9 +96,7 @@ public void waitHttpAsAction() {
     public void waitHttp() {
 
         //GIVEN
-        String server = String.format("http://localhost:%s", serverPort);
-        httpServer.setPort(serverPort);
-        start(httpServer);
+        String server = startHttpServerAndGetUrl();
 
         parallel().actions(
                 sequential().actions(
@@ -150,4 +141,12 @@ public void apply() {
             }
         });
     }
+
+    private String startHttpServerAndGetUrl() {
+        final int serverPort = SocketUtils.findAvailableTcpPort();
+        String server = String.format("http://localhost:%s", serverPort);
+        httpServer.setPort(serverPort);
+        start(httpServer);
+        return server;
+    }
 }