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 2016/09/12 08:33:33 UTC
[2/2] aries-rsa git commit: Small test improvements
Small test improvements
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/4c8ae19f
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/4c8ae19f
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/4c8ae19f
Branch: refs/heads/master
Commit: 4c8ae19f42b3ab410129e653f1137b89f5789df0
Parents: b95999c
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Mon Sep 12 10:33:13 2016 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Mon Sep 12 10:33:13 2016 +0200
----------------------------------------------------------------------
.../org/apache/aries/rsa/itests/felix/RsaTestBase.java | 11 +++++++----
.../rsa/itests/felix/fastbin/TestFastbinRoundTrip.java | 4 ++--
.../aries/rsa/itests/felix/tcp/TestDiscoveryExport.java | 2 +-
.../apache/aries/rsa/itests/felix/tcp/TestRoundTrip.java | 4 ++--
4 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/4c8ae19f/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 9515eac..1368f41 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
@@ -137,18 +137,21 @@ public class RsaTestBase {
mvn("org.apache.aries.rsa.provider", "org.apache.aries.rsa.provider.fastbin"));
}
- protected static Option configZKConsumer() {
- return newConfiguration("org.apache.aries.rsa.discovery.zookeeper").put("zookeeper.host", "127.0.0.1")
+ protected static Option configZKDiscovery() {
+ return newConfiguration("org.apache.aries.rsa.discovery.zookeeper") //
+ .put("zookeeper.host", "127.0.0.1") //
.put("zookeeper.port", ZK_PORT).asOption();
}
protected static Option configZKServer() {
- return newConfiguration("org.apache.aries.rsa.discovery.zookeeper.server").put("clientPort", ZK_PORT)
+ return newConfiguration("org.apache.aries.rsa.discovery.zookeeper.server") //
+ .put("clientPort", ZK_PORT) //
.asOption();
}
protected static Option configFastBin(String port) {
- return newConfiguration("org.apache.aries.rsa.provider.fastbin").put("uri", "tcp://0.0.0.0:" + port)
+ return newConfiguration("org.apache.aries.rsa.provider.fastbin") //
+ .put("uri", "tcp://0.0.0.0:" + port) //
.asOption();
}
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/4c8ae19f/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 fb04bb3..26a0625 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
@@ -47,7 +47,7 @@ public class TestFastbinRoundTrip extends RsaTestBase {
rsaFastBin(),
echoTcpService(),
configZKServer(),
- configZKConsumer(),
+ configZKDiscovery(),
configFastBin("2544"),
};
}
@@ -59,7 +59,7 @@ public class TestFastbinRoundTrip extends RsaTestBase {
rsaDiscoveryZookeeper(),
rsaFastBin(),
echoTcpConsumer(),
- configZKConsumer(),
+ configZKDiscovery(),
configFastBin("2545")
};
}
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/4c8ae19f/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryExport.java
----------------------------------------------------------------------
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryExport.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryExport.java
index c2bba89..151d02e 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryExport.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryExport.java
@@ -55,7 +55,7 @@ public class TestDiscoveryExport extends RsaTestBase {
rsaTcp(),
echoTcpService(),
localRepo(),
- configZKConsumer(),
+ configZKDiscovery(),
configZKServer()
};
}
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/4c8ae19f/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestRoundTrip.java
----------------------------------------------------------------------
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestRoundTrip.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestRoundTrip.java
index 3c3f500..577d56b 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestRoundTrip.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestRoundTrip.java
@@ -48,7 +48,7 @@ public class TestRoundTrip extends RsaTestBase {
rsaTcp(),
echoTcpService(),
configZKServer(),
- configZKConsumer(),
+ configZKDiscovery(),
};
}
@@ -59,7 +59,7 @@ public class TestRoundTrip extends RsaTestBase {
rsaDiscoveryZookeeper(),
rsaTcp(),
RsaTestBase.echoTcpConsumer(),
- configZKConsumer()
+ configZKDiscovery()
};
}