commit 6c1f83ae05bc0c3ad657373fc07c107de32edc87
author Amichai Rothman <amichai2@amichais.net> Tue May 14 12:10:59 2019 +0300
committer Amichai Rothman <amichai2@amichais.net> Thu May 16 12:45:52 2019 +0300
tree 6df5e742c184860722555036f507f35c25581a17
parent e5942644a3cc5d025ddc652a9de2983a74b457f6

Organize itests server port config

itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java

diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
index 346960d..c08bfce 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
@@ -70,7 +70,7 @@
         }
     }
 
-    protected int getFreePort() throws IOException {
+    protected static int getFreePort() throws IOException {
         try (ServerSocket socket = new ServerSocket()) {
             socket.setReuseAddress(true); // enables quickly reopening socket on same port
             socket.bind(new InetSocketAddress(0)); // zero finds a free port
@@ -178,10 +178,14 @@
             .asOption();
     }
 
-    protected static Option configFastBinPort(String port) {
+    protected static Option configFastBinPort(int port) {
         return newConfiguration("org.apache.aries.rsa.provider.fastbin") //
             .put("uri", "tcp://0.0.0.0:" + port) //
             .asOption();
     }
 
+    protected static Option configFastBinFreePort() throws IOException {
+        return configFastBinPort(getFreePort());
+    }
+
 }

itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java

diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java
index 36d86ca..14d4ffd 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/fastbin/TestFastbinRoundTrip.java
@@ -37,17 +37,10 @@
 
 @RunWith(TwoContainerPaxExam.class)
 public class TestFastbinRoundTrip extends RsaTestBase {
-    private static String FASTBIN_PORT_SERVER = "2544";
-    private static String FASTBIN_PORT_CLIENT = "2545";
     
     @Inject
     EchoService echoService;
-    
-    public TestFastbinRoundTrip() throws IOException {
-        FASTBIN_PORT_CLIENT = "" + getFreePort();
-        FASTBIN_PORT_SERVER = "" + getFreePort();
-    }
-    
+
     @ServerConfiguration
     public static Option[] remoteConfig() throws IOException {
         return new Option[] //
@@ -58,7 +51,7 @@
          echoTcpService(), //
          configZKServer(), //
          configZKDiscovery(), //
-         configFastBinPort(FASTBIN_PORT_SERVER),
+         configFastBinFreePort()
         };
     }
 
@@ -71,7 +64,7 @@
          rsaProviderFastBin(), //
          echoTcpConsumer(), //
          configZKDiscovery(), //
-         configFastBinPort(FASTBIN_PORT_CLIENT)
+         configFastBinFreePort()
         };
     }
 

itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/rsa/TestRSAListener.java

diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/rsa/TestRSAListener.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/rsa/TestRSAListener.java
index 0371787..3cf0267 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/rsa/TestRSAListener.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/rsa/TestRSAListener.java
@@ -57,7 +57,7 @@
          rsaCore(), //
          rsaProviderFastBin(), //
          echoTcpService(), //
-         configFastBinPort("2545"),
+         configFastBinFreePort()
         };
     }