Added a new test that validates listening to services with aspects whiteboard style.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@943059 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectWhiteboardTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectWhiteboardTest.java
new file mode 100644
index 0000000..69e3097
--- /dev/null
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectWhiteboardTest.java
@@ -0,0 +1,199 @@
+package org.apache.felix.dm.test;
+
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.provision;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
+import org.apache.felix.dm.util.ServiceUtil;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+
+@RunWith(JUnit4TestRunner.class)
+public class AspectWhiteboardTest extends Base {
+ @Configuration
+ public static Option[] configuration() {
+ return options(
+ provision(
+ mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").version("4.1.0"),
+ mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager").versionAsInProject()
+ )
+ );
+ }
+
+ @Test
+ public void testWhiteboardConsumer(BundleContext context) {
+ DependencyManager m = new DependencyManager(context);
+ // helper class that ensures certain steps get executed in sequence
+ Ensure e = new Ensure();
+ // create service providers and consumer
+ Service sp1 = m.createService().setImplementation(new ServiceProvider(e)).setInterface(ServiceInterface.class.getName(), null);
+ Service sp2 = m.createService().setImplementation(new ServiceProvider(e)).setInterface(ServiceInterface.class.getName(), null);
+ ServiceConsumer sci = new ServiceConsumer(e);
+ Service sc = m.createService().setImplementation(sci).add(m.createServiceDependency().setService(ServiceInterface.class).setRequired(false).setCallbacks("add", "remove"));
+ Service sa2 = m.createAspectService(ServiceInterface.class, null, 20, new ServiceAspect(e, 3), null);
+ Service sa1 = m.createAspectService(ServiceInterface.class, null, 10, new ServiceAspect(e, 4), null);
+
+ // start with a service consumer
+ System.out.println("Adding consumer");
+ m.add(sc);
+
+ // then add two providers, so the consumer will see two services
+ System.out.println("Adding 2 providers");
+ m.add(sp1);
+ m.add(sp2);
+
+ // make sure consumer sees both services
+ Assert.assertEquals(2, sci.services());
+
+ // add an aspect with ranking 20
+ System.out.println("Adding aspect with rank 20");
+ m.add(sa2);
+
+ // make sure the consumer sees the two new aspects and no longer sees the two original services
+ Assert.assertEquals(2, sci.services());
+ Assert.assertEquals(20, sci.highestRanking());
+ Assert.assertEquals(20, sci.lowestRanking());
+
+ // add an aspect with ranking 10
+ System.out.println("Adding aspect with rank 10");
+ m.add(sa1);
+
+ // make sure the consumer still sees the two aspects with ranking 20
+ Assert.assertEquals(2, sci.services());
+ Assert.assertEquals(20, sci.highestRanking());
+ Assert.assertEquals(20, sci.lowestRanking());
+
+ // remove the aspect with ranking 20
+ System.out.println("Removing aspect with rank 20");
+ m.remove(sa2);
+
+ // make sure the consumer now sees the aspects with ranking 10
+ Assert.assertEquals(2, sci.services());
+ Assert.assertEquals(10, sci.highestRanking());
+ Assert.assertEquals(10, sci.lowestRanking());
+
+ // remove one of the original services
+ System.out.println("Removing 1 service");
+ m.remove(sp1);
+
+ // make sure the aspect of that service goes away
+ Assert.assertEquals(1, sci.services());
+ Assert.assertEquals(10, sci.highestRanking());
+ Assert.assertEquals(10, sci.lowestRanking());
+
+ // remove the aspect with ranking 10
+ System.out.println("Removing aspect with rank 10");
+ m.remove(sa1);
+
+ // make sure only the original service remains
+ Assert.assertEquals(1, sci.services());
+ Assert.assertEquals(0, sci.highestRanking());
+ Assert.assertEquals(0, sci.lowestRanking());
+
+ System.out.println("Done with test");
+
+ // end of test
+ m.remove(sa2);
+ m.remove(sp2);
+ m.remove(sc);
+ }
+
+ static interface ServiceInterface {
+ public void invoke(Runnable run);
+ }
+
+ static class ServiceProvider implements ServiceInterface {
+ private final Ensure m_ensure;
+ public ServiceProvider(Ensure e) {
+ m_ensure = e;
+ }
+ public void invoke(Runnable run) {
+ run.run();
+ }
+ }
+
+ static class ServiceAspect implements ServiceInterface {
+ private final Ensure m_ensure;
+ private volatile ServiceInterface m_parentService;
+ private final int m_step;
+
+ public ServiceAspect(Ensure e, int step) {
+ m_ensure = e;
+ m_step = step;
+ }
+ public void start() {
+ }
+
+ public void invoke(Runnable run) {
+ m_ensure.step(m_step);
+ m_parentService.invoke(run);
+ }
+
+ public void stop() {
+ }
+ }
+
+ static class ServiceConsumer implements Runnable {
+ private List m_services = new ArrayList();
+ private final Ensure m_ensure;
+
+ public ServiceConsumer(Ensure e) {
+ m_ensure = e;
+ }
+
+ public void init() {
+ Thread t = new Thread(this);
+ t.start();
+ }
+
+ public void run() {
+ }
+
+ public int services() {
+ return m_services.size();
+ }
+
+ public int highestRanking() {
+ int ranking = Integer.MIN_VALUE;
+ for (int i = 0; i < m_services.size(); i++) {
+ ServiceReference ref = (ServiceReference) m_services.get(i);
+ Integer r = (Integer) ref.getProperty(Constants.SERVICE_RANKING);
+ int rank = r == null ? 0 : r.intValue();
+ ranking = Math.max(ranking, rank);
+ }
+ return ranking;
+ }
+ public int lowestRanking() {
+ int ranking = Integer.MAX_VALUE;
+ for (int i = 0; i < m_services.size(); i++) {
+ ServiceReference ref = (ServiceReference) m_services.get(i);
+ Integer r = (Integer) ref.getProperty(Constants.SERVICE_RANKING);
+ int rank = r == null ? 0 : r.intValue();
+ ranking = Math.min(ranking, rank);
+ }
+ return ranking;
+ }
+
+ public void add(ServiceReference ref, ServiceInterface svc) {
+ System.out.println("Added: " + ServiceUtil.toString(ref));
+ m_services.add(ref);
+ }
+ public void remove(ServiceReference ref, ServiceInterface svc) {
+ System.out.println("Removed: " + ServiceUtil.toString(ref));
+ m_services.remove(ref);
+ }
+ }
+}
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/Ensure.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/Ensure.java
index 8a93edd..cc5b0ca 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/Ensure.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/Ensure.java
@@ -53,7 +53,7 @@
step++;
Assert.assertEquals(nr, step);
if (DEBUG) {
- STREAM.println("[Ensure " + INSTANCE + "] step " + step);
+ STREAM.println("[Ensure " + INSTANCE + "] step " + step + " [" + currentThread() + "]");
}
notifyAll();
}
@@ -64,7 +64,7 @@
public synchronized void step() {
step++;
if (DEBUG) {
- STREAM.println("[Ensure " + INSTANCE + "] next step " + step);
+ STREAM.println("[Ensure " + INSTANCE + "] next step " + step + " [" + currentThread() + "]");
}
notifyAll();
}
@@ -81,7 +81,7 @@
public synchronized void waitForStep(int nr, int timeout) {
final int initialTimeout = timeout;
if (DEBUG) {
- STREAM.println("[Ensure " + INSTANCE + "] waiting for step " + nr);
+ STREAM.println("[Ensure " + INSTANCE + "] waiting for step " + nr + " [" + currentThread() + "]");
}
while (step < nr && timeout > 0) {
try {
@@ -94,10 +94,15 @@
throw new IllegalStateException("Timed out waiting for " + initialTimeout + " ms for step " + nr + ", we are still at step " + step);
}
if (DEBUG) {
- STREAM.println("[Ensure " + INSTANCE + "] arrived at step " + nr);
+ STREAM.println("[Ensure " + INSTANCE + "] arrived at step " + nr + " [" + currentThread() + "]");
}
}
+ private String currentThread() {
+ Thread thread = Thread.currentThread();
+ return thread.getId() + " " + thread.getName();
+ }
+
public static Runnable createRunnableStep(final Ensure ensure, final int nr) {
return new Runnable() { public void run() { ensure.step(nr); }};
}