Upgarded pax-exam version of camel-itest-karaf to 3.4.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fe438ef7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fe438ef7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fe438ef7 Branch: refs/heads/master Commit: fe438ef79b601424b7bec444629662db79b94754 Parents: b70c418 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Tue Aug 26 10:11:08 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Tue Aug 26 14:08:13 2014 +0800 ---------------------------------------------------------------------- tests/camel-itest-karaf/pom.xml | 12 +++++----- .../camel/itest/karaf/AbstractFeatureTest.java | 25 +++++++++----------- .../apache/camel/itest/karaf/CamelAhcTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelAmqpTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelApnsTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelAtomTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelAvroTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelAwsTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelBamTest.java | 6 ++--- .../camel/itest/karaf/CamelBase64Test.java | 6 ++--- .../itest/karaf/CamelBeanValidatorTest.java | 6 ++--- .../camel/itest/karaf/CamelBeanioTest.java | 6 ++--- .../camel/itest/karaf/CamelBindyTest.java | 6 ++--- .../camel/itest/karaf/CamelCacheTest.java | 6 ++--- .../camel/itest/karaf/CamelCastorTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelCmisTest.java | 6 ++--- .../camel/itest/karaf/CamelCometdTest.java | 6 ++--- .../camel/itest/karaf/CamelContextTest.java | 6 ++--- .../camel/itest/karaf/CamelCouchDBTest.java | 6 ++--- .../camel/itest/karaf/CamelCryptoTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelCsvTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelCxfTest.java | 6 ++--- .../camel/itest/karaf/CamelDisruptorTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelDnsTest.java | 6 ++--- .../camel/itest/karaf/CamelDropboxTest.java | 6 ++--- .../itest/karaf/CamelElasticsearchTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelExecTest.java | 6 ++--- .../camel/itest/karaf/CamelFacebookTest.java | 6 ++--- .../camel/itest/karaf/CamelFlatpackTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelFopTest.java | 6 ++--- .../camel/itest/karaf/CamelFreemarkerTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelFtpTest.java | 6 ++--- .../camel/itest/karaf/CamelGeocoderTest.java | 6 ++--- .../camel/itest/karaf/CamelGroovyTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelGsonTest.java | 6 ++--- .../itest/karaf/CamelGuavaEventBusTest.java | 6 ++--- .../camel/itest/karaf/CamelGuiceTest.java | 6 ++--- .../camel/itest/karaf/CamelHazelcastTest.java | 6 ++--- .../camel/itest/karaf/CamelHbaseTest.java | 6 ++--- .../camel/itest/karaf/CamelHdfs2Test.java | 6 ++--- .../apache/camel/itest/karaf/CamelHdfsTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelHl7Test.java | 6 ++--- .../camel/itest/karaf/CamelHttp4Test.java | 6 ++--- .../apache/camel/itest/karaf/CamelHttpTest.java | 6 ++--- .../camel/itest/karaf/CamelIbatisTest.java | 6 ++--- .../camel/itest/karaf/CamelInfinispanTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelIrcTest.java | 6 ++--- .../camel/itest/karaf/CamelJacksonTest.java | 6 ++--- .../camel/itest/karaf/CamelJasyptTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelJaxbTest.java | 6 ++--- .../camel/itest/karaf/CamelJcloudsTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelJcrTest.java | 6 ++--- .../itest/karaf/CamelJdbcAggregatorTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelJdbcTest.java | 6 ++--- .../camel/itest/karaf/CamelJettyTest.java | 6 ++--- .../camel/itest/karaf/CamelJgroupsTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelJibxTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelJingTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelJmsTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelJmxTest.java | 6 ++--- .../camel/itest/karaf/CamelJosqlTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelJpaTest.java | 6 ++--- .../camel/itest/karaf/CamelJsonpathTest.java | 6 ++--- .../camel/itest/karaf/CamelJt400Test.java | 6 ++--- .../apache/camel/itest/karaf/CamelJuelTest.java | 6 ++--- .../camel/itest/karaf/CamelJxpathTest.java | 6 ++--- .../camel/itest/karaf/CamelKafkaTest.java | 6 ++--- .../camel/itest/karaf/CamelKratiTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelLdapTest.java | 6 ++--- .../camel/itest/karaf/CamelLuceneTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelMailTest.java | 6 ++--- .../camel/itest/karaf/CamelMetricsTest.java | 6 ++--- .../camel/itest/karaf/CamelMina2Test.java | 6 ++--- .../apache/camel/itest/karaf/CamelMinaTest.java | 6 ++--- .../camel/itest/karaf/CamelMongodbTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelMqttTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelMsvTest.java | 6 ++--- .../camel/itest/karaf/CamelMustacheTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelMvelTest.java | 6 ++--- .../camel/itest/karaf/CamelMyBatisTest.java | 6 ++--- .../camel/itest/karaf/CamelNettyHttpTest.java | 6 ++--- .../camel/itest/karaf/CamelNettyTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelOgnlTest.java | 6 ++--- .../camel/itest/karaf/CamelOpenshiftTest.java | 6 ++--- .../camel/itest/karaf/CamelOptaplannerTest.java | 6 ++--- .../camel/itest/karaf/CamelPrinterTest.java | 6 ++--- .../camel/itest/karaf/CamelProtobufTest.java | 6 ++--- .../camel/itest/karaf/CamelQuartz2Test.java | 6 ++--- .../camel/itest/karaf/CamelQuartzTest.java | 6 ++--- .../camel/itest/karaf/CamelQuickFixTest.java | 6 ++--- .../camel/itest/karaf/CamelRabbitmqTest.java | 6 ++--- .../camel/itest/karaf/CamelRestletTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelRmiTest.java | 6 ++--- .../camel/itest/karaf/CamelRouteboxTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelRssTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelRubyTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelRxTest.java | 6 ++--- .../camel/itest/karaf/CamelSalesforceTest.java | 6 ++--- .../itest/karaf/CamelSapNetweaverTest.java | 6 ++--- .../camel/itest/karaf/CamelSaxonTest.java | 6 ++--- .../camel/itest/karaf/CamelScalaTest.java | 6 ++--- .../camel/itest/karaf/CamelScriptTest.java | 6 ++--- .../camel/itest/karaf/CamelServletTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelSipTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelSjmsTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelSmppTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelSnmpTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelSoapTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelSolrTest.java | 6 ++--- .../camel/itest/karaf/CamelSplunkTest.java | 6 ++--- .../camel/itest/karaf/CamelSpringBatchTest.java | 6 ++--- .../itest/karaf/CamelSpringIntegrationTest.java | 6 ++--- .../itest/karaf/CamelSpringJavaconfigTest.java | 6 ++--- .../camel/itest/karaf/CamelSpringLdapTest.java | 6 ++--- .../camel/itest/karaf/CamelSpringRedisTest.java | 6 ++--- .../itest/karaf/CamelSpringWebServiceTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelSqlTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelSshTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelStAXTest.java | 6 ++--- .../camel/itest/karaf/CamelStompTest.java | 6 ++--- .../camel/itest/karaf/CamelStreamTest.java | 6 ++--- .../itest/karaf/CamelStringTemplateTest.java | 6 ++--- .../camel/itest/karaf/CamelSyslogTest.java | 6 ++--- .../camel/itest/karaf/CamelTagsoupTest.java | 6 ++--- .../camel/itest/karaf/CamelTestSpringTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelTestTest.java | 6 ++--- .../camel/itest/karaf/CamelTwitterTest.java | 6 ++--- .../camel/itest/karaf/CamelUrlrewriteTest.java | 6 ++--- .../camel/itest/karaf/CamelVelocityTest.java | 6 ++--- .../camel/itest/karaf/CamelVertxTest.java | 6 ++--- .../camel/itest/karaf/CamelWeatherTest.java | 6 ++--- .../camel/itest/karaf/CamelWebsocketTest.java | 6 ++--- .../camel/itest/karaf/CamelXmlbeansTest.java | 6 ++--- .../camel/itest/karaf/CamelXmljsonTest.java | 6 ++--- .../camel/itest/karaf/CamelXmlrpcTest.java | 6 ++--- .../camel/itest/karaf/CamelXmlsecurityTest.java | 6 ++--- .../apache/camel/itest/karaf/CamelXmppTest.java | 6 ++--- .../camel/itest/karaf/CamelXstreamTest.java | 6 ++--- .../camel/itest/karaf/CamelYammerTest.java | 6 ++--- .../camel/itest/karaf/CamelZipfileTest.java | 6 ++--- .../camel/itest/karaf/CamelZookeeperTest.java | 6 ++--- 141 files changed, 434 insertions(+), 437 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml index 50f9264..9e5e6b4 100644 --- a/tests/camel-itest-karaf/pom.xml +++ b/tests/camel-itest-karaf/pom.xml @@ -37,18 +37,18 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.ops4j.pax.runner</groupId> - <artifactId>pax-runner-no-jcl</artifactId> + <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> + <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> http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java index dfcd42f..9cd900c 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java @@ -24,8 +24,8 @@ import org.apache.camel.CamelContext; import org.apache.camel.impl.DefaultRouteContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.osgi.CamelContextFactory; -import org.apache.karaf.tooling.exam.options.KarafDistributionOption; -import org.apache.karaf.tooling.exam.options.LogLevelOption; +import org.ops4j.pax.exam.karaf.options.KarafDistributionOption; +import org.ops4j.pax.exam.karaf.options.LogLevelOption; import org.junit.After; import org.junit.Before; import org.ops4j.pax.exam.Option; @@ -34,14 +34,11 @@ import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.editConfigurationFilePut; -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.junit.Assert.assertNotNull; import static org.ops4j.pax.exam.CoreOptions.maven; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; -import static org.ops4j.pax.exam.CoreOptions.scanFeatures; + public abstract class AbstractFeatureTest { @@ -157,18 +154,18 @@ public abstract class AbstractFeatureTest { public static Option[] configure(String feature) { Option[] options = new Option[]{ - karafDistributionConfiguration().frameworkUrl( + KarafDistributionOption.karafDistributionConfiguration().frameworkUrl( maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject()) .karafVersion("2.3.6").name("Apache Karaf") .unpackDirectory(new File("target/paxexam/unpack/")), 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/jre.properties", new File("../../platforms/karaf/features/src/main/resources/config.properties")), + 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/jre.properties", new File("../../platforms/karaf/features/src/main/resources/config.properties")), // Add apache-snapshots repository - editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories", + KarafDistributionOption.editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories", "http://repo1.maven.org/maven2@id=central, " + "http://svn.apache.org/repos/asf/servicemix/m2-repo@id=servicemix, " + "http://repository.springsource.com/maven/bundles/release@id=springsource.release, " @@ -177,9 +174,9 @@ public abstract class AbstractFeatureTest { + "http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache";), // we need INFO logging otherwise we cannot see what happens - logLevel(LogLevelOption.LogLevel.INFO), + KarafDistributionOption.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-" + feature)}; + KarafDistributionOption.features(getCamelKarafFeatureUrl(), "cxf-jaxb", "camel-core", "camel-spring", "camel-" + feature)}; return options; } http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java index 0ec1270..90abb6d 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAhcTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelAhcTest extends AbstractFeatureTest { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java index 843cb5a..3c99fba 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAmqpTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelAmqpTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelAmqpTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java index ec7daf2..d931eda 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelApnsTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelApnsTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelApnsTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java index ba2eb6f..a7ca26c 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAtomTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelAtomTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelAtomTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java index 5ad10f9..f96902a 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAvroTest.java @@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.AvroDataFormat; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelAvroTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelAvroTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java index 7bda30c..133cbb4 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelAwsTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelAwsTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelAwsTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java index 8fa478a..b5514e5 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBamTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelBamTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelBamTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java index e4b7f13..50aef64 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBase64Test.java @@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.Base64DataFormat; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelBase64Test extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelBase64Test.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java index 36cda26..645c6f4 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanValidatorTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelBeanValidatorTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelBeanValidatorTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java index beff805..0566d06 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBeanioTest.java @@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.BeanioDataFormat; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelBeanioTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelBeanioTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java index fc0f4f1..f9f6dc4 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelBindyTest.java @@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.BindyDataFormat; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelBindyTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelBindyTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java index 275626f..1793dca 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCacheTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelCacheTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelCacheTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java index b72c602..0ae0d16 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCastorTest.java @@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.CastorDataFormat; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelCastorTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelCastorTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java index b4780d9..0fd4aa8 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCmisTest.java @@ -19,11 +19,11 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelCmisTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelCxfTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java index f51ab5b..cbccfa1 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCometdTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelCometdTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelCometdTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java index eb3a810..1107402 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelContextTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelContextTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelContextTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java index f019e3f..d280f18 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCouchDBTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelCouchDBTest extends AbstractFeatureTest { public static final String COMPONENT = "couchdb"; http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java index 9cd5c68..712de11 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCryptoTest.java @@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.CryptoDataFormat; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelCryptoTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelCryptoTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java index c0159f9..3abfdbd 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCsvTest.java @@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.CsvDataFormat; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelCsvTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelCsvTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java index 9d280f6..f0607bf 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelCxfTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelCxfTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelCxfTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java index 5b56939..100eb0e 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDisruptorTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelDisruptorTest extends AbstractFeatureTest { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java index baddf02..9018950 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDnsTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelDnsTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelDnsTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java index 36d7b49..39750c5 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDropboxTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelDropboxTest extends AbstractFeatureTest { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java index a21e040..d60c802 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelElasticsearchTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelElasticsearchTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelElasticsearchTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java index 5327163..88c7318 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelExecTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelExecTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelExecTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java index 1de7f50..e90341d 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFacebookTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelFacebookTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelFacebookTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java index 199e3f2..f207a57 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFlatpackTest.java @@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.FlatpackDataFormat; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelFlatpackTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelFlatpackTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java index 12af049..27c7f8e 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFopTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelFopTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelFopTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java index 00f0bee..d916289 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFreemarkerTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelFreemarkerTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelFreemarkerTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java index 9f9444f..e035cda 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelFtpTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelFtpTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelFtpTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java index 6f3382a..6a934aa 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGeocoderTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelGeocoderTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelGeocoderTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java index 8faa0b4..95ab0fe 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGroovyTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelGroovyTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelGroovyTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java index 21f8c65..1020093 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGsonTest.java @@ -22,10 +22,10 @@ import org.apache.camel.model.dataformat.JsonLibrary; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelGsonTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelGsonTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java index 530bd0d..2088615 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuavaEventBusTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelGuavaEventBusTest extends AbstractFeatureTest { public static final String COMPONENT = "guava-eventbus"; http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java index 97e081e..7b1ef55 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGuiceTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelGuiceTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelGuiceTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java index b563aaa..6af04a1 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHazelcastTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelHazelcastTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelHazelcastTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java index 55ebc51..cf5f84f 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHbaseTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelHbaseTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelHbaseTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java index ac50076..cf94d2e 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfs2Test.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelHdfs2Test extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelHdfs2Test.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java index cdfc38b..d7d085a 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHdfsTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelHdfsTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelHdfsTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java index f8130e5..0f39f31 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHl7Test.java @@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.HL7DataFormat; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelHl7Test extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelHl7Test.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java index 2e0b5ba..817512d 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttp4Test.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelHttp4Test extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelHttp4Test.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java index d2c6259..ac1af2b 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelHttpTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelHttpTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelHttpTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java index f5ab3d6..9071453 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIbatisTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelIbatisTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelIbatisTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java index d11c400..cd253fd 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelInfinispanTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelInfinispanTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelInfinispanTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java index 207f31f..f007a6f 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIrcTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelIrcTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelIrcTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonTest.java index 8468598..74b427a 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJacksonTest.java @@ -22,10 +22,10 @@ import org.apache.camel.model.dataformat.JsonLibrary; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJacksonTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJacksonTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java index 7f71df8..216aed8 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJasyptTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJasyptTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java index 81c59ac..de2b09a 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJaxbTest.java @@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.JaxbDataFormat; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJaxbTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJaxbTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcloudsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcloudsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcloudsTest.java index 2b499e9..2147b5c 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcloudsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcloudsTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJcloudsTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJcloudsTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcrTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcrTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcrTest.java index fbc33f4..46ebc2a 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcrTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJcrTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJcrTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJcrTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java index 665da5c..3e70072 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJdbcAggregatorTest extends AbstractFeatureTest { // the aggregator is included in the camel-sql artifact http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcTest.java index d0ab87e..ee4a37f 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJdbcTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJdbcTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJettyTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJettyTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJettyTest.java index 32d58c7..768d606 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJettyTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJettyTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJettyTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJettyTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJgroupsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJgroupsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJgroupsTest.java index c5a8a64..6a5988b 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJgroupsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJgroupsTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJgroupsTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJgroupsTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java index 54b4e7e..ab4b8e8 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java @@ -21,10 +21,10 @@ import org.apache.camel.model.dataformat.JibxDataFormat; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJibxTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJibxTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJingTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJingTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJingTest.java index d76fd76..d1101ba 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJingTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJingTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJingTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJingTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmsTest.java index e69fbc7..561b094 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmsTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmsTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJmsTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJmsTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmxTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmxTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmxTest.java index bc83cf8..833056d 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmxTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJmxTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJmxTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJmxTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJosqlTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJosqlTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJosqlTest.java index 9c464c4..c9fecdf 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJosqlTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJosqlTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJosqlTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJosqlTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java index 11de1fa..ad0a56c 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJpaTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJpaTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJpaTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java index a86cdde..c03ee73 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJsonpathTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJsonpathTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJsonpathTest.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java index 3a51913..fa1d51e 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJt400Test.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJt400Test extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJt400Test.class); http://git-wip-us.apache.org/repos/asf/camel/blob/fe438ef7/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJuelTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJuelTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJuelTest.java index 7bede1c..96d2f1b 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJuelTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJuelTest.java @@ -19,10 +19,10 @@ package org.apache.camel.itest.karaf; import org.junit.Test; import org.junit.runner.RunWith; 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.Configuration; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelJuelTest extends AbstractFeatureTest { public static final String COMPONENT = extractName(CamelJuelTest.class);
