You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2014/08/22 02:17:25 UTC
git commit: Start upgrading to pax-exam 3.4. Bunch of tests failing,
but they are failing with the old version as well.
Repository: camel
Updated Branches:
refs/heads/master 09f2dfd9a -> 8142b4380
Start upgrading to pax-exam 3.4. Bunch of tests failing, but they are failing with the old version as well.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8142b438
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8142b438
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8142b438
Branch: refs/heads/master
Commit: 8142b4380e9740cfdfe79ee254b153acf8235e75
Parents: 09f2dfd
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Aug 21 20:16:10 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Aug 21 20:16:53 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 26 +-
tests/camel-itest-osgi/pom.xml | 23 +-
.../itest/osgi/OSGiIntegrationTestSupport.java | 43 ++-
.../camel/itest/osgi/base64/Base64Test.java | 315 ++++++++++---------
.../CamelMultiVersionBlueprintTest.java | 7 +-
...ogRouteWithLoggersPresentInRegistryTest.java | 16 +-
.../log/LogRouteWithNonDefaultLoggerTest.java | 13 +-
.../OSGiIntegrationManagedCamelContextTest.java | 13 +-
.../itest/osgi/disruptor/DisruptorTest.java | 10 +-
.../osgi/disruptor/vm/DisruptorVmTest.java | 10 +-
.../apache/camel/itest/osgi/ftp/FtpTest.java | 7 +-
.../camel/itest/osgi/groovy/GroovyTest.java | 7 +-
.../camel/itest/osgi/hdfs/HdfsRouteTest.java | 15 +-
.../itest/osgi/jaxb/JaxbDataFormatTest.java | 7 +-
.../jclouds/BlobStoreBlueprintRouteTest.java | 7 +-
.../apache/camel/itest/osgi/jms/JmsTest.java | 7 +-
.../itest/osgi/jpa/JpaBlueprintRouteTest.java | 7 +-
.../camel/itest/osgi/mail/MailRouteTest.java | 7 +-
.../osgi/servlet/ServletComponentTest.java | 11 +-
.../itest/osgi/servlet/ServletServicesTest.java | 11 +-
.../camel/itest/osgi/sql/SqlBlueprintRoute.java | 9 +-
21 files changed, 293 insertions(+), 278 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 98c6a01..d95468c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -332,8 +332,8 @@
<oscache-bundle-version>2.4_5</oscache-bundle-version>
<osgi-version>4.3.1</osgi-version>
<paranamer-bundle-version>2.4_1</paranamer-bundle-version>
- <pax-exam-version>2.6.0</pax-exam-version>
- <paxexam-karaf-container-version>1.0.0</paxexam-karaf-container-version>
+ <pax-exam-version>3.4.0</pax-exam-version>
+ <paxexam-karaf-container-version>3.4.0</paxexam-karaf-container-version>
<pax-runner-version>1.7.6</pax-runner-version>
<pax-tiny-bundle-version>1.3.1</pax-tiny-bundle-version>
<pax-logging-version>1.7.1</pax-logging-version>
@@ -1945,14 +1945,24 @@
<!-- optional Pax support -->
<dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
+ <version>${pax-exam-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
<version>${pax-exam-version}</version>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.runner</groupId>
- <artifactId>pax-runner-no-jcl</artifactId>
- <version>${pax-runner-version}</version>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-karaf</artifactId>
+ <version>${pax-exam-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>${pax-exam-version}</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.swissbox</groupId>
@@ -1960,12 +1970,6 @@
<version>${pax-tiny-bundle-version}</version>
</dependency>
- <!-- optional Karaf test support -->
- <dependency>
- <groupId>org.apache.karaf.tooling.exam</groupId>
- <artifactId>org.apache.karaf.tooling.exam.container</artifactId>
- <version>${karaf-version}</version>
- </dependency>
<!-- optional Saxon support -->
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index 5823c3d..7001415 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -44,18 +44,24 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.runner</groupId>
- <artifactId>pax-runner-no-jcl</artifactId>
- <scope>test</scope>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.swissbox</groupId>
- <artifactId>pax-swissbox-tinybundles</artifactId>
- <scope>test</scope>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-karaf</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf.tooling.exam</groupId>
- <artifactId>org.apache.karaf.tooling.exam.container</artifactId>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-tinybundles</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -507,6 +513,7 @@
<sourceRoot>${basedir}/target/generated/src/main/java</sourceRoot>
<wsdlOptions>
<wsdlOption>
+ <frontEnd>jaxws21</frontEnd>
<wsdl>${basedir}/src/test/resources/report_incident.wsdl</wsdl>
</wsdlOption>
</wsdlOptions>
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
index cb4f9b6..a3cd45c 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
@@ -25,10 +25,10 @@ import javax.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.osgi.CamelContextFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.karaf.tooling.exam.options.KarafDistributionOption;
-import org.apache.karaf.tooling.exam.options.LogLevelOption;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.karaf.options.KarafDistributionOption;
+import org.ops4j.pax.exam.karaf.options.LogLevelOption;
import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.ops4j.pax.exam.options.UrlReference;
import org.osgi.framework.Bundle;
@@ -36,12 +36,8 @@ import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration;
-import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.logLevel;
-import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.replaceConfigurationFile;
import static org.ops4j.pax.exam.CoreOptions.maven;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import static org.ops4j.pax.exam.OptionUtils.combine;
public class OSGiIntegrationTestSupport extends CamelTestSupport {
@@ -125,12 +121,27 @@ public class OSGiIntegrationTestSupport extends CamelTestSupport {
}
return scanFeatures(getCamelKarafFeatureUrl(), result.toArray(new String[4 + features.length]));
}
-
+ public static Option scanFeatures(UrlReference ref, String ... features) {
+ return KarafDistributionOption.features(ref, features);
+ }
+ public static Option scanFeatures(String ref, String ... features) {
+ return KarafDistributionOption.features(ref, features);
+ }
+ public static Option felix() {
+ return KarafDistributionOption.editConfigurationFileExtend("etc/config.properties",
+ "karaf.framework",
+ "felix");
+ }
+ public static Option equinox() {
+ return KarafDistributionOption.editConfigurationFileExtend("etc/config.properties",
+ "karaf.framework",
+ "equinox");
+ }
public static Option[] getDefaultCamelKarafOptions() {
Option[] options =
// Set the karaf environment with some customer configuration
new Option[] {
- karafDistributionConfiguration()
+ KarafDistributionOption.karafDistributionConfiguration()
.frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
.karafVersion("2.3.6")
.name("Apache Karaf")
@@ -138,15 +149,15 @@ public class OSGiIntegrationTestSupport extends CamelTestSupport {
KarafDistributionOption.keepRuntimeFolder(),
// override the config.properties (to fix pax-exam bug)
- replaceConfigurationFile("etc/config.properties", new File("src/test/resources/org/apache/camel/itest/karaf/config.properties")),
- replaceConfigurationFile("etc/custom.properties", new File("src/test/resources/org/apache/camel/itest/karaf/custom.properties")),
- replaceConfigurationFile("etc/org.ops4j.pax.url.mvn.cfg", new File("src/test/resources/org/apache/camel/itest/karaf/org.ops4j.pax.url.mvn.cfg")),
+ KarafDistributionOption.replaceConfigurationFile("etc/config.properties", new File("src/test/resources/org/apache/camel/itest/karaf/config.properties")),
+ KarafDistributionOption.replaceConfigurationFile("etc/custom.properties", new File("src/test/resources/org/apache/camel/itest/karaf/custom.properties")),
+ KarafDistributionOption.replaceConfigurationFile("etc/org.ops4j.pax.url.mvn.cfg", new File("src/test/resources/org/apache/camel/itest/karaf/org.ops4j.pax.url.mvn.cfg")),
- // we need INFO logging otherwise we cannot see what happens
- logLevel(LogLevelOption.LogLevel.INFO),
- // install the cxf jaxb spec as the karaf doesn't provide it by default
- scanFeatures(getCamelKarafFeatureUrl(), "cxf-jaxb", "camel-core", "camel-spring", "camel-test")};
+ // we need INFO logging otherwise we cannot see what happens
+ new LogLevelOption(LogLevelOption.LogLevel.INFO),
+ // install the cxf jaxb spec as the karaf doesn't provide it by default
+ scanFeatures(getCamelKarafFeatureUrl(), "cxf-jaxb", "camel-core", "camel-spring", "camel-test")};
return options;
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/base64/Base64Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/base64/Base64Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/base64/Base64Test.java
index 3aeb53c..c2ce431 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/base64/Base64Test.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/base64/Base64Test.java
@@ -16,172 +16,175 @@
*/
package org.apache.camel.itest.osgi.base64;
-import static org.ops4j.pax.exam.OptionUtils.combine;
-
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.base64.Base64DataFormat;
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 Base64Test extends OSGiIntegrationTestSupport {
- private static final String ENCODED = "IrRWhNZNjFxQ6WXJEIsehbnFdurtgacAq+t6Zh3uYlyclF3HAx995mbIydQlymM8V3yA+Yb1p3Ij\r\n"
- + "7AS1VQaUNHAljNpHUqrWR6EmASZV/EQvR5Gk8XDvRrrtkoDm+jdZ/XKfest2OIzhixZF1mcqyi1P\r\n"
- + "Hep/rFnVPclO9WOWtCCRhz+U2soBzNBtvTc6x1pz1gOZcoOEFKHSf2kmkq1/7hHFl5Cb9nbSBgyp\r\n"
- + "lFzsInVBfCkRxXAFixwbC3B+LB8e15zSMvoG6okyDs7C8QShIZCXGHlsuUiH96izUbfB8qpTQK80\r\n"
- + "PPAisxYhF/gb678wvO5e/03AmFmYbBqzwoNQ6PoZKFI8a4PUrLoCLrUnKQgwOXueb1y8d4bsVGrX\r\n"
- + "H5QUFgAE3yZEn2ZQtVv6bZnm3lvBe/LLRD4xIU2Pcm5e+DJUZhHcl/8MaioDWFgYPLftDKvEUwLB\r\n"
- + "3IFWLSKMKFoeXn2nkwxsCHrzhajhbkKl1+H9I7Gkd19DyAoPIriWOJScog+mcP0iqG9iMqYFko2n\r\n"
- + "rh2rr+jcyKFBhrRUuNw3W8+h+FOwZDLcBmuTv2lEOvUdaPgD+1e6fXpuxhiih4wf/zlakeVa031T\r\n"
- + "9c0/HN02z0cAhLT1vtEA0zDn6OzzhY//Mh332ZmC+xro+e9o2a6+dnwamDtLuRgDDd+EcoUQpfEL\r\n"
- + "XobX3ZSX7OQw1ZXxWiJLtSOc5yLRkdbxdLK/C6fkcY4cqc/RwBGYtXN7Z1ENG/s/LnrZnRU/ErMW\r\n"
- + "RtbRwehA/0a2KSbNOMwK8BpzDruXufLXZcGaDKRUektQfdX4XhhYESt1drewlQLVaEWrZBR8JOd5\r\n"
- + "mckulPhwHp2Q00YyoScEj6Rs/9siyv49/FSaRCbnfzl3CRnNvCOD1cvF4OneYbVJCMOY49ucFmN/\r\n"
- + "mBCyxLOtJ4Zz8EG1FC81QTg3Scw+FdFDsCgr7DqVrmPOLikqq6wJdLBjyHXuMiVP9Fq/aAxvXEgj\r\n"
- + "RuVnN20wn2tUOXeaN4XqziQ66M229HsY0BX5riJ00yXArDxd+I9mFDpw/UDnGBAE2P//1fU1ns1A\r\n"
- + "6zQ6hTv7axdlw3/FnOAdymEKqED9CPfbiDvJygcAcxv2fyORHQ+TiprMGxckAlnLZ2pGl+gOzbtZ\r\n"
- + "zJgecyFJHBbhtkubGD4zzQhuJJw8ypqppSxqDs8SAW2frj42UT9qRMeCBGXLa1wyISt4GI6iOnfw\r\n"
- + "TCRJ/SE7CVrEfmdmROlJpAJHfUlQIJq1aW3mTE5zTmAygypxRUDCmA+eY9wdCicFp6YptdCEK3P2\r\n"
- + "7QzZsSASAByd5jxHMiIBkdwGzj1501xZ7hFLJDXDTQ==\r\n";
-
- private static final byte[] DECODED = { 34, -76, 86, -124, -42, 77, -116,
- 92, 80, -23, 101, -55, 16, -117, 30, -123, -71, -59, 118, -22, -19,
- -127, -89, 0, -85, -21, 122, 102, 29, -18, 98, 92, -100, -108, 93,
- -57, 3, 31, 125, -26, 102, -56, -55, -44, 37, -54, 99, 60, 87, 124,
- -128, -7, -122, -11, -89, 114, 35, -20, 4, -75, 85, 6, -108, 52,
- 112, 37, -116, -38, 71, 82, -86, -42, 71, -95, 38, 1, 38, 85, -4,
- 68, 47, 71, -111, -92, -15, 112, -17, 70, -70, -19, -110, -128,
- -26, -6, 55, 89, -3, 114, -97, 122, -53, 118, 56, -116, -31, -117,
- 22, 69, -42, 103, 42, -54, 45, 79, 29, -22, 127, -84, 89, -43, 61,
- -55, 78, -11, 99, -106, -76, 32, -111, -121, 63, -108, -38, -54, 1,
- -52, -48, 109, -67, 55, 58, -57, 90, 115, -42, 3, -103, 114, -125,
- -124, 20, -95, -46, 127, 105, 38, -110, -83, 127, -18, 17, -59,
- -105, -112, -101, -10, 118, -46, 6, 12, -87, -108, 92, -20, 34,
- 117, 65, 124, 41, 17, -59, 112, 5, -117, 28, 27, 11, 112, 126, 44,
- 31, 30, -41, -100, -46, 50, -6, 6, -22, -119, 50, 14, -50, -62,
- -15, 4, -95, 33, -112, -105, 24, 121, 108, -71, 72, -121, -9, -88,
- -77, 81, -73, -63, -14, -86, 83, 64, -81, 52, 60, -16, 34, -77, 22,
- 33, 23, -8, 27, -21, -65, 48, -68, -18, 94, -1, 77, -64, -104, 89,
- -104, 108, 26, -77, -62, -125, 80, -24, -6, 25, 40, 82, 60, 107,
- -125, -44, -84, -70, 2, 46, -75, 39, 41, 8, 48, 57, 123, -98, 111,
- 92, -68, 119, -122, -20, 84, 106, -41, 31, -108, 20, 22, 0, 4, -33,
- 38, 68, -97, 102, 80, -75, 91, -6, 109, -103, -26, -34, 91, -63,
- 123, -14, -53, 68, 62, 49, 33, 77, -113, 114, 110, 94, -8, 50, 84,
- 102, 17, -36, -105, -1, 12, 106, 42, 3, 88, 88, 24, 60, -73, -19,
- 12, -85, -60, 83, 2, -63, -36, -127, 86, 45, 34, -116, 40, 90, 30,
- 94, 125, -89, -109, 12, 108, 8, 122, -13, -123, -88, -31, 110, 66,
- -91, -41, -31, -3, 35, -79, -92, 119, 95, 67, -56, 10, 15, 34, -72,
- -106, 56, -108, -100, -94, 15, -90, 112, -3, 34, -88, 111, 98, 50,
- -90, 5, -110, -115, -89, -82, 29, -85, -81, -24, -36, -56, -95, 65,
- -122, -76, 84, -72, -36, 55, 91, -49, -95, -8, 83, -80, 100, 50,
- -36, 6, 107, -109, -65, 105, 68, 58, -11, 29, 104, -8, 3, -5, 87,
- -70, 125, 122, 110, -58, 24, -94, -121, -116, 31, -1, 57, 90, -111,
- -27, 90, -45, 125, 83, -11, -51, 63, 28, -35, 54, -49, 71, 0, -124,
- -76, -11, -66, -47, 0, -45, 48, -25, -24, -20, -13, -123, -113, -1,
- 50, 29, -9, -39, -103, -126, -5, 26, -24, -7, -17, 104, -39, -82,
- -66, 118, 124, 26, -104, 59, 75, -71, 24, 3, 13, -33, -124, 114,
- -123, 16, -91, -15, 11, 94, -122, -41, -35, -108, -105, -20, -28,
- 48, -43, -107, -15, 90, 34, 75, -75, 35, -100, -25, 34, -47, -111,
- -42, -15, 116, -78, -65, 11, -89, -28, 113, -114, 28, -87, -49,
- -47, -64, 17, -104, -75, 115, 123, 103, 81, 13, 27, -5, 63, 46,
- 122, -39, -99, 21, 63, 18, -77, 22, 70, -42, -47, -63, -24, 64, -1,
- 70, -74, 41, 38, -51, 56, -52, 10, -16, 26, 115, 14, -69, -105,
- -71, -14, -41, 101, -63, -102, 12, -92, 84, 122, 75, 80, 125, -43,
- -8, 94, 24, 88, 17, 43, 117, 118, -73, -80, -107, 2, -43, 104, 69,
- -85, 100, 20, 124, 36, -25, 121, -103, -55, 46, -108, -8, 112, 30,
- -99, -112, -45, 70, 50, -95, 39, 4, -113, -92, 108, -1, -37, 34,
- -54, -2, 61, -4, 84, -102, 68, 38, -25, 127, 57, 119, 9, 25, -51,
- -68, 35, -125, -43, -53, -59, -32, -23, -34, 97, -75, 73, 8, -61,
- -104, -29, -37, -100, 22, 99, 127, -104, 16, -78, -60, -77, -83,
- 39, -122, 115, -16, 65, -75, 20, 47, 53, 65, 56, 55, 73, -52, 62,
- 21, -47, 67, -80, 40, 43, -20, 58, -107, -82, 99, -50, 46, 41, 42,
- -85, -84, 9, 116, -80, 99, -56, 117, -18, 50, 37, 79, -12, 90, -65,
- 104, 12, 111, 92, 72, 35, 70, -27, 103, 55, 109, 48, -97, 107, 84,
- 57, 119, -102, 55, -123, -22, -50, 36, 58, -24, -51, -74, -12, 123,
- 24, -48, 21, -7, -82, 34, 116, -45, 37, -64, -84, 60, 93, -8, -113,
- 102, 20, 58, 112, -3, 64, -25, 24, 16, 4, -40, -1, -1, -43, -11,
- 53, -98, -51, 64, -21, 52, 58, -123, 59, -5, 107, 23, 101, -61,
- 127, -59, -100, -32, 29, -54, 97, 10, -88, 64, -3, 8, -9, -37,
- -120, 59, -55, -54, 7, 0, 115, 27, -10, 127, 35, -111, 29, 15,
- -109, -118, -102, -52, 27, 23, 36, 2, 89, -53, 103, 106, 70, -105,
- -24, 14, -51, -69, 89, -52, -104, 30, 115, 33, 73, 28, 22, -31,
- -74, 75, -101, 24, 62, 51, -51, 8, 110, 36, -100, 60, -54, -102,
- -87, -91, 44, 106, 14, -49, 18, 1, 109, -97, -82, 62, 54, 81, 63,
- 106, 68, -57, -126, 4, 101, -53, 107, 92, 50, 33, 43, 120, 24,
- -114, -94, 58, 119, -16, 76, 36, 73, -3, 33, 59, 9, 90, -60, 126,
- 103, 102, 68, -23, 73, -92, 2, 71, 125, 73, 80, 32, -102, -75, 105,
- 109, -26, 76, 78, 115, 78, 96, 50, -125, 42, 113, 69, 64, -62,
- -104, 15, -98, 99, -36, 29, 10, 39, 5, -89, -90, 41, -75, -48,
- -124, 43, 115, -10, -19, 12, -39, -79, 32, 18, 0, 28, -99, -26, 60,
- 71, 50, 34, 1, -111, -36, 6, -50, 61, 121, -45, 92, 89, -18, 17,
- 75, 36, 53, -61, 77 };
-
- public Base64DataFormat format = new Base64DataFormat();
-
- @EndpointInject(uri = "mock:result")
- private MockEndpoint result;
-
- public void runEncoderTest(byte[] raw, byte[] expected) throws Exception {
- result.setExpectedMessageCount(1);
-
- template.sendBody("direct:startEncode", raw);
-
- assertMockEndpointsSatisfied();
-
- byte[] encoded = result.getReceivedExchanges().get(0).getIn()
- .getBody(byte[].class);
- assertArrayEquals(expected, encoded);
- }
-
- public void runDecoderTest(byte[] encoded, byte[] expected)
- throws Exception {
- result.setExpectedMessageCount(1);
-
- template.sendBody("direct:startDecode", encoded);
-
- assertMockEndpointsSatisfied();
-
- byte[] decoded = result.getReceivedExchanges().get(0).getIn()
- .getBody(byte[].class);
- assertArrayEquals(expected, decoded);
- }
-
- @Test
- public void testEncode() throws Exception {
- runEncoderTest(DECODED, ENCODED.getBytes());
- }
-
- @Test
- public void testDecode() throws Exception {
- runDecoderTest(ENCODED.getBytes(), DECODED);
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
-
- @Override
- public void configure() throws Exception {
- from("direct:startEncode").marshal(format).to("mock:result");
-
- from("direct:startDecode").unmarshal(format).to("mock:result");
- }
- };
- }
-
- @Configuration
- public static Option[] configure() {
- Option[] options = combine(getDefaultCamelKarafOptions(),
- loadCamelFeatures("camel-base64"));
-
- return options;
- }
+ private static final String ENCODED = "IrRWhNZNjFxQ6WXJEIsehbnFdurtgacAq+t6Zh3uYlyclF3HAx995mbIydQlymM8V3yA+Yb1p3Ij\r\n"
+ + "7AS1VQaUNHAljNpHUqrWR6EmASZV/EQvR5Gk8XDvRrrtkoDm+jdZ/XKfest2OIzhixZF1mcqyi1P\r\n"
+ + "Hep/rFnVPclO9WOWtCCRhz+U2soBzNBtvTc6x1pz1gOZcoOEFKHSf2kmkq1/7hHFl5Cb9nbSBgyp\r\n"
+ + "lFzsInVBfCkRxXAFixwbC3B+LB8e15zSMvoG6okyDs7C8QShIZCXGHlsuUiH96izUbfB8qpTQK80\r\n"
+ + "PPAisxYhF/gb678wvO5e/03AmFmYbBqzwoNQ6PoZKFI8a4PUrLoCLrUnKQgwOXueb1y8d4bsVGrX\r\n"
+ + "H5QUFgAE3yZEn2ZQtVv6bZnm3lvBe/LLRD4xIU2Pcm5e+DJUZhHcl/8MaioDWFgYPLftDKvEUwLB\r\n"
+ + "3IFWLSKMKFoeXn2nkwxsCHrzhajhbkKl1+H9I7Gkd19DyAoPIriWOJScog+mcP0iqG9iMqYFko2n\r\n"
+ + "rh2rr+jcyKFBhrRUuNw3W8+h+FOwZDLcBmuTv2lEOvUdaPgD+1e6fXpuxhiih4wf/zlakeVa031T\r\n"
+ + "9c0/HN02z0cAhLT1vtEA0zDn6OzzhY//Mh332ZmC+xro+e9o2a6+dnwamDtLuRgDDd+EcoUQpfEL\r\n"
+ + "XobX3ZSX7OQw1ZXxWiJLtSOc5yLRkdbxdLK/C6fkcY4cqc/RwBGYtXN7Z1ENG/s/LnrZnRU/ErMW\r\n"
+ + "RtbRwehA/0a2KSbNOMwK8BpzDruXufLXZcGaDKRUektQfdX4XhhYESt1drewlQLVaEWrZBR8JOd5\r\n"
+ + "mckulPhwHp2Q00YyoScEj6Rs/9siyv49/FSaRCbnfzl3CRnNvCOD1cvF4OneYbVJCMOY49ucFmN/\r\n"
+ + "mBCyxLOtJ4Zz8EG1FC81QTg3Scw+FdFDsCgr7DqVrmPOLikqq6wJdLBjyHXuMiVP9Fq/aAxvXEgj\r\n"
+ + "RuVnN20wn2tUOXeaN4XqziQ66M229HsY0BX5riJ00yXArDxd+I9mFDpw/UDnGBAE2P//1fU1ns1A\r\n"
+ + "6zQ6hTv7axdlw3/FnOAdymEKqED9CPfbiDvJygcAcxv2fyORHQ+TiprMGxckAlnLZ2pGl+gOzbtZ\r\n"
+ + "zJgecyFJHBbhtkubGD4zzQhuJJw8ypqppSxqDs8SAW2frj42UT9qRMeCBGXLa1wyISt4GI6iOnfw\r\n"
+ + "TCRJ/SE7CVrEfmdmROlJpAJHfUlQIJq1aW3mTE5zTmAygypxRUDCmA+eY9wdCicFp6YptdCEK3P2\r\n"
+ + "7QzZsSASAByd5jxHMiIBkdwGzj1501xZ7hFLJDXDTQ==\r\n";
+
+ private static final byte[] DECODED = {
+ 34, -76, 86, -124, -42, 77, -116,
+ 92, 80, -23, 101, -55, 16, -117, 30, -123, -71, -59, 118, -22, -19,
+ -127, -89, 0, -85, -21, 122, 102, 29, -18, 98, 92, -100, -108, 93,
+ -57, 3, 31, 125, -26, 102, -56, -55, -44, 37, -54, 99, 60, 87, 124,
+ -128, -7, -122, -11, -89, 114, 35, -20, 4, -75, 85, 6, -108, 52,
+ 112, 37, -116, -38, 71, 82, -86, -42, 71, -95, 38, 1, 38, 85, -4,
+ 68, 47, 71, -111, -92, -15, 112, -17, 70, -70, -19, -110, -128,
+ -26, -6, 55, 89, -3, 114, -97, 122, -53, 118, 56, -116, -31, -117,
+ 22, 69, -42, 103, 42, -54, 45, 79, 29, -22, 127, -84, 89, -43, 61,
+ -55, 78, -11, 99, -106, -76, 32, -111, -121, 63, -108, -38, -54, 1,
+ -52, -48, 109, -67, 55, 58, -57, 90, 115, -42, 3, -103, 114, -125,
+ -124, 20, -95, -46, 127, 105, 38, -110, -83, 127, -18, 17, -59,
+ -105, -112, -101, -10, 118, -46, 6, 12, -87, -108, 92, -20, 34,
+ 117, 65, 124, 41, 17, -59, 112, 5, -117, 28, 27, 11, 112, 126, 44,
+ 31, 30, -41, -100, -46, 50, -6, 6, -22, -119, 50, 14, -50, -62,
+ -15, 4, -95, 33, -112, -105, 24, 121, 108, -71, 72, -121, -9, -88,
+ -77, 81, -73, -63, -14, -86, 83, 64, -81, 52, 60, -16, 34, -77, 22,
+ 33, 23, -8, 27, -21, -65, 48, -68, -18, 94, -1, 77, -64, -104, 89,
+ -104, 108, 26, -77, -62, -125, 80, -24, -6, 25, 40, 82, 60, 107,
+ -125, -44, -84, -70, 2, 46, -75, 39, 41, 8, 48, 57, 123, -98, 111,
+ 92, -68, 119, -122, -20, 84, 106, -41, 31, -108, 20, 22, 0, 4, -33,
+ 38, 68, -97, 102, 80, -75, 91, -6, 109, -103, -26, -34, 91, -63,
+ 123, -14, -53, 68, 62, 49, 33, 77, -113, 114, 110, 94, -8, 50, 84,
+ 102, 17, -36, -105, -1, 12, 106, 42, 3, 88, 88, 24, 60, -73, -19,
+ 12, -85, -60, 83, 2, -63, -36, -127, 86, 45, 34, -116, 40, 90, 30,
+ 94, 125, -89, -109, 12, 108, 8, 122, -13, -123, -88, -31, 110, 66,
+ -91, -41, -31, -3, 35, -79, -92, 119, 95, 67, -56, 10, 15, 34, -72,
+ -106, 56, -108, -100, -94, 15, -90, 112, -3, 34, -88, 111, 98, 50,
+ -90, 5, -110, -115, -89, -82, 29, -85, -81, -24, -36, -56, -95, 65,
+ -122, -76, 84, -72, -36, 55, 91, -49, -95, -8, 83, -80, 100, 50,
+ -36, 6, 107, -109, -65, 105, 68, 58, -11, 29, 104, -8, 3, -5, 87,
+ -70, 125, 122, 110, -58, 24, -94, -121, -116, 31, -1, 57, 90, -111,
+ -27, 90, -45, 125, 83, -11, -51, 63, 28, -35, 54, -49, 71, 0, -124,
+ -76, -11, -66, -47, 0, -45, 48, -25, -24, -20, -13, -123, -113, -1,
+ 50, 29, -9, -39, -103, -126, -5, 26, -24, -7, -17, 104, -39, -82,
+ -66, 118, 124, 26, -104, 59, 75, -71, 24, 3, 13, -33, -124, 114,
+ -123, 16, -91, -15, 11, 94, -122, -41, -35, -108, -105, -20, -28,
+ 48, -43, -107, -15, 90, 34, 75, -75, 35, -100, -25, 34, -47, -111,
+ -42, -15, 116, -78, -65, 11, -89, -28, 113, -114, 28, -87, -49,
+ -47, -64, 17, -104, -75, 115, 123, 103, 81, 13, 27, -5, 63, 46,
+ 122, -39, -99, 21, 63, 18, -77, 22, 70, -42, -47, -63, -24, 64, -1,
+ 70, -74, 41, 38, -51, 56, -52, 10, -16, 26, 115, 14, -69, -105,
+ -71, -14, -41, 101, -63, -102, 12, -92, 84, 122, 75, 80, 125, -43,
+ -8, 94, 24, 88, 17, 43, 117, 118, -73, -80, -107, 2, -43, 104, 69,
+ -85, 100, 20, 124, 36, -25, 121, -103, -55, 46, -108, -8, 112, 30,
+ -99, -112, -45, 70, 50, -95, 39, 4, -113, -92, 108, -1, -37, 34,
+ -54, -2, 61, -4, 84, -102, 68, 38, -25, 127, 57, 119, 9, 25, -51,
+ -68, 35, -125, -43, -53, -59, -32, -23, -34, 97, -75, 73, 8, -61,
+ -104, -29, -37, -100, 22, 99, 127, -104, 16, -78, -60, -77, -83,
+ 39, -122, 115, -16, 65, -75, 20, 47, 53, 65, 56, 55, 73, -52, 62,
+ 21, -47, 67, -80, 40, 43, -20, 58, -107, -82, 99, -50, 46, 41, 42,
+ -85, -84, 9, 116, -80, 99, -56, 117, -18, 50, 37, 79, -12, 90, -65,
+ 104, 12, 111, 92, 72, 35, 70, -27, 103, 55, 109, 48, -97, 107, 84,
+ 57, 119, -102, 55, -123, -22, -50, 36, 58, -24, -51, -74, -12, 123,
+ 24, -48, 21, -7, -82, 34, 116, -45, 37, -64, -84, 60, 93, -8, -113,
+ 102, 20, 58, 112, -3, 64, -25, 24, 16, 4, -40, -1, -1, -43, -11,
+ 53, -98, -51, 64, -21, 52, 58, -123, 59, -5, 107, 23, 101, -61,
+ 127, -59, -100, -32, 29, -54, 97, 10, -88, 64, -3, 8, -9, -37,
+ -120, 59, -55, -54, 7, 0, 115, 27, -10, 127, 35, -111, 29, 15,
+ -109, -118, -102, -52, 27, 23, 36, 2, 89, -53, 103, 106, 70, -105,
+ -24, 14, -51, -69, 89, -52, -104, 30, 115, 33, 73, 28, 22, -31,
+ -74, 75, -101, 24, 62, 51, -51, 8, 110, 36, -100, 60, -54, -102,
+ -87, -91, 44, 106, 14, -49, 18, 1, 109, -97, -82, 62, 54, 81, 63,
+ 106, 68, -57, -126, 4, 101, -53, 107, 92, 50, 33, 43, 120, 24,
+ -114, -94, 58, 119, -16, 76, 36, 73, -3, 33, 59, 9, 90, -60, 126,
+ 103, 102, 68, -23, 73, -92, 2, 71, 125, 73, 80, 32, -102, -75, 105,
+ 109, -26, 76, 78, 115, 78, 96, 50, -125, 42, 113, 69, 64, -62,
+ -104, 15, -98, 99, -36, 29, 10, 39, 5, -89, -90, 41, -75, -48,
+ -124, 43, 115, -10, -19, 12, -39, -79, 32, 18, 0, 28, -99, -26, 60,
+ 71, 50, 34, 1, -111, -36, 6, -50, 61, 121, -45, 92, 89, -18, 17,
+ 75, 36, 53, -61, 77 };
+
+ public Base64DataFormat format = new Base64DataFormat();
+
+ @EndpointInject(uri = "mock:result")
+ private MockEndpoint result;
+
+ public void runEncoderTest(byte[] raw, byte[] expected) throws Exception {
+ result.setExpectedMessageCount(1);
+
+ template.sendBody("direct:startEncode", raw);
+
+ assertMockEndpointsSatisfied();
+
+ byte[] encoded = result.getReceivedExchanges().get(0).getIn()
+ .getBody(byte[].class);
+ assertArrayEquals(expected, encoded);
+ }
+
+ public void runDecoderTest(byte[] encoded, byte[] expected)
+ throws Exception {
+ result.setExpectedMessageCount(1);
+
+ template.sendBody("direct:startDecode", encoded);
+
+ assertMockEndpointsSatisfied();
+
+ byte[] decoded = result.getReceivedExchanges().get(0).getIn()
+ .getBody(byte[].class);
+ assertArrayEquals(expected, decoded);
+ }
+
+ @Test
+ public void testEncode() throws Exception {
+ runEncoderTest(DECODED, ENCODED.getBytes());
+ }
+
+ @Test
+ public void testDecode() throws Exception {
+ runDecoderTest(ENCODED.getBytes(), DECODED);
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+
+ @Override
+ public void configure() throws Exception {
+ from("direct:startEncode").marshal(format).to("mock:result");
+
+ from("direct:startDecode").unmarshal(format).to("mock:result");
+ }
+ };
+ }
+
+ @Configuration
+ public static Option[] configure() {
+ Option[] options = combine(getDefaultCamelKarafOptions(),
+ loadCamelFeatures("camel-base64"));
+
+ return options;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelMultiVersionBlueprintTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelMultiVersionBlueprintTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelMultiVersionBlueprintTest.java
index df7c757..1329f04 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelMultiVersionBlueprintTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelMultiVersionBlueprintTest.java
@@ -22,17 +22,16 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
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 org.osgi.service.blueprint.container.BlueprintContainer;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
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 CamelMultiVersionBlueprintTest extends OSGiBlueprintTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithLoggersPresentInRegistryTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithLoggersPresentInRegistryTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithLoggersPresentInRegistryTest.java
index 2a15d73..fcb473e 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithLoggersPresentInRegistryTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithLoggersPresentInRegistryTest.java
@@ -16,26 +16,28 @@
*/
package org.apache.camel.itest.osgi.core.log;
+import java.io.File;
+
import org.apache.camel.CamelContext;
import org.apache.camel.impl.SimpleRegistry;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.apache.camel.osgi.CamelContextFactory;
-import org.apache.karaf.tooling.exam.options.DoNotModifyLogOption;
-import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationFileReplacementOption;
+
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.ops4j.pax.exam.karaf.options.DoNotModifyLogOption;
+import org.ops4j.pax.exam.karaf.options.KarafDistributionConfigurationFileReplacementOption;
import org.slf4j.LoggerFactory;
-import java.io.File;
-
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class LogRouteWithLoggersPresentInRegistryTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithNonDefaultLoggerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithNonDefaultLoggerTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithNonDefaultLoggerTest.java
index 408b7d8..a3f729f 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithNonDefaultLoggerTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteWithNonDefaultLoggerTest.java
@@ -16,25 +16,26 @@
*/
package org.apache.camel.itest.osgi.core.log;
+import java.io.File;
+
import org.apache.camel.CamelContext;
import org.apache.camel.impl.SimpleRegistry;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.apache.camel.osgi.CamelContextFactory;
-import org.apache.karaf.tooling.exam.options.DoNotModifyLogOption;
-import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationFileReplacementOption;
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.ops4j.pax.exam.karaf.options.DoNotModifyLogOption;
+import org.ops4j.pax.exam.karaf.options.KarafDistributionConfigurationFileReplacementOption;
import org.slf4j.LoggerFactory;
-import java.io.File;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class LogRouteWithNonDefaultLoggerTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/OSGiIntegrationManagedCamelContextTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/OSGiIntegrationManagedCamelContextTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/OSGiIntegrationManagedCamelContextTest.java
index b3aeabd..39db6cf 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/OSGiIntegrationManagedCamelContextTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/management/OSGiIntegrationManagedCamelContextTest.java
@@ -26,20 +26,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.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.profile;
import static org.ops4j.pax.exam.CoreOptions.provision;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import static org.ops4j.pax.exam.CoreOptions.workingDirectory;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("TODO: fix me")
public class OSGiIntegrationManagedCamelContextTest extends OSGiIntegrationTestSupport {
@@ -75,7 +71,8 @@ public class OSGiIntegrationManagedCamelContextTest extends OSGiIntegrationTestS
Option[] options = options(
// install the spring dm profile
- profile("spring.dm").version("1.2.1"),
+ //profile("spring.dm").version("1.2.1"),
+
// this is how you set the default log level when using pax logging (logProfile)
org.ops4j.pax.exam.CoreOptions.systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/DisruptorTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/DisruptorTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/DisruptorTest.java
index 941d609..ff65269 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/DisruptorTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/DisruptorTest.java
@@ -16,17 +16,15 @@
*/
package org.apache.camel.itest.osgi.disruptor;
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationFileExtendOption;
-import org.apache.karaf.tooling.exam.options.KarafDistributionOption;
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.ops4j.pax.exam.karaf.options.KarafDistributionConfigurationFileExtendOption;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -34,7 +32,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class DisruptorTest extends OSGiIntegrationTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/vm/DisruptorVmTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/vm/DisruptorVmTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/vm/DisruptorVmTest.java
index 42aea26..54693c8 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/vm/DisruptorVmTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/disruptor/vm/DisruptorVmTest.java
@@ -18,12 +18,14 @@ package org.apache.camel.itest.osgi.disruptor.vm;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.tooling.exam.options.KarafDistributionConfigurationFileExtendOption;
+
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.ops4j.pax.exam.karaf.options.KarafDistributionConfigurationFileExtendOption;
import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -32,7 +34,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine;
/**
* @version
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class DisruptorVmTest extends OSGiIntegrationTestSupport {
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpTest.java
index 8ca955d..ffd57b8 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ftp/FtpTest.java
@@ -21,16 +21,15 @@ 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.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("Not fully implemented, see TODO")
public class FtpTest extends OSGiIntegrationSpringTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java
index 8c51a73..d030adc 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/groovy/GroovyTest.java
@@ -20,17 +20,16 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.tooling.exam.options.KarafDistributionOption;
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 GroovyTest extends OSGiIntegrationTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsRouteTest.java
index aac35c2..99a19b4 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hdfs/HdfsRouteTest.java
@@ -28,14 +28,13 @@ import org.apache.hadoop.io.SequenceFile;
import org.apache.hadoop.io.Text;
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.scanFeatures;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class HdfsRouteTest extends OSGiIntegrationTestSupport {
//Hadoop doesn't run on IBM JDK
private static final boolean SKIP = System.getProperty("java.vendor").contains("IBM");
@@ -79,10 +78,10 @@ public class HdfsRouteTest extends OSGiIntegrationTestSupport {
@Configuration
public static Option[] configure() throws Exception {
Option[] options = combine(
- getDefaultCamelKarafOptions(),
- // using the features to install the camel components
- scanFeatures(getCamelKarafFeatureUrl(), "camel-hdfs2")
- );
+ getDefaultCamelKarafOptions(),
+ // using the features to install the camel components
+ scanFeatures(getCamelKarafFeatureUrl(), "camel-hdfs2")
+ );
return options;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbDataFormatTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbDataFormatTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbDataFormatTest.java
index 23ecbe0..0291b8b 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbDataFormatTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbDataFormatTest.java
@@ -21,16 +21,15 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.jaxb.JaxbDataFormat;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
-import org.apache.karaf.tooling.exam.options.KarafDistributionOption;
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 JaxbDataFormatTest extends OSGiIntegrationTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java
index eff0a54..f448df7 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jclouds/BlobStoreBlueprintRouteTest.java
@@ -27,18 +27,17 @@ 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.Constants;
-import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.CoreOptions.workingDirectory;
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 BlobStoreBlueprintRouteTest extends OSGiBlueprintTestSupport {
private static final String TEST_CONTAINER = "testContainer";
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java
index 9a2fae2..d910076 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jms/JmsTest.java
@@ -19,15 +19,14 @@ package org.apache.camel.itest.osgi.jms;
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.CoreOptions.scanFeatures;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class JmsTest extends OSGiIntegrationSpringTestSupport {
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java
index 9fbf4d5..4e2936a 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jpa/JpaBlueprintRouteTest.java
@@ -24,17 +24,16 @@ import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport;
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.osgi.framework.Constants;
import static org.ops4j.pax.exam.CoreOptions.provision;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("Does not work properly")
public class JpaBlueprintRouteTest extends OSGiBlueprintTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java
index 19c47a6..8f075b5 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mail/MailRouteTest.java
@@ -34,16 +34,15 @@ import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.jvnet.mock_javamail.Mailbox;
+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.equinox;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.workingDirectory;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
@Ignore("Does not work anymore as the mock javamail does not kick in as mail provider")
public class MailRouteTest extends OSGiIntegrationTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
index acdbcc8..d225e64 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletComponentTest.java
@@ -17,18 +17,19 @@
package org.apache.camel.itest.osgi.servlet;
import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
-import org.apache.karaf.tooling.exam.options.KarafDistributionOption;
+
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.ops4j.pax.exam.karaf.options.KarafDistributionOption;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class ServletComponentTest extends OSGiIntegrationSpringTestSupport {
private static final String CONTEXT_PATH = "/org/apache/camel/itest/osgi/servlet/ServletComponentTest-context.xml";
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java
index 2f08818..b87d176 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/ServletServicesTest.java
@@ -17,18 +17,19 @@
package org.apache.camel.itest.osgi.servlet;
import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
-import org.apache.karaf.tooling.exam.options.KarafDistributionOption;
+
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.ops4j.pax.exam.karaf.options.KarafDistributionOption;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import static org.ops4j.pax.exam.OptionUtils.combine;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class ServletServicesTest extends OSGiIntegrationSpringTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/8142b438/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java
index e8684ad..849937b 100644
--- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java
@@ -32,23 +32,20 @@ import org.apache.camel.component.sql.SqlConstants;
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.Customizer;
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 org.springframework.dao.DataAccessException;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
-import static org.ops4j.pax.exam.CoreOptions.scanFeatures;
import static org.ops4j.pax.exam.OptionUtils.combine;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.modifyBundle;
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
public class SqlBlueprintRoute extends OSGiBlueprintTestSupport {