This is an automated email from the ASF dual-hosted git repository. amichair pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 70b2ec713a66b9663d35f55e0bf9eb89ba9dce2a Author: Amichai Rothman <[email protected]> AuthorDate: Mon Mar 23 00:20:05 2026 +0200 Add separate TCP Discovery round trip itest --- .../{TestRoundTrip.java => TestTcpDiscoveryRoundTrip.java} | 11 +++++------ ...tRoundTrip.java => TestZookeeperDiscoveryRoundTrip.java} | 13 ++++++------- 2 files changed, 11 insertions(+), 13 deletions(-) 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/TestTcpDiscoveryRoundTrip.java similarity index 89% copy from itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestRoundTrip.java copy to itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestTcpDiscoveryRoundTrip.java index c89ff278..23a912c2 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/TestTcpDiscoveryRoundTrip.java @@ -34,7 +34,7 @@ import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; @RunWith(TwoContainerPaxExam.class) -public class TestRoundTrip extends RsaTestBase { +public class TestTcpDiscoveryRoundTrip extends RsaTestBase { @Inject EchoService echoService; @@ -43,11 +43,10 @@ public class TestRoundTrip extends RsaTestBase { public static Option[] remoteConfig() throws IOException { return new Option[] { rsaCore(), - rsaDiscoveryZookeeper(), + rsaDiscoveryTcp(), rsaProviderTcp(), echoTcpService(), - configZKServer(), - configZKDiscovery(), + configTcpDiscovery(0, 1), }; } @@ -55,10 +54,10 @@ public class TestRoundTrip extends RsaTestBase { public static Option[] configure() throws Exception { return new Option[] { rsaCore(), - rsaDiscoveryZookeeper(), + rsaDiscoveryTcp(), rsaProviderTcp(), echoTcpConsumer(), - configZKDiscovery() + configTcpDiscovery(1, 0) }; } 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/TestZookeeperDiscoveryRoundTrip.java similarity index 96% rename from itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestRoundTrip.java rename to itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestZookeeperDiscoveryRoundTrip.java index c89ff278..593ae931 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/TestZookeeperDiscoveryRoundTrip.java @@ -18,12 +18,6 @@ */ package org.apache.aries.rsa.itests.felix.tcp; -import static org.junit.Assert.assertEquals; - -import java.io.IOException; - -import javax.inject.Inject; - 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; @@ -33,8 +27,13 @@ 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 TestRoundTrip extends RsaTestBase { +public class TestZookeeperDiscoveryRoundTrip extends RsaTestBase { @Inject EchoService echoService;
