You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2010/10/16 21:36:33 UTC
svn commit: r1023362 -
/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependenciesTest.java
Author: pderop
Date: Sat Oct 16 19:36:33 2010
New Revision: 1023362
URL: http://svn.apache.org/viewvc?rev=1023362&view=rev
Log:
fixed wrong method names
Modified:
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependenciesTest.java
Modified: felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependenciesTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependenciesTest.java?rev=1023362&r1=1023361&r2=1023362&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependenciesTest.java (original)
+++ felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependenciesTest.java Sat Oct 16 19:36:33 2010
@@ -50,63 +50,60 @@ public class MultipleExtraDependenciesTe
/**
* Check that list of extra dependencies (defined from init method) are handled properly.
* The extra dependencies are added using a List object (Component.add(List)).
- * A component c1 will define two extra dependencies over available c4/c5 services.
+ * A component c1 will define two extra dependencies over *available* c4/c5 services.
*/
- @Test
- public void testWithTwoAvailableExtraDependencies(BundleContext context) {
- DependencyManager m = new DependencyManager(context);
- // Helper class that ensures certain steps get executed in sequence
- Ensure e = new Ensure();
- Component c1 = m.createComponent()
- .setInterface(Service1.class.getName(), null)
- .setImplementation(new MyComponent1(e))
- .add(m.createServiceDependency()
- .setService(Service2.class)
- .setRequired(true)
- .setAutoConfig("m_service2"));
-
- Component c2 = m.createComponent()
- .setImplementation(new MyComponent2(e))
- .add(m.createServiceDependency()
- .setService(Service1.class)
- .setRequired(false)
- .setAutoConfig(false)
- .setCallbacks("added", null, null));
-
- Component c3 = m.createComponent()
- .setInterface(Service2.class.getName(), null)
- .setImplementation(Service2Impl.class);
-
- Hashtable h = new Hashtable();
- h.put("type", "xx");
- Component c4 = m.createComponent()
- .setInterface(Service3.class.getName(), h)
- .setImplementation(Service3Impl1.class);
-
- h = new Hashtable();
- h.put("type", "yy");
- Component c5 = m.createComponent()
- .setInterface(Service3.class.getName(), h)
- .setImplementation(Service3Impl2.class);
-
-
- System.out.println("\n+++ Adding c2 / MyComponent2");
- m.add(c2);
- System.out.println("\n+++ Adding c3 / Service2");
- m.add(c3);
- System.out.println("\n+++ Adding c4 / Service3(xx)");
- m.add(c4);
-
- System.out.println("\n+++ Adding c1 / MyComponent1");
- m.add(c1);
-
- // c1 have declared two extra dependency on Service3 (xx/yy).
- // So, because we have not yet added c5 (yy), c1 should not be started currently.
- // But, now, we'll add c5 (Service3/yy) and c1 should then be started ...
- System.out.println("\n+++ Adding c5 / Service3(yy)");
- m.add(c5);
- e.waitForStep(3, 3000);
- }
+ @Test
+ public void testWithTwoAvailableExtraDependency(BundleContext context) {
+ DependencyManager m = new DependencyManager(context);
+ // Helper class that ensures certain steps get executed in sequence
+ Ensure e = new Ensure();
+ Component c1 = m.createComponent()
+ .setInterface(Service1.class.getName(), null)
+ .setImplementation(new MyComponent1(e))
+ .add(m.createServiceDependency()
+ .setService(Service2.class)
+ .setRequired(true)
+ .setAutoConfig("m_service2"));
+
+ Component c2 = m.createComponent()
+ .setImplementation(new MyComponent2(e))
+ .add(m.createServiceDependency()
+ .setService(Service1.class)
+ .setRequired(false)
+ .setAutoConfig(false)
+ .setCallbacks("added", null, null));
+
+ Component c3 = m.createComponent()
+ .setInterface(Service2.class.getName(), null)
+ .setImplementation(Service2Impl.class);
+
+ Hashtable h = new Hashtable();
+ h.put("type", "xx");
+ Component c4 = m.createComponent()
+ .setInterface(Service3.class.getName(), h)
+ .setImplementation(Service3Impl1.class);
+
+ h = new Hashtable();
+ h.put("type", "yy");
+ Component c5 = m.createComponent()
+ .setInterface(Service3.class.getName(), h)
+ .setImplementation(Service3Impl2.class);
+
+
+ System.out.println("\n+++ Adding c2 / MyComponent2");
+ m.add(c2);
+ System.out.println("\n+++ Adding c3 / Service2");
+ m.add(c3);
+ System.out.println("\n+++ Adding c4 / Service3(xx)");
+ m.add(c4);
+ System.out.println("\n+++ Adding c5 / Service3(yy)");
+ m.add(c5);
+ System.out.println("\n+++ Adding c1 / MyComponent1");
+ // c1 have declared two extra dependency on Service3 (xx/yy).
+ // both extra dependencies are available, so the c1 component should be started immediately.
+ m.add(c1);
+ e.waitForStep(3, 3000);
+ }
/**
* Check that list of extra dependencies (defined from init method) are handled properly.
@@ -116,7 +113,7 @@ public class MultipleExtraDependenciesTe
* So, c1 is not yet activated.
* Then c5 is added, and it triggers the c1 activation ...
*/
- @Test
+ @Test
public void testWithOneAvailableExtraDependency(BundleContext context) {
DependencyManager m = new DependencyManager(context);
// Helper class that ensures certain steps get executed in sequence
@@ -160,15 +157,18 @@ public class MultipleExtraDependenciesTe
m.add(c3);
System.out.println("\n+++ Adding c4 / Service3(xx)");
m.add(c4);
- System.out.println("\n+++ Adding c5 / Service3(yy)");
- m.add(c5);
System.out.println("\n+++ Adding c1 / MyComponent1");
- // c1 have declared two extra dependency on Service3 (xx/yy).
- // both extra dependencies are available, so the c1 component should be started immediately.
m.add(c1);
+
+ // c1 have declared two extra dependency on Service3 (xx/yy).
+ // So, because we have not yet added c5 (yy), c1 should not be started currently.
+ // But, now, we'll add c5 (Service3/yy) and c1 should then be started ...
+ System.out.println("\n+++ Adding c5 / Service3(yy)");
+ m.add(c5);
e.waitForStep(3, 3000);
}
+
public interface Service1 {}
public interface Service2 {}
public interface Service3 {}