You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2019/05/16 12:25:14 UTC
[aries-rsa] branch master updated: Organize itests server port
config
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
The following commit(s) were added to refs/heads/master by this push:
new 6c1f83a Organize itests server port config
new 24c75ce Merge pull request #26 from amichair/itest-ports
6c1f83a is described below
commit 6c1f83ae05bc0c3ad657373fc07c107de32edc87
Author: Amichai Rothman <am...@amichais.net>
AuthorDate: Tue May 14 12:10:59 2019 +0300
Organize itests server port config
---
.../java/org/apache/aries/rsa/itests/felix/RsaTestBase.java | 8 ++++++--
.../rsa/itests/felix/fastbin/TestFastbinRoundTrip.java | 13 +++----------
.../apache/aries/rsa/itests/felix/rsa/TestRSAListener.java | 2 +-
3 files changed, 10 insertions(+), 13 deletions(-)
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 @@ public class RsaTestBase {
}
}
- 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 @@ public class RsaTestBase {
.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());
+ }
+
}
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 @@ import org.ops4j.pax.exam.Option;
@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 @@ public class TestFastbinRoundTrip extends RsaTestBase {
echoTcpService(), //
configZKServer(), //
configZKDiscovery(), //
- configFastBinPort(FASTBIN_PORT_SERVER),
+ configFastBinFreePort()
};
}
@@ -71,7 +64,7 @@ public class TestFastbinRoundTrip extends RsaTestBase {
rsaProviderFastBin(), //
echoTcpConsumer(), //
configZKDiscovery(), //
- configFastBinPort(FASTBIN_PORT_CLIENT)
+ configFastBinFreePort()
};
}
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 @@ public class TestRSAListener extends RsaTestBase implements RemoteServiceAdminLi
rsaCore(), //
rsaProviderFastBin(), //
echoTcpService(), //
- configFastBinPort("2545"),
+ configFastBinFreePort()
};
}