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/23 15:13:02 UTC
svn commit: r1535019 - in
/karaf/trunk/itests/src/test/java/org/apache/karaf/itests: ./ features/
Author: cschneider
Date: Wed Oct 23 13:13:01 2013
New Revision: 1535019
URL: http://svn.apache.org/r1535019
Log:
KARAF-2422 Use the new pax exam config style
Modified:
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/BundleTests.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConfigTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/DiagnosticTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/HttpTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/InstanceTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/JaasTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/LogTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ObrTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/PackageTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/RegionTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ServiceTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemShutdownTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/BootFeaturesTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/BundleTests.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/BundleTests.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/BundleTests.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/BundleTests.java Wed Oct 23 13:13:01 2013
@@ -23,12 +23,12 @@ import javax.management.remote.JMXConnec
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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class BundleTests extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java Wed Oct 23 13:13:01 2013
@@ -19,12 +19,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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class ConditionalFeaturesTest extends KarafTestSupport {
/*
@Inject
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConfigTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConfigTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConfigTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConfigTest.java Wed Oct 23 13:13:01 2013
@@ -25,12 +25,12 @@ import javax.management.remote.JMXConnec
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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class ConfigTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/DiagnosticTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/DiagnosticTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/DiagnosticTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/DiagnosticTest.java Wed Oct 23 13:13:01 2013
@@ -19,12 +19,12 @@ import javax.management.remote.JMXConnec
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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class DiagnosticTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java Wed Oct 23 13:13:01 2013
@@ -23,12 +23,12 @@ import javax.management.remote.JMXConnec
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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class FeatureTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/HttpTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/HttpTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/HttpTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/HttpTest.java Wed Oct 23 13:13:01 2013
@@ -23,12 +23,12 @@ import javax.management.remote.JMXConnec
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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class HttpTest extends KarafTestSupport {
@Before
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/InstanceTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/InstanceTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/InstanceTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/InstanceTest.java Wed Oct 23 13:13:01 2013
@@ -23,12 +23,12 @@ import javax.management.remote.JMXConnec
import org.junit.Assert;
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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class InstanceTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/JaasTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/JaasTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/JaasTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/JaasTest.java Wed Oct 23 13:13:01 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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class JaasTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarTest.java Wed Oct 23 13:13:01 2013
@@ -23,12 +23,12 @@ import javax.management.remote.JMXConnec
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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class KarTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java Wed Oct 23 13:13:01 2013
@@ -48,10 +48,10 @@ import org.apache.karaf.features.BootFin
import org.apache.karaf.features.Feature;
import org.apache.karaf.features.FeaturesService;
import org.junit.Assert;
+import org.ops4j.pax.exam.Configuration;
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.ops4j.pax.exam.karaf.options.LogLevelOption;
import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
import org.osgi.framework.Bundle;
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/LogTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/LogTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/LogTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/LogTest.java Wed Oct 23 13:13:01 2013
@@ -23,14 +23,14 @@ import javax.management.remote.JMXConnec
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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class LogTest extends KarafTestSupport {
private static final Logger LOGGER = LoggerFactory.getLogger(LogTest.class);
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ObrTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ObrTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ObrTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ObrTest.java Wed Oct 23 13:13:01 2013
@@ -25,12 +25,12 @@ import javax.management.remote.JMXConnec
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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class ObrTest extends KarafTestSupport {
@Before
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/PackageTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/PackageTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/PackageTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/PackageTest.java Wed Oct 23 13:13:01 2013
@@ -23,12 +23,12 @@ import javax.management.remote.JMXConnec
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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class PackageTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/RegionTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/RegionTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/RegionTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/RegionTest.java Wed Oct 23 13:13:01 2013
@@ -17,12 +17,12 @@ import static org.junit.Assert.assertTru
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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class RegionTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ServiceTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ServiceTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ServiceTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ServiceTest.java Wed Oct 23 13:13:01 2013
@@ -23,12 +23,12 @@ import javax.management.remote.JMXConnec
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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class ServiceTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemShutdownTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemShutdownTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemShutdownTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemShutdownTest.java Wed Oct 23 13:13:01 2013
@@ -19,12 +19,12 @@ import javax.management.remote.JMXConnec
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 SystemShutdownTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemTest.java Wed Oct 23 13:13:01 2013
@@ -21,12 +21,12 @@ import javax.management.remote.JMXConnec
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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class SystemTest extends KarafTestSupport {
private static final String KARAF_VERSION = "3";
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java Wed Oct 23 13:13:01 2013
@@ -24,12 +24,12 @@ import javax.management.remote.JMXConnec
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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class WebTest extends KarafTestSupport {
@Before
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java Wed Oct 23 13:13:01 2013
@@ -22,12 +22,12 @@ import javax.management.remote.JMXConnec
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.EagerSingleStagedReactorFactory;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
-@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class WrapperTest extends KarafTestSupport {
@Before
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/BootFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/BootFeaturesTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/BootFeaturesTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/BootFeaturesTest.java Wed Oct 23 13:13:01 2013
@@ -3,12 +3,12 @@ package org.apache.karaf.itests.features
import org.apache.karaf.itests.KarafTestSupport;
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 BootFeaturesTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java Wed Oct 23 13:13:01 2013
@@ -16,12 +16,12 @@ package org.apache.karaf.itests.features
import org.apache.karaf.itests.KarafTestSupport;
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 EnterpriseFeaturesTest extends KarafTestSupport {
private void installAndAssertFeature(String feature) throws Exception {
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java Wed Oct 23 13:13:01 2013
@@ -17,12 +17,12 @@ import org.apache.karaf.itests.KarafTest
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 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 SpringFeaturesTest extends KarafTestSupport {
private void installAndAssertFeature(String feature) throws Exception {
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java?rev=1535019&r1=1535018&r2=1535019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java Wed Oct 23 13:13:01 2013
@@ -16,12 +16,12 @@ package org.apache.karaf.itests.features
import org.apache.karaf.itests.KarafTestSupport;
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 {
private void installAndAssertFeature(String feature) throws Exception {