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 fb07bc0041693a7a902cc81f4b2be81cd46bcec9 Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Fri Jul 17 15:51:44 2020 +0200 [CAMEL-11807] Upgrade camel-pdf to junit5 --- components/camel-pdf/pom.xml | 6 +++--- .../org/apache/camel/component/pdf/PdfAppendTest.java | 10 ++++++---- .../org/apache/camel/component/pdf/PdfCreationTest.java | 16 ++++++++++------ .../camel/component/pdf/PdfTextExtractionTest.java | 5 +++-- .../component/pdf/text/PatternSplitStrategyTest.java | 4 ++-- .../camel/component/pdf/text/WordSplitStrategyTest.java | 4 ++-- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/components/camel-pdf/pom.xml b/components/camel-pdf/pom.xml index 8e23736..ff636e7 100644 --- a/components/camel-pdf/pom.xml +++ b/components/camel-pdf/pom.xml @@ -70,12 +70,12 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> + <artifactId>camel-test-junit5</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> <exclusions> <exclusion> diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java index 16a1072..a0d8dfa 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java @@ -27,7 +27,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Predicate; 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.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageContentStream; @@ -37,11 +37,13 @@ import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial; import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy; import org.apache.pdfbox.pdmodel.font.PDType1Font; import org.apache.pdfbox.text.PDFTextStripper; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; +import static org.junit.jupiter.api.Assertions.assertEquals; public class PdfAppendTest extends CamelTestSupport { @@ -49,7 +51,7 @@ public class PdfAppendTest extends CamelTestSupport { protected MockEndpoint resultEndpoint; @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); } diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java index 9bb9005..e01ff15 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java @@ -25,16 +25,20 @@ import org.apache.camel.Exchange; import org.apache.camel.Predicate; 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.apache.pdfbox.pdmodel.encryption.AccessPermission; import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy; import org.apache.pdfbox.text.PDFTextStripper; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class PdfCreationTest extends CamelTestSupport { @@ -42,7 +46,7 @@ public class PdfCreationTest extends CamelTestSupport { protected MockEndpoint resultEndpoint; @Override - @Before + @BeforeEach public void setUp() throws Exception { super.setUp(); } @@ -94,8 +98,8 @@ public class PdfCreationTest extends CamelTestSupport { assertThat(body, instanceOf(ByteArrayOutputStream.class)); try { PDDocument doc = PDDocument.load(new ByteArrayInputStream(((ByteArrayOutputStream) body).toByteArray()), userPass); - assertTrue("Expected encrypted document", doc.isEncrypted()); - assertFalse("Printing should not be permitted", doc.getCurrentAccessPermission().canPrint()); + assertTrue(doc.isEncrypted(), "Expected encrypted document"); + assertFalse(doc.getCurrentAccessPermission().canPrint(), "Printing should not be permitted"); PDFTextStripper pdfTextStripper = new PDFTextStripper(); String text = pdfTextStripper.getText(doc); assertEquals(1, doc.getNumberOfPages()); diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java index f994d7d..7996277 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java @@ -24,7 +24,7 @@ import org.apache.camel.Exchange; import org.apache.camel.Predicate; 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.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageContentStream; @@ -33,8 +33,9 @@ import org.apache.pdfbox.pdmodel.encryption.AccessPermission; import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial; import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy; import org.apache.pdfbox.pdmodel.font.PDType1Font; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/text/PatternSplitStrategyTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/text/PatternSplitStrategyTest.java index 18f1d14..449a66a 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/text/PatternSplitStrategyTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/text/PatternSplitStrategyTest.java @@ -19,9 +19,9 @@ package org.apache.camel.component.pdf.text; import java.util.ArrayList; import java.util.Collection; -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 PatternSplitStrategyTest { private static final String PATTERN = "\n"; diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/text/WordSplitStrategyTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/text/WordSplitStrategyTest.java index 8b9cddc..92a2a20 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/text/WordSplitStrategyTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/text/WordSplitStrategyTest.java @@ -19,9 +19,9 @@ package org.apache.camel.component.pdf.text; import java.util.ArrayList; import java.util.Collection; -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 WordSplitStrategyTest {