paxexam 3.0.0 migration. This test is sometimes failing.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1531662 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectAwareServiceDependencyTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectAwareServiceDependencyTest.java
similarity index 72%
rename from dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectAwareServiceDependencyTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectAwareServiceDependencyTest.java
index 0e9d3f6..0e7f776 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/AspectAwareServiceDependencyTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectAwareServiceDependencyTest.java
@@ -16,37 +16,20 @@
* 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;
-import static org.ops4j.pax.exam.CoreOptions.provision;
-
+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.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;
-@RunWith(JUnit4TestRunner.class)
-public class AspectAwareServiceDependencyTest extends Base {
- @Configuration
- public static Option[] configuration() {
- return options(
-// vmOption( "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005" ),
-// waitForFrameworkStartupFor(Long.MAX_VALUE),
- 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 AspectAwareServiceDependencyTest extends TestBase {
@Test
- public void testServiceRegistrationAndConsumption(BundleContext context) {
+ public void testServiceRegistrationAndConsumption() {
DependencyManager m = new DependencyManager(context);
// helper class that ensures certain steps get executed in sequence
Ensure e = new Ensure();