Don't use the deprecated pax-exam classes.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a2aa6ac8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a2aa6ac8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a2aa6ac8 Branch: refs/heads/master Commit: a2aa6ac8300a84a1f74a8b19fae86e328865db8f Parents: 7a2e519 Author: Daniel Kulp <dk...@apache.org> Authored: Fri Aug 22 10:16:50 2014 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Fri Aug 22 10:16:50 2014 -0400 ---------------------------------------------------------------------- .../src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java | 6 +++--- .../org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java | 4 ++-- .../test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java | 4 ++-- .../org/apache/camel/itest/osgi/aws/AwsSdbIntegrationTest.java | 4 ++-- .../test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java | 4 ++-- .../org/apache/camel/itest/osgi/aws/AwsSesIntegrationTest.java | 4 ++-- .../test/java/org/apache/camel/itest/osgi/aws/AwsSesTest.java | 4 ++-- .../org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java | 4 ++-- .../test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java | 4 ++-- .../org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java | 4 ++-- .../test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java | 4 ++-- .../java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java | 2 +- .../camel/itest/osgi/bean/validator/BeanValidatorTest.java | 6 +++--- .../camel/itest/osgi/beanio/BeanIODataFormatSimpleTest.java | 6 +++--- .../apache/camel/itest/osgi/bindy/BindyDataFormatCsvTest.java | 6 +++--- .../osgi/bindy/BindySpringDataFormatCsvJavaRouteTest.java | 6 +++--- .../camel/itest/osgi/bindy/BindySpringDataFormatCsvTest.java | 6 +++--- .../osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java | 6 +++--- .../blueprint/BlueprintPropertiesCustomPrefixRouteTest.java | 6 +++--- .../osgi/blueprint/BlueprintPropertiesJasyptRouteTest.java | 6 +++--- .../itest/osgi/blueprint/BlueprintPropertiesRouteTest.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprint6Test.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprint7Test.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java | 6 +++--- .../blueprint/CamelBlueprintManagedNamePatternFixedTest.java | 6 +++--- .../camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java | 6 +++--- .../apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java | 6 +++--- .../itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java | 6 +++--- .../itest/osgi/blueprint/OSGiBlueprintQuarz2SchedulerTest.java | 6 +++--- .../camel/itest/osgi/cache/CacheManagerFactoryRefTest.java | 6 +++--- .../camel/itest/osgi/cache/CacheRoutesManagementTest.java | 6 +++--- .../test/java/org/apache/camel/itest/osgi/cache/CacheTest.java | 6 +++--- .../apache/camel/itest/osgi/core/OsgiFactoryFinderTest.java | 4 ++-- .../apache/camel/itest/osgi/core/TypeConverterLoaderTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java | 4 ++-- .../apache/camel/itest/osgi/core/browse/BrowseRouteTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java | 4 ++-- .../osgi/core/dataformat/SerializationDataFormatTest.java | 4 ++-- .../apache/camel/itest/osgi/core/dataset/DataSetRouteTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/direct/DirectTest.java | 4 ++-- .../apache/camel/itest/osgi/core/file/FileComponentTest.java | 4 ++-- .../apache/camel/itest/osgi/core/file/FileRouteDelayTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/file/FileRouteTest.java | 4 ++-- .../camel/itest/osgi/core/language/LanguageRouteTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/language/SimpleTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/log/LogRouteTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/mock/MockXPathTest.java | 4 ++-- .../camel/itest/osgi/core/packages/OSGiPackageScanTest.java | 4 ++-- .../camel/itest/osgi/core/properties/PropertiesRouteTest.java | 4 ++-- .../apache/camel/itest/osgi/core/ref/RefFileEndpointTest.java | 4 ++-- .../java/org/apache/camel/itest/osgi/core/seda/SedaTest.java | 4 ++-- .../org/apache/camel/itest/osgi/core/timer/TimerFiredTest.java | 4 ++-- .../camel/itest/osgi/core/validator/ValidatorRouteTest.java | 4 ++-- .../test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java | 4 ++-- .../camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java | 6 +++--- .../org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java | 4 ++-- .../apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java | 6 +++--- .../org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java | 6 +++--- .../itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java | 6 +++--- .../camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java | 6 +++--- .../itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java | 6 +++--- .../test/java/org/apache/camel/itest/osgi/dozer/DozerTest.java | 6 +++--- .../test/java/org/apache/camel/itest/osgi/exec/ExecTest.java | 6 +++--- .../apache/camel/itest/osgi/freemarker/FreemarkerFileTest.java | 4 ++-- .../org/apache/camel/itest/osgi/freemarker/FreemarkerTest.java | 6 +++--- .../java/org/apache/camel/itest/osgi/ftp/FtpConsumeTest.java | 6 +++--- .../camel/itest/osgi/hawtdb/HawtDBAggregateRouteTest.java | 6 +++--- .../org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java | 6 +++--- .../apache/camel/itest/osgi/hdfs/HdfsBlueprintRouteTest.java | 6 +++--- .../org/apache/camel/itest/osgi/hl7/HL7DataFormatTest.java | 6 +++--- .../org/apache/camel/itest/osgi/hl7/HL7MLLPCodec2Test.java | 6 +++--- .../java/org/apache/camel/itest/osgi/hl7/HL7MLLPCodecTest.java | 6 +++--- .../test/java/org/apache/camel/itest/osgi/http/HttpTest.java | 6 +++--- .../apache/camel/itest/osgi/http/HttpTypeConverterTest.java | 6 +++--- .../test/java/org/apache/camel/itest/osgi/http4/Http4Test.java | 6 +++--- .../java/org/apache/camel/itest/osgi/jasypt/JasyptTest.java | 6 +++--- .../camel/itest/osgi/jaxb/JaxbFallbackConverterSpringTest.java | 6 +++--- .../camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java | 6 +++--- .../apache/camel/itest/osgi/jclouds/BlobStoreRouteTest.java | 6 +++--- .../osgi/jetty/OSGiJettyCamelContextsClassloaderTest.java | 6 +++--- .../itest/osgi/jetty/OSGiMulitJettyCamelContextsTest.java | 6 +++--- .../java/org/apache/camel/itest/osgi/jpa/JpaRouteTest.java | 6 +++--- .../test/java/org/apache/camel/itest/osgi/jsch/ScpTest.java | 6 +++--- .../apache/camel/itest/osgi/krati/KratiBlueprintRouteTest.java | 6 +++--- .../java/org/apache/camel/itest/osgi/krati/KratiRouteTest.java | 6 +++--- .../camel/itest/osgi/leveldb/LevelDBAggregateRouteTest.java | 6 +++--- .../test/java/org/apache/camel/itest/osgi/mina/MinaTest.java | 6 +++--- .../test/java/org/apache/camel/itest/osgi/mvel/MvelTest.java | 6 +++--- .../java/org/apache/camel/itest/osgi/mybatis/MyBatisTest.java | 6 +++--- .../test/java/org/apache/camel/itest/osgi/netty/NettyTest.java | 6 +++--- .../apache/camel/itest/osgi/protobuf/ProtobufRouteTest.java | 6 +++--- .../apache/camel/itest/osgi/quartz/QuartzCronRouteTest.java | 6 +++--- .../java/org/apache/camel/itest/osgi/restlet/RestletTest.java | 6 +++--- .../itest/osgi/restlet/example/RestletDomainServiceTest.java | 6 +++--- .../apache/camel/itest/osgi/rss/RssPollingConsumerTest.java | 6 +++--- .../apache/camel/itest/osgi/script/GroovyScriptOsgiTest.java | 6 +++--- .../java/org/apache/camel/itest/osgi/script/RubyOsgiTest.java | 6 +++--- .../apache/camel/itest/osgi/shiro/ShiroAuthenticationTest.java | 6 +++--- .../camel/itest/osgi/spring/bean/SpringBeanRouteTest.java | 4 ++-- .../apache/camel/itest/osgi/spring/event/EventRouteTest.java | 4 ++-- .../java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java | 6 +++--- .../java/org/apache/camel/itest/osgi/stream/StreamTest.java | 6 +++--- .../java/org/apache/camel/itest/osgi/syslog/SyslogTest.java | 6 +++--- .../org/apache/camel/itest/osgi/util/jsse/JsseUtilTest.java | 4 ++-- .../camel/itest/osgi/velocity/VelocityBlueprintTest.java | 6 +++--- .../org/apache/camel/itest/osgi/velocity/VelocityFileTest.java | 4 ++-- .../org/apache/camel/itest/osgi/velocity/VelocityTest.java | 6 +++--- .../camel/itest/osgi/xmljson/XmlJsonBlueprintRouteTest.java | 6 +++--- .../camel/itest/osgi/xstream/XstreamBlueprintRouteTest.java | 6 +++--- .../apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTest.java | 4 ++-- .../camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java | 2 +- 115 files changed, 302 insertions(+), 302 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java index 6f0766c..0d30d03 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/ahc/AhcTest.java @@ -21,17 +21,17 @@ 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.ExamReactorStrategy; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory; import static org.ops4j.pax.exam.OptionUtils.combine; /** * */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @ExamReactorStrategy(AllConfinedStagedReactorFactory.class) public class AhcTest extends OSGiIntegrationTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java index 6be307e..8b490fa 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3IntegrationTest.java @@ -28,10 +28,10 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("Test fails") public class AwsS3IntegrationTest extends AwsTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java index c900bb5..63a457e 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsS3Test.java @@ -27,10 +27,10 @@ import org.apache.camel.component.aws.s3.S3Constants; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class AwsS3Test extends AwsTestSupport { @EndpointInject(uri = "mock:result-s3") http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbIntegrationTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbIntegrationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbIntegrationTest.java index 4d987f0..7a49890 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbIntegrationTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbIntegrationTest.java @@ -32,10 +32,10 @@ import org.apache.camel.component.aws.sdb.SdbOperations; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("Must be manually tested. Provide your own accessKey and secretKey!") public class AwsSdbIntegrationTest extends AwsTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java index 4edac9f..139d157 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSdbTest.java @@ -34,10 +34,10 @@ import org.apache.camel.impl.DefaultProducerTemplate; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class AwsSdbTest extends AwsTestSupport { private AmazonSDBClientMock amazonSDBClient; http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesIntegrationTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesIntegrationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesIntegrationTest.java index b3084f6..3b0b7e7 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesIntegrationTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesIntegrationTest.java @@ -22,10 +22,10 @@ import org.apache.camel.component.aws.ses.SesConstants; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("Must be manually tested. Provide your own accessKey and secretKey in CamelIntegrationContext.xml!") public class AwsSesIntegrationTest extends AwsTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesTest.java index 3a6d391..83f9649 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSesTest.java @@ -21,10 +21,10 @@ import org.apache.camel.Processor; import org.apache.camel.component.aws.ses.SesConstants; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class AwsSesTest extends AwsTestSupport { @Override http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java index 68c9439..5054f21 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsIntegrationTest.java @@ -23,10 +23,10 @@ import org.apache.camel.component.aws.sns.SnsConstants; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("Must be manually tested. Provide your own accessKey and secretKey in CamelIntegrationContext.xml!") public class AwsSnsIntegrationTest extends AwsTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java index 7983318..66e5d08 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSnsTest.java @@ -22,10 +22,10 @@ import org.apache.camel.Processor; import org.apache.camel.component.aws.sns.SnsConstants; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class AwsSnsTest extends AwsTestSupport { @Override http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java index 3b9288a..c4bf03c 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsIntegrationTest.java @@ -25,10 +25,10 @@ import org.apache.camel.component.mock.MockEndpoint; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) @Ignore("Must be manually tested. Provide your own accessKey and secretKey in CamelIntegrationContext.xml!") public class AwsSqsIntegrationTest extends AwsTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java index 9a8c508..1bc909f 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsSqsTest.java @@ -24,11 +24,11 @@ import org.apache.camel.component.aws.sqs.SqsConstants; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class AwsSqsTest extends AwsTestSupport { @EndpointInject(uri = "mock:result") http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java index 1941ffa..71ca810 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/aws/AwsTestSupport.java @@ -18,8 +18,8 @@ package org.apache.camel.itest.osgi.aws; import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; import static org.ops4j.pax.exam.OptionUtils.combine; http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bean/validator/BeanValidatorTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bean/validator/BeanValidatorTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bean/validator/BeanValidatorTest.java index ecae32f..d106b5a 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bean/validator/BeanValidatorTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bean/validator/BeanValidatorTest.java @@ -22,13 +22,13 @@ import org.apache.camel.Processor; 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 BeanValidatorTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/beanio/BeanIODataFormatSimpleTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/beanio/BeanIODataFormatSimpleTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/beanio/BeanIODataFormatSimpleTest.java index 3d172cd..ad0feca 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/beanio/BeanIODataFormatSimpleTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/beanio/BeanIODataFormatSimpleTest.java @@ -28,16 +28,16 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.apache.camel.spi.DataFormat; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; /** * */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class BeanIODataFormatSimpleTest extends OSGiIntegrationTestSupport { private static final String FIXED_DATA = "Joe,Smith,Developer,75000,10012009" + LS http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindyDataFormatCsvTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindyDataFormatCsvTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindyDataFormatCsvTest.java index dfed422..65bccfd 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindyDataFormatCsvTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindyDataFormatCsvTest.java @@ -28,16 +28,16 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.apache.camel.spi.DataFormat; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import static org.ops4j.pax.exam.OptionUtils.combine; /** * */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class BindyDataFormatCsvTest extends OSGiIntegrationTestSupport { private static final String FIXED_DATA = "Joe,Smith,Developer,75000,10012009" + "\n" http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvJavaRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvJavaRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvJavaRouteTest.java index 9f8fb0f..8addfe5 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvJavaRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvJavaRouteTest.java @@ -25,9 +25,9 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; import static org.ops4j.pax.exam.OptionUtils.combine; @@ -35,7 +35,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine; /** * */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class BindySpringDataFormatCsvJavaRouteTest extends OSGiIntegrationSpringTestSupport { private static final String FIXED_DATA = "Joe,Smith,Developer,75000,10012009" + "\n" http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvTest.java index 3b264bd..514b466 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/bindy/BindySpringDataFormatCsvTest.java @@ -25,9 +25,9 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; import static org.ops4j.pax.exam.OptionUtils.combine; @@ -35,7 +35,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine; /** * */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class BindySpringDataFormatCsvTest extends OSGiIntegrationSpringTestSupport { private static final String FIXED_DATA = "Joe,Smith,Developer,75000,10012009" + "\n" http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java index dce7440..33d0a74 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java @@ -21,9 +21,9 @@ 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 static org.ops4j.pax.exam.OptionUtils.combine; @@ -32,7 +32,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class BlueprintExplicitPropertiesRouteTest extends OSGiBlueprintTestSupport { private String name = BlueprintExplicitPropertiesRouteTest.class.getName(); http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesCustomPrefixRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesCustomPrefixRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesCustomPrefixRouteTest.java index 7419098..08565c5 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesCustomPrefixRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesCustomPrefixRouteTest.java @@ -21,9 +21,9 @@ 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.ops4j.pax.exam.options.extra.VMOption; import org.osgi.framework.Constants; @@ -33,7 +33,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class BlueprintPropertiesCustomPrefixRouteTest extends OSGiBlueprintTestSupport { private String name = BlueprintPropertiesCustomPrefixRouteTest.class.getName(); http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesJasyptRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesJasyptRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesJasyptRouteTest.java index d4b4ab0..e898085 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesJasyptRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesJasyptRouteTest.java @@ -21,9 +21,9 @@ 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 static org.ops4j.pax.exam.OptionUtils.combine; @@ -32,7 +32,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class BlueprintPropertiesJasyptRouteTest extends OSGiBlueprintTestSupport { private String name = BlueprintPropertiesJasyptRouteTest.class.getName(); http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java index d0ce0ff..a4f3954 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java @@ -21,9 +21,9 @@ 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 static org.ops4j.pax.exam.OptionUtils.combine; @@ -32,7 +32,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class BlueprintPropertiesRouteTest extends OSGiBlueprintTestSupport { private String name = BlueprintPropertiesRouteTest.class.getName(); http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java index 7fdf2bf..fca75ae 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java @@ -22,9 +22,9 @@ import org.apache.camel.model.RouteDefinition; 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 org.osgi.service.blueprint.container.BlueprintContainer; @@ -34,7 +34,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelBlueprint2Test extends OSGiBlueprintTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java index 80e6b61..94376f8 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint3Test.java @@ -19,9 +19,9 @@ package org.apache.camel.itest.osgi.blueprint; import org.apache.camel.CamelContext; 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; @@ -31,7 +31,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelBlueprint3Test extends OSGiBlueprintTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java index 0d43e89..e62d475 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint4Test.java @@ -21,9 +21,9 @@ 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 static org.ops4j.pax.exam.OptionUtils.combine; @@ -33,7 +33,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelBlueprint4Test extends OSGiBlueprintTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java index 26d17c4..b137e9c 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint5Test.java @@ -21,9 +21,9 @@ 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 static org.ops4j.pax.exam.OptionUtils.combine; @@ -32,7 +32,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelBlueprint5Test extends OSGiBlueprintTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint6Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint6Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint6Test.java index 70ee0b4..eebc69a 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint6Test.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint6Test.java @@ -21,9 +21,9 @@ 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 static org.ops4j.pax.exam.OptionUtils.combine; @@ -32,7 +32,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelBlueprint6Test extends OSGiBlueprintTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint7Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint7Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint7Test.java index 33353ed..05f45d4 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint7Test.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint7Test.java @@ -21,9 +21,9 @@ 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 static org.ops4j.pax.exam.OptionUtils.combine; @@ -32,7 +32,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelBlueprint7Test extends OSGiBlueprintTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java index 4159ce2..2d2e428 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java @@ -21,9 +21,9 @@ import java.lang.reflect.Method; import org.apache.camel.util.jsse.SSLContextParameters; 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; @@ -33,7 +33,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelBlueprint8Test extends OSGiBlueprintTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintManagedNamePatternFixedTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintManagedNamePatternFixedTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintManagedNamePatternFixedTest.java index a4b914f..cc2c0ca 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintManagedNamePatternFixedTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintManagedNamePatternFixedTest.java @@ -24,9 +24,9 @@ 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 static org.ops4j.pax.exam.OptionUtils.combine; @@ -35,7 +35,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelBlueprintManagedNamePatternFixedTest extends OSGiBlueprintTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java index 5cc7908..2c1deb3 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTcclTest.java @@ -25,9 +25,9 @@ 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.Bundle; import org.osgi.framework.Constants; @@ -40,7 +40,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; * * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelBlueprintTcclTest extends OSGiBlueprintTestSupport { private static final String BUNDLE_SYMBOLICNAME = "CamelBlueprintTcclTestBundle"; http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java index ad03053..630c61f 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java @@ -19,9 +19,9 @@ package org.apache.camel.itest.osgi.blueprint; import org.apache.camel.CamelContext; 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; @@ -31,7 +31,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CamelBlueprintTest extends OSGiBlueprintTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java index c9f77c5..05c161a 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintHelloWorldTest.java @@ -22,9 +22,9 @@ 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 static org.ops4j.pax.exam.OptionUtils.combine; @@ -33,7 +33,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class OSGiBlueprintHelloWorldTest extends OSGiBlueprintTestSupport { private static final String NAME = OSGiBlueprintHelloWorldTest.class.getName(); http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintQuarz2SchedulerTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintQuarz2SchedulerTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintQuarz2SchedulerTest.java index fae4496..3daf917 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintQuarz2SchedulerTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintQuarz2SchedulerTest.java @@ -22,9 +22,9 @@ 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 static org.ops4j.pax.exam.OptionUtils.combine; @@ -33,7 +33,7 @@ import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class OSGiBlueprintQuarz2SchedulerTest extends OSGiBlueprintTestSupport { private static final String NAME = OSGiBlueprintQuarz2SchedulerTest.class.getName(); http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java index fc413b1..f53efe7 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheManagerFactoryRefTest.java @@ -28,14 +28,14 @@ import org.apache.camel.component.cache.CacheManagerFactory; 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 CacheManagerFactoryRefTest extends OSGiIntegrationTestSupport { private static final String CACHE_URI = "cache:foo?cacheManagerFactory=#cacheManagerFactory"; private TestingCacheManagerFactory cmfRef = new TestingCacheManagerFactory("ehcache_test.xml"); http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheRoutesManagementTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheRoutesManagementTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheRoutesManagementTest.java index 3c38beb..32fec5e 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheRoutesManagementTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheRoutesManagementTest.java @@ -28,14 +28,14 @@ import org.apache.camel.component.cache.CacheManagerFactory; 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 CacheRoutesManagementTest extends OSGiIntegrationTestSupport { private static final String CACHE_URI = "cache:foo?cacheManagerFactory=#cacheManagerFactory"; private static final String ROUTE1_ID = "TEST_ROUTE_1"; http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheTest.java index ef01cb1..a9bec7e 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cache/CacheTest.java @@ -21,13 +21,13 @@ import org.apache.camel.component.cache.CacheConstants; 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 CacheTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/OsgiFactoryFinderTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/OsgiFactoryFinderTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/OsgiFactoryFinderTest.java index b291dad..3f64c06 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/OsgiFactoryFinderTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/OsgiFactoryFinderTest.java @@ -21,9 +21,9 @@ import org.apache.camel.spi.FactoryFinder; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class OsgiFactoryFinderTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/TypeConverterLoaderTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/TypeConverterLoaderTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/TypeConverterLoaderTest.java index ee0e257..eca1894 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/TypeConverterLoaderTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/TypeConverterLoaderTest.java @@ -20,9 +20,9 @@ import org.apache.camel.spi.FactoryFinder; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class TypeConverterLoaderTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java index 63d26cb..0b692ff 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java @@ -21,11 +21,11 @@ import org.apache.camel.impl.JndiRegistry; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class BeanRouteTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/browse/BrowseRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/browse/BrowseRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/browse/BrowseRouteTest.java index 14e62c9..10562c2 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/browse/BrowseRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/browse/BrowseRouteTest.java @@ -22,9 +22,9 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.apache.camel.spi.BrowsableEndpoint; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class BrowseRouteTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java index 3c5cc3f..3465d92 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java @@ -20,10 +20,10 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class ClassRouteTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/SerializationDataFormatTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/SerializationDataFormatTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/SerializationDataFormatTest.java index 004dafc..ee87e49 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/SerializationDataFormatTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataformat/SerializationDataFormatTest.java @@ -20,9 +20,9 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class SerializationDataFormatTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataset/DataSetRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataset/DataSetRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataset/DataSetRouteTest.java index ce6bfbf..2e8b910 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataset/DataSetRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/dataset/DataSetRouteTest.java @@ -23,10 +23,10 @@ import org.apache.camel.component.dataset.SimpleDataSet; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class DataSetRouteTest extends OSGiIntegrationTestSupport { protected SimpleDataSet dataSet = new SimpleDataSet(20); http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java index 9a267b4..a24bcd9 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/direct/DirectTest.java @@ -21,9 +21,9 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class DirectTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileComponentTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileComponentTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileComponentTest.java index 9ac8033..a1a2db7 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileComponentTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileComponentTest.java @@ -21,9 +21,9 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class FileComponentTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteDelayTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteDelayTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteDelayTest.java index 915250b..891ce60 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteDelayTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteDelayTest.java @@ -23,9 +23,9 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.apache.camel.util.StopWatch; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class FileRouteDelayTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteTest.java index 27feb23..d2387a5 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/file/FileRouteTest.java @@ -22,9 +22,9 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class FileRouteTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/LanguageRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/LanguageRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/LanguageRouteTest.java index 059f0d1..7caed99 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/LanguageRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/LanguageRouteTest.java @@ -20,9 +20,9 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class LanguageRouteTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java index 512ce8e..ce19e04 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/language/SimpleTest.java @@ -21,10 +21,10 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class SimpleTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteTest.java index 139daeb..160d6b0 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/log/LogRouteTest.java @@ -19,9 +19,9 @@ package org.apache.camel.itest.osgi.core.log; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class LogRouteTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/mock/MockXPathTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/mock/MockXPathTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/mock/MockXPathTest.java index 8191777..45553fc 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/mock/MockXPathTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/mock/MockXPathTest.java @@ -22,9 +22,9 @@ import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.apache.camel.model.language.XPathExpression; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class MockXPathTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/OSGiPackageScanTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/OSGiPackageScanTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/OSGiPackageScanTest.java index 0a48645..2fa143b 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/OSGiPackageScanTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/packages/OSGiPackageScanTest.java @@ -20,10 +20,10 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class OSGiPackageScanTest extends OSGiIntegrationSpringTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/properties/PropertiesRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/properties/PropertiesRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/properties/PropertiesRouteTest.java index f7bedd3..c28a009 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/properties/PropertiesRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/properties/PropertiesRouteTest.java @@ -21,10 +21,10 @@ import org.apache.camel.component.properties.PropertiesComponent; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class PropertiesRouteTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/ref/RefFileEndpointTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/ref/RefFileEndpointTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/ref/RefFileEndpointTest.java index 2361549..87e10c3 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/ref/RefFileEndpointTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/ref/RefFileEndpointTest.java @@ -23,9 +23,9 @@ import org.apache.camel.impl.JndiRegistry; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class RefFileEndpointTest extends OSGiIntegrationTestSupport { private JndiRegistry jndi; http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java index a46d59c..1be2d07 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/seda/SedaTest.java @@ -22,12 +22,12 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class SedaTest extends OSGiIntegrationTestSupport { protected RouteBuilder createRouteBuilder() throws Exception { http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/timer/TimerFiredTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/timer/TimerFiredTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/timer/TimerFiredTest.java index a8e505a..4b793d0 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/timer/TimerFiredTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/timer/TimerFiredTest.java @@ -22,9 +22,9 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class TimerFiredTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/validator/ValidatorRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/validator/ValidatorRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/validator/ValidatorRouteTest.java index 534e288..148af2d 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/validator/ValidatorRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/validator/ValidatorRouteTest.java @@ -21,9 +21,9 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class ValidatorRouteTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java index bdd601f..2320dd3 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/vm/VmTest.java @@ -20,12 +20,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; /** * @version */ -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class VmTest extends OSGiIntegrationTestSupport { @Override http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java index 4f1b991..deea855 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltBlueprintRouteTest.java @@ -26,16 +26,16 @@ import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.osgi.framework.Constants; import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class XsltBlueprintRouteTest extends OSGiBlueprintTestSupport { private CamelContext camelContext; private ProducerTemplate mytemplate; http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java index 27187bb..e2324e9 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/xslt/XsltRouteTest.java @@ -21,11 +21,11 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport; import org.junit.Test; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class XsltRouteTest extends OSGiIntegrationTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java index ebf2366..eed51ec 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java @@ -26,9 +26,9 @@ import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; import org.junit.Test; import org.junit.runner.RunWith; +import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.Configuration; -import org.ops4j.pax.exam.junit.JUnit4TestRunner; +import org.ops4j.pax.exam.junit.PaxExam; import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; import static org.ops4j.pax.exam.CoreOptions.provision; @@ -36,7 +36,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CxfBeanSpringRouteTest extends OSGiIntegrationSpringTestSupport { @Test http://git-wip-us.apache.org/repos/asf/camel/blob/a2aa6ac8/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java index 8b4c34b..70f2ff3 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfProxyExampleTest.java @@ -23,9 +23,9 @@ import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; 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.provision; @@ -33,7 +33,7 @@ import static org.ops4j.pax.exam.OptionUtils.combine; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd; -@RunWith(JUnit4TestRunner.class) +@RunWith(PaxExam.class) public class CxfProxyExampleTest extends OSGiIntegrationSpringTestSupport { protected static ReportIncidentEndpoint createCXFClient() {
