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 2013/10/13 21:51:41 UTC
svn commit: r1531738 - in /felix/trunk/dependencymanager:
test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/
test/src/test/java/org/apache/felix/dm/test/annotation/
test2/src/main/java/org/apache/felix/dependencymanager/test...
Author: pderop
Date: Sun Oct 13 19:51:41 2013
New Revision: 1531738
URL: http://svn.apache.org/r1531738
Log:
pax-exam 3.0.0 migration ...
Added:
felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleAnnotation.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java
- copied, changed from r1531247, felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/AspectLifecycleAnnotationTest.java
Removed:
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/aspectlifecycle/
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/AspectLifecycleAnnotationTest.java
Added: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleAnnotation.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleAnnotation.java?rev=1531738&view=auto
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleAnnotation.java (added)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleAnnotation.java Sun Oct 13 19:51:41 2013
@@ -0,0 +1,94 @@
+/*
+ * 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.dependencymanager.test2.components;
+
+import org.apache.felix.dm.annotation.api.AspectService;
+import org.apache.felix.dm.annotation.api.Component;
+import org.apache.felix.dm.annotation.api.Destroy;
+import org.apache.felix.dm.annotation.api.Init;
+import org.apache.felix.dm.annotation.api.ServiceDependency;
+import org.apache.felix.dm.annotation.api.Start;
+import org.apache.felix.dm.annotation.api.Stop;
+
+public class AspectLifecycleAnnotation {
+ public interface ServiceInterface {
+ public void run();
+ }
+
+ /**
+ * Tests an aspect service, and ensure that its lifecycle methods are properly invoked (init/start/stop/destroy)
+ */
+ @Component
+ public static class AspectLifecycleTest {
+ @ServiceDependency
+ void bind(ServiceInterface service) {
+ service.run();
+ }
+ }
+
+ @Component
+ public static class ServiceProvider implements ServiceInterface {
+ @ServiceDependency(filter = "(name=aspectLifecycle.ServiceProvider)")
+ protected volatile Ensure m_sequencer;
+
+ public void run() {
+ m_sequencer.step();
+ }
+ }
+
+ @AspectService(ranking = 10)
+ public static class ServiceProviderAspect implements ServiceInterface {
+ protected volatile boolean m_initCalled;
+ protected volatile Ensure m_sequencer;
+
+ @ServiceDependency(filter = "(name=aspectLifecycle.ServiceProviderAspect)")
+ protected void bind(Ensure 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() {
+ // At this point, the AspectLifecycleTest class has been rebound to the original ServiceProvider.
+ m_sequencer.step(6);
+ }
+
+ @Destroy
+ void destroy() {
+ m_sequencer.step(7);
+ }
+ }
+}
Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java (from r1531247, felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/AspectLifecycleAnnotationTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java&p1=felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/AspectLifecycleAnnotationTest.java&r1=1531247&r2=1531738&rev=1531738&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/AspectLifecycleAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java Sun Oct 13 19:51:41 2013
@@ -16,73 +16,36 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.test.annotation;
+package org.apache.felix.dependencymanager.test2.integration.annotations;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.provision;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-import org.apache.felix.dm.Component;
-import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.test.Base;
-import org.apache.felix.dm.test.BundleGenerator;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
+import org.apache.felix.dependencymanager.test2.components.Ensure;
+import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.osgi.framework.ServiceRegistration;
/**
* Use case: Tests an aspect service, and ensure that its lifecycle methods are properly invoked
* (init/start/stop/destroy methods).
*/
-@RunWith(JUnit4TestRunner.class)
-public class AspectLifecycleAnnotationTest extends AnnotationBase
-{
- @Configuration
- public static Option[] configuration()
- {
- return options(
- systemProperty(DMLOG_PROPERTY).value( "true" ),
- provision(
- mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").version(Base.OSGI_SPEC_VERSION),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager").versionAsInProject(),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager.runtime").versionAsInProject()),
- provision(
- new BundleGenerator()
- .set(Constants.BUNDLE_SYMBOLICNAME, "AspectLifecycleTest")
- .set("Export-Package", "org.apache.felix.dm.test.bundle.annotation.sequencer")
- .set("Private-Package", "org.apache.felix.dm.test.bundle.annotation.aspectlifecycle")
- .set("Import-Package", "*")
- .set("-plugin", "org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin")
- .build()));
- }
-
+@RunWith(PaxExam.class)
+public class AspectLifecycleAnnotationTest extends TestBase {
@Test
- public void testAnnotatedAspect(BundleContext context)
- {
- DependencyManager m = new DependencyManager(context);
+ public void testAnnotatedAspect() {
+ Ensure e = new Ensure();
// Provide the Sequencer server to the ServiceProvider service
- Dictionary props = new Hashtable() {{ put("test", "aspectLifecycle.ServiceProvider"); }};
- m.add(m.createComponent().setImplementation(this).setInterface(Sequencer.class.getName(), props));
+ ServiceRegistration sr1 = register(e, "aspectLifecycle.ServiceProvider");
// Check if the ServiceProvider has been injected in the AspectTest service.
- m_ensure.waitForStep(1, 10000);
+ e.waitForStep(1, 10000);
// Provide the Sequencer server to the ServiceProviderAspect service
- props = new Hashtable() {{ put("test", "aspectLifecycle.ServiceProviderAspect"); }};
- Component seq = m.createComponent().setImplementation(this).setInterface(Sequencer.class.getName(), props);
- m.add(seq);
+ ServiceRegistration sr2 = register(e, "aspectLifecycle.ServiceProviderAspect");
// Check if the AspectTest has been injected with the aspect
- m_ensure.waitForStep(3, 10000);
+ e.waitForStep(3, 10000);
// Stop the ServiceProviderAspect service.
- m.remove(seq);
+ sr2.unregister();
// And check if the aspect has been called in its stop/destroy methods.
- m_ensure.waitForStep(7, 10000);
+ e.waitForStep(7, 10000);
+ sr1.unregister();
}
}