This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new ee8f56af47 Update testing to more recent pax exam and make tests pass
on java 11
ee8f56af47 is described below
commit ee8f56af475159e3a370e53f74f1e428e0c1a078
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Mon Oct 24 18:12:25 2022 +0200
Update testing to more recent pax exam and make tests pass on java 11
---
configadmin/pom.xml | 14 ++++----------
.../org/apache/felix/cm/MockServiceReference.java | 1 -
.../apache/felix/cm/impl/RankingComparatorTest.java | 1 -
.../apache/felix/cm/integration/ActivationTest.java | 4 ++--
.../cm/integration/ConfigAdminSecurityTest.java | 12 ++++++------
.../felix/cm/integration/ConfigUpdateStressTest.java | 8 ++++----
.../ConfigurationAdminUpdateStressTest.java | 7 +++----
.../felix/cm/integration/ConfigurationBaseTest.java | 20 ++++++++++----------
.../cm/integration/ConfigurationBindingTest.java | 7 ++++---
.../cm/integration/ConfigurationListenerTest.java | 4 ++--
.../felix/cm/integration/ConfigurationTestBase.java | 11 +++++------
.../FELIX2813_ConfigurationAdminStartupTest.java | 5 +++--
.../felix/cm/integration/FELIX4385_StressTest.java | 10 +++++-----
.../cm/integration/MultiServiceFactoryPIDTest.java | 8 ++++----
.../felix/cm/integration/MultiServicePIDTest.java | 8 ++++----
.../felix/cm/integration/MultiValuePIDTest.java | 8 ++++----
.../apache/felix/cm/integration/TargetedPidTest.java | 8 ++++----
17 files changed, 64 insertions(+), 72 deletions(-)
diff --git a/configadmin/pom.xml b/configadmin/pom.xml
index e8ea3e447c..f195cc6f25 100644
--- a/configadmin/pom.xml
+++ b/configadmin/pom.xml
@@ -122,32 +122,26 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>2.6.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-native</artifactId>
- <version>2.6.0</version>
+ <version>4.13.3</version>
<scope>test</scope>
</dependency>
<!-- The forked container is needed so that we can use Java security
in the tests -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-forked</artifactId>
- <version>2.6.0</version>
+ <version>4.13.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
- <version>2.6.0</version>
+ <version>4.13.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>2.6.2</version>
+ <version>2.6.12</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/MockServiceReference.java
b/configadmin/src/test/java/org/apache/felix/cm/MockServiceReference.java
index 230d71309b..bb2f20c6a9 100644
--- a/configadmin/src/test/java/org/apache/felix/cm/MockServiceReference.java
+++ b/configadmin/src/test/java/org/apache/felix/cm/MockServiceReference.java
@@ -66,5 +66,4 @@ public class MockServiceReference<S> implements
ServiceReference<S>
{
return 0;
}
-
}
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/impl/RankingComparatorTest.java
b/configadmin/src/test/java/org/apache/felix/cm/impl/RankingComparatorTest.java
index 3be2b222c3..a301bc4525 100644
---
a/configadmin/src/test/java/org/apache/felix/cm/impl/RankingComparatorTest.java
+++
b/configadmin/src/test/java/org/apache/felix/cm/impl/RankingComparatorTest.java
@@ -265,7 +265,6 @@ public class RankingComparatorTest
return 0;
}
-
@Override
public String toString()
{
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/integration/ActivationTest.java
b/configadmin/src/test/java/org/apache/felix/cm/integration/ActivationTest.java
index c24b0e2816..960f7d8f40 100755
---
a/configadmin/src/test/java/org/apache/felix/cm/integration/ActivationTest.java
+++
b/configadmin/src/test/java/org/apache/felix/cm/integration/ActivationTest.java
@@ -32,14 +32,14 @@ import
org.apache.felix.cm.impl.RequiredConfigurationPluginTracker;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.cm.ConfigurationPlugin;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class ActivationTest extends ConfigurationTestBase
{
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigAdminSecurityTest.java
b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigAdminSecurityTest.java
index 0932bde619..a9989c6bce 100644
---
a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigAdminSecurityTest.java
+++
b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigAdminSecurityTest.java
@@ -40,12 +40,12 @@ import
org.apache.felix.cm.integration.helper.ManagedServiceFactoryTestActivator
import org.apache.felix.cm.integration.helper.NestedURLStreamHandler;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.ExamFactory;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.forked.ForkedTestContainerFactory;
-import org.ops4j.pax.exam.junit.ExamFactory;
-import org.ops4j.pax.exam.junit.ExamReactorStrategy;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
@@ -63,9 +63,9 @@ import junit.framework.TestCase;
* Note that it must run as a {@link ForkedTestContainerFactory} because
otherwise
* we can't enable Java Security in the Framework
*/
-@RunWith( JUnit4TestRunner.class )
+@RunWith( PaxExam.class )
@ExamFactory( ForkedTestContainerFactory.class )
-@ExamReactorStrategy( AllConfinedStagedReactorFactory.class )
+@ExamReactorStrategy( PerMethod.class )
public class ConfigAdminSecurityTest extends ConfigurationBaseTest
{
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigUpdateStressTest.java
b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigUpdateStressTest.java
index 81ac693233..5c4f1f658f 100644
---
a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigUpdateStressTest.java
+++
b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigUpdateStressTest.java
@@ -23,14 +23,14 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Dictionary;
-import junit.framework.TestCase;
-
import org.apache.felix.cm.integration.helper.ConfigureThread;
import org.apache.felix.cm.integration.helper.ManagedServiceFactoryThread;
import org.apache.felix.cm.integration.helper.ManagedServiceThread;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+import junit.framework.TestCase;
/**
@@ -40,7 +40,7 @@ import org.ops4j.pax.exam.junit.JUnit4TestRunner;
* <p>
* @see <a
href="https://issues.apache.org/jira/browse/FELIX-1545";>FELIX-1545</a>
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class ConfigUpdateStressTest extends ConfigurationTestBase
{
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationAdminUpdateStressTest.java
b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationAdminUpdateStressTest.java
index d6b4eddcea..bacea20c7d 100644
---
a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationAdminUpdateStressTest.java
+++
b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationAdminUpdateStressTest.java
@@ -29,14 +29,13 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.junit.Assert;
-
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.Configuration;
@@ -54,7 +53,7 @@ import org.osgi.util.tracker.ServiceTracker;
*
* @see <a
href="https://issues.apache.org/jira/browse/FELIX-1545";>FELIX-1545</a>
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class ConfigurationAdminUpdateStressTest extends ConfigurationTestBase
implements LogService
{
public static final int TEST_LOOP = 10;
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java
b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java
index 9d1025e92b..d978cb6d99 100644
---
a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java
+++
b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java
@@ -28,13 +28,11 @@ import java.util.Iterator;
import java.util.List;
import java.util.Vector;
-import junit.framework.TestCase;
-
import
org.apache.felix.cm.integration.helper.ManagedServiceFactoryTestActivator;
import org.apache.felix.cm.integration.helper.ManagedServiceTestActivator;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
@@ -42,8 +40,10 @@ import org.osgi.framework.InvalidSyntaxException;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
+import junit.framework.TestCase;
-@RunWith(JUnit4TestRunner.class)
+
+@RunWith(PaxExam.class)
public class ConfigurationBaseTest extends ConfigurationTestBase
{
@@ -575,7 +575,7 @@ public class ConfigurationBaseTest extends
ConfigurationTestBase
TestCase.assertEquals("Expect first version to be 1", 1,
config.getChangeCount());
- config.update(new Hashtable(){{put("x", "x");}});
+ config.update(new Hashtable<String, Object>(){{put("x", "x");}});
TestCase.assertEquals("Expect second version to be 2", 2,
config.getChangeCount());
// delete
@@ -870,7 +870,7 @@ public class ConfigurationBaseTest extends
ConfigurationTestBase
// 1. create a new Conf1 with pid1 and null location.
// 2. Conf1#update(props) is called.
final String pid = "test_listConfiguration";
- final Configuration config = configure( pid, null, true );
+ configure( pid, null, true );
// 3. bundleA will locationA registers ManagedServiceA with pid1.
bundle = installBundle( pid );
@@ -1272,8 +1272,8 @@ public class ConfigurationBaseTest extends
ConfigurationTestBase
final Bundle cmBundle = getCmBundle();
try
{
- final Vector v = new Vector( Arrays.asList( value ) );
- getConfigurationAdmin().getConfiguration( pid ).update( new
Hashtable()
+ final Vector<String> v = new Vector<>( Arrays.asList( value ) );
+ getConfigurationAdmin().getConfiguration( pid ).update( new
Hashtable<String, Object>()
{
{
put( "v", v );
@@ -1287,8 +1287,8 @@ public class ConfigurationBaseTest extends
ConfigurationTestBase
assertOrder( value, getConfigurationAdmin().getConfiguration( pid
).getProperties().get( "v" ) );
getConfigurationAdmin().getConfiguration( pid, null ).delete();
- final List l = Arrays.asList( value );
- getConfigurationAdmin().getConfiguration( pid ).update( new
Hashtable()
+ final List<String> l = Arrays.asList( value );
+ getConfigurationAdmin().getConfiguration( pid ).update( new
Hashtable<String, Object>()
{
{
put( "v", l );
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBindingTest.java
b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBindingTest.java
index eb398440d0..a36cd0bd9e 100644
---
a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBindingTest.java
+++
b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationBindingTest.java
@@ -21,7 +21,6 @@ package org.apache.felix.cm.integration;
import java.io.IOException;
import java.util.Hashtable;
-import junit.framework.TestCase;
import
org.apache.felix.cm.integration.helper.ManagedServiceFactoryTestActivator;
import
org.apache.felix.cm.integration.helper.ManagedServiceFactoryTestActivator2;
@@ -29,7 +28,7 @@ import
org.apache.felix.cm.integration.helper.ManagedServiceTestActivator;
import org.apache.felix.cm.integration.helper.ManagedServiceTestActivator2;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceReference;
@@ -39,8 +38,10 @@ import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.cm.ConfigurationEvent;
import org.osgi.service.cm.ConfigurationListener;
+import junit.framework.TestCase;
+
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class ConfigurationBindingTest extends ConfigurationTestBase
{
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationListenerTest.java
b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationListenerTest.java
index 4961d008bd..1c93fe9e70 100644
---
a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationListenerTest.java
+++
b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationListenerTest.java
@@ -26,7 +26,7 @@ import
org.apache.felix.cm.integration.helper.SynchronousTestListener;
import org.apache.felix.cm.integration.helper.TestListener;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationEvent;
@@ -34,7 +34,7 @@ import org.osgi.service.cm.ConfigurationListener;
import org.osgi.service.cm.SynchronousConfigurationListener;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class ConfigurationListenerTest extends ConfigurationTestBase
{
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java
b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java
index 60f4fc5a56..66f905398a 100644
---
a/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java
+++
b/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java
@@ -44,14 +44,13 @@ import
org.apache.felix.cm.integration.helper.ManagedServiceTestActivator;
import org.apache.felix.cm.integration.helper.UpdateThreadSignalTask;
import org.junit.After;
import org.junit.Before;
+import org.ops4j.pax.exam.ExamFactory;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.OptionUtils;
+import org.ops4j.pax.exam.ProbeBuilder;
import org.ops4j.pax.exam.TestProbeBuilder;
import org.ops4j.pax.exam.forked.ForkedTestContainer;
-import org.ops4j.pax.exam.junit.ExamFactory;
-import org.ops4j.pax.exam.junit.ProbeBuilder;
-import org.ops4j.pax.exam.nat.internal.NativeTestContainer;
-import org.ops4j.pax.exam.nat.internal.NativeTestContainerFactory;
+import org.ops4j.pax.exam.forked.ForkedTestContainerFactory;
import org.ops4j.pax.tinybundles.core.TinyBundles;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -73,7 +72,7 @@ import junit.framework.TestCase;
* The default is always to use the {@link NativeTestContainer} as it is much
* faster. Tests that need more isolation should use the {@link
ForkedTestContainer}.
*/
-@ExamFactory(NativeTestContainerFactory.class)
+@ExamFactory(ForkedTestContainerFactory.class)
public abstract class ConfigurationTestBase
{
@@ -110,7 +109,7 @@ public abstract class ConfigurationTestBase
}
- @org.ops4j.pax.exam.junit.Configuration
+ @org.ops4j.pax.exam.Configuration
public Option[] configuration()
{
final String bundleFileName = System.getProperty( BUNDLE_JAR_SYS_PROP,
BUNDLE_JAR_DEFAULT );
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/integration/FELIX2813_ConfigurationAdminStartupTest.java
b/configadmin/src/test/java/org/apache/felix/cm/integration/FELIX2813_ConfigurationAdminStartupTest.java
index c69e47c7b5..a4b3f93eff 100644
---
a/configadmin/src/test/java/org/apache/felix/cm/integration/FELIX2813_ConfigurationAdminStartupTest.java
+++
b/configadmin/src/test/java/org/apache/felix/cm/integration/FELIX2813_ConfigurationAdminStartupTest.java
@@ -23,11 +23,12 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
+
import org.apache.felix.cm.integration.helper.SynchronousTestListener;
import org.apache.felix.cm.integration.helper.TestListener;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
@@ -41,7 +42,7 @@ import org.osgi.service.cm.ConfigurationListener;
import org.osgi.service.cm.SynchronousConfigurationListener;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class FELIX2813_ConfigurationAdminStartupTest extends
ConfigurationTestBase implements ServiceListener
{
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/integration/FELIX4385_StressTest.java
b/configadmin/src/test/java/org/apache/felix/cm/integration/FELIX4385_StressTest.java
index 659ce88cd2..89c96cb32a 100644
---
a/configadmin/src/test/java/org/apache/felix/cm/integration/FELIX4385_StressTest.java
+++
b/configadmin/src/test/java/org/apache/felix/cm/integration/FELIX4385_StressTest.java
@@ -27,13 +27,11 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
import org.apache.felix.cm.integration.helper.Log;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cm.Configuration;
@@ -41,6 +39,8 @@ import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.cm.ManagedService;
+import junit.framework.TestCase;
+
/**
* The <code>FELIX4385_StressTest</code> class tests the issue related to
concurrency between configuration
* creation/update/removal and ManagedService registration/unregistration.
@@ -57,7 +57,7 @@ import org.osgi.service.cm.ManagedService;
* <p>
* @see <a
href="https://issues.apache.org/jira/browse/FELIX-4385";>FELIX-4385</a>
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class FELIX4385_StressTest extends ConfigurationTestBase
{
final static int MAXWAIT = 10000;
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/integration/MultiServiceFactoryPIDTest.java
b/configadmin/src/test/java/org/apache/felix/cm/integration/MultiServiceFactoryPIDTest.java
index e25d827602..1ae339b71a 100644
---
a/configadmin/src/test/java/org/apache/felix/cm/integration/MultiServiceFactoryPIDTest.java
+++
b/configadmin/src/test/java/org/apache/felix/cm/integration/MultiServiceFactoryPIDTest.java
@@ -19,24 +19,24 @@
package org.apache.felix.cm.integration;
-import junit.framework.TestCase;
-
import
org.apache.felix.cm.integration.helper.ManagedServiceFactoryTestActivator;
import
org.apache.felix.cm.integration.helper.ManagedServiceFactoryTestActivator2;
import
org.apache.felix.cm.integration.helper.MultiManagedServiceFactoryTestActivator;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.service.cm.Configuration;
+import junit.framework.TestCase;
+
/**
* The <code>MultiServicePIDTest</code> tests the case of multiple services
* bound with the same PID
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class MultiServiceFactoryPIDTest extends ConfigurationTestBase
{
static
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/integration/MultiServicePIDTest.java
b/configadmin/src/test/java/org/apache/felix/cm/integration/MultiServicePIDTest.java
index c0f547bfc4..3c7a208811 100644
---
a/configadmin/src/test/java/org/apache/felix/cm/integration/MultiServicePIDTest.java
+++
b/configadmin/src/test/java/org/apache/felix/cm/integration/MultiServicePIDTest.java
@@ -19,24 +19,24 @@
package org.apache.felix.cm.integration;
-import junit.framework.TestCase;
-
import org.apache.felix.cm.integration.helper.ManagedServiceTestActivator;
import org.apache.felix.cm.integration.helper.ManagedServiceTestActivator2;
import org.apache.felix.cm.integration.helper.MultiManagedServiceTestActivator;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.service.cm.Configuration;
+import junit.framework.TestCase;
+
/**
* The <code>MultiServicePIDTest</code> tests the case of multiple services
* bound with the same PID
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class MultiServicePIDTest extends ConfigurationTestBase
{
static
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/integration/MultiValuePIDTest.java
b/configadmin/src/test/java/org/apache/felix/cm/integration/MultiValuePIDTest.java
index e0ed8da2d4..12206a18e7 100644
---
a/configadmin/src/test/java/org/apache/felix/cm/integration/MultiValuePIDTest.java
+++
b/configadmin/src/test/java/org/apache/felix/cm/integration/MultiValuePIDTest.java
@@ -19,17 +19,17 @@
package org.apache.felix.cm.integration;
-import junit.framework.TestCase;
-
import org.apache.felix.cm.integration.helper.ManagedServiceTestActivator;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.BundleException;
import org.osgi.service.cm.Configuration;
+import junit.framework.TestCase;
+
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class MultiValuePIDTest extends ConfigurationTestBase
{
diff --git
a/configadmin/src/test/java/org/apache/felix/cm/integration/TargetedPidTest.java
b/configadmin/src/test/java/org/apache/felix/cm/integration/TargetedPidTest.java
index b35d08e819..f644215dd2 100644
---
a/configadmin/src/test/java/org/apache/felix/cm/integration/TargetedPidTest.java
+++
b/configadmin/src/test/java/org/apache/felix/cm/integration/TargetedPidTest.java
@@ -19,17 +19,17 @@
package org.apache.felix.cm.integration;
-import junit.framework.TestCase;
-
import org.apache.felix.cm.integration.helper.ManagedServiceTestActivator;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
+import junit.framework.TestCase;
+
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class TargetedPidTest extends ConfigurationTestBase
{
