felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1531247 - in /felix/trunk/dependencymanager: test/src/test/java/org/apache/felix/dm/test/AdapterWithAspectCallbacksTest.java test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectCallbacksTest.java
Date Fri, 11 Oct 2013 10:00:38 GMT
Author: pderop
Date: Fri Oct 11 10:00:38 2013
New Revision: 1531247

URL: http://svn.apache.org/r1531247
Log:
pax exam 3.0.0 migration (in progress ...).

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

Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectCallbacksTest.java
(from r1531223, felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterWithAspectCallbacksTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectCallbacksTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectCallbacksTest.java&p1=felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterWithAspectCallbacksTest.java&r1=1531223&r2=1531247&rev=1531247&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AdapterWithAspectCallbacksTest.java
(original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectCallbacksTest.java
Fri Oct 11 10:00:38 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dm.test;
+package org.apache.felix.dependencymanager.test2.integration.api;
 
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
@@ -38,22 +38,14 @@ import org.ops4j.pax.exam.junit.JUnit4Te
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 
-@RunWith(JUnit4TestRunner.class)
-public class AdapterWithAspectCallbacksTest 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()
-            ) // ,
-//          new VMOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
-//          new TimeoutOption(0)
-        );
-    }
-    
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.apache.felix.dependencymanager.test2.components.Ensure;
+import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+
+@RunWith(PaxExam.class)
+public class AdapterWithAspectCallbacksTest extends TestBase {
     @Test
-    public void testAdapterWithAspectMultipleTimes(BundleContext context) {
+    public void testAdapterWithAspectMultipleTimes() {
         DependencyManager m = new DependencyManager(context);
         // helper class that ensures certain steps get executed in sequence
         Ensure e = new Ensure();
@@ -115,6 +107,7 @@ public class AdapterWithAspectCallbacksT
         e.waitForStep(count * 3, 15000);
         m.remove(aspect2);
         e.step(count * 3 + 1);
+        m.clear();
     }
         
     static interface OriginalService {



Mime
View raw message