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 2014/05/28 15:02:55 UTC
svn commit: r1598004 -
/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/
Author: pderop
Date: Wed May 28 13:02:54 2014
New Revision: 1598004
URL: http://svn.apache.org/r1598004
Log:
don't clean all dependency managers when a test is done, because we don't want to clear the managers created by the runtime itself.
Modified:
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AdapterAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/BundleDependencyAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/CompositeAnnotationsTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ExtraServicePropertiesTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/FactoryConfigurationAdapterAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/Felix4357Test.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/MultipleAnnotationsTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PropagateAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PublisherAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ResourceAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ServiceFactoryAnnotationTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/SimpleAnnotationsTest.java
felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/TemporalAnnotationsTest.java
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AdapterAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AdapterAnnotationTest.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AdapterAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AdapterAnnotationTest.java Wed May 28 13:02:54 2014
@@ -32,6 +32,11 @@ import dm.runtime.it.components.AdapterA
* Use case: Verify Aspect Annotations usage.
*/
public class AdapterAnnotationTest extends TestBase {
+
+ public AdapterAnnotationTest() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
/**
* Check if an adapter gets injected with its adaptee using default auto config mode.
* @throws Throwable
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectAnnotationTest.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectAnnotationTest.java Wed May 28 13:02:54 2014
@@ -32,6 +32,11 @@ import dm.runtime.it.components.AspectAn
* Use case: Verify Aspect Annotations usage.
*/
public class AspectAnnotationTest extends TestBase {
+
+ public AspectAnnotationTest() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
public void testAspectChain() throws Throwable {
Ensure e = new Ensure();
// Activate service consumer
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleAnnotationTest.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleAnnotationTest.java Wed May 28 13:02:54 2014
@@ -30,6 +30,11 @@ import dm.runtime.it.components.AspectLi
* (init/start/stop/destroy methods).
*/
public class AspectLifecycleAnnotationTest extends TestBase {
+
+ public AspectLifecycleAnnotationTest() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
public void testAnnotatedAspect() {
Ensure e = new Ensure();
// Provide the Sequencer server to the ServiceProvider service
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/AspectLifecycleWithDynamicProxyAnnotationTest.java Wed May 28 13:02:54 2014
@@ -30,6 +30,11 @@ import dm.runtime.it.components.AspectLi
* (init/start/stop/destroy methods).
*/
public class AspectLifecycleWithDynamicProxyAnnotationTest extends TestBase {
+
+ public AspectLifecycleWithDynamicProxyAnnotationTest() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
public void testAnnotatedAspect() {
Ensure e = new Ensure();
// Provide the Sequencer server to the ServiceProvider service
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/BundleDependencyAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/BundleDependencyAnnotationTest.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/BundleDependencyAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/BundleDependencyAnnotationTest.java Wed May 28 13:02:54 2014
@@ -30,6 +30,11 @@ import dm.runtime.it.components.Utils;
* Use case: Verify Bundle Dependency annotations usage.
*/
public class BundleDependencyAnnotationTest extends TestBase {
+
+ public BundleDependencyAnnotationTest() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
/**
* Tests a simple Consumer, which has a BundleDependency over the dependency manager bundle.
*/
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/CompositeAnnotationsTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/CompositeAnnotationsTest.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/CompositeAnnotationsTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/CompositeAnnotationsTest.java Wed May 28 13:02:54 2014
@@ -30,6 +30,11 @@ import dm.runtime.it.components.Composit
* Use case: Verify Composite annotated services.
*/
public class CompositeAnnotationsTest extends TestBase {
+
+ public CompositeAnnotationsTest() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
public void testComposite() {
Ensure e = new Ensure();
ServiceRegistration sr1 = register(e, C1.ENSURE);
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ExtraServicePropertiesTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ExtraServicePropertiesTest.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ExtraServicePropertiesTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ExtraServicePropertiesTest.java Wed May 28 13:02:54 2014
@@ -30,6 +30,11 @@ import dm.runtime.it.components.ExtraSer
* Use case: Verify the a Service may provide its service properties dynamically from its start method.
*/
public class ExtraServicePropertiesTest extends TestBase {
+
+ public ExtraServicePropertiesTest() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
/**
* Tests if a Service can provide its service properties from its start method.
*/
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/FactoryConfigurationAdapterAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/FactoryConfigurationAdapterAnnotationTest.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/FactoryConfigurationAdapterAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/FactoryConfigurationAdapterAnnotationTest.java Wed May 28 13:02:54 2014
@@ -35,6 +35,11 @@ import dm.runtime.it.components.FactoryC
* is created from Config Admin.
*/
public class FactoryConfigurationAdapterAnnotationTest extends TestBase {
+
+ public FactoryConfigurationAdapterAnnotationTest() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
private final static int MAXWAIT = 10000;
public void testFactoryConfigurationAdapterAnnotation() throws Throwable {
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/Felix4357Test.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/Felix4357Test.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/Felix4357Test.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/Felix4357Test.java Wed May 28 13:02:54 2014
@@ -29,6 +29,11 @@ import dm.runtime.it.components.Felix435
* defined with @Property annotation.
*/
public class Felix4357Test extends TestBase {
+
+ public Felix4357Test() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
public void testPropertiesWithTypes() {
Ensure e = new Ensure();
ServiceRegistration sr = register(e, Felix4357.ENSURE);
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/MultipleAnnotationsTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/MultipleAnnotationsTest.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/MultipleAnnotationsTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/MultipleAnnotationsTest.java Wed May 28 13:02:54 2014
@@ -29,6 +29,11 @@ import dm.runtime.it.components.Utils;
* Use case: Verify complex Annotation usage.
*/
public class MultipleAnnotationsTest extends TestBase {
+
+ public MultipleAnnotationsTest() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
public void testMultipleAnnotations() {
Ensure e = new Ensure();
ServiceRegistration sr = register(e, MultipleAnnotations.ENSURE);
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PropagateAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PropagateAnnotationTest.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PropagateAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PropagateAnnotationTest.java Wed May 28 13:02:54 2014
@@ -28,6 +28,11 @@ import dm.runtime.it.components.Propagat
* Use case: Verify that dependency "propagate" option is properly propagating properties to provided service.
*/
public class PropagateAnnotationTest extends TestBase {
+
+ public PropagateAnnotationTest() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
public void testServiceDependencyPropagate() {
Ensure e = new Ensure();
ServiceRegistration sr = register(e, PropagateAnnotation.ENSURE);
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PublisherAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PublisherAnnotationTest.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PublisherAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/PublisherAnnotationTest.java Wed May 28 13:02:54 2014
@@ -30,6 +30,11 @@ import dm.runtime.it.components.Resource
import dm.runtime.it.components.ServiceTestWthPublisher;
public class PublisherAnnotationTest extends TestBase {
+
+ public PublisherAnnotationTest() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
/**
* A Service that just registers/unregisters its service, using the @ServiceLifecycle annotation.
*/
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ResourceAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ResourceAnnotationTest.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ResourceAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ResourceAnnotationTest.java Wed May 28 13:02:54 2014
@@ -28,6 +28,11 @@ import dm.runtime.it.components.Resource
* Use case: Verify Bundle Dependency annotations usage.
*/
public class ResourceAnnotationTest extends TestBase {
+
+ public ResourceAnnotationTest() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
/**
* Tests a simple ResourceConsumer
* @param context
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ServiceFactoryAnnotationTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ServiceFactoryAnnotationTest.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ServiceFactoryAnnotationTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/ServiceFactoryAnnotationTest.java Wed May 28 13:02:54 2014
@@ -32,6 +32,11 @@ import dm.it.TestBase;
import dm.runtime.it.components.ServiceFactoryAnnotation;
public class ServiceFactoryAnnotationTest extends TestBase {
+
+ public ServiceFactoryAnnotationTest() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
private final Ensure m_ensure = new Ensure();
public void testServiceFactory() {
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/SimpleAnnotationsTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/SimpleAnnotationsTest.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/SimpleAnnotationsTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/SimpleAnnotationsTest.java Wed May 28 13:02:54 2014
@@ -11,6 +11,11 @@ import dm.runtime.it.components.SimpleAn
* Use case: Ensure that a Provider can be injected into a Consumer, using simple DM annotations.
*/
public class SimpleAnnotationsTest extends TestBase {
+
+ public SimpleAnnotationsTest() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
public void testSimpleAnnotations() throws Throwable {
Ensure e = new Ensure();
ServiceRegistration er = register(e, Producer.ENSURE);
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/TemporalAnnotationsTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/TemporalAnnotationsTest.java?rev=1598004&r1=1598003&r2=1598004&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/TemporalAnnotationsTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.runtime.it/src/dm/runtime/it/tests/TemporalAnnotationsTest.java Wed May 28 13:02:54 2014
@@ -31,7 +31,12 @@ import dm.runtime.it.components.Temporal
* Use case: Verify Temporal Service dependency Annotations usage.
*/
public class TemporalAnnotationsTest extends TestBase {
- public void testTemporalServiceDependency() {
+
+ public TemporalAnnotationsTest() {
+ super(false); /* don't autoclear managers when one test is done */
+ }
+
+ public void testTemporalServiceDependency() {
Ensure ensure = new Ensure();
ServiceRegistration ensureReg = register(ensure, TemporalAnnotations.ENSURE);
Dictionary props = new Hashtable() {