Added test case for issue FELIX-2344
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@945113 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithCallback.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithCallback.java
new file mode 100644
index 0000000..78d8d84
--- /dev/null
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/FELIX2344_ExtraDependencyWithCallback.java
@@ -0,0 +1,97 @@
+/*
+ * 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 junit.framework.Assert;
+
+import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.service.Service;
+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 FELIX2344_ExtraDependencyWithCallback 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 testExtraDependencyWithCallback(BundleContext context) {
+ DependencyManager m = new DependencyManager(context);
+ // helper class that ensures certain steps get executed in sequence
+ Ensure e = new Ensure();
+ // create a service consumer and provider
+ Service sp = m.createService().setInterface(MyService.class.getName(), null).setImplementation(MyServiceImpl.class);
+ Service sc = m.createService().setImplementation(new MyClient(e));
+ m.add(sp);
+ m.add(sc);
+ e.waitForStep(4, 5000);
+ }
+
+ public interface MyService {
+ }
+
+ public static class MyServiceImpl implements MyService {
+ public void start() {
+ System.out.println("MyServiceImpl started");
+ }
+ }
+
+ public static class MyClient {
+ MyService m_myService;
+ private Ensure m_ensure;
+
+ public MyClient(Ensure e) {
+ m_ensure = e;
+ }
+
+ public void init(DependencyManager dm, Service s) {
+ m_ensure.step(1);
+ s.add(dm.createServiceDependency()
+ .setInstanceBound(true)
+ .setService(MyService.class)
+ .setRequired(true)
+ .setCallbacks("bind", null));
+ }
+
+ void bind(MyService myService) {
+ m_ensure.step(2);
+ m_myService = myService;
+ }
+
+ public void start() {
+ m_ensure.step(3);
+ Assert.assertNotNull("Dependendency should have been injected", m_myService);
+ m_ensure.step(4);
+ }
+ }
+}