Added and clarified several tests.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1005431 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterTest.java
deleted file mode 100644
index 01c82c8..0000000
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * 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.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 org.apache.felix.dm.Component;
-import org.apache.felix.dm.DependencyManager;
-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;
-
-@RunWith(JUnit4TestRunner.class)
-public class AdapterTest 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 testInstanceBoundDependency(BundleContext context) {
- DependencyManager m = new DependencyManager(context);
- // helper class that ensures certain steps get executed in sequence
- Ensure e = new Ensure();
- // create a service provider and consumer
- Component sp = m.createComponent()
- .setInterface(ServiceInterface.class.getName(), null)
- .setImplementation(new ServiceProvider(e));
- Component sp2 = m.createComponent()
- .setInterface(ServiceInterface2.class.getName(), null)
- .setImplementation(new ServiceProvider2(e));
- Component sc = m.createComponent()
- .setImplementation(new ServiceConsumer())
- .add(m.createServiceDependency()
- .setService(ServiceInterface3.class)
- .setRequired(true));
- Component sa = m.createAdapterService(ServiceInterface.class, null)
- .setInterface(ServiceInterface3.class.getName(), null)
- .setImplementation(new ServiceAdapter(e));
- m.add(sc);
- m.add(sp);
- m.add(sp2);
- m.add(sa);
- e.waitForStep(5, 15000);
- m.remove(sa);
- m.remove(sp2);
- m.remove(sp);
- m.remove(sc);
- }
-
- static interface ServiceInterface {
- public void invoke();
- }
-
- static interface ServiceInterface2 {
- public void invoke();
- }
-
- static interface ServiceInterface3 {
- public void invoke();
- }
-
- static class ServiceProvider2 implements ServiceInterface2 {
- private final Ensure m_ensure;
-
- public ServiceProvider2(Ensure ensure) {
- m_ensure = ensure;
- }
-
- public void invoke() {
- m_ensure.step(4);
- }
- }
-
- static class ServiceProvider implements ServiceInterface {
- private final Ensure m_ensure;
- public ServiceProvider(Ensure e) {
- m_ensure = e;
- }
- public void invoke() {
- m_ensure.step(5);
- }
- }
-
- static class ServiceAdapter implements ServiceInterface3 {
- private Ensure m_ensure;
- private volatile ServiceInterface m_originalService;
- private volatile ServiceInterface2 m_injectedService;
- private volatile Component m_service;
- private volatile DependencyManager m_manager;
-
- public ServiceAdapter(Ensure e) {
- m_ensure = e;
- }
- public void init() {
- m_ensure.step(1);
- m_service.add(m_manager.createServiceDependency().setInstanceBound(true).setRequired(true).setService(ServiceInterface2.class));
- }
- public void start() {
- m_ensure.step(2);
- }
- public void invoke() {
- m_ensure.step(3);
- m_injectedService.invoke();
- m_originalService.invoke();
- }
-
- public void stop() {
- m_ensure.step(6);
- }
- }
-
- static class ServiceConsumer implements Runnable {
- private volatile ServiceInterface3 m_service;
-
- public void init() {
- Thread t = new Thread(this);
- t.start();
- }
-
- public void run() {
- m_service.invoke();
- }
- }
-}
-
-
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterWithExtraDependenciesTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterWithExtraDependenciesTest.java
index fbfbe9d..4915c2c 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterWithExtraDependenciesTest.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterWithExtraDependenciesTest.java
@@ -1,11 +1,29 @@
+/*
+ * 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.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 org.apache.felix.dm.DependencyManager;
import org.apache.felix.dm.Component;
+import org.apache.felix.dm.DependencyManager;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectBaseTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectBaseTest.java
index 766db6b..ce32c67 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectBaseTest.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectBaseTest.java
@@ -28,8 +28,8 @@
import junit.framework.Assert;
-import org.apache.felix.dm.DependencyManager;
import org.apache.felix.dm.Component;
+import org.apache.felix.dm.DependencyManager;
import org.apache.felix.dm.ServiceUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -118,6 +118,8 @@
// remove and add will be invoked
e.waitForStep(4, 2000);
+ Assert.assertEquals("a", c.invoke());
+
m.remove(sp);
// after removing the original service, the consumer's remove should be called once
e.waitForStep(5, 2000);
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 cc5b0ca..bc828e4 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
@@ -106,4 +106,33 @@
public static Runnable createRunnableStep(final Ensure ensure, final int nr) {
return new Runnable() { public void run() { ensure.step(nr); }};
}
+
+ public synchronized void steps(Steps steps) {
+ steps.next(this);
+ }
+
+ /**
+ * Helper class for naming a list of step numbers. If used with the steps(Steps) method
+ * you can define at which steps in time this point should be passed. That means you can
+ * check methods that will get invoked multiple times during a test.
+ */
+ public static class Steps {
+ private final int[] m_steps;
+ private int m_stepIndex;
+
+ /**
+ * Create a list of steps and initialize the step counter to zero.
+ */
+ public Steps(int... steps) {
+ m_steps = steps;
+ m_stepIndex = 0;
+ }
+
+ /**
+ * Ensure we're at the right step. Will throw an index out of bounds exception if we enter this step more often than defined.
+ */
+ public void next(Ensure ensure) {
+ ensure.step(m_steps[m_stepIndex++]);
+ }
+ }
}
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithAutoConfigTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithAutoConfigTest.java
index b783faa..1de59ed 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithAutoConfigTest.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithAutoConfigTest.java
@@ -23,8 +23,8 @@
import static org.ops4j.pax.exam.CoreOptions.provision;
import junit.framework.Assert;
-import org.apache.felix.dm.DependencyManager;
import org.apache.felix.dm.Component;
+import org.apache.felix.dm.DependencyManager;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -88,7 +88,7 @@
// This client is not using callbacks, but instead, it uses auto config.
public static class Client {
- ProviderInterface m_provider = null;
+ volatile ProviderInterface m_provider;
private Ensure m_ensure;
private final boolean m_required;
private final int m_startStep;
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FactoryConfigurationAdapterTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FactoryConfigurationAdapterTest.java
index c777619..eda7525 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FactoryConfigurationAdapterTest.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FactoryConfigurationAdapterTest.java
@@ -29,8 +29,8 @@
import junit.framework.Assert;
-import org.apache.felix.dm.DependencyManager;
import org.apache.felix.dm.Component;
+import org.apache.felix.dm.DependencyManager;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -170,7 +170,7 @@
}
public static class Adapter implements AdapterService {
- AdapterExtraDependency m_extraDependency; // extra dependency.
+ volatile AdapterExtraDependency m_extraDependency; // extra dependency.
private int updateCount;
void updated(Dictionary settings) {
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependencyTest2.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependencyTest2.java
index ca0f263..6bd2388 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependencyTest2.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependencyTest2.java
@@ -24,8 +24,8 @@
import java.util.Hashtable;
-import org.apache.felix.dm.DependencyManager;
import org.apache.felix.dm.Component;
+import org.apache.felix.dm.DependencyManager;
import org.apache.felix.dm.ServiceDependency;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -134,36 +134,33 @@
public void doService();
}
- public static class ServiceConsumer
- {
+ public static class ServiceConsumer {
volatile Sequencer m_sequencer;
volatile ServiceInterface m_service;
ServiceDependency m_d1, m_d2;
- public void init(Object serviceInstance, DependencyManager m, Component s)
- {
- s.add(m_d1 = m.createServiceDependency()
- .setService(Sequencer.class)
- .setRequired(true)
- .setInstanceBound(true)
- .setAutoConfig("m_sequencer"));
- s.add(m_d2 = m.createServiceDependency()
- .setService(ServiceInterface.class, "(foo=bar)")
- .setRequired(true)
- .setInstanceBound(true)
- .setAutoConfig("m_service"));
+ public void init(Component s) {
+ DependencyManager m = s.getDependencyManager();
+ s.add(m_d1 = m.createServiceDependency()
+ .setService(Sequencer.class)
+ .setRequired(true)
+ .setInstanceBound(true)
+ .setAutoConfig("m_sequencer"));
+ s.add(m_d2 = m.createServiceDependency()
+ .setService(ServiceInterface.class, "(foo=bar)")
+ .setRequired(true)
+ .setInstanceBound(true)
+ .setAutoConfig("m_service"));
}
- void start()
- {
+ void start() {
m_d1.setInstanceBound(false);
m_d2.setInstanceBound(false);
m_sequencer.step(6);
m_service.doService();
}
- void stop()
- {
+ void stop() {
m_sequencer.step(8);
}
}
@@ -174,8 +171,9 @@
ServiceProvider2 m_serviceProvider2;
ServiceDependency m_d1, m_d2;
- public void init(Object serviceInstance, DependencyManager m, Component s)
+ public void init(Component s)
{
+ DependencyManager m = s.getDependencyManager();
s.add(m_d1 = m.createServiceDependency()
.setService(Sequencer.class)
.setRequired(true)
@@ -224,8 +222,9 @@
Runnable m_runnable;
ServiceDependency m_d1, m_d2;
- public void init(Object serviceInstance, DependencyManager m, Component s)
+ public void init(Component s)
{
+ DependencyManager m = s.getDependencyManager();
s.add(m_d1 = m.createServiceDependency()
.setService(Runnable.class, "(foo=bar)")
.setRequired(false)
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ResourceAdapterDependencyAddAndRemoveTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ResourceAdapterDependencyAddAndRemoveTest.java
new file mode 100644
index 0000000..c3f1475
--- /dev/null
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ResourceAdapterDependencyAddAndRemoveTest.java
@@ -0,0 +1,286 @@
+/*
+ * 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.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.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import junit.framework.Assert;
+
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.ComponentStateListener;
+import org.apache.felix.dm.Dependency;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.ResourceHandler;
+import org.apache.felix.dm.ResourceUtil;
+import org.apache.felix.dm.ServiceDependency;
+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.Filter;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+
+
+@RunWith(JUnit4TestRunner.class)
+public class ResourceAdapterDependencyAddAndRemoveTest 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 testBasicResourceAdapter(BundleContext context) throws Exception {
+ DependencyManager m = new DependencyManager(context);
+ // helper class that ensures certain steps get executed in sequence
+ Ensure e = new Ensure();
+
+ // create and add a service provider
+ m.add(m.createComponent()
+ .setInterface(ServiceInterface.class.getName(), null)
+ .setImplementation(new ServiceProvider(e)));
+
+ // create and add a resource provider
+ ResourceProvider provider = new ResourceProvider(e);
+ m.add(m.createComponent()
+ .setImplementation(provider)
+ .add(m.createServiceDependency()
+ .setService(ResourceHandler.class)
+ .setCallbacks("add", "remove"))
+ );
+
+ // create a resource adapter for our single resource
+ // note that we can provide an actual implementation instance here because there will be only one
+ // adapter, normally you'd want to specify a Class here
+ // also, create a callback instance which will be used for both callbacks on resource changes and
+ // life cycle callbacks on the adapters themselves
+ CallbackInstance callbackInstance = new CallbackInstance(e);
+ Component component = m.createResourceAdapterService("(&(path=/path/to/*.txt)(host=localhost))", false, callbackInstance, "changed")
+ .setImplementation(new ResourceAdapter(e))
+ .setCallbacks(callbackInstance, "init", "start", "stop", "destroy")
+ .add(m.createServiceDependency()
+ .setService(ServiceInterface.class)
+ .setRequired(true)
+ .setInstanceBound(true));
+ // add a component state listener
+ component.addStateListener(new ComponentStateListenerImpl(e));
+ // add the resource adapter
+ m.add(component);
+ // wait until the single resource is available (the adapter has been started)
+ e.waitForStep(1, 5000);
+ // trigger a 'change' in our resource
+ provider.change();
+ // wait until the changed callback is invoked
+ e.waitForStep(2, 5000);
+ // and has completed (ensuring no "extra" steps are invoked in the mean time)
+ e.waitForStep(3, 5000);
+
+ // remove the resource adapter again
+ m.remove(component);
+
+ // wait for the stopped callback in the state listener
+ e.waitForStep(4, 5000);
+ }
+
+ static class ResourceAdapter {
+ protected URL m_resource; // injected by reflection.
+ private Ensure m_ensure;
+
+ ResourceAdapter(Ensure e) {
+ m_ensure = e;
+ }
+
+ }
+
+ static class ResourceProvider {
+ private volatile BundleContext m_context;
+ private final Ensure m_ensure;
+ private final Map m_handlers = new HashMap();
+ private URL[] m_resources;
+
+ public ResourceProvider(Ensure ensure) throws MalformedURLException {
+ m_ensure = ensure;
+ m_resources = new URL[] {
+ new URL("file://localhost/path/to/file1.txt")
+ };
+ }
+
+ public void change() {
+ ResourceHandler[] handlers;
+ synchronized (m_handlers) {
+ handlers = (ResourceHandler[]) m_handlers.keySet().toArray(new ResourceHandler[m_handlers.size()]);
+ }
+ for (int i = 0; i < m_resources.length; i++) {
+ for (int j = 0; j < handlers.length; j++) {
+ ResourceHandler handler = handlers[j];
+ handler.changed(m_resources[i]);
+ }
+ }
+ }
+
+ public void add(ServiceReference ref, ResourceHandler handler) {
+ String filterString = (String) ref.getProperty("filter");
+ Filter filter = null;
+ if (filterString != null) {
+ try {
+ filter = m_context.createFilter(filterString);
+ }
+ catch (InvalidSyntaxException e) {
+ Assert.fail("Could not create filter for resource handler: " + e);
+ return;
+ }
+ }
+ synchronized (m_handlers) {
+ m_handlers.put(handler, filter);
+ }
+ for (int i = 0; i < m_resources.length; i++) {
+ if (filter == null || filter.match(ResourceUtil.createProperties(m_resources[i]))) {
+ handler.added(m_resources[i]);
+ }
+ }
+ }
+
+ public void remove(ServiceReference ref, ResourceHandler handler) {
+ Filter filter;
+ synchronized (m_handlers) {
+ filter = (Filter) m_handlers.remove(handler);
+ }
+ removeResources(handler, filter);
+ }
+
+ private void removeResources(ResourceHandler handler, Filter filter) {
+ for (int i = 0; i < m_resources.length; i++) {
+ if (filter == null || filter.match(ResourceUtil.createProperties(m_resources[i]))) {
+ handler.removed(m_resources[i]);
+ }
+ }
+ }
+
+ public void destroy() {
+ Entry[] handlers;
+ synchronized (m_handlers) {
+ handlers = (Entry[]) m_handlers.entrySet().toArray(new Entry[m_handlers.size()]);
+ }
+ for (int i = 0; i < handlers.length; i++) {
+ removeResources((ResourceHandler) handlers[i].getKey(), (Filter) handlers[i].getValue());
+ }
+
+ System.out.println("DESTROY..." + m_handlers.size());
+ }
+ }
+
+ static interface ServiceInterface {
+ public void invoke();
+ }
+
+ static class ServiceProvider implements ServiceInterface {
+ private final Ensure m_ensure;
+ public ServiceProvider(Ensure e) {
+ m_ensure = e;
+ }
+ public void invoke() {
+ }
+ }
+
+ static class CallbackInstance {
+
+ private final Ensure m_ensure;
+
+ public CallbackInstance(Ensure e) {
+ m_ensure = e;
+ }
+
+ void init() {
+ System.out.println("init");
+ }
+
+ void start() {
+ System.out.println("start");
+ m_ensure.step(1);
+ }
+
+ void stop() {
+ System.out.println("stop");
+ }
+
+ void destroy() {
+ System.out.println("destroy");
+ }
+
+ void changed(Component component) {
+ m_ensure.step(2);
+ Dependency oldDependency = null;
+
+ for (Object dependency : component.getDependencies()) {
+ if (dependency instanceof ServiceDependency) {
+ // remove the dependency
+ oldDependency = (Dependency) dependency;
+ }
+ }
+
+ // and add a new dependency
+ component.add(component.getDependencyManager().createServiceDependency().setService(ServiceInterface.class).setRequired(true).setInstanceBound(true));
+ // remove the old dependency
+ component.remove(oldDependency);
+ System.out.println("Changed the dependencies");
+ m_ensure.step(3);
+ }
+ }
+
+ static class ComponentStateListenerImpl implements ComponentStateListener {
+
+ private final Ensure m_ensure;
+
+ public ComponentStateListenerImpl(Ensure e) {
+ this.m_ensure = e;
+ }
+
+ public void started(Component c) {
+ System.out.println("started");
+ }
+
+ public void starting(Component c) {
+ System.out.println("starting");
+ }
+
+ public void stopped(Component c) {
+ System.out.println("stopped");
+ m_ensure.step(4);
+ }
+
+ public void stopping(Component c) {
+ System.out.println("stopping");
+ }
+ }
+}
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ServiceDependencyComponentLifeCycleTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ServiceDependencyComponentLifeCycleTest.java
new file mode 100644
index 0000000..87ee50a
--- /dev/null
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/ServiceDependencyComponentLifeCycleTest.java
@@ -0,0 +1,153 @@
+/*
+ * 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.felix.dm.test;
+//import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartupFor;
+//import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
+
+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 junit.framework.Assert;
+
+import org.apache.felix.dm.Component;
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.ServiceDependency;
+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.util.tracker.ServiceTracker;
+
+
+@RunWith(JUnit4TestRunner.class)
+public class ServiceDependencyComponentLifeCycleTest extends Base {
+ @Configuration
+ public static Option[] configuration() {
+ return options(
+ //vmOption( "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005" ),
+ //waitForFrameworkStartupFor(Long.MAX_VALUE),
+ 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 testComponentLifeCycleWhenAddingAndRemovingDependencies(BundleContext context) throws Exception {
+ DependencyManager m = new DependencyManager(context);
+ // helper class that ensures certain steps get executed in sequence
+ Ensure e = new Ensure();
+ // create a resource provider
+
+ Component component = m.createComponent().setInterface(MyService2.class.getName(), null).setImplementation(new MyComponent(e));
+ ServiceDependency dependency = m.createServiceDependency().setService(MyService.class).setRequired(true);
+ ServiceDependency dependency2 = m.createServiceDependency().setService(MyService.class).setRequired(true);
+ ServiceTracker st = new ServiceTracker(context, MyService2.class.getName(), null);
+ st.open();
+ Component component2 = m.createComponent().setInterface(MyService.class.getName(), null).setImplementation(MyImpl.class);
+
+ // add the component: it has no dependencies so it should be activated immediately
+ m.add(component);
+ Assert.assertNotNull("service should be available", st.getService());
+
+ // add a required dependency that is not available, so the component should be deactivated
+ component.add(dependency);
+ Assert.assertNull("service should no longer be available", st.getService());
+ // remove the dependency again, so the component should be activated again
+ component.remove(dependency);
+ Assert.assertNotNull("service should be available", st.getService());
+ // make the dependency instance bound
+ dependency.setInstanceBound(true);
+
+ // add it again, the component was already active so even though the dependency
+ // is required, the component will *NOT* go through the destroy life cycle methods
+ component.add(dependency);
+ Assert.assertNull("service should no longer be available", st.getService());
+ component.remove(dependency);
+ Assert.assertNotNull("service should be available", st.getService());
+
+ // make the second dependency instance bound too
+ dependency2.setInstanceBound(true);
+
+ // activate the service we depend on
+ m.add(component2);
+
+ component.add(dependency);
+ Assert.assertNotNull("service should be available", st.getService());
+ component.add(dependency2);
+ Assert.assertNotNull("service should be available", st.getService());
+ component.remove(dependency);
+ Assert.assertNotNull("service should be available", st.getService());
+
+ e.step(9);
+
+ // remove the service again
+ m.remove(component2);
+ e.step(11);
+ Assert.assertNull("service should no longer be available", st.getService());
+ component.remove(dependency2);
+ Assert.assertNotNull("service should be available", st.getService());
+ m.remove(component);
+ e.step(15);
+ }
+
+ public static class MyComponent implements MyService2 {
+ private final Ensure m_ensure;
+ private final Ensure.Steps m_initSteps = new Ensure.Steps(1, 5);
+ private final Ensure.Steps m_startSteps = new Ensure.Steps(2, 6, 8, 12);
+ private final Ensure.Steps m_stopSteps = new Ensure.Steps(3, 7, 10, 13);
+ private final Ensure.Steps m_destroySteps = new Ensure.Steps(4, 14);
+
+ public MyComponent(Ensure e) {
+ m_ensure = e;
+ }
+
+ public void init() {
+ System.out.println("init");
+ m_ensure.steps(m_initSteps);
+ }
+
+ public void start() {
+ System.out.println("start");
+ m_ensure.steps(m_startSteps);
+ }
+
+ public void stop() {
+ System.out.println("stop");
+ m_ensure.steps(m_stopSteps);
+ }
+
+ public void destroy() {
+ System.out.println("destroy");
+ m_ensure.steps(m_destroySteps);
+ }
+ }
+
+ public static interface MyService2 {
+ }
+
+ public static interface MyService {
+ }
+
+ public static class MyImpl implements MyService {
+ }
+}