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 6e211039b7f2eb3358263215d2afaf51c805ca6d Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Jun 24 17:46:09 2020 +0200 [CAMEL-11807] Upgrade camel-fop to junit5 --- components/camel-fop/pom.xml | 2 +- .../org/apache/camel/component/fop/FopComponentTest.java | 14 +++++++++----- .../org/apache/camel/component/fop/FopEndpointTest.java | 7 +++++-- .../org/apache/camel/component/fop/FopOutputTypeTest.java | 4 ++-- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/components/camel-fop/pom.xml b/components/camel-fop/pom.xml index 953cbaf..8be65b6 100644 --- a/components/camel-fop/pom.xml +++ b/components/camel-fop/pom.xml @@ -74,7 +74,7 @@ <!-- for testing --> <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-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java index d2dc7b3f..8f37eaf 100644 --- a/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java +++ b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java @@ -25,10 +25,14 @@ import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.pdfbox.pdmodel.PDDocument; -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.test.junit5.TestSupport.deleteDirectory; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class FopComponentTest extends CamelTestSupport { @@ -41,7 +45,7 @@ public class FopComponentTest extends CamelTestSupport { private boolean canTest = true; @Override - @Before + @BeforeEach public void setUp() throws Exception { deleteDirectory("target/data"); @@ -72,7 +76,7 @@ public class FopComponentTest extends CamelTestSupport { // assert on the header "foo" being populated Exchange exchange = resultEndpoint.getReceivedExchanges().get(0); - assertEquals("Header value is lost!", "bar", exchange.getIn().getHeader("foo")); + assertEquals("bar", exchange.getIn().getHeader("foo"), "Header value is lost!"); } @Override diff --git a/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java index 0df933c..6ec1991 100644 --- a/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java +++ b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopEndpointTest.java @@ -23,10 +23,13 @@ import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.Producer; import org.apache.camel.support.DefaultExchange; -import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.pdmodel.PDDocument; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class FopEndpointTest extends CamelTestSupport { diff --git a/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopOutputTypeTest.java b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopOutputTypeTest.java index 6208bb4..067b41f 100644 --- a/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopOutputTypeTest.java +++ b/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopOutputTypeTest.java @@ -16,9 +16,9 @@ */ package org.apache.camel.component.fop; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class FopOutputTypeTest {
