pax-exam 3.0.0 ...
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1532050 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java b/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java
index 7fd72a2..023f60d 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java
@@ -48,7 +48,9 @@
@Component
public static class ServiceProvider implements ServiceInterface {
- @ServiceDependency(filter = "(name=aspectLifecycle.dynamicProxy.ServiceProvider)")
+ public final static String ENSURE = "AspectLifecycleWithDynamicProxyAnnotation.ServiceProvider";
+
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
protected volatile Ensure m_sequencer;
public void run() {
@@ -58,10 +60,12 @@
@AspectService(ranking = 10, service = ServiceInterface.class, factoryMethod = "create")
public static class ServiceProviderAspect implements InvocationHandler {
+ public final static String ENSURE = "AspectLifecycleWithDynamicProxyAnnotation.ServiceProviderAspect";
+
protected volatile boolean m_initCalled;
protected volatile Ensure m_sequencer;
- @ServiceDependency(filter = "(name=aspectLifecycle.dynamicProxy.ServiceProviderAspect)")
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
protected void bind(Ensure sequencer) {
m_sequencer = sequencer;
m_sequencer.step(2);
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
index 3004621..f39610b 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.felix.dependencymanager.test2.integration.annotations;
+import org.apache.felix.dependencymanager.test2.components.AspectLifecycleWithDynamicProxyAnnotation.ServiceProvider;
+import org.apache.felix.dependencymanager.test2.components.AspectLifecycleWithDynamicProxyAnnotation.ServiceProviderAspect;
import org.apache.felix.dependencymanager.test2.components.Ensure;
import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
import org.junit.Test;
@@ -35,11 +37,11 @@
public void testAnnotatedAspect() {
Ensure e = new Ensure();
// Provide the Sequencer server to the ServiceProvider service
- ServiceRegistration sr1 = register(e, "aspectLifecycle.dynamicProxy.ServiceProvider");
+ ServiceRegistration sr1 = register(e, ServiceProvider.ENSURE);
// Check if the ServiceProvider has been injected in the AspectTest service.
e.waitForStep(1, 10000);
// Provide the Sequencer server to the ServiceProviderAspect service
- ServiceRegistration sr2 = register(e, "aspectLifecycle.dynamicProxy.ServiceProviderAspect");
+ ServiceRegistration sr2 = register(e, ServiceProviderAspect.ENSURE);
// Check if the AspectTest has been injected with the aspect
e.waitForStep(3, 10000);
// Remove the ServiceProviderAspect service