felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1583078 - /felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/
Date Sat, 29 Mar 2014 22:18:00 GMT
Author: pderop
Date: Sat Mar 29 22:18:00 2014
New Revision: 1583078

URL: http://svn.apache.org/r1583078
Log:
Clear dependencymanager at the end of the tests.

Modified:
    felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/AbstractServiceDependencyTest.java
    felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/AdapterWithExtraDependenciesTest.java
    felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/AdapterWithInstanceBoundDependencyTest.java
    felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/ComponentTest.java
    felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/FELIX2344_ExtraDependencyWithAutoConfigTest.java
    felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/FELIX2369_ExtraDependencyTest.java

Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/AbstractServiceDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/AbstractServiceDependencyTest.java?rev=1583078&r1=1583077&r2=1583078&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/AbstractServiceDependencyTest.java
(original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/AbstractServiceDependencyTest.java
Sat Mar 29 22:18:00 2014
@@ -44,6 +44,7 @@ public class AbstractServiceDependencyTe
        m.remove(sp);
        // ensure we executed all steps inside the component instance
        e.step(8);
+       m.clear();
    }
 
    static abstract class ServiceAbstract {

Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/AdapterWithExtraDependenciesTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/AdapterWithExtraDependenciesTest.java?rev=1583078&r1=1583077&r2=1583078&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/AdapterWithExtraDependenciesTest.java
(original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/AdapterWithExtraDependenciesTest.java
Sat Mar 29 22:18:00 2014
@@ -57,6 +57,7 @@ public class AdapterWithExtraDependencie
         
         m.remove(s1);
         m.remove(sa);
+        m.clear();
     }
     
     static interface S1 {

Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/AdapterWithInstanceBoundDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/AdapterWithInstanceBoundDependencyTest.java?rev=1583078&r1=1583077&r2=1583078&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/AdapterWithInstanceBoundDependencyTest.java
(original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/AdapterWithInstanceBoundDependencyTest.java
Sat Mar 29 22:18:00 2014
@@ -51,6 +51,7 @@ public class AdapterWithInstanceBoundDep
         m.remove(sp2);
         m.remove(sp);
         m.remove(sc);
+        m.clear();
     }
     
     static interface ServiceInterface {

Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/ComponentTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/ComponentTest.java?rev=1583078&r1=1583077&r2=1583078&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/ComponentTest.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/ComponentTest.java Sat
Mar 29 22:18:00 2014
@@ -42,6 +42,7 @@ public class ComponentTest extends TestB
         dm.remove(provider1); 
         dm.remove(provider2);    
         m_ensure.waitForStep(5, 5000);
+        dm.clear();
     }
     
     public static interface Provider {    	

Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/FELIX2344_ExtraDependencyWithAutoConfigTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/FELIX2344_ExtraDependencyWithAutoConfigTest.java?rev=1583078&r1=1583077&r2=1583078&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/FELIX2344_ExtraDependencyWithAutoConfigTest.java
(original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/FELIX2344_ExtraDependencyWithAutoConfigTest.java
Sat Mar 29 22:18:00 2014
@@ -51,7 +51,8 @@ public class FELIX2344_ExtraDependencyWi
         
         // Add consumer sc2 (optional dependency over provider)
         m.add(sc2);
-        e.waitForStep(4, 5000);     
+        e.waitForStep(4, 5000);    
+        m.clear();
     }
 
     public interface ProviderInterface {

Modified: felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/FELIX2369_ExtraDependencyTest.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/FELIX2369_ExtraDependencyTest.java?rev=1583078&r1=1583077&r2=1583078&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/FELIX2369_ExtraDependencyTest.java
(original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm.it/src/dm/it/FELIX2369_ExtraDependencyTest.java
Sat Mar 29 22:18:00 2014
@@ -48,6 +48,7 @@ public class FELIX2369_ExtraDependencyTe
         // remove MyClient (it should not be invoked in its stop() method because it should
not be active, since MyService2 is not there.
         m.remove(sc);
         e.waitForStep(2, 5000);
+        m.clear();
     }
     
     public interface MyService1 {



Mime
View raw message