added new AspectWithLifecycleAnnotation test
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@910049 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/AspectLifecycleTest.java b/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/AspectLifecycleTest.java
new file mode 100644
index 0000000..f95ff94
--- /dev/null
+++ b/dependencymanager/test/annotation/src/main/java/org/apache/felix/dm/test/annotation/AspectLifecycleTest.java
@@ -0,0 +1,100 @@
+/*
+ * 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.annotation;
+
+import org.apache.felix.dm.annotation.api.AspectService;
+import org.apache.felix.dm.annotation.api.Destroy;
+import org.apache.felix.dm.annotation.api.Init;
+import org.apache.felix.dm.annotation.api.Param;
+import org.apache.felix.dm.annotation.api.Service;
+import org.apache.felix.dm.annotation.api.ServiceDependency;
+import org.apache.felix.dm.annotation.api.Start;
+import org.apache.felix.dm.annotation.api.Stop;
+import org.osgi.framework.Constants;
+
+/**
+ * Tests an aspect service, and ensure that its lifecycle methods are properly invoked (init/start/stop/destroy)
+ */
+@Service
+public class AspectLifecycleTest
+{
+ public interface ServiceInterface
+ {
+ public void run();
+ }
+
+ @ServiceDependency
+ void bind(ServiceInterface service)
+ {
+ service.run();
+ }
+
+ @Service
+ public static class ServiceProvider implements ServiceInterface
+ {
+ @ServiceDependency(filter = "(test=aspectLifecycle.ServiceProvider)")
+ protected Sequencer m_sequencer;
+
+ public void run()
+ {
+ m_sequencer.step(1);
+ }
+ }
+
+ @AspectService(filter = "(!(" + Constants.SERVICE_RANKING + "=*))", properties = { @Param(name = Constants.SERVICE_RANKING, value = "1") })
+ public static class ServiceProviderAspect implements ServiceInterface
+ {
+ protected boolean m_initCalled;
+ protected Sequencer m_sequencer;
+
+ @ServiceDependency(filter = "(test=aspectLifecycle.ServiceProviderAspect)")
+ protected void bind(Sequencer sequencer) {
+ m_sequencer = sequencer;
+ m_sequencer.step(2);
+ }
+
+ @Init
+ void init() {
+ m_initCalled = true;
+ }
+
+ @Start
+ void start() {
+ if (! m_initCalled) {
+ throw new IllegalStateException("start method called, but init method was not called");
+ }
+ m_sequencer.step(3);
+ }
+
+ public void run()
+ {
+ m_sequencer.step(4);
+ }
+
+ @Stop()
+ void stop() {
+ m_sequencer.step(5);
+ }
+
+ @Destroy
+ void destroy() {
+ m_sequencer.step(6);
+ }
+ }
+}
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AnnotationTest.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AnnotationTest.java
index 7701645..9275cfe 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AnnotationTest.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AnnotationTest.java
@@ -140,6 +140,27 @@
m_ensure.waitForStep(2, 10000);
}
+ @Test
+ public void testAspectWithLifecycleAnnotation(BundleContext context)
+ {
+ m_ensure = new Ensure();
+ DependencyManager m = new DependencyManager(context);
+ // We provide ourself as a "Sequencer" service: this will active the org.apache.felix.dependencymanager.test.annotation.AspectTest service
+ Dictionary props = new Hashtable() {{ put("test", "aspectLifecycle.ServiceProvider"); }};
+ m.add(m.createService().setImplementation(this).setInterface(Sequencer.class.getName(), props));
+ // Check if the ServiceProvider has been injected in the AspectTest service.
+ m_ensure.waitForStep(1, 10000);
+ // Provide the Sequencer for activating the ServiceProviderAspect service
+ props = new Hashtable() {{ put("test", "aspectLifecycle.ServiceProviderAspect"); }};
+ m.add(m.createService().setImplementation(this).setInterface(Sequencer.class.getName(), props));
+ // Check if the AspectTest has been injected with the aspect
+ m_ensure.waitForStep(3, 10000);
+ // Stop the test.annotation bundle.
+ stopAnnotationBundle(context);
+ // And check if the aspect has been called in its stop/destroy methods.
+ m_ensure.waitForStep(6, 10000);
+ }
+
private void sleep(int i)
{
try {