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/15 01:21:11 UTC
svn commit: r1532131 - in /felix/trunk/dependencymanager/test2/src:
main/java/org/apache/felix/dependencymanager/test2/components/
test/java/org/apache/felix/dependencymanager/test2/integration/annotations/
test/java/org/apache/felix/dependencymanager/...
Author: pderop
Date: Mon Oct 14 23:21:10 2013
New Revision: 1532131
URL: http://svn.apache.org/r1532131
Log:
pax-exam 3.0.0 migration
Added:
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AnnotationBase.java
Modified:
felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/CompositeAnnotations.java
felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/SimpleAnnotations.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/BundleDependencyAnnotationTest.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/CompositeAnnotationsTest.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/Felix4050Test.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/MultipleAnnotationsTest.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PropagateAnnotationTest.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ResourceAnnotationTest.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ServiceFactoryAnnotationTest.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/SimpleAnnotationsTest.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/TemporalAnnotationsTest.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java
Modified: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/CompositeAnnotations.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/CompositeAnnotations.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/CompositeAnnotations.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/CompositeAnnotations.java Mon Oct 14 23:21:10 2013
@@ -35,6 +35,9 @@ import org.osgi.framework.ServiceRegistr
public class CompositeAnnotations {
public interface C1Service {
}
+
+ public interface Dependency extends Runnable {
+ }
/**
* This service is also composed of the Component object.
@@ -48,7 +51,7 @@ public class CompositeAnnotations {
/* This dependency filter will be configured from our init method */
@ServiceDependency(name = "D")
- public volatile Runnable m_runnable;
+ public volatile Dependency m_runnable;
/* Object used to check that methods are called in the proper sequence */
@ServiceDependency(filter = "(name=" + ENSURE + ")")
@@ -120,7 +123,7 @@ public class CompositeAnnotations {
private volatile Ensure m_sequencer;
// Injected dependency (from CompositeService)
- public volatile Runnable m_runnable;
+ public volatile Dependency m_runnable;
// lifecycle callback (same method as the one from CompositeService)
void init() {
@@ -152,7 +155,7 @@ public class CompositeAnnotations {
}
@Component(properties = @Property(name = "foo", value = "bar1"))
- public static class Dependency1 implements Runnable {
+ public static class Dependency1 implements Dependency {
public final static String ENSURE = "CompositeAnnotations.Dependency1";
@ServiceDependency(filter = "(name=" + ENSURE + ")")
@@ -169,7 +172,7 @@ public class CompositeAnnotations {
}
@Component(properties = @Property(name = "foo", value = "bar2"))
- public static class Dependency2 implements Runnable {
+ public static class Dependency2 implements Dependency {
public final static String ENSURE = "CompositeAnnotations.Dependency2";
@ServiceDependency(filter = "(name=" + ENSURE + ")")
Modified: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/SimpleAnnotations.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/SimpleAnnotations.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/SimpleAnnotations.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/SimpleAnnotations.java Mon Oct 14 23:21:10 2013
@@ -38,7 +38,7 @@ public class SimpleAnnotations {
* Provides a <code>Runnable</code> service, which is required by the
* {@link Consumer} class.
*/
- @Component(properties = {@Property(name = "foo", value = "bar")})
+ @Component(properties = {@Property(name = "foo", value = "bar"), @Property(name="type", value="SimpleAnnotations")})
public static class Producer implements Runnable {
public final static String ENSURE = "SimpleAnnotations.Producer";
@@ -111,7 +111,7 @@ public class SimpleAnnotations {
@ServiceDependency
volatile LogService _logService;
- @ServiceDependency
+ @ServiceDependency(filter="(type=SimpleAnnotations)")
volatile Runnable _runnable;
@ServiceDependency(filter = "(name=" + ENSURE + ")")
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java Mon Oct 14 23:21:10 2013
@@ -34,7 +34,7 @@ import org.osgi.framework.ServiceRegistr
* Use case: Verify Aspect Annotations usage.
*/
@RunWith(PaxExam.class)
-public class AdapterAnnotationTest extends TestBase {
+public class AdapterAnnotationTest extends AnnotationBase {
/**
* Check if an adapter gets injected with its adaptee using default auto config mode.
* @throws Throwable
Added: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AnnotationBase.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AnnotationBase.java?rev=1532131&view=auto
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AnnotationBase.java (added)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AnnotationBase.java Mon Oct 14 23:21:10 2013
@@ -0,0 +1,27 @@
+/*
+ * 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.integration.annotations;
+
+import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+
+public class AnnotationBase extends TestBase {
+ protected boolean startComponents() {
+ return true;
+ }
+}
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java Mon Oct 14 23:21:10 2013
@@ -34,7 +34,7 @@ import org.osgi.framework.ServiceRegistr
* Use case: Verify Aspect Annotations usage.
*/
@RunWith(PaxExam.class)
-public class AspectAnnotationTest extends TestBase {
+public class AspectAnnotationTest extends AnnotationBase {
@Test
public void testAspectChain() throws Throwable {
Ensure e = new Ensure();
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java Mon Oct 14 23:21:10 2013
@@ -32,7 +32,7 @@ import org.osgi.framework.ServiceRegistr
* (init/start/stop/destroy methods).
*/
@RunWith(PaxExam.class)
-public class AspectLifecycleAnnotationTest extends TestBase {
+public class AspectLifecycleAnnotationTest extends AnnotationBase {
@Test
public void testAnnotatedAspect() {
Ensure e = new Ensure();
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java Mon Oct 14 23:21:10 2013
@@ -32,7 +32,7 @@ import org.osgi.framework.ServiceRegistr
* (init/start/stop/destroy methods).
*/
@RunWith(PaxExam.class)
-public class AspectLifecycleWithDynamicProxyAnnotationTest extends TestBase {
+public class AspectLifecycleWithDynamicProxyAnnotationTest extends AnnotationBase {
@Test
public void testAnnotatedAspect() {
Ensure e = new Ensure();
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/BundleDependencyAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/BundleDependencyAnnotationTest.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/BundleDependencyAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/BundleDependencyAnnotationTest.java Mon Oct 14 23:21:10 2013
@@ -30,7 +30,7 @@ import org.osgi.framework.ServiceRegistr
* Use case: Verify Bundle Dependency annotations usage.
*/
@RunWith(PaxExam.class)
-public class BundleDependencyAnnotationTest extends TestBase {
+public class BundleDependencyAnnotationTest extends AnnotationBase {
/**
* Tests a simple Consumer, which has a BundleDependency over the dependency manager bundle.
*/
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/CompositeAnnotationsTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/CompositeAnnotationsTest.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/CompositeAnnotationsTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/CompositeAnnotationsTest.java Mon Oct 14 23:21:10 2013
@@ -32,7 +32,7 @@ import org.osgi.framework.ServiceRegistr
* Use case: Verify Composite annotated services.
*/
@RunWith(PaxExam.class)
-public class CompositeAnnotationsTest extends TestBase {
+public class CompositeAnnotationsTest extends AnnotationBase {
@Test
public void testComposite() {
Ensure e = new Ensure();
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java Mon Oct 14 23:21:10 2013
@@ -33,7 +33,7 @@ import org.osgi.framework.ServiceRegistr
* Use case: Verify the a Service may provide its service properties dynamically from its start method.
*/
@RunWith(PaxExam.class)
-public class ExtraServicePropertiesTest extends TestBase {
+public class ExtraServicePropertiesTest extends AnnotationBase {
/**
* Tests if a Service can provide its service properties from its start method.
*/
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java Mon Oct 14 23:21:10 2013
@@ -37,7 +37,7 @@ import org.osgi.service.cm.Configuration
* is created from Config Admin.
*/
@RunWith(PaxExam.class)
-public class FactoryConfigurationAdapterAnnotationTest extends TestBase {
+public class FactoryConfigurationAdapterAnnotationTest extends AnnotationBase {
@Test
public void testFactoryConfigurationAdapterAnnotation() throws Throwable {
Ensure e = new Ensure();
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/Felix4050Test.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/Felix4050Test.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/Felix4050Test.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/Felix4050Test.java Mon Oct 14 23:21:10 2013
@@ -32,7 +32,7 @@ import org.osgi.framework.ServiceRegistr
* configuring a named dependency.
*/
@RunWith(PaxExam.class)
-public class Felix4050Test extends TestBase {
+public class Felix4050Test extends AnnotationBase {
@Test
public void testFelix4050() {
Ensure e = new Ensure();
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/MultipleAnnotationsTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/MultipleAnnotationsTest.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/MultipleAnnotationsTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/MultipleAnnotationsTest.java Mon Oct 14 23:21:10 2013
@@ -30,7 +30,7 @@ import org.osgi.framework.ServiceRegistr
* Use case: Verify complex Annotation usage.
*/
@RunWith(PaxExam.class)
-public class MultipleAnnotationsTest extends TestBase {
+public class MultipleAnnotationsTest extends AnnotationBase {
@Test
public void testMultipleAnnotations() {
Ensure e = new Ensure();
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PropagateAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PropagateAnnotationTest.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PropagateAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PropagateAnnotationTest.java Mon Oct 14 23:21:10 2013
@@ -30,7 +30,7 @@ import org.osgi.framework.ServiceRegistr
* Use case: Verify that dependency "propagate" option is properly propagating properties to provided service.
*/
@RunWith(PaxExam.class)
-public class PropagateAnnotationTest extends TestBase {
+public class PropagateAnnotationTest extends AnnotationBase {
@Test
public void testServiceDependencyPropagate() {
Ensure e = new Ensure();
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java Mon Oct 14 23:21:10 2013
@@ -32,7 +32,7 @@ import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.ServiceRegistration;
@RunWith(PaxExam.class)
-public class PublisherAnnotationTest extends TestBase {
+public class PublisherAnnotationTest extends AnnotationBase {
/**
* A Service that just registers/unregisters its service, using the @ServiceLifecycle annotation.
*/
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ResourceAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ResourceAnnotationTest.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ResourceAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ResourceAnnotationTest.java Mon Oct 14 23:21:10 2013
@@ -30,7 +30,7 @@ import org.osgi.framework.ServiceRegistr
* Use case: Verify Bundle Dependency annotations usage.
*/
@RunWith(PaxExam.class)
-public class ResourceAnnotationTest extends TestBase {
+public class ResourceAnnotationTest extends AnnotationBase {
/**
* Tests a simple ResourceConsumer
* @param context
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ServiceFactoryAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ServiceFactoryAnnotationTest.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ServiceFactoryAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ServiceFactoryAnnotationTest.java Mon Oct 14 23:21:10 2013
@@ -34,7 +34,7 @@ import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.ServiceRegistration;
@RunWith(PaxExam.class)
-public class ServiceFactoryAnnotationTest extends TestBase {
+public class ServiceFactoryAnnotationTest extends AnnotationBase {
private final Ensure m_ensure = new Ensure();
@Test
public void testServiceFactory() {
@@ -70,4 +70,4 @@ public class ServiceFactoryAnnotationTes
// remove instance
Assert.assertTrue(factory.remove(conf));
}
-}
\ No newline at end of file
+}
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/SimpleAnnotationsTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/SimpleAnnotationsTest.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/SimpleAnnotationsTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/SimpleAnnotationsTest.java Mon Oct 14 23:21:10 2013
@@ -32,7 +32,7 @@ import org.osgi.framework.ServiceRegistr
* Use case: Ensure that a Provider can be injected into a Consumer, using simple DM annotations.
*/
@RunWith(PaxExam.class)
-public class SimpleAnnotationsTest extends TestBase
+public class SimpleAnnotationsTest extends AnnotationBase
{
@Test
public void testSimpleAnnotations() throws Throwable
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/TemporalAnnotationsTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/TemporalAnnotationsTest.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/TemporalAnnotationsTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/TemporalAnnotationsTest.java Mon Oct 14 23:21:10 2013
@@ -33,7 +33,7 @@ import org.osgi.framework.ServiceRegistr
* Use case: Verify Temporal Service dependency Annotations usage.
*/
@RunWith(PaxExam.class)
-public class TemporalAnnotationsTest extends TestBase
+public class TemporalAnnotationsTest extends AnnotationBase
{
@Test
public void testTemporalServiceDependency()
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java?rev=1532131&r1=1532130&r2=1532131&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java Mon Oct 14 23:21:10 2013
@@ -81,9 +81,13 @@ public abstract class TestBase implement
protected BundleContext context;
protected ServiceRegistration logService;
+
+ protected boolean startComponents() {
+ return false;
+ }
@Configuration
- public static Option[] configuration() {
+ public Option[] configuration() {
final String bundleFileName = System.getProperty(BUNDLE_JAR_SYS_PROP, BUNDLE_JAR_DEFAULT);
final File bundleFile = new File(bundleFileName);
if (!bundleFile.canRead()) {
@@ -110,7 +114,7 @@ public abstract class TestBase implement
mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager","3.1.1-SNAPSHOT"),
mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager.shell", "3.0.2-SNAPSHOT"),
mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager.runtime", "3.1.1-SNAPSHOT"),
- bundle(bundleFile.toURI().toString()));
+ bundle(bundleFile.toURI().toString()).start(startComponents()));
final Option option = (paxRunnerVmOption != null) ? vmOption(paxRunnerVmOption) : null;
return OptionUtils.combine(base, option);
}