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 0c964a5e419ee56069671837e0ece463b01bd7ba Author: Guillaume Nodet <[email protected]> AuthorDate: Mon Jul 27 11:17:46 2020 +0200 [CAMEL-11807] Upgrade camel-xstream to junit5 --- components/camel-xstream/pom.xml | 6 +++--- .../xstream/MarshalDomainObjectJSONDropRootNodeTest.java | 1 - .../apache/camel/dataformat/xstream/MarshalListTest.java | 4 ++-- .../camel/dataformat/xstream/UnmarshalThenMarshalTest.java | 14 ++++++++++---- .../camel/dataformat/xstream/XStreamConcurrencyTest.java | 6 ++++-- .../camel/dataformat/xstream/XStreamConfigurationTest.java | 12 +++++++----- .../xstream/XStreamDataFormatDriverConfigTest.java | 6 ++++-- 7 files changed, 30 insertions(+), 19 deletions(-) diff --git a/components/camel-xstream/pom.xml b/components/camel-xstream/pom.xml index c19a52a..7c774b6 100644 --- a/components/camel-xstream/pom.xml +++ b/components/camel-xstream/pom.xml @@ -71,7 +71,7 @@ <!-- test dependencies --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> @@ -100,8 +100,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-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONDropRootNodeTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONDropRootNodeTest.java index a64b95e..23a0cbe 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONDropRootNodeTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONDropRootNodeTest.java @@ -23,7 +23,6 @@ import org.apache.camel.model.dataformat.JsonLibrary; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertEquals; public class MarshalDomainObjectJSONDropRootNodeTest extends CamelTestSupport { diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java index 03a849d..e1f88f4 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java @@ -25,8 +25,8 @@ import org.apache.camel.EndpointInject; 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; /** * Marshal tests with List objects. diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalTest.java index 00a2bf7..10f07e4 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/UnmarshalThenMarshalTest.java @@ -22,11 +22,17 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; 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.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class UnmarshalThenMarshalTest extends CamelTestSupport { - + + private Logger log = LoggerFactory.getLogger(getClass()); + @Test public void testSendXmlAndUnmarshal() throws Exception { @@ -47,7 +53,7 @@ public class UnmarshalThenMarshalTest extends CamelTestSupport { Object actualBody = exchange.getIn().getBody(); log.debug("Received: " + actualBody); - assertEquals("Received body", expectedBody, actualBody); + assertEquals(expectedBody, actualBody, "Received body"); } @Override diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java index 84a4fc1..e09911e 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java @@ -21,8 +21,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; 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.body; public class XStreamConcurrencyTest extends CamelTestSupport { diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java index ff904ec..00fd9a5 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConfigurationTest.java @@ -31,9 +31,11 @@ import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.dataformat.XStreamDataFormat; -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.junit.jupiter.api.Assertions.assertTrue; /** * Marshal tests with domain objects. @@ -44,7 +46,7 @@ public class XStreamConfigurationTest extends CamelTestSupport { private static volatile boolean methodInjected; @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); constructorInjected = false; @@ -124,7 +126,7 @@ public class XStreamConfigurationTest extends CamelTestSupport { mock.assertIsSatisfied(); String result = mock.getExchanges().get(0).getIn().getBody(String.class); // make sure the result is start with "{" - assertTrue("Should get a json result", result.startsWith("{")); + assertTrue(result.startsWith("{"), "Should get a json result"); } @Override diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatDriverConfigTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatDriverConfigTest.java index 4935cbb..f52d6fc 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatDriverConfigTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatDriverConfigTest.java @@ -18,8 +18,10 @@ package org.apache.camel.dataformat.xstream; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver; -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 XStreamDataFormatDriverConfigTest extends CamelTestSupport {
