pax exam 3.0.0 ...
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1532045 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterAnnotation.java b/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterAnnotation.java
index c87aa28..a2a4a00 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterAnnotation.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterAnnotation.java
@@ -67,10 +67,12 @@
@AdapterService(adapteeService = S1.class, properties = {@Property(name = "adapter", value = "true")})
public static class S1ToS3AdapterAutoConfig implements S3 {
+ public static final String ENSURE = "AdapterAnnotation.autoConfig";
+
// This is the adapted service
protected volatile S1 m_s1;
- @ServiceDependency(filter = "(name=adapter.autoConfig)")
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
protected volatile Ensure m_sequencer;
// Check auto config injections
@@ -124,10 +126,11 @@
@AdapterService(adapteeService = S1.class, properties = {@Property(name = "adapter", value = "true")}, field = "m_s1")
public static class S1ToS3AdapterAutoConfigField implements S3 {
+ public final static String ENSURE = "AdapterAnnotation.autoConfig.field";
// This is the adapted service
protected volatile S1 m_s1;
- @ServiceDependency(filter = "(name=adapter.autoConfig.field)")
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
protected volatile Ensure m_sequencer;
public void run3() {
@@ -138,10 +141,11 @@
@AdapterService(adapteeService = S1.class, properties = {@Property(name = "adapter", value = "true")}, added = "bind", removed = "removed")
public static class S1ToS3AdapterCallback implements S3 {
+ public final static String ENSURE = "AdapterAnnotation.callback";
// This is the adapted service
protected Object m_s1;
- @ServiceDependency(filter = "(name=adapter.callback)")
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
protected Ensure m_sequencer;
void bind(S1 s1) {
@@ -164,7 +168,9 @@
@Component(properties = {@Property(name = "param1", value = "value1")})
public static class S1Impl implements S1 {
- @ServiceDependency
+ public final static String ENSURE = "AdapterAnnotation.S1Impl";
+
+ @ServiceDependency(filter="(name=" + ENSURE + ")")
protected Ensure m_sequencer;
@ServiceDependency
@@ -178,7 +184,9 @@
@Component
public static class S2Impl implements S2 {
- @ServiceDependency
+ public final static String ENSURE = "AdapterAnnotation.S2Impl";
+
+ @ServiceDependency(filter="(name=" + ENSURE + ")")
protected Ensure m_sequencer;
public void run2() {
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java
index 6322b57..befe127 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java
@@ -18,6 +18,11 @@
*/
package org.apache.felix.dependencymanager.test2.integration.annotations;
+import org.apache.felix.dependencymanager.test2.components.AdapterAnnotation.S1Impl;
+import org.apache.felix.dependencymanager.test2.components.AdapterAnnotation.S1ToS3AdapterAutoConfig;
+import org.apache.felix.dependencymanager.test2.components.AdapterAnnotation.S1ToS3AdapterAutoConfigField;
+import org.apache.felix.dependencymanager.test2.components.AdapterAnnotation.S1ToS3AdapterCallback;
+import org.apache.felix.dependencymanager.test2.components.AdapterAnnotation.S2Impl;
import org.apache.felix.dependencymanager.test2.components.Ensure;
import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
import org.junit.Test;
@@ -37,10 +42,14 @@
@Test
public void testAnnotatedAdapterAutoConfig() throws Throwable {
Ensure e = new Ensure();
- ServiceRegistration er = register(e, "adapter.autoConfig");
+ ServiceRegistration sr1 = register(e, S1ToS3AdapterAutoConfig.ENSURE);
+ ServiceRegistration sr2 = register(e, S1Impl.ENSURE);
+ ServiceRegistration sr3 = register(e, S2Impl.ENSURE);
e.waitForStep(3, 10000);
e.ensure();
- er.unregister();
+ sr1.unregister();
+ sr2.unregister();
+ sr3.unregister();
}
/**
@@ -49,10 +58,14 @@
@Test
public void testAnnotatedAdapterAutoConfigField() throws Throwable {
Ensure e = new Ensure();
- ServiceRegistration er = register(e, "adapter.autoConfig.field");
+ ServiceRegistration sr1 = register(e, S1ToS3AdapterAutoConfigField.ENSURE);
+ ServiceRegistration sr2 = register(e, S1Impl.ENSURE);
+ ServiceRegistration sr3 = register(e, S2Impl.ENSURE);
e.waitForStep(3, 10000);
e.ensure();
- er.unregister();
+ sr1.unregister();
+ sr2.unregister();
+ sr3.unregister();
}
/**
@@ -61,9 +74,13 @@
@Test
public void testAnnotatedAdapterCallback() {
Ensure e = new Ensure();
- ServiceRegistration er = register(e, "adapter.callback");
+ ServiceRegistration sr1 = register(e, S1ToS3AdapterCallback.ENSURE);
+ ServiceRegistration sr2 = register(e, S1Impl.ENSURE);
+ ServiceRegistration sr3 = register(e, S2Impl.ENSURE);
e.waitForStep(2, 10000);
- er.unregister();
+ sr1.unregister();
e.waitForStep(4, 10000);
+ sr2.unregister();
+ sr3.unregister();
}
}