pax-exam 3.0.0 ...
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1532046 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectAnnotation.java b/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectAnnotation.java
index dea27bd..abe7fc5 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectAnnotation.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectAnnotation.java
@@ -36,7 +36,9 @@
@Component
public static class ServiceProvider implements ServiceInterface {
- @ServiceDependency(filter = "(name=AspectChainTest.ServiceProvider)")
+ public final static String ENSURE = "AspectAnnotation.ServiceProvider";
+
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
protected volatile Ensure m_sequencer;
// Injected by reflection.
protected volatile ServiceRegistration m_sr;
@@ -59,7 +61,9 @@
@AspectService(ranking = 20)
public static class ServiceAspect2 implements ServiceInterface {
- @ServiceDependency(filter = "(name=AspectChainTest.ServiceAspect2)")
+ public final static String ENSURE = "AspectAnnotation.ServiceAspect2";
+
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
protected volatile Ensure m_sequencer;
// Injected by reflection.
private volatile ServiceInterface m_parentService;
@@ -125,7 +129,9 @@
@AspectService(ranking = 30, added = "add")
public static class ServiceAspect3 implements ServiceInterface {
- @ServiceDependency(filter = "(name=AspectChainTest.ServiceAspect3)")
+ public final static String ENSURE = "AspectAnnotation.ServiceAspect3";
+
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
protected volatile Ensure m_sequencer;
// Injected using add callback.
private volatile ServiceInterface m_parentService;
@@ -152,7 +158,9 @@
@AspectService(ranking = 10, added = "added", removed = "removed")
public static class ServiceAspect1 implements ServiceInterface {
- @ServiceDependency(filter = "(name=AspectChainTest.ServiceAspect1)")
+ public final static String ENSURE = "AspectAnnotation.ServiceAspect1";
+
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
protected volatile Ensure m_sequencer;
// Injected by reflection.
private volatile ServiceInterface m_parentService;
@@ -188,7 +196,9 @@
@Component
public static class ServiceConsumer implements Runnable {
- @ServiceDependency(filter = "(name=AspectChainTest.ServiceConsumer)")
+ public final static String ENSURE = "AspectAnnotation.ServiceConsumer";
+
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
protected volatile Ensure m_sequencer;
@ServiceDependency
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java
index 155578f..c71ea8e 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java
@@ -19,6 +19,11 @@
package org.apache.felix.dependencymanager.test2.integration.annotations;
import org.apache.felix.dependencymanager.test2.components.Ensure;
+import org.apache.felix.dependencymanager.test2.components.AspectAnnotation.ServiceAspect1;
+import org.apache.felix.dependencymanager.test2.components.AspectAnnotation.ServiceAspect2;
+import org.apache.felix.dependencymanager.test2.components.AspectAnnotation.ServiceAspect3;
+import org.apache.felix.dependencymanager.test2.components.AspectAnnotation.ServiceConsumer;
+import org.apache.felix.dependencymanager.test2.components.AspectAnnotation.ServiceProvider;
import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,15 +39,15 @@
public void testAspectChain() throws Throwable {
Ensure e = new Ensure();
// Activate service consumer
- ServiceRegistration scSequencer = register(e, "AspectChainTest.ServiceConsumer");
+ ServiceRegistration scSequencer = register(e, ServiceConsumer.ENSURE);
// Activate service provider
- ServiceRegistration spSequencer = register(e, "AspectChainTest.ServiceProvider");
+ ServiceRegistration spSequencer = register(e, ServiceProvider.ENSURE);
// Activate service aspect 2
- ServiceRegistration sa2Sequencer = register(e, "AspectChainTest.ServiceAspect2");
+ ServiceRegistration sa2Sequencer = register(e, ServiceAspect2.ENSURE);
// Activate service aspect 3
- ServiceRegistration sa3Sequencer = register(e, "AspectChainTest.ServiceAspect3");
+ ServiceRegistration sa3Sequencer = register(e, ServiceAspect3.ENSURE);
// Activate service aspect 1
- ServiceRegistration sa1Sequencer = register(e, "AspectChainTest.ServiceAspect1");
+ ServiceRegistration sa1Sequencer = register(e, ServiceAspect1.ENSURE);
e.step();
e.waitForStep(6, 10000);