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 a22c39f39e8ed76f19958b2f76ed6004593bf155 Author: Guillaume Nodet <[email protected]> AuthorDate: Mon Jul 27 10:26:30 2020 +0200 [CAMEL-11807] Upgrade camel-xj to junit5 --- components/camel-xj/pom.xml | 2 +- .../test/java/org/apache/camel/component/xj/J2XInputStreamTest.java | 4 ++-- .../test/java/org/apache/camel/component/xj/J2XOutputBytesTest.java | 4 ++-- .../test/java/org/apache/camel/component/xj/J2XOutputFileTest.java | 4 ++-- .../java/org/apache/camel/component/xj/J2XOutputIdentityTest.java | 4 ++-- .../test/java/org/apache/camel/component/xj/J2XOutputStringTest.java | 4 ++-- .../java/org/apache/camel/component/xj/JsonXmlStreamReaderTest.java | 2 +- .../test/java/org/apache/camel/component/xj/X2JInputStreamTest.java | 4 ++-- .../test/java/org/apache/camel/component/xj/X2JOutputBytesTest.java | 4 ++-- .../test/java/org/apache/camel/component/xj/X2JOutputFileTest.java | 4 ++-- .../java/org/apache/camel/component/xj/X2JOutputIdentityTest.java | 4 ++-- .../test/java/org/apache/camel/component/xj/X2JOutputStringTest.java | 4 ++-- .../src/test/java/org/apache/camel/component/xj/XJTestUtils.java | 5 +++-- .../java/org/apache/camel/component/xj/XmlJsonStreamWriterTest.java | 2 +- 14 files changed, 26 insertions(+), 25 deletions(-) diff --git a/components/camel-xj/pom.xml b/components/camel-xj/pom.xml index dd815ea..43bb6cd 100644 --- a/components/camel-xj/pom.xml +++ b/components/camel-xj/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XInputStreamTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XInputStreamTest.java index 519d16e..0429c33 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XInputStreamTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XInputStreamTest.java @@ -22,8 +22,8 @@ import java.nio.charset.StandardCharsets; 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 J2XInputStreamTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputBytesTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputBytesTest.java index 0e041d9..151504b 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputBytesTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputBytesTest.java @@ -19,8 +19,8 @@ package org.apache.camel.component.xj; 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 J2XOutputBytesTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputFileTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputFileTest.java index 7195b8e..17ffd4e 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputFileTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputFileTest.java @@ -22,8 +22,8 @@ import java.io.File; 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; public class J2XOutputFileTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputIdentityTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputIdentityTest.java index f9d7d62..405856c 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputIdentityTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputIdentityTest.java @@ -19,8 +19,8 @@ package org.apache.camel.component.xj; 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 J2XOutputIdentityTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputStringTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputStringTest.java index 280009f..0f6c794 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputStringTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/J2XOutputStringTest.java @@ -19,8 +19,8 @@ package org.apache.camel.component.xj; 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 J2XOutputStringTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/JsonXmlStreamReaderTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/JsonXmlStreamReaderTest.java index c82b28a..bc594cb 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/JsonXmlStreamReaderTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/JsonXmlStreamReaderTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.xj; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class JsonXmlStreamReaderTest { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JInputStreamTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JInputStreamTest.java index 503fe99..4dfc239 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JInputStreamTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JInputStreamTest.java @@ -22,8 +22,8 @@ import java.nio.charset.StandardCharsets; 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 X2JInputStreamTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputBytesTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputBytesTest.java index fa603df..a138a3a 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputBytesTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputBytesTest.java @@ -19,8 +19,8 @@ package org.apache.camel.component.xj; 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 X2JOutputBytesTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputFileTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputFileTest.java index 84aae4a..22d514d 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputFileTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputFileTest.java @@ -22,8 +22,8 @@ import java.io.File; 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; public class X2JOutputFileTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputIdentityTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputIdentityTest.java index 5a280c8..d5758c9 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputIdentityTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputIdentityTest.java @@ -19,8 +19,8 @@ package org.apache.camel.component.xj; 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 X2JOutputIdentityTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputStringTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputStringTest.java index 088a151..930d1dc 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputStringTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/X2JOutputStringTest.java @@ -19,8 +19,8 @@ package org.apache.camel.component.xj; 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 X2JOutputStringTest extends CamelTestSupport { diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/XJTestUtils.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/XJTestUtils.java index ac1717b..e1568a8 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/XJTestUtils.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/XJTestUtils.java @@ -42,12 +42,13 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import org.apache.commons.io.IOUtils; -import org.junit.Assert; import org.skyscreamer.jsonassert.JSONAssert; import org.xmlunit.builder.DiffBuilder; import org.xmlunit.builder.Input; import org.xmlunit.diff.Diff; +import static org.junit.jupiter.api.Assertions.assertFalse; + final class XJTestUtils { private static final TransformerFactory TRANSFORMER_FACTORY = TransformerFactory.newInstance(); @@ -178,6 +179,6 @@ final class XJTestUtils { .checkForIdentical() .build(); - Assert.assertFalse("\nExpected: " + expected + "\n\nGot: " + result + "\n\nDiff: " + diff.toString(), diff.hasDifferences()); + assertFalse(diff.hasDifferences(), "\nExpected: " + expected + "\n\nGot: " + result + "\n\nDiff: " + diff.toString()); } } diff --git a/components/camel-xj/src/test/java/org/apache/camel/component/xj/XmlJsonStreamWriterTest.java b/components/camel-xj/src/test/java/org/apache/camel/component/xj/XmlJsonStreamWriterTest.java index 8c930ce..2a824e1 100644 --- a/components/camel-xj/src/test/java/org/apache/camel/component/xj/XmlJsonStreamWriterTest.java +++ b/components/camel-xj/src/test/java/org/apache/camel/component/xj/XmlJsonStreamWriterTest.java @@ -17,7 +17,7 @@ package org.apache.camel.component.xj; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class XmlJsonStreamWriterTest {
