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/06/24 07:57:47 UTC
[1/2] aries-rsa git commit: [ARIES-1573] Integration tests
Repository: aries-rsa
Updated Branches:
refs/heads/master 28b402195 -> b33cdf310
[ARIES-1573] Integration tests
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/51f3c347
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/51f3c347
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/51f3c347
Branch: refs/heads/master
Commit: 51f3c34740766e7e9b5c53724de2fe4000316213
Parents: 28b4021
Author: Dmytro Pishchukhin <dm...@gmail.com>
Authored: Thu Jun 23 08:49:03 2016 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Fri Jun 24 09:06:31 2016 +0200
----------------------------------------------------------------------
itests/felix/pom.xml | 5 ++
.../aries/rsa/itests/felix/RsaTestBase.java | 66 +++++++++++++++-----
.../config/TestConfigDiscoveryRoundTrip.java | 66 ++++++++++++++++++++
3 files changed, 122 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/51f3c347/itests/felix/pom.xml
----------------------------------------------------------------------
diff --git a/itests/felix/pom.xml b/itests/felix/pom.xml
index 396c216..8e0350d 100644
--- a/itests/felix/pom.xml
+++ b/itests/felix/pom.xml
@@ -59,6 +59,11 @@
</dependency>
<dependency>
<groupId>org.apache.aries.rsa.discovery</groupId>
+ <artifactId>org.apache.aries.rsa.discovery.config</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.aries.rsa.discovery</groupId>
<artifactId>org.apache.aries.rsa.discovery.zookeeper</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/51f3c347/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 1dcfd38..a1bbf34 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
@@ -19,20 +19,6 @@
package org.apache.aries.rsa.itests.felix;
-import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.junitBundles;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-import static org.ops4j.pax.exam.CoreOptions.vmOption;
-import static org.ops4j.pax.exam.CoreOptions.when;
-import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-
-import javax.inject.Inject;
-
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
@@ -41,6 +27,15 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationAdmin;
+import javax.inject.Inject;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+
+import static org.ops4j.pax.exam.CoreOptions.*;
+import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
+import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
+
public class RsaTestBase {
protected static final String ZK_PORT = "15201";
@@ -116,6 +111,36 @@ public class RsaTestBase {
);
}
+ protected static Option rsaCoreConfigDiscovery() {
+ return composite(junitBundles(),
+ localRepo(),
+ systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+ systemProperty("aries.rsa.hostname").value("localhost"),
+ mvn("org.apache.felix", "org.apache.felix.configadmin"),
+ mvn("org.apache.aries.rsa", "org.apache.aries.rsa.core"),
+ mvn("org.apache.aries.rsa", "org.apache.aries.rsa.spi"),
+ mvn("org.apache.aries.rsa", "org.apache.aries.rsa.topology-manager"),
+ mvn("org.apache.aries.rsa.discovery", "org.apache.aries.rsa.discovery.config")
+ //CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
+ );
+ }
+
+ protected static Option rsaCore() {
+ return composite(junitBundles(),
+ localRepo(),
+ systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+ systemProperty("aries.rsa.hostname").value("localhost"),
+ mvn("org.apache.felix", "org.apache.felix.configadmin"),
+ mvn("org.apache.aries.rsa", "org.apache.aries.rsa.core"),
+ mvn("org.apache.aries.rsa", "org.apache.aries.rsa.spi"),
+ mvn("org.apache.aries.rsa", "org.apache.aries.rsa.topology-manager"),
+ mvn("org.apache.aries.rsa.discovery", "org.apache.aries.rsa.discovery.local")
+ //CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
+ );
+ }
+
protected static Option rsaTcp() {
return mvn("org.apache.aries.rsa.provider", "org.apache.aries.rsa.provider.tcp");
}
@@ -132,7 +157,18 @@ public class RsaTestBase {
.put("zookeeper.port", ZK_PORT)
.asOption();
}
-
+
+ protected static Option configTcpConfigDiscovery() {
+ return factoryConfiguration("org.apache.aries.rsa.discovery.config")
+ .put("service.imported", "true")
+ .put("service.imported.configs", "aries.tcp")
+ .put("objectClass", "org.apache.aries.rsa.examples.echotcp.api.EchoService")
+ .put("endpoint.id", "tcp://localhost:8201")
+ .put("aries.tcp.hostname", "localhost")
+ .put("aries.tcp.port", "8201")
+ .asOption();
+ }
+
protected static Option configZKServer() {
return newConfiguration("org.apache.aries.rsa.discovery.zookeeper.server")
.put("clientPort", ZK_PORT).asOption();
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/51f3c347/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/discovery/config/TestConfigDiscoveryRoundTrip.java
----------------------------------------------------------------------
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/discovery/config/TestConfigDiscoveryRoundTrip.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/discovery/config/TestConfigDiscoveryRoundTrip.java
new file mode 100644
index 0000000..bdcea6d
--- /dev/null
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/discovery/config/TestConfigDiscoveryRoundTrip.java
@@ -0,0 +1,66 @@
+package org.apache.aries.rsa.itests.felix.discovery.config;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+import org.apache.aries.rsa.examples.echotcp.api.EchoService;
+import org.apache.aries.rsa.itests.felix.RsaTestBase;
+import org.apache.aries.rsa.itests.felix.ServerConfiguration;
+import org.apache.aries.rsa.itests.felix.TwoContainerPaxExam;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+
+import javax.inject.Inject;
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(TwoContainerPaxExam.class)
+public class TestConfigDiscoveryRoundTrip extends RsaTestBase {
+
+ @Inject
+ EchoService echoService;
+
+ @ServerConfiguration
+ public static Option[] remoteConfig() throws IOException {
+ return new Option[] {
+ rsaCore(),
+ rsaTcp(),
+ echoTcpService()
+ };
+ }
+
+ @Configuration
+ public static Option[] configure() throws Exception {
+ return new Option[] {
+ rsaCoreConfigDiscovery(),
+ rsaTcp(),
+ echoTcpConsumer(),
+ configTcpConfigDiscovery()
+ };
+ }
+
+ @Test
+ public void testCall() throws Exception {
+ assertEquals("test", echoService.echo("test"));
+ }
+
+}
[2/2] aries-rsa git commit: [ARIES-1573] Refactored tests to avoid
duplications
Posted by cs...@apache.org.
[ARIES-1573] Refactored tests to avoid duplications
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/b33cdf31
Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/b33cdf31
Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/b33cdf31
Branch: refs/heads/master
Commit: b33cdf31082beb9e55c56da31696b8faea840881
Parents: 51f3c34
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri Jun 24 09:57:41 2016 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Fri Jun 24 09:57:41 2016 +0200
----------------------------------------------------------------------
.../aries/rsa/itests/felix/RsaTestBase.java | 105 +++++++------------
.../config/TestConfigDiscoveryRoundTrip.java | 16 ++-
.../felix/fastbin/TestFastbinRoundTrip.java | 9 +-
.../itests/felix/tcp/TestDiscoveryExport.java | 3 +-
.../rsa/itests/felix/tcp/TestRoundTrip.java | 6 +-
5 files changed, 66 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/b33cdf31/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 a1bbf34..9515eac 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
@@ -19,6 +19,20 @@
package org.apache.aries.rsa.itests.felix;
+import static org.ops4j.pax.exam.CoreOptions.composite;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
+import static org.ops4j.pax.exam.CoreOptions.when;
+import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+
+import javax.inject.Inject;
+
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
@@ -27,15 +41,6 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationAdmin;
-import javax.inject.Inject;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-
-import static org.ops4j.pax.exam.CoreOptions.*;
-import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
-import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
-
public class RsaTestBase {
protected static final String ZK_PORT = "15201";
@@ -92,53 +97,34 @@ public class RsaTestBase {
mvn("org.apache.aries.rsa.examples.echotcp", "org.apache.aries.rsa.examples.echotcp.service")
);
}
-
- protected static Option rsaCoreZookeeper() {
+
+ protected static Option rsaCore() {
return composite(junitBundles(),
localRepo(),
systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
- systemProperty("zkPort").value("15201"),
- systemProperty("aries.rsa.hostname").value("localhost"),
- mvn("org.apache.felix", "org.apache.felix.configadmin"),
- mvn("org.apache.aries.rsa", "org.apache.aries.rsa.core"),
- mvn("org.apache.aries.rsa", "org.apache.aries.rsa.spi"),
- mvn("org.apache.aries.rsa", "org.apache.aries.rsa.topology-manager"),
- mvn("org.apache.aries.rsa.discovery", "org.apache.aries.rsa.discovery.local"),
- mvn("org.apache.zookeeper", "zookeeper"),
- mvn("org.apache.aries.rsa.discovery", "org.apache.aries.rsa.discovery.zookeeper")
- //CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
- );
- }
-
- protected static Option rsaCoreConfigDiscovery() {
- return composite(junitBundles(),
- localRepo(),
- systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
systemProperty("aries.rsa.hostname").value("localhost"),
mvn("org.apache.felix", "org.apache.felix.configadmin"),
mvn("org.apache.aries.rsa", "org.apache.aries.rsa.core"),
mvn("org.apache.aries.rsa", "org.apache.aries.rsa.spi"),
mvn("org.apache.aries.rsa", "org.apache.aries.rsa.topology-manager"),
+ mvn("org.apache.aries.rsa.discovery", "org.apache.aries.rsa.discovery.local")
+ // CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
+ );
+ }
+
+ protected static Option rsaDiscoveryConfig() {
+ return composite(
mvn("org.apache.aries.rsa.discovery", "org.apache.aries.rsa.discovery.config")
- //CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
- );
+ );
}
-
- protected static Option rsaCore() {
- return composite(junitBundles(),
- localRepo(),
- systemProperty("pax.exam.osgi.unresolved.fail").value("true"),
- systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
- systemProperty("aries.rsa.hostname").value("localhost"),
- mvn("org.apache.felix", "org.apache.felix.configadmin"),
- mvn("org.apache.aries.rsa", "org.apache.aries.rsa.core"),
- mvn("org.apache.aries.rsa", "org.apache.aries.rsa.spi"),
- mvn("org.apache.aries.rsa", "org.apache.aries.rsa.topology-manager"),
- mvn("org.apache.aries.rsa.discovery", "org.apache.aries.rsa.discovery.local")
- //CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
- );
+
+ protected static Option rsaDiscoveryZookeeper() {
+ return composite(
+ systemProperty("zkPort").value("15201"),
+ mvn("org.apache.zookeeper", "zookeeper"),
+ mvn("org.apache.aries.rsa.discovery", "org.apache.aries.rsa.discovery.zookeeper")
+ );
}
protected static Option rsaTcp() {
@@ -147,36 +133,23 @@ public class RsaTestBase {
protected static Option rsaFastBin() {
return composite(mvn("org.fusesource.hawtbuf", "hawtbuf"),
- mvn("org.fusesource.hawtdispatch", "hawtdispatch"),
- mvn("org.apache.aries.rsa.provider", "org.apache.aries.rsa.provider.fastbin"));
+ mvn("org.fusesource.hawtdispatch", "hawtdispatch"),
+ 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")
- .put("zookeeper.port", ZK_PORT)
- .asOption();
+ return newConfiguration("org.apache.aries.rsa.discovery.zookeeper").put("zookeeper.host", "127.0.0.1")
+ .put("zookeeper.port", ZK_PORT).asOption();
}
- protected static Option configTcpConfigDiscovery() {
- return factoryConfiguration("org.apache.aries.rsa.discovery.config")
- .put("service.imported", "true")
- .put("service.imported.configs", "aries.tcp")
- .put("objectClass", "org.apache.aries.rsa.examples.echotcp.api.EchoService")
- .put("endpoint.id", "tcp://localhost:8201")
- .put("aries.tcp.hostname", "localhost")
- .put("aries.tcp.port", "8201")
+ protected static Option configZKServer() {
+ return newConfiguration("org.apache.aries.rsa.discovery.zookeeper.server").put("clientPort", ZK_PORT)
.asOption();
}
- protected static Option configZKServer() {
- 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).asOption();
+ 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/b33cdf31/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/discovery/config/TestConfigDiscoveryRoundTrip.java
----------------------------------------------------------------------
diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/discovery/config/TestConfigDiscoveryRoundTrip.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/discovery/config/TestConfigDiscoveryRoundTrip.java
index bdcea6d..9e4b133 100644
--- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/discovery/config/TestConfigDiscoveryRoundTrip.java
+++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/discovery/config/TestConfigDiscoveryRoundTrip.java
@@ -32,6 +32,7 @@ import javax.inject.Inject;
import java.io.IOException;
import static org.junit.Assert.assertEquals;
+import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
@RunWith(TwoContainerPaxExam.class)
public class TestConfigDiscoveryRoundTrip extends RsaTestBase {
@@ -51,12 +52,25 @@ public class TestConfigDiscoveryRoundTrip extends RsaTestBase {
@Configuration
public static Option[] configure() throws Exception {
return new Option[] {
- rsaCoreConfigDiscovery(),
+ rsaCore(),
+ rsaDiscoveryConfig(),
rsaTcp(),
echoTcpConsumer(),
configTcpConfigDiscovery()
};
}
+
+
+ protected static Option configTcpConfigDiscovery() {
+ return factoryConfiguration("org.apache.aries.rsa.discovery.config")
+ .put("service.imported", "true")
+ .put("service.imported.configs", "aries.tcp")
+ .put("objectClass", "org.apache.aries.rsa.examples.echotcp.api.EchoService")
+ .put("endpoint.id", "tcp://localhost:8201")
+ .put("aries.tcp.hostname", "localhost")
+ .put("aries.tcp.port", "8201")
+ .asOption();
+ }
@Test
public void testCall() throws Exception {
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/b33cdf31/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 c73d822..fb04bb3 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
@@ -40,8 +40,10 @@ public class TestFastbinRoundTrip extends RsaTestBase {
@ServerConfiguration
public static Option[] remoteConfig() throws IOException {
- return new Option[] {
- rsaCoreZookeeper(),
+ return new Option[] //
+ {
+ rsaCore(),
+ rsaDiscoveryZookeeper(),
rsaFastBin(),
echoTcpService(),
configZKServer(),
@@ -53,7 +55,8 @@ public class TestFastbinRoundTrip extends RsaTestBase {
@Configuration
public static Option[] configure() throws Exception {
return new Option[] {
- rsaCoreZookeeper(),
+ rsaCore(),
+ rsaDiscoveryZookeeper(),
rsaFastBin(),
echoTcpConsumer(),
configZKConsumer(),
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/b33cdf31/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 95732fd..c2bba89 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
@@ -50,7 +50,8 @@ public class TestDiscoveryExport extends RsaTestBase {
@Configuration
public static Option[] configure() throws Exception {
return new Option[] {
- rsaCoreZookeeper(),
+ rsaCore(),
+ rsaDiscoveryZookeeper(),
rsaTcp(),
echoTcpService(),
localRepo(),
http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/b33cdf31/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 b3ea522..3c3f500 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
@@ -43,7 +43,8 @@ public class TestRoundTrip extends RsaTestBase {
@ServerConfiguration
public static Option[] remoteConfig() throws IOException {
return new Option[] {
- rsaCoreZookeeper(),
+ rsaCore(),
+ rsaDiscoveryZookeeper(),
rsaTcp(),
echoTcpService(),
configZKServer(),
@@ -54,7 +55,8 @@ public class TestRoundTrip extends RsaTestBase {
@Configuration
public static Option[] configure() throws Exception {
return new Option[] {
- rsaCoreZookeeper(),
+ rsaCore(),
+ rsaDiscoveryZookeeper(),
rsaTcp(),
RsaTestBase.echoTcpConsumer(),
configZKConsumer()