Improve 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/736a259b Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/736a259b Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/736a259b Branch: refs/heads/master Commit: 736a259b4b8bb47af594d774da76537c4f0b66c5 Parents: 722d81c Author: Christian Schneider <[email protected]> Authored: Thu Feb 15 14:00:42 2018 +0100 Committer: Christian Schneider <[email protected]> Committed: Thu Feb 15 14:00:42 2018 +0100 ---------------------------------------------------------------------- .../aries/rsa/itests/felix/RsaTestBase.java | 1 - .../felix/fastbin/TestFastbinRoundTrip.java | 12 ++- .../itests/felix/tcp/TestDiscoveryImport.java | 94 ++++++++++++++++++++ .../rsa/itests/felix/tcp/TestFindHook.java | 2 +- 4 files changed, 104 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/736a259b/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 051884b..e2e56f0 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 @@ -140,7 +140,6 @@ public class RsaTestBase { 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") ); http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/736a259b/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 afd8cf9..1790951 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 @@ -35,11 +35,17 @@ import org.ops4j.pax.exam.Option; @RunWith(TwoContainerPaxExam.class) public class TestFastbinRoundTrip extends RsaTestBase { - private static final String FASTBIN_PORT_SERVER = "2544"; - private static final String FASTBIN_PORT_CLIENT = "2545"; + 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[] // http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/736a259b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryImport.java ---------------------------------------------------------------------- diff --git a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryImport.java b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryImport.java new file mode 100644 index 0000000..d7424ea --- /dev/null +++ b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/tcp/TestDiscoveryImport.java @@ -0,0 +1,94 @@ +/** + * 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. + */ +package org.apache.aries.rsa.itests.felix.tcp; + +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.Dictionary; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Semaphore; +import java.util.concurrent.TimeUnit; + +import javax.inject.Inject; + +import org.apache.aries.rsa.discovery.zookeeper.repository.ZookeeperEndpointRepository; +import org.apache.aries.rsa.itests.felix.RsaTestBase; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.junit.PaxExam; +import org.ops4j.pax.exam.util.Filter; +import org.osgi.framework.BundleContext; +import org.osgi.framework.Constants; +import org.osgi.service.remoteserviceadmin.EndpointDescription; +import org.osgi.service.remoteserviceadmin.EndpointEvent; +import org.osgi.service.remoteserviceadmin.EndpointEventListener; +import org.osgi.service.remoteserviceadmin.RemoteConstants; + +@RunWith(PaxExam.class) +public class TestDiscoveryImport extends RsaTestBase { + @Inject + ZookeeperEndpointRepository repository; + + @Inject + BundleContext context; + + @Configuration + public static Option[] configure() throws Exception { + return new Option[] { + rsaCore(), + rsaProviderTcp(), + rsaDiscoveryZookeeper(), + localRepo(), + configZKDiscovery(), + configZKServer() + }; + } + + @Test + public void testDiscoveryImport() throws Exception { + final Semaphore sem = new Semaphore(0); + final List<EndpointEvent> events = new ArrayList<>(); + EndpointEventListener listener = new EndpointEventListener() { + + @Override + public void endpointChanged(EndpointEvent event, String filter) { + events.add(event); + sem.release(); + } + }; + Dictionary<String, Object> eprops = new Hashtable<>(); + eprops.put(EndpointEventListener.ENDPOINT_LISTENER_SCOPE, "(objectClass=*)"); + context.registerService(EndpointEventListener.class, listener, eprops); + Map<String, Object> props = new HashMap<>(); + props.put(Constants.OBJECTCLASS, new String[]{"my"}); + props.put(RemoteConstants.ENDPOINT_ID, "myid"); + props.put(RemoteConstants.SERVICE_IMPORTED_CONFIGS, "myconfig"); + EndpointDescription endpoint = new EndpointDescription(props); + repository.add(endpoint); + assertTrue(sem.tryAcquire(10, TimeUnit.SECONDS)); + //assertThat(events.get(0), samePropertyValuesAs(new EndpointEvent(EndpointEvent.ADDED, endpoint))); + } + +} http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/736a259b/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 8d4ab97..19f481a 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 @@ -31,6 +31,7 @@ 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.Assert; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; @@ -99,7 +100,6 @@ public class TestFindHook extends RsaTestBase { @Test public void testFind() throws Exception { - Thread.sleep(1000); // FIXME Why does it only work if we wait? ServiceReference<EchoService> ref = tryTo("get EchoService", new Callable<ServiceReference<EchoService>>() { @Override
