You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2013/10/25 15:01:35 UTC

svn commit: r1535723 - /karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/

Author: cschneider
Date: Fri Oct 25 13:01:34 2013
New Revision: 1535723

URL: http://svn.apache.org/r1535723
Log:
KARAF-2422 Upgrading annotations to pax exam 3.2

Modified:
    karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/AdminTest.java
    karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/ConfigTest.java
    karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java
    karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/FeaturesTest.java
    karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/JaasTest.java
    karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
    karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/LogTest.java
    karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/ObrTest.java
    karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/OsgiTest.java
    karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/PackagesTest.java
    karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/ServicesTest.java
    karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/StandardFeaturesTest.java
    karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java

Modified: karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/AdminTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/AdminTest.java?rev=1535723&r1=1535722&r2=1535723&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/AdminTest.java (original)
+++ karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/AdminTest.java Fri Oct 25 13:01:34 2013
@@ -13,23 +13,23 @@
  */
 package org.apache.karaf.itests;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.ExamReactorStrategy;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.openmbean.TabularData;
 import javax.management.remote.JMXConnector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
 public class AdminTest extends KarafTestSupport {
 
     @Test

Modified: karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/ConfigTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/ConfigTest.java?rev=1535723&r1=1535722&r2=1535723&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/ConfigTest.java (original)
+++ karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/ConfigTest.java Fri Oct 25 13:01:34 2013
@@ -13,24 +13,24 @@
  */
 package org.apache.karaf.itests;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.ExamReactorStrategy;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+import java.util.Map;
 
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.remote.JMXConnector;
 
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
 public class ConfigTest extends KarafTestSupport {
 
     @Test

Modified: karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java?rev=1535723&r1=1535722&r2=1535723&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java (original)
+++ karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java Fri Oct 25 13:01:34 2013
@@ -15,12 +15,12 @@ package org.apache.karaf.itests;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-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.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
 public class EnterpriseFeaturesTest extends KarafTestSupport {
 
     private void installAndAssertFeature(String feature) throws Exception {

Modified: karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/FeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/FeaturesTest.java?rev=1535723&r1=1535722&r2=1535723&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/FeaturesTest.java (original)
+++ karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/FeaturesTest.java Fri Oct 25 13:01:34 2013
@@ -13,22 +13,22 @@
  */
 package org.apache.karaf.itests;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.ExamReactorStrategy;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.openmbean.TabularData;
 import javax.management.remote.JMXConnector;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
 public class FeaturesTest extends KarafTestSupport {
 
     @Test

Modified: karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/JaasTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/JaasTest.java?rev=1535723&r1=1535722&r2=1535723&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/JaasTest.java (original)
+++ karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/JaasTest.java Fri Oct 25 13:01:34 2013
@@ -13,16 +13,16 @@
  */
 package org.apache.karaf.itests;
 
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.ExamReactorStrategy;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
-
-import static org.junit.Assert.assertTrue;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
 public class JaasTest extends KarafTestSupport {
 
     @Test

Modified: karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java?rev=1535723&r1=1535722&r2=1535723&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java (original)
+++ karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java Fri Oct 25 13:01:34 2013
@@ -19,11 +19,11 @@ import org.apache.karaf.features.Feature
 import org.apache.karaf.features.FeaturesService;
 import org.ops4j.pax.exam.karaf.options.LogLevelOption;
 import org.junit.Assert;
+import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.MavenUtils;
 import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.ProbeBuilder;
 import org.ops4j.pax.exam.TestProbeBuilder;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.ProbeBuilder;
 import org.osgi.framework.*;
 import org.osgi.util.tracker.ServiceTracker;
 
@@ -41,7 +41,6 @@ import java.util.concurrent.*;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
-
 import static org.ops4j.pax.exam.CoreOptions.maven;
 
 public class KarafTestSupport {

Modified: karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/LogTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/LogTest.java?rev=1535723&r1=1535722&r2=1535723&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/LogTest.java (original)
+++ karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/LogTest.java Fri Oct 25 13:01:34 2013
@@ -13,23 +13,22 @@
  */
 package org.apache.karaf.itests;
 
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.ExamReactorStrategy;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import javax.management.Attribute;
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.remote.JMXConnector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
 public class LogTest extends KarafTestSupport {
 
     @Test

Modified: karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/ObrTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/ObrTest.java?rev=1535723&r1=1535722&r2=1535723&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/ObrTest.java (original)
+++ karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/ObrTest.java Fri Oct 25 13:01:34 2013
@@ -13,23 +13,24 @@
  */
 package org.apache.karaf.itests;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.ExamReactorStrategy;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
 
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.openmbean.TabularData;
 import javax.management.remote.JMXConnector;
-import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
 public class ObrTest extends KarafTestSupport {
 
     @Before

Modified: karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/OsgiTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/OsgiTest.java?rev=1535723&r1=1535722&r2=1535723&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/OsgiTest.java (original)
+++ karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/OsgiTest.java Fri Oct 25 13:01:34 2013
@@ -13,23 +13,23 @@
  */
 package org.apache.karaf.itests;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.ExamReactorStrategy;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.openmbean.TabularData;
 import javax.management.remote.JMXConnector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
 public class OsgiTest extends KarafTestSupport {
 
     @Test

Modified: karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/PackagesTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/PackagesTest.java?rev=1535723&r1=1535722&r2=1535723&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/PackagesTest.java (original)
+++ karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/PackagesTest.java Fri Oct 25 13:01:34 2013
@@ -13,23 +13,23 @@
  */
 package org.apache.karaf.itests;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.ExamReactorStrategy;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
 
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.remote.JMXConnector;
 
-import java.util.ArrayList;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
 public class PackagesTest extends KarafTestSupport {
 
     @Test

Modified: karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/ServicesTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/ServicesTest.java?rev=1535723&r1=1535722&r2=1535723&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/ServicesTest.java (original)
+++ karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/ServicesTest.java Fri Oct 25 13:01:34 2013
@@ -13,22 +13,22 @@
  */
 package org.apache.karaf.itests;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.ExamReactorStrategy;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 import javax.management.openmbean.TabularData;
 import javax.management.remote.JMXConnector;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
 public class ServicesTest extends KarafTestSupport {
 
     @Test

Modified: karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/StandardFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/StandardFeaturesTest.java?rev=1535723&r1=1535722&r2=1535723&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/StandardFeaturesTest.java (original)
+++ karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/StandardFeaturesTest.java Fri Oct 25 13:01:34 2013
@@ -15,12 +15,12 @@ package org.apache.karaf.itests;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-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;
 
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
 public class StandardFeaturesTest extends KarafTestSupport {
 
     @Test

Modified: karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java?rev=1535723&r1=1535722&r2=1535723&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java (original)
+++ karaf/branches/karaf-2.x/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java Fri Oct 25 13:01:34 2013
@@ -13,21 +13,17 @@
  */
 package org.apache.karaf.itests;
 
+import static org.junit.Assert.assertFalse;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.ExamReactorStrategy;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
-
-import static org.junit.Assert.assertFalse;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
 
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
 public class WrapperTest extends KarafTestSupport {
 
     @Before