This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5577a49991b41fca21e49809a9edd29d09e78bbd Author: Guillaume Nodet <[email protected]> AuthorDate: Tue Jul 7 10:45:40 2020 +0200 [CAMEL-11807] Upgrade camel-saxon to junit5 --- components/camel-saxon/pom.xml | 6 ++-- .../camel/builder/XsltAggregationStrategyTest.java | 4 +-- .../builder/saxon/BeanWithXQueryInjectionTest.java | 10 +++--- .../camel/builder/saxon/ParameterDynamicTest.java | 12 +++---- .../camel/builder/saxon/SaxonXPathSplitTest.java | 4 +-- .../apache/camel/builder/saxon/SaxonXPathTest.java | 4 +-- .../saxon/SpringXQueryTransformIssueTest.java | 4 +-- .../saxon/XPathAnnotationResultTypeTest.java | 6 ++-- .../saxon/XPathSplitChoicePerformanceTest.java | 42 +++++++++++++--------- .../org/apache/camel/builder/saxon/XPathTest.java | 10 +++--- .../camel/builder/saxon/XQueryFilterTest.java | 8 ++--- ...XQueryHeaderNameResultTypeAndNamespaceTest.java | 4 +-- .../camel/builder/saxon/XQueryHeaderNameTest.java | 4 +-- .../builder/saxon/XQueryRecipientListTest.java | 8 ++--- .../camel/builder/saxon/XQueryResourceTest.java | 4 +-- .../org/apache/camel/builder/saxon/XQueryTest.java | 13 +++---- .../builder/saxon/XQueryTransformIssueTest.java | 4 +-- .../camel/builder/saxon/XQueryTransformTest.java | 8 ++--- .../builder/saxon/XQueryTransformTextTest.java | 8 ++--- .../saxon/XQueryWithNamespacesFilterTest.java | 8 ++--- ...eanWithXQueryInjectionUsingHeaderValueTest.java | 12 ++++--- .../component/xquery/SoapPayloadBeanTest.java | 4 +-- .../xquery/XQueryComponentConfigurationTest.java | 7 ++-- .../component/xquery/XQueryConcurrencyTest.java | 6 ++-- .../xquery/XQueryEndpointConfigurationTest.java | 9 +++-- .../camel/component/xquery/XQueryEndpointTest.java | 15 ++++---- .../camel/component/xquery/XQueryExampleTest.java | 4 +-- .../xquery/XQueryFromFileExceptionTest.java | 20 ++++++----- .../camel/component/xquery/XQueryFromFileTest.java | 18 ++++++---- .../xquery/XQueryLanguageFromFileTest.java | 10 +++--- .../component/xquery/XQueryNullHeaderTest.java | 4 +-- .../xquery/XQueryPredicateFilterTest.java | 8 ++--- .../xquery/XQueryPropogateHeadersTest.java | 4 +-- .../xquery/XQueryStripWhitespaceTest.java | 7 ++-- .../xquery/XQueryURLBasedConcurrencyTest.java | 6 ++-- .../xquery/XQueryWithExplicitTypeTest.java | 8 ++--- .../component/xquery/XQueryWithExtensionTest.java | 4 +-- .../xslt/PayloadWithDefaultNamespaceTest.java | 4 +-- .../component/xslt/SaxonInvalidXsltFileTest.java | 8 +++-- .../camel/component/xslt/SaxonUriResolverTest.java | 9 ++--- .../xslt/SaxonXslIncludeEmptyHrefTest.java | 4 +-- .../xslt/SaxonXsltComponentConfigurationTest.java | 8 +++-- .../camel/component/xslt/SaxonXsltDTDTest.java | 14 ++++---- .../xslt/SaxonXsltEndpointConfigurationTest.java | 9 +++-- .../component/xslt/SaxonXsltFeatureRouteTest.java | 11 +++--- .../xslt/SaxonXsltMessageTerminateTest.java | 7 ++-- .../apache/camel/component/xslt/SaxonXsltTest.java | 17 +++++---- .../component/xslt/XsltRouteAllowStAXTest.java | 20 ++++++----- .../extensions/SaxonExtensionFunctionsTest.java | 7 ++-- .../SaxonSpringExtensionFunctionsTest.java | 7 ++-- .../camel/converter/saxon/SaxonConverterTest.java | 11 +++--- .../xpath/XPathHeaderEnableSaxonJavaDslTest.java | 4 +-- .../camel/language/xpath/XPathHeaderTest.java | 4 +-- .../xpath/XPathLanguageDefaultSettingsTest.java | 14 ++++---- .../camel/language/xpath/XPathLanguageTest.java | 21 ++++++----- 55 files changed, 291 insertions(+), 205 deletions(-) diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml index 5f84355..7112af6 100644 --- a/components/camel-saxon/pom.xml +++ b/components/camel-saxon/pom.xml @@ -56,7 +56,7 @@ <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test-spring</artifactId> + <artifactId>camel-test-spring-junit5</artifactId> <scope>test</scope> </dependency> <dependency> @@ -65,8 +65,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/XsltAggregationStrategyTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/XsltAggregationStrategyTest.java index 3d197e2..b675f28 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/XsltAggregationStrategyTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/XsltAggregationStrategyTest.java @@ -18,8 +18,8 @@ package org.apache.camel.builder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.xslt.saxon.XsltSaxonAggregationStrategy; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; /** * Unit test for the {@link XsltSaxonAggregationStrategy}. diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java index 840766e..1034d20 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java @@ -19,11 +19,13 @@ package org.apache.camel.builder.saxon; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.xquery.XQuery; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class BeanWithXQueryInjectionTest extends CamelTestSupport { private static final Logger LOG = LoggerFactory.getLogger(BeanWithXQueryInjectionTest.class); protected MyBean myBean = new MyBean(); @@ -34,8 +36,8 @@ public class BeanWithXQueryInjectionTest extends CamelTestSupport { template.sendBodyAndHeader("direct:in", expectedBody, "foo", "bar"); - assertEquals("bean body: " + myBean, expectedBody, myBean.body); - assertEquals("bean foo: " + myBean, "bar", myBean.foo); + assertEquals(expectedBody, myBean.body, "bean body: " + myBean); + assertEquals("bar", myBean.foo, "bean foo: " + myBean); } @Override diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/ParameterDynamicTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/ParameterDynamicTest.java index b99ae6e..f08ea18 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/ParameterDynamicTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/ParameterDynamicTest.java @@ -26,13 +26,13 @@ import net.sf.saxon.value.ObjectValue; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.xquery.XQueryBuilder.xquery; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class ParameterDynamicTest { @@ -46,7 +46,7 @@ public class ParameterDynamicTest { private XQueryExpression query; private DynamicQueryContext context; - @Before + @BeforeEach public void setup() throws Exception { conf.setCompileWithTracing(true); query = conf.newStaticQueryContext().compileQuery(TEST_QUERY); diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathSplitTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathSplitTest.java index 8515486..b39c8fd 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathSplitTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathSplitTest.java @@ -17,8 +17,8 @@ package org.apache.camel.builder.saxon; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; /** * diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathTest.java index f034b96..225f3c7 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SaxonXPathTest.java @@ -17,8 +17,8 @@ package org.apache.camel.builder.saxon; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; /** * diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java index a067581..e0446d3 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/SpringXQueryTransformIssueTest.java @@ -18,9 +18,9 @@ package org.apache.camel.builder.saxon; import java.io.FileInputStream; -import org.apache.camel.test.spring.CamelSpringTestSupport; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; import org.apache.camel.util.IOHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java index 5a6145c..102b6a5 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java @@ -22,8 +22,10 @@ import net.sf.saxon.lib.NamespaceConstant; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.language.xpath.XPath; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class XPathAnnotationResultTypeTest extends CamelTestSupport { protected MyBean myBean = new MyBean(); diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java index 6a7b7e6..38ac435 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java @@ -25,19 +25,27 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.util.StopWatch; import org.apache.camel.util.TimeUtils; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.apache.camel.test.junit5.TestSupport.createDirectory; +import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * */ public class XPathSplitChoicePerformanceTest extends CamelTestSupport { + private static final Logger LOG = LoggerFactory.getLogger(XPathSplitChoicePerformanceTest.class); + private int size = 20 * 1000; private final AtomicInteger tiny = new AtomicInteger(); private final AtomicInteger small = new AtomicInteger(); @@ -46,31 +54,31 @@ public class XPathSplitChoicePerformanceTest extends CamelTestSupport { private final StopWatch watch = new StopWatch(); @Override - @Before + @BeforeEach public void setUp() throws Exception { - createDataFile(log, size); + createDataFile(LOG, size); super.setUp(); } @Test - @Ignore("Manual test") + @Disabled("Manual test") public void testXPathPerformanceRoute() throws Exception { NotifyBuilder notify = new NotifyBuilder(context).whenDone(size).create(); boolean matches = notify.matches(60, TimeUnit.SECONDS); - log.info("Processed file with " + size + " elements in: " + TimeUtils.printDuration(watch.taken())); + LOG.info("Processed file with " + size + " elements in: " + TimeUtils.printDuration(watch.taken())); - log.info("Processed " + tiny.get() + " tiny messages"); - log.info("Processed " + small.get() + " small messages"); - log.info("Processed " + med.get() + " medium messages"); - log.info("Processed " + large.get() + " large messages"); + LOG.info("Processed " + tiny.get() + " tiny messages"); + LOG.info("Processed " + small.get() + " small messages"); + LOG.info("Processed " + med.get() + " medium messages"); + LOG.info("Processed " + large.get() + " large messages"); assertEquals((size / 10) * 4, tiny.get()); assertEquals((size / 10) * 2, small.get()); assertEquals((size / 10) * 3, med.get()); assertEquals((size / 10) * 1, large.get()); - assertTrue("Should complete route", matches); + assertTrue(matches, "Should complete route"); } @Override @@ -91,7 +99,7 @@ public class XPathSplitChoicePerformanceTest extends CamelTestSupport { .process(new Processor() { public void process(Exchange exchange) throws Exception { String xml = exchange.getIn().getBody(String.class); - assertTrue(xml, xml.contains("<amount>3</amount>")); + assertTrue(xml.contains("<amount>3</amount>"), xml); int num = tiny.incrementAndGet(); if (num % 100 == 0) { @@ -104,7 +112,7 @@ public class XPathSplitChoicePerformanceTest extends CamelTestSupport { .process(new Processor() { public void process(Exchange exchange) throws Exception { String xml = exchange.getIn().getBody(String.class); - assertTrue(xml, xml.contains("<amount>44</amount>")); + assertTrue(xml.contains("<amount>44</amount>"), xml); int num = small.incrementAndGet(); if (num % 100 == 0) { @@ -117,7 +125,7 @@ public class XPathSplitChoicePerformanceTest extends CamelTestSupport { .process(new Processor() { public void process(Exchange exchange) throws Exception { String xml = exchange.getIn().getBody(String.class); - assertTrue(xml, xml.contains("<amount>88</amount>")); + assertTrue(xml.contains("<amount>88</amount>"), xml); int num = med.incrementAndGet(); if (num % 100 == 0) { @@ -130,7 +138,7 @@ public class XPathSplitChoicePerformanceTest extends CamelTestSupport { .process(new Processor() { public void process(Exchange exchange) throws Exception { String xml = exchange.getIn().getBody(String.class); - assertTrue(xml, xml.contains("<amount>123</amount>")); + assertTrue(xml.contains("<amount>123</amount>"), xml); int num = large.incrementAndGet(); if (num % 100 == 0) { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java index fc5f102..de8d499 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathTest.java @@ -20,9 +20,11 @@ import javax.xml.xpath.XPathFactory; import net.sf.saxon.xpath.XPathFactoryImpl; import org.apache.camel.language.xpath.XPathBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class XPathTest extends CamelTestSupport { @@ -70,7 +72,7 @@ public class XPathTest extends CamelTestSupport { // END SNIPPET: e1 } - @Ignore("See http://www.saxonica.com/documentation/index.html#!xpath-api/jaxp-xpath/factory";) + @Disabled("See http://www.saxonica.com/documentation/index.html#!xpath-api/jaxp-xpath/factory";) @Test public void testXPathFunctionTokenizeUsingObjectModel() throws Exception { // START SNIPPET: e2 diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java index 962b9e8..475163d 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java @@ -19,9 +19,9 @@ package org.apache.camel.builder.saxon; import org.apache.camel.Endpoint; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class XQueryFilterTest extends CamelTestSupport { @@ -48,7 +48,7 @@ public class XQueryFilterTest extends CamelTestSupport { } @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameResultTypeAndNamespaceTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameResultTypeAndNamespaceTest.java index faa5b8f..66ff115 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameResultTypeAndNamespaceTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameResultTypeAndNamespaceTest.java @@ -19,8 +19,8 @@ package org.apache.camel.builder.saxon; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; /** * Test XPath DSL with the ability to apply XPath on a header diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameTest.java index af8def4..a00478c 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryHeaderNameTest.java @@ -18,8 +18,8 @@ package org.apache.camel.builder.saxon; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; /** * Test XQuery DSL with the ability to apply XPath on a header diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java index f2886b6..165bbf0 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryRecipientListTest.java @@ -18,9 +18,9 @@ package org.apache.camel.builder.saxon; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class XQueryRecipientListTest extends CamelTestSupport { @@ -48,7 +48,7 @@ public class XQueryRecipientListTest extends CamelTestSupport { } @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryResourceTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryResourceTest.java index 715a63b..2afec05 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryResourceTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryResourceTest.java @@ -17,8 +17,8 @@ package org.apache.camel.builder.saxon; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; /** * diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTest.java index fe49c70..19db666 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTest.java @@ -21,13 +21,14 @@ import org.w3c.dom.Document; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.apache.camel.component.xquery.XQueryBuilder.xquery; import static org.apache.camel.util.ObjectHelper.className; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; -public class XQueryTest extends Assert { +public class XQueryTest { @Test public void testXQuery() throws Exception { Exchange exchange = new DefaultExchange(new DefaultCamelContext()); @@ -35,12 +36,12 @@ public class XQueryTest extends Assert { Object result = xquery(".//product[@type = 'beer']/*").evaluate(exchange, Object.class); - assertTrue("Should be a document but was: " + className(result), result instanceof Document); + assertTrue(result instanceof Document, "Should be a document but was: " + className(result)); Document doc = (Document) result; - assertEquals("Root document element name", "stella", doc.getDocumentElement().getLocalName()); + assertEquals("stella", doc.getDocumentElement().getLocalName(), "Root document element name"); result = xquery(".//product[@type = 'beer']/*").evaluate(exchange, String.class); - assertEquals("Get a wrong result", "<stella/>", result); + assertEquals("<stella/>", result, "Get a wrong result"); } } diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformIssueTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformIssueTest.java index 8f1ecf5..1bc0771 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformIssueTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformIssueTest.java @@ -20,9 +20,9 @@ import java.io.FileInputStream; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.util.IOHelper; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class XQueryTransformIssueTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java index 1093b43..5c502b4 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTest.java @@ -19,9 +19,9 @@ package org.apache.camel.builder.saxon; import org.apache.camel.Endpoint; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class XQueryTransformTest extends CamelTestSupport { @@ -39,7 +39,7 @@ public class XQueryTransformTest extends CamelTestSupport { } @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTextTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTextTest.java index a1fe11e..a8ce841 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTextTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryTransformTextTest.java @@ -19,9 +19,9 @@ package org.apache.camel.builder.saxon; import org.apache.camel.Endpoint; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class XQueryTransformTextTest extends CamelTestSupport { @@ -39,7 +39,7 @@ public class XQueryTransformTextTest extends CamelTestSupport { } @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java index d10cec3..d26427b 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryWithNamespacesFilterTest.java @@ -20,9 +20,9 @@ import org.apache.camel.Endpoint; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.builder.Namespaces; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class XQueryWithNamespacesFilterTest extends CamelTestSupport { protected Endpoint startEndpoint; @@ -47,7 +47,7 @@ public class XQueryWithNamespacesFilterTest extends CamelTestSupport { } @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/BeanWithXQueryInjectionUsingHeaderValueTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/BeanWithXQueryInjectionUsingHeaderValueTest.java index c513b4d..cb7a969 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/BeanWithXQueryInjectionUsingHeaderValueTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/BeanWithXQueryInjectionUsingHeaderValueTest.java @@ -18,8 +18,10 @@ package org.apache.camel.component.xquery; import org.apache.camel.Handler; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class BeanWithXQueryInjectionUsingHeaderValueTest extends CamelTestSupport { protected MyBean myBean = new MyBean(); @@ -29,9 +31,9 @@ public class BeanWithXQueryInjectionUsingHeaderValueTest extends CamelTestSuppor template.sendBodyAndHeader("bean:myBean", "<response>OK</response>", "invoiceDetails", "<invoice><person><name>Alan</name><date>26/08/2012</date></person></invoice>"); - assertEquals("bean response: " + myBean, "OK", myBean.response); - assertEquals("bean userName: " + myBean, "Alan", myBean.userName); - assertEquals("bean date: " + myBean, "26/08/2012", myBean.date); + assertEquals("OK", myBean.response, "bean response: " + myBean); + assertEquals("Alan", myBean.userName, "bean userName: " + myBean); + assertEquals("26/08/2012", myBean.date, "bean date: " + myBean); } @Override diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/SoapPayloadBeanTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/SoapPayloadBeanTest.java index 46efab1..c886d69 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/SoapPayloadBeanTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/SoapPayloadBeanTest.java @@ -18,8 +18,8 @@ package org.apache.camel.component.xquery; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; public class SoapPayloadBeanTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryComponentConfigurationTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryComponentConfigurationTest.java index ad919c0..e9a9736 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryComponentConfigurationTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryComponentConfigurationTest.java @@ -16,10 +16,13 @@ */ package org.apache.camel.component.xquery; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class XQueryComponentConfigurationTest extends CamelSpringTestSupport { @Test diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java index c7f715d..73754bf 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java @@ -20,10 +20,12 @@ import java.util.Random; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import static org.apache.camel.test.junit5.TestSupport.body; + /** * Concurrency test of XQuery using transform.xquery DSL. */ diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointConfigurationTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointConfigurationTest.java index 95e2387..ea5e656 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointConfigurationTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointConfigurationTest.java @@ -20,10 +20,15 @@ import java.util.Map; import net.sf.saxon.Configuration; import org.apache.camel.Endpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class XQueryEndpointConfigurationTest extends CamelSpringTestSupport { @Test public void testConfiguration() throws Exception { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java index ce9d608..e354e01 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryEndpointTest.java @@ -20,10 +20,13 @@ import java.util.List; import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class XQueryEndpointTest extends CamelSpringTestSupport { @Test @@ -39,12 +42,12 @@ public class XQueryEndpointTest extends CamelSpringTestSupport { List<Exchange> list = endpoint.getReceivedExchanges(); Exchange exchange = list.get(0); String xml = exchange.getIn().getBody(String.class); - assertNotNull("The transformed XML should not be null", xml); - assertEquals("transformed", "<transformed subject=\"Hey\"><mail><subject>Hey</subject>" - + "<body>Hello world!</body></mail></transformed>", xml); + assertNotNull(xml, "The transformed XML should not be null"); + assertEquals("<transformed subject=\"Hey\"><mail><subject>Hey</subject>" + + "<body>Hello world!</body></mail></transformed>", xml, "transformed"); TestBean bean = getMandatoryBean(TestBean.class, "testBean"); - assertEquals("bean.subject", "Hey", bean.getSubject()); + assertEquals("Hey", bean.getSubject(), "bean.subject"); } @Override diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java index 7c82e1a..948778a 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryExampleTest.java @@ -17,8 +17,8 @@ package org.apache.camel.component.xquery; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; public class XQueryExampleTest extends CamelSpringTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileExceptionTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileExceptionTest.java index 0ecede0..fe294eb 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileExceptionTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileExceptionTest.java @@ -20,9 +20,13 @@ import java.io.File; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @@ -30,7 +34,7 @@ import org.junit.Test; public class XQueryFromFileExceptionTest extends CamelTestSupport { @Override - @Before + @BeforeEach public void setUp() throws Exception { deleteDirectory("target/xquery"); super.setUp(); @@ -50,10 +54,10 @@ public class XQueryFromFileExceptionTest extends CamelTestSupport { Thread.sleep(500); File file = new File("target/xquery/hello.xml"); - assertFalse("File should not exists " + file, file.exists()); + assertFalse(file.exists(), "File should not exists " + file); file = new File("target/xquery/ok/hello.xml"); - assertTrue("File should exists " + file, file.exists()); + assertTrue(file.exists(), "File should exists " + file); } @Test @@ -71,10 +75,10 @@ public class XQueryFromFileExceptionTest extends CamelTestSupport { Thread.sleep(500); File file = new File("target/xquery/hello2.xml"); - assertFalse("File should not exists " + file, file.exists()); + assertFalse(file.exists(), "File should not exists " + file); file = new File("target/xquery/error/hello2.xml"); - assertTrue("File should exists " + file, file.exists()); + assertTrue(file.exists(), "File should exists " + file); } @Override diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileTest.java index e208231..8414dc9 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryFromFileTest.java @@ -21,9 +21,13 @@ import java.util.List; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @@ -43,13 +47,13 @@ public class XQueryFromFileTest extends CamelTestSupport { List<Exchange> list = mock.getReceivedExchanges(); Exchange exchange = list.get(0); String xml = exchange.getIn().getBody(String.class); - assertNotNull("The transformed XML should not be null", xml); - assertEquals("transformed", "<transformed subject=\"Hey\"><mail><subject>Hey</subject>" - + "<body>Hello world!</body></mail></transformed>", xml); + assertNotNull(xml, "The transformed XML should not be null"); + assertEquals("<transformed subject=\"Hey\"><mail><subject>Hey</subject>" + + "<body>Hello world!</body></mail></transformed>", xml, "transformed"); } @Override - @Before + @BeforeEach public void setUp() throws Exception { deleteDirectory("target/xquery"); super.setUp(); diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java index 7505dd8..d3c5b68 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryLanguageFromFileTest.java @@ -19,9 +19,11 @@ package org.apache.camel.component.xquery; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.test.junit5.TestSupport.deleteDirectory; /** * @@ -48,7 +50,7 @@ public class XQueryLanguageFromFileTest extends CamelTestSupport { } @Override - @Before + @BeforeEach public void setUp() throws Exception { deleteDirectory("target/xquery"); super.setUp(); diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryNullHeaderTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryNullHeaderTest.java index a6c1bcf..ee736d7 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryNullHeaderTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryNullHeaderTest.java @@ -17,8 +17,8 @@ package org.apache.camel.component.xquery; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; public class XQueryNullHeaderTest extends CamelSpringTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java index a69fc31..f79ca74 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPredicateFilterTest.java @@ -22,11 +22,11 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.language.xpath.XPathBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; -@Ignore("Fixed me later") +@Disabled("Fixed me later") public class XQueryPredicateFilterTest extends CamelTestSupport { @EndpointInject("mock:result") diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java index 88fbfed..fb34c37 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryPropogateHeadersTest.java @@ -18,8 +18,8 @@ package org.apache.camel.component.xquery; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; /** * Unit test to verify that headers can be propogated through this component. diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryStripWhitespaceTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryStripWhitespaceTest.java index ea3f8c3..970559a 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryStripWhitespaceTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryStripWhitespaceTest.java @@ -20,8 +20,11 @@ import java.io.File; import org.apache.camel.Exchange; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class XQueryStripWhitespaceTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java index 4099119..2fd9e12b 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java @@ -20,10 +20,12 @@ import java.util.Random; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import static org.apache.camel.test.junit5.TestSupport.bodyAs; + /** * Concurrency test of XQuery using classpath resources (to). */ diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java index 4201164..ccc2045 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExplicitTypeTest.java @@ -17,9 +17,9 @@ package org.apache.camel.component.xquery; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; public class XQueryWithExplicitTypeTest extends CamelSpringTestSupport { @@ -37,7 +37,7 @@ public class XQueryWithExplicitTypeTest extends CamelSpringTestSupport { } @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java index d761b18..9f0bc51 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryWithExtensionTest.java @@ -29,8 +29,8 @@ import net.sf.saxon.value.StringValue; import org.apache.camel.BindToRegistry; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; public class XQueryWithExtensionTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java index e47650a..0c9334c 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/PayloadWithDefaultNamespaceTest.java @@ -17,8 +17,8 @@ package org.apache.camel.component.xslt; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; public class PayloadWithDefaultNamespaceTest extends CamelTestSupport { private static final String PAYLOAD = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Message xmlns=\"http://www.camel.apache.org/envelope\";><Version>2.0</Version></Message>"; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java index 5968e29..a956110 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonInvalidXsltFileTest.java @@ -21,10 +21,12 @@ import javax.xml.transform.TransformerException; import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.test.junit4.TestSupport; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class SaxonInvalidXsltFileTest extends TestSupport { +import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.junit.jupiter.api.Assertions.fail; + +public class SaxonInvalidXsltFileTest { @Test public void testInvalidStylesheet() throws Exception { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonUriResolverTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonUriResolverTest.java index 285f3eb..e7b58c0 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonUriResolverTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonUriResolverTest.java @@ -28,9 +28,10 @@ import javax.xml.transform.stream.StreamSource; import net.sf.saxon.TransformerFactoryImpl; import org.apache.camel.support.ResourceHelper; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Assert; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class SaxonUriResolverTest extends CamelTestSupport { private static final String XSL_PATH = "org/apache/camel/component/xslt/transform_includes_data.xsl"; @@ -52,7 +53,7 @@ public class SaxonUriResolverTest extends CamelTestSupport { transformer.setURIResolver(new XsltUriResolver(context(), XSL_PATH)); transformer.transform(xml, result); - Assert.assertEquals(XML_RESP, writer.toString()); + assertEquals(XML_RESP, writer.toString()); } protected Source fromString(String data) throws IOException { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXslIncludeEmptyHrefTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXslIncludeEmptyHrefTest.java index c07fa57..c96abf7 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXslIncludeEmptyHrefTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXslIncludeEmptyHrefTest.java @@ -18,8 +18,8 @@ package org.apache.camel.component.xslt; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; public class SaxonXslIncludeEmptyHrefTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java index d8d1a89..b33058f 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltComponentConfigurationTest.java @@ -18,10 +18,14 @@ package org.apache.camel.component.xslt; import org.apache.camel.component.xslt.saxon.XsltSaxonComponent; import org.apache.camel.component.xslt.saxon.XsltSaxonEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class SaxonXsltComponentConfigurationTest extends CamelSpringTestSupport { @Test public void testConfiguration() throws Exception { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltDTDTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltDTDTest.java index 2e8c170..df789fb 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltDTDTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltDTDTest.java @@ -26,8 +26,10 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class SaxonXsltDTDTest extends CamelTestSupport { @@ -58,7 +60,7 @@ public class SaxonXsltDTDTest extends CamelTestSupport { List<Exchange> list = endpoint.getReceivedExchanges(); Exchange exchange = list.get(0); String xml = exchange.getIn().getBody(String.class); - assertTrue("Get a wrong transformed message", xml.indexOf("<transformed subject=\"\">") > 0); + assertTrue(xml.indexOf("<transformed subject=\"\">") > 0, "Get a wrong transformed message"); endpoint.reset(); endpoint.expectedMessageCount(1); @@ -72,13 +74,13 @@ public class SaxonXsltDTDTest extends CamelTestSupport { list = endpoint.getReceivedExchanges(); exchange = list.get(0); xml = exchange.getIn().getBody(String.class); - assertTrue("Get a wrong transformed message", xml.indexOf("<transformed subject=\"\">") > 0); + assertTrue(xml.indexOf("<transformed subject=\"\">") > 0, "Get a wrong transformed message"); } catch (Exception ex) { ex.printStackTrace(); // expect an exception here - assertTrue("Get a wrong exception", ex instanceof CamelExecutionException); + assertTrue(ex instanceof CamelExecutionException, "Get a wrong exception"); // the file could not be found - assertTrue("Get a wrong exception cause", ex.getCause() instanceof TransformerException); + assertTrue(ex.getCause() instanceof TransformerException, "Get a wrong exception cause"); } } diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java index 5db5727..67851de 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltEndpointConfigurationTest.java @@ -22,10 +22,15 @@ import net.sf.saxon.Configuration; import org.apache.camel.Endpoint; import org.apache.camel.component.xslt.saxon.XsltSaxonComponent; import org.apache.camel.component.xslt.saxon.XsltSaxonEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class SaxonXsltEndpointConfigurationTest extends CamelSpringTestSupport { @Test public void testConfiguration() throws Exception { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java index d7d738d..94f59f4 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltFeatureRouteTest.java @@ -19,8 +19,11 @@ package org.apache.camel.component.xslt; import net.sf.saxon.trans.UncheckedXPathException; import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class SaxonXsltFeatureRouteTest extends CamelTestSupport { @@ -37,8 +40,8 @@ public class SaxonXsltFeatureRouteTest extends CamelTestSupport { fail("expect an exception here"); } catch (Exception ex) { // expect an exception here - assertTrue("Get a wrong exception", ex instanceof CamelExecutionException); - assertTrue("Get a wrong exception cause", ex.getCause() instanceof UncheckedXPathException); + assertTrue(ex instanceof CamelExecutionException, "Get a wrong exception"); + assertTrue(ex.getCause() instanceof UncheckedXPathException, "Get a wrong exception cause"); } } diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java index 36cbebb..12baf10 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltMessageTerminateTest.java @@ -19,8 +19,11 @@ package org.apache.camel.component.xslt; import net.sf.saxon.expr.instruct.TerminationException; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class SaxonXsltMessageTerminateTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java index 016f83c..0c5a176 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/SaxonXsltTest.java @@ -20,11 +20,14 @@ import java.util.List; import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class SaxonXsltTest extends CamelSpringTestSupport { @Override @@ -46,12 +49,12 @@ public class SaxonXsltTest extends CamelSpringTestSupport { Exchange exchange = list.get(0); String xml = exchange.getIn().getBody(String.class); - assertNotNull("The transformed XML should not be null", xml); - assertTrue(xml.indexOf("transformed") > -1); + assertNotNull(xml, "The transformed XML should not be null"); + assertTrue(xml.contains("transformed")); // the cheese tag is in the transform.xsl - assertTrue(xml.indexOf("cheese") > -1); - assertTrue(xml.indexOf("<subject>Hey</subject>") > -1); - assertTrue(xml.indexOf("<body>Hello world!</body>") > -1); + assertTrue(xml.contains("cheese")); + assertTrue(xml.contains("<subject>Hey</subject>")); + assertTrue(xml.contains("<body>Hello world!</body>")); } diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java index c340bfc..614d27a 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/XsltRouteAllowStAXTest.java @@ -26,8 +26,12 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.xquery.TestBean; import org.apache.camel.converter.jaxp.XmlConverter; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class XsltRouteAllowStAXTest extends CamelTestSupport { @@ -63,16 +67,16 @@ public class XsltRouteAllowStAXTest extends CamelTestSupport { Exchange exchange = list.get(0); String xml = exchange.getIn().getBody(String.class); - assertNotNull("The transformed XML should not be null", xml); - assertTrue(xml.indexOf("transformed") > -1); + assertNotNull(xml, "The transformed XML should not be null"); + assertTrue(xml.contains("transformed")); // the cheese tag is in the transform.xsl - assertTrue(xml.indexOf("cheese") > -1); - assertTrue(xml.indexOf("<subject>Hey</subject>") > -1); - assertTrue(xml.indexOf("<body>Hello world!</body>") > -1); + assertTrue(xml.contains("cheese")); + assertTrue(xml.contains("<subject>Hey</subject>")); + assertTrue(xml.contains("<body>Hello world!</body>")); TestBean bean = context.getRegistry().lookupByNameAndType("testBean", TestBean.class); assertNotNull(bean); - assertEquals("bean.subject", "Hey", bean.getSubject()); + assertEquals("Hey", bean.getSubject(), "bean.subject"); } @Override diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonExtensionFunctionsTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonExtensionFunctionsTest.java index c130fbf..7e2b066 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonExtensionFunctionsTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonExtensionFunctionsTest.java @@ -18,8 +18,11 @@ package org.apache.camel.component.xslt.extensions; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.Registry; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class SaxonExtensionFunctionsTest extends CamelTestSupport { private static final String XSLT_PATH = "org/apache/camel/component/xslt/extensions/extensions.xslt"; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java index 4c3708a..9830739 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/component/xslt/extensions/SaxonSpringExtensionFunctionsTest.java @@ -16,11 +16,14 @@ */ package org.apache.camel.component.xslt.extensions; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + public class SaxonSpringExtensionFunctionsTest extends CamelSpringTestSupport { private static final String XSLT_RESULT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Test1>3</Test1><Test2>abccde</Test2><Test3>xyz</Test3>"; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java b/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java index f372900..e01580d 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java @@ -35,10 +35,13 @@ import net.sf.saxon.xpath.XPathEvaluator; import org.apache.camel.Exchange; import org.apache.camel.language.xpath.DefaultNamespaceContext; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.util.xml.StringSource; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class SaxonConverterTest extends CamelTestSupport { private static final String CONTENT = "<a xmlns=\"http://www.apache.org/test\";><b foo=\"bar\">test</b><c><d>foobar</d></c></a>"; @@ -50,7 +53,7 @@ public class SaxonConverterTest extends CamelTestSupport { private NodeInfo doc; @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); exchange = new DefaultExchange(context); diff --git a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderEnableSaxonJavaDslTest.java b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderEnableSaxonJavaDslTest.java index 0803fe5..50aaf79 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderEnableSaxonJavaDslTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderEnableSaxonJavaDslTest.java @@ -19,8 +19,8 @@ package org.apache.camel.language.xpath; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; +import org.apache.camel.test.junit5.CamelTestSupport; +import org.junit.jupiter.api.Test; public class XPathHeaderEnableSaxonJavaDslTest extends CamelTestSupport { diff --git a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderTest.java b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderTest.java index 30a71de..8df3917 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathHeaderTest.java @@ -17,8 +17,8 @@ package org.apache.camel.language.xpath; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java index f3b3b9d..551781a 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java @@ -19,13 +19,15 @@ package org.apache.camel.language.xpath; import javax.xml.xpath.XPathFactory; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.apache.camel.test.junit5.TestSupport.isJavaVendor; + /** * Tests that verify the usage of default settings in the XPath language by declaring a bean called xpath in the registry */ @@ -36,7 +38,7 @@ public class XPathLanguageDefaultSettingsTest extends CamelSpringTestSupport { private String oldPropertyValue; @Override - @Before + @BeforeEach public void setUp() throws Exception { if (!isJavaVendor("ibm")) { // Force using the JAXP default implementation, because having Saxon in the classpath will automatically make JAXP use it @@ -49,7 +51,7 @@ public class XPathLanguageDefaultSettingsTest extends CamelSpringTestSupport { } @Override - @After + @AfterEach public void tearDown() throws Exception { if (oldPropertyValue != null) { System.setProperty(KEY, oldPropertyValue); diff --git a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java index 333a91d..9d4cb93 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java @@ -20,14 +20,17 @@ import javax.xml.xpath.XPathFactory; import org.apache.camel.Exchange; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.spring.CamelSpringTestSupport; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.apache.camel.test.junit5.TestSupport.isJavaVendor; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * */ @@ -38,7 +41,7 @@ public class XPathLanguageTest extends CamelSpringTestSupport { private String oldPropertyValue; @Override - @Before + @BeforeEach public void setUp() throws Exception { if (!isJavaVendor("ibm")) { // Force using the JAXP default implementation, because having Saxon in the classpath will automatically make JAXP use it @@ -51,7 +54,7 @@ public class XPathLanguageTest extends CamelSpringTestSupport { } @Override - @After + @AfterEach public void tearDown() throws Exception { if (oldPropertyValue != null) { System.setProperty(KEY, oldPropertyValue); @@ -100,7 +103,7 @@ public class XPathLanguageTest extends CamelSpringTestSupport { assertEquals("Hello", body); } - @Ignore("See http://www.saxonica.com/documentation/index.html#!xpath-api/jaxp-xpath/factory";) + @Disabled("See http://www.saxonica.com/documentation/index.html#!xpath-api/jaxp-xpath/factory";) @Test public void testSpringDSLXPathObjectModel() throws Exception { if (!jvmAdequate) { @@ -146,7 +149,7 @@ public class XPathLanguageTest extends CamelSpringTestSupport { assertMockEndpointsSatisfied(); } - @Ignore("See http://www.saxonica.com/documentation/index.html#!xpath-api/jaxp-xpath/factory";) + @Disabled("See http://www.saxonica.com/documentation/index.html#!xpath-api/jaxp-xpath/factory";) @Test public void testSpringDSLXPathObjectModelPredicate() throws Exception { if (!jvmAdequate) {
