felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1531660 - in /felix/trunk/dependencymanager: test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependencyTest2.java test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest2.java
Date Sun, 13 Oct 2013 09:46:01 GMT
Author: pderop
Date: Sun Oct 13 09:46:00 2013
New Revision: 1531660

URL: http://svn.apache.org/r1531660
Log:
pax-exam 3.0.0 migration. This test is problematic: with old pax exam, it does not work when
run individually.
And with pax-exam 3.0.0, it does not work at all.

Added:
    felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest2.java
      - copied, changed from r1531247, felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependencyTest2.java
Removed:
    felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependencyTest2.java

Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest2.java
(from r1531247, felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependencyTest2.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest2.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest2.java&p1=felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependencyTest2.java&r1=1531247&r2=1531660&rev=1531660&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/MultipleExtraDependencyTest2.java
(original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest2.java
Sun Oct 13 09:46:00 2013
@@ -16,41 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.test;
-
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.provision;
+package org.apache.felix.dependencymanager.test2.integration.api;
 
 import java.util.Hashtable;
 
+import org.apache.felix.dependencymanager.test2.components.Ensure;
+import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.ServiceDependency;
 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.ops4j.pax.exam.junit.PaxExam;
+
 
 /**
  * Tests for extra dependencies which are declared from service's init method.
  */
-@RunWith(JUnit4TestRunner.class)
-public class MultipleExtraDependencyTest2 extends Base {
-    @Configuration
-    public static Option[] configuration() {
-        return options(
-            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()
-            )
-        );
-    }    
-    
+@RunWith(PaxExam.class)
+public class MultipleExtraDependencyTest2 extends TestBase {
     @Test
-    public void testMultipleExtraDependencies(BundleContext context)
+    public void testMultipleExtraDependencies()
     {
         DependencyManager m = new DependencyManager(context);
         Ensure e = new Ensure();
@@ -96,6 +82,7 @@ public class MultipleExtraDependencyTest
         
         // And check if the test.annotation bundle has been deactivated orderly
         e.waitForStep(11, 10000);
+        m.clear();
     }
     
     public interface Sequencer



Mime
View raw message