Repository: aries-rsa Updated Branches: refs/heads/master 4bd3d757c -> b4a95725d
Refactoring of itests Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/90205645 Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/90205645 Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/90205645 Branch: refs/heads/master Commit: 90205645cca228f23a217cceae46c86da945edb0 Parents: 4bd3d75 Author: Christian Schneider <[email protected]> Authored: Wed May 3 11:18:40 2017 +0200 Committer: Christian Schneider <[email protected]> Committed: Wed May 3 11:18:40 2017 +0200 ---------------------------------------------------------------------- .../aries/rsa/itests/felix/RsaTestBase.java | 15 ++++---- .../config/TestConfigDiscoveryRoundTrip.java | 25 +++++++------- .../felix/fastbin/TestFastbinRoundTrip.java | 31 +++++++++-------- .../rsa/itests/felix/rsa/TestRSAListener.java | 36 +++++++++++++------- .../itests/felix/tcp/TestDiscoveryExport.java | 2 +- .../rsa/itests/felix/tcp/TestFindHook.java | 4 +-- .../rsa/itests/felix/tcp/TestRoundTrip.java | 4 +-- 7 files changed, 65 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/90205645/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 b6ba815..b6bbbd9 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 @@ -99,17 +99,15 @@ public class RsaTestBase { protected static Option echoTcpConsumer() { return CoreOptions.composite( - mvn("org.apache.felix", "org.apache.felix.scr"), - mvn("org.apache.aries.rsa.examples.echotcp", "org.apache.aries.rsa.examples.echotcp.api"), - // Consumer is needed to trigger service import. Pax exam inject does not trigger it + echoTcpAPI(), + // Consumer bundle is needed to trigger service import. Pax exam inject does not trigger it mvn("org.apache.aries.rsa.examples.echotcp", "org.apache.aries.rsa.examples.echotcp.consumer") ); } protected static Option echoTcpService() { return composite( - mvn("org.apache.felix", "org.apache.felix.scr"), - mvn("org.apache.aries.rsa.examples.echotcp", "org.apache.aries.rsa.examples.echotcp.api"), + echoTcpAPI(), mvn("org.apache.aries.rsa.examples.echotcp", "org.apache.aries.rsa.examples.echotcp.service") ); } @@ -121,6 +119,7 @@ public class RsaTestBase { 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.felix", "org.apache.felix.scr"), 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"), @@ -146,11 +145,11 @@ public class RsaTestBase { ); } - protected static Option rsaTcp() { + protected static Option rsaProviderTcp() { return mvn("org.apache.aries.rsa.provider", "org.apache.aries.rsa.provider.tcp"); } - protected static Option rsaFastBin() { + protected static Option rsaProviderFastBin() { return composite(mvn("org.fusesource.hawtbuf", "hawtbuf"), mvn("org.fusesource.hawtdispatch", "hawtdispatch"), mvn("org.apache.aries.rsa.provider", "org.apache.aries.rsa.provider.fastbin")); @@ -168,7 +167,7 @@ public class RsaTestBase { .asOption(); } - protected static Option configFastBin(String port) { + protected static Option configFastBinPort(String 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/90205645/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 9e4b133..179b2ed 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 @@ -42,26 +42,27 @@ public class TestConfigDiscoveryRoundTrip extends RsaTestBase { @ServerConfiguration public static Option[] remoteConfig() throws IOException { - return new Option[] { - rsaCore(), - rsaTcp(), - echoTcpService() + return new Option[] // + { + rsaCore(), // + rsaProviderTcp(), // + echoTcpService() }; } @Configuration public static Option[] configure() throws Exception { - return new Option[] { - rsaCore(), - rsaDiscoveryConfig(), - rsaTcp(), - echoTcpConsumer(), - configTcpConfigDiscovery() + return new Option[] // + { + rsaCore(), // + rsaDiscoveryConfig(), // + rsaProviderTcp(), // + echoTcpConsumer(), // + configImportEchoService() }; } - - protected static Option configTcpConfigDiscovery() { + protected static Option configImportEchoService() { return factoryConfiguration("org.apache.aries.rsa.discovery.config") .put("service.imported", "true") .put("service.imported.configs", "aries.tcp") http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/90205645/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 26a0625..95bcae0 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 @@ -41,26 +41,27 @@ public class TestFastbinRoundTrip extends RsaTestBase { @ServerConfiguration public static Option[] remoteConfig() throws IOException { return new Option[] // - { - rsaCore(), - rsaDiscoveryZookeeper(), - rsaFastBin(), - echoTcpService(), - configZKServer(), - configZKDiscovery(), - configFastBin("2544"), + { + rsaCore(), // + rsaDiscoveryZookeeper(), // + rsaProviderFastBin(), // + echoTcpService(), // + configZKServer(), // + configZKDiscovery(), // + configFastBinPort("2544"), }; } @Configuration public static Option[] configure() throws Exception { - return new Option[] { - rsaCore(), - rsaDiscoveryZookeeper(), - rsaFastBin(), - echoTcpConsumer(), - configZKDiscovery(), - configFastBin("2545") + return new Option[] // + { + rsaCore(), // + rsaDiscoveryZookeeper(), // + rsaProviderFastBin(), // + echoTcpConsumer(), // + configZKDiscovery(), // + configFastBinPort("2545") }; } http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/90205645/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 9dea585..8a0c9f9 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 @@ -19,10 +19,13 @@ package org.apache.aries.rsa.itests.felix.rsa; */ -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.concurrent.TimeoutException; +import javax.inject.Inject; + +import org.apache.aries.rsa.examples.echotcp.api.EchoService; import org.apache.aries.rsa.itests.felix.RsaTestBase; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,33 +34,43 @@ import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.Bundle; import org.osgi.framework.ServiceRegistration; +import org.osgi.service.remoteserviceadmin.RemoteServiceAdmin; import org.osgi.service.remoteserviceadmin.RemoteServiceAdminEvent; import org.osgi.service.remoteserviceadmin.RemoteServiceAdminListener; @RunWith(PaxExam.class) public class TestRSAListener extends RsaTestBase implements RemoteServiceAdminListener { + private static final int EVENT_TIMEOUT = 2000; private RemoteServiceAdminEvent lastEvent; private Bundle serviceBundle; - + + @Inject + EchoService echoService; + + @Inject + RemoteServiceAdmin rsa; + @Configuration public static Option[] configure() throws Exception { - return new Option[] { - rsaCore(), - rsaFastBin(), - echoTcpService(), - configFastBin("2545"), + return new Option[] // + { + rsaCore(), // + rsaProviderFastBin(), // + echoTcpService(), // + configFastBinPort("2545"), }; } @Test public void testListener() throws Exception { serviceBundle = getBundle("org.apache.aries.rsa.examples.echotcp.service"); + serviceBundle.stop(); ServiceRegistration<RemoteServiceAdminListener> sreg = bundleContext.registerService(RemoteServiceAdminListener.class, this, null); - + serviceBundle.start(); assertEvent(RemoteServiceAdminEvent.EXPORT_REGISTRATION); - + serviceBundle.stop(); assertEvent(RemoteServiceAdminEvent.EXPORT_UNREGISTRATION); @@ -66,7 +79,7 @@ public class TestRSAListener extends RsaTestBase implements RemoteServiceAdminLi @Override public synchronized void remoteAdminEvent(RemoteServiceAdminEvent event) { - if (serviceBundle == event.getExportReference().getExportedService().getBundle()) { + if (event.getExportReference() != null && serviceBundle == event.getExportReference().getExportedService().getBundle()) { lastEvent = event; this.notifyAll(); } @@ -75,12 +88,11 @@ public class TestRSAListener extends RsaTestBase implements RemoteServiceAdminLi private void assertEvent(int eventType) throws InterruptedException, TimeoutException { waitEvent(); assertEquals(eventType, lastEvent.getType()); - assertNotNull("ExportReference must be available",lastEvent.getExportReference()); this.lastEvent = null; } private synchronized void waitEvent() throws InterruptedException, TimeoutException { - this.wait(2000); + this.wait(EVENT_TIMEOUT); if (this.lastEvent == null) { throw new TimeoutException("Timeout waiting for Event"); } http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/90205645/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 151d02e..218316e 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 @@ -52,7 +52,7 @@ public class TestDiscoveryExport extends RsaTestBase { return new Option[] { rsaCore(), rsaDiscoveryZookeeper(), - rsaTcp(), + rsaProviderTcp(), echoTcpService(), localRepo(), configZKDiscovery(), http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/90205645/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestFindHook.java ---------------------------------------------------------------------- diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestFindHook.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestFindHook.java index f866f7b..8d4ab97 100644 --- a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestFindHook.java +++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestFindHook.java @@ -49,7 +49,7 @@ public class TestFindHook extends RsaTestBase { return new Option[] { rsaCore(), rsaDiscoveryZookeeper(), - rsaTcp(), + rsaProviderTcp(), echoTcpService(), configZKServer(), configZKDiscovery(), @@ -61,7 +61,7 @@ public class TestFindHook extends RsaTestBase { return new Option[] { rsaCore(), rsaDiscoveryZookeeper(), - rsaTcp(), + rsaProviderTcp(), echoTcpAPI(), configZKDiscovery() }; http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/90205645/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 577d56b..2a038b8 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 @@ -45,7 +45,7 @@ public class TestRoundTrip extends RsaTestBase { return new Option[] { rsaCore(), rsaDiscoveryZookeeper(), - rsaTcp(), + rsaProviderTcp(), echoTcpService(), configZKServer(), configZKDiscovery(), @@ -57,7 +57,7 @@ public class TestRoundTrip extends RsaTestBase { return new Option[] { rsaCore(), rsaDiscoveryZookeeper(), - rsaTcp(), + rsaProviderTcp(), RsaTestBase.echoTcpConsumer(), configZKDiscovery() };
