Repository: camel Updated Branches: refs/heads/master 7a2e5197f -> a2aa6ac83
http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java index 490eb94..eee924c 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java @@ -27,15 +27,15 @@ import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CxfBeanBlueprintRouterTest extends OSGiBlueprintTestSupport { protected void doPostSetup() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java index 81fbfe2..5dc34e3 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java @@ -29,16 +29,16 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CxfBlueprintRouterTest extends OSGiBlueprintTestSupport { private static Server server; http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java index f456e27..1e2d252 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java @@ -36,15 +36,15 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CxfRsBlueprintRouterTest extends OSGiBlueprintTestSupport { private static final String PUT_REQUEST = "<Customer><name>Mary</name><id>123</id></Customer>"; private static final String POST_REQUEST = "<Customer><name>Jack</name></Customer>"; http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java index 1ff6dbc..95d66d2 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java @@ -21,9 +21,9 @@ import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; import org.apache.camel.itest.osgi.dozer.service.Customer; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; import static org.ops4j.pax.exam.OptionUtils.combine; @@ -32,7 +32,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class DozerTest extends OSGiIntegrationSpringTestSupport { @Override http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/exec/ExecTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/exec/ExecTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/exec/ExecTest.java index 827eb37..36867c2 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/exec/ExecTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/exec/ExecTest.java @@ -21,13 +21,13 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("We need a test which runs on all platforms") public class ExecTest extends OSGiIntegrationTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java index bcda540..36e5a95 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java @@ -23,9 +23,9 @@ import java.io.InputStream; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.util.IOHelper; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class FreemarkerFileTest extends FreemarkerTest { @Override http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java index a37718c..d19c171 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java @@ -24,13 +24,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class FreemarkerTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpConsumeTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpConsumeTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpConsumeTest.java index ceb7609..bc4285a 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpConsumeTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpConsumeTest.java @@ -19,14 +19,14 @@ package org.apache.camel.itest.osgi.ftp; import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class FtpConsumeTest extends OSGiIntegrationSpringTestSupport { @Override http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java index 8b27178..8890989 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java @@ -26,13 +26,13 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.apache.camel.processor.aggregate.AggregationStrategy; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class HawtDBAggregateRouteTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java index 903ab71..8ff20c8 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java @@ -21,14 +21,14 @@ import org.apache.camel.component.hazelcast.HazelcastConstants; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class HazelcastTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java index e644f9f..d273884 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java @@ -22,16 +22,16 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.CoreOptions.provision; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class HdfsBlueprintRouteTest extends OSGiBlueprintTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java index 6e4dbb3..3752090 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java @@ -21,13 +21,13 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class HL7DataFormatTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java index 07019f9..3653c28 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java @@ -24,14 +24,14 @@ import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("TODO need to find a way fix the hl7codec setting issue") public class HL7MLLPCodec2Test extends OSGiIntegrationSpringTestSupport implements Processor { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java index 8f12a25..6859c46 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java @@ -22,14 +22,14 @@ import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("TODO need to find a way fix the hl7codec setting issue") public class HL7MLLPCodecTest extends OSGiIntegrationSpringTestSupport implements Processor { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTest.java index 823d334..b4e7f11 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTest.java @@ -21,16 +21,16 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; /** * */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class HttpTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java index ce172a1..5eb54cd 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http/HttpTypeConverterTest.java @@ -30,13 +30,13 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class HttpTypeConverterTest extends OSGiIntegrationTestSupport { static HttpServletResponse servletResponse = new HttpServletResponse() { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http4/Http4Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http4/Http4Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http4/Http4Test.java index 9ed0214..8f2d09d 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http4/Http4Test.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/http4/Http4Test.java @@ -21,16 +21,16 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; /** * */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class Http4Test extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java index c65e783..a9c9e51 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java @@ -22,13 +22,13 @@ import org.apache.camel.component.properties.PropertiesComponent; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class JasyptTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java index fb8d5f5..93a7081 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java @@ -20,14 +20,14 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class JaxbFallbackConverterSpringTest extends OSGiIntegrationSpringTestSupport { @Override http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java index c3b05c7..de4f9e5 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java @@ -21,13 +21,13 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class JaxbFallbackConverterTest extends OSGiIntegrationTestSupport { protected RouteBuilder createRouteBuilder() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreRouteTest.java index 5301539..a9e9a0b 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreRouteTest.java @@ -29,15 +29,15 @@ import org.jclouds.blobstore.BlobStore; import org.jclouds.blobstore.BlobStoreContext; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.BundleContext; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class BlobStoreRouteTest extends OSGiIntegrationTestSupport { private static final String TEST_CONTAINER = "testContainer"; http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiJettyCamelContextsClassloaderTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiJettyCamelContextsClassloaderTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiJettyCamelContextsClassloaderTest.java index 2d81f61..07c6f09 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiJettyCamelContextsClassloaderTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiJettyCamelContextsClassloaderTest.java @@ -19,9 +19,9 @@ package org.apache.camel.itest.osgi.jetty; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.Constants; @@ -34,7 +34,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; * and thus, sharing the same container-wide Jetty Connector, do not share the classloader. The TCCL should * be different in each case, as for each route it should be the Classloader of their containing bundle. */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class OSGiJettyCamelContextsClassloaderTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java index 81d1e12..ca993c7 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java @@ -20,9 +20,9 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.Constants; @@ -30,7 +30,7 @@ import static org.ops4j.pax.exam.CoreOptions.provision; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class OSGiMulitJettyCamelContextsTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java index ce40365..74ea5f3 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java @@ -28,9 +28,9 @@ import org.apache.camel.util.IOHelper; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.BundleContext; import org.springframework.orm.jpa.JpaTemplate; import org.springframework.orm.jpa.JpaTransactionManager; @@ -43,7 +43,7 @@ import org.springframework.transaction.support.TransactionTemplate; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class JpaRouteTest extends OSGiIntegrationTestSupport { protected static final String SELECT_ALL_STRING = "select x from " + SendEmail.class.getName() + " x"; http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jsch/ScpTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jsch/ScpTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jsch/ScpTest.java index 94dbb73..563a4e0 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jsch/ScpTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jsch/ScpTest.java @@ -22,14 +22,14 @@ import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("Not fully implemented, see TODO") public class ScpTest extends OSGiIntegrationSpringTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java index 6b57a1e..e6bbe8e 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java @@ -23,16 +23,16 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.CoreOptions.provision; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class KratiBlueprintRouteTest extends OSGiBlueprintTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiRouteTest.java index c26752b..16be8b2 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/krati/KratiRouteTest.java @@ -26,15 +26,15 @@ import org.apache.camel.spring.SpringCamelContext; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.BundleContext; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class KratiRouteTest extends OSGiIntegrationTestSupport { protected OsgiBundleXmlApplicationContext applicationContext; http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java index 0a25baf..eaf630b 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java @@ -27,13 +27,13 @@ import org.apache.camel.processor.aggregate.AggregationStrategy; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("leveldb artifact needs to be osgi bundle.") public class LevelDBAggregateRouteTest extends OSGiIntegrationTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java index b664e5b..810fd44 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java @@ -20,13 +20,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class MinaTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mvel/MvelTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mvel/MvelTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mvel/MvelTest.java index 9bc2ffd..1101395 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mvel/MvelTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mvel/MvelTest.java @@ -22,14 +22,14 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.apache.camel.itest.osgi.core.bean.MyFooBean; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class MvelTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java index b2f8d0b..d7449d0 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java @@ -27,9 +27,9 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.OptionUtils.combine; @@ -37,7 +37,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("Loading OSGi driver in OSGi is ***** hard") public class MyBatisTest extends OSGiIntegrationTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java index ca3f043..32c179e 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/netty/NettyTest.java @@ -20,13 +20,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class NettyTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java index dc6c637..d1cc40c 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java @@ -25,13 +25,13 @@ import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class ProtobufRouteTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java index f99d5e5..174a763 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java @@ -21,13 +21,13 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class QuartzCronRouteTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java index 4296ccd..51f0ff1 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/RestletTest.java @@ -25,13 +25,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class RestletTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java index 8d8a528..0516628 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/restlet/example/RestletDomainServiceTest.java @@ -21,9 +21,9 @@ import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; import static org.ops4j.pax.exam.OptionUtils.combine; @@ -31,7 +31,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("PaxExam hang on shutdown of this test") public class RestletDomainServiceTest extends OSGiIntegrationSpringTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java index ad81ae1..680b722 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/rss/RssPollingConsumerTest.java @@ -29,13 +29,13 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("abdera-core bundle has a wrong stax api dependency") public class RssPollingConsumerTest extends OSGiIntegrationTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java index bea39a2..ab1535f 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java @@ -22,16 +22,16 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; /** * Test camel-script for groovy expressions in OSGi */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class GroovyScriptOsgiTest extends OSGiIntegrationTestSupport { protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java index eed3848..4b0e181 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java @@ -22,16 +22,16 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; /** * Test camel-script for Ruby expressions in OSGi */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("You need an OSGi-ified version of JRuby for this to pass") public class RubyOsgiTest extends OSGiIntegrationTestSupport { protected RouteBuilder createRouteBuilder() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java index f2227f8..900dc1c2 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java @@ -31,14 +31,14 @@ import org.apache.shiro.authc.LockedAccountException; import org.apache.shiro.authc.UnknownAccountException; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class ShiroAuthenticationTest extends OSGiIntegrationTestSupport { @EndpointInject(uri = "mock:success") http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/bean/SpringBeanRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/bean/SpringBeanRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/bean/SpringBeanRouteTest.java index a142e2b..f1bf75c 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/bean/SpringBeanRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/bean/SpringBeanRouteTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.osgi.spring.bean; import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; 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.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class SpringBeanRouteTest extends OSGiIntegrationSpringTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/event/EventRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/event/EventRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/event/EventRouteTest.java index 781f335..fd30c04 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/event/EventRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/spring/event/EventRouteTest.java @@ -22,11 +22,11 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; 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.springframework.context.event.ContextRefreshedEvent; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class EventRouteTest extends OSGiIntegrationSpringTestSupport { protected Object expectedBody = "Hello there!"; http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java index 3ab9ee8..0711d8a 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java @@ -33,9 +33,9 @@ import org.apache.camel.util.IOHelper; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.dao.DataAccessException; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; @@ -45,7 +45,7 @@ import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class SqlRouteTest extends OSGiIntegrationTestSupport { String driverClass = "org.apache.derby.jdbc.EmbeddedDriver"; http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java index 1eb22f2..4c5bc73 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java @@ -20,13 +20,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class StreamTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java index 52108f0..ae0b606 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/syslog/SyslogTest.java @@ -32,14 +32,14 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.apache.camel.spi.DataFormat; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class SyslogTest extends OSGiIntegrationTestSupport { private final int serverPort = 10514; http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java index 0ac33c4..d37d2d0 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java @@ -25,10 +25,10 @@ import org.apache.camel.util.jsse.KeyStoreParameters; import org.apache.camel.util.jsse.SSLContextParameters; 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.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class JsseUtilTest extends OSGiIntegrationSpringTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityBlueprintTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityBlueprintTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityBlueprintTest.java index fdab827..2f55fcc 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityBlueprintTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityBlueprintTest.java @@ -25,16 +25,16 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class VelocityBlueprintTest extends OSGiBlueprintTestSupport { private CamelContext camelContext; private ProducerTemplate mytemplate; http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityFileTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityFileTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityFileTest.java index 7b555fd..97a9b5c 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityFileTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityFileTest.java @@ -23,9 +23,9 @@ import java.io.InputStream; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.util.IOHelper; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class VelocityFileTest extends VelocityTest { @Override http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java index 2a6e71a..4041417 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/velocity/VelocityTest.java @@ -24,13 +24,13 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class VelocityTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xmljson/XmlJsonBlueprintRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xmljson/XmlJsonBlueprintRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xmljson/XmlJsonBlueprintRouteTest.java index 4f71c4f..0797940 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xmljson/XmlJsonBlueprintRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xmljson/XmlJsonBlueprintRouteTest.java @@ -23,9 +23,9 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.CoreOptions.provision; @@ -35,7 +35,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * OSGi integration test for camel-xmljson */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class XmlJsonBlueprintRouteTest extends OSGiBlueprintTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java index 4ef3fc9..12bed11 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java @@ -23,9 +23,9 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.Constants; @@ -33,7 +33,7 @@ import static org.ops4j.pax.exam.CoreOptions.provision; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class XstreamBlueprintRouteTest extends OSGiBlueprintTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java index 41a1fe4..affea26 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java @@ -34,12 +34,12 @@ 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 static org.apache.camel.component.zookeeper.ZooKeeperMessage.ZOOKEEPER_CREATE_MODE; import static org.apache.camel.component.zookeeper.ZooKeeperMessage.ZOOKEEPER_NODE; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("Causes processes to not cleanly shutdown. " + "And There is an issue with the zookeeper bundle, so the server cannot be started in pax-exam karaf container") http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java index c8f5a35..2796100 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java @@ -52,8 +52,8 @@ import org.apache.zookeeper.server.persistence.FileTxnSnapLog; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
