Author: msahyoun Date: Mon Nov 16 17:54:52 2020 New Revision: 1883487 URL: http://svn.apache.org/viewvc?rev=1883487&view=rev Log: PDFBOX-5017: switch test to junit5
Modified: pdfbox/trunk/preflight/pom.xml pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestInvalidDirectory.java pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPDFBox3741.java pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPreflightConfiguration.java pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPreflightPath.java pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestValidDirectory.java Modified: pdfbox/trunk/preflight/pom.xml URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/pom.xml?rev=1883487&r1=1883486&r2=1883487&view=diff ============================================================================== --- pdfbox/trunk/preflight/pom.xml (original) +++ pdfbox/trunk/preflight/pom.xml Mon Nov 16 17:54:52 2020 @@ -176,6 +176,10 @@ <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-params</artifactId> + </dependency> <dependency> <groupId>org.junit.vintage</groupId> <artifactId>junit-vintage-engine</artifactId> Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestInvalidDirectory.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestInvalidDirectory.java?rev=1883487&r1=1883486&r2=1883487&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestInvalidDirectory.java (original) +++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestInvalidDirectory.java Mon Nov 16 17:54:52 2020 @@ -21,42 +21,31 @@ package org.apache.pdfbox.preflight; +import static org.junit.jupiter.api.Assertions.assertFalse; + import java.io.File; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.apache.pdfbox.preflight.parser.PreflightParser; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) public class TestInvalidDirectory { - - protected static File directory; - - protected File target = null; - - public TestInvalidDirectory(File file) - { - this.target = file; - } - - @Test - public void validate() throws Exception + @ParameterizedTest + @MethodSource("initializeParameters") + public void validate(File target) throws Exception { System.out.println(target); ValidationResult result = PreflightParser.validate(target); - Assert.assertFalse("Test of " + target, result.isValid()); + assertFalse(result.isValid(), "Test of " + target); } - @Parameters - public static Collection<Object[]> initializeParameters() throws Exception + public static Collection<File> initializeParameters() throws Exception { // check directory File directory = null; @@ -80,21 +69,20 @@ public class TestInvalidDirectory // create list if (directory == null) { - return new ArrayList<>(0); + return Collections.emptyList(); } else { File[] files = directory.listFiles(); - List<Object[]> data = new ArrayList<>(files.length); + List<File> data = new ArrayList<>(files.length); for (File file : files) { if (file.isFile()) { - data.add(new Object[] { file }); + data.add(file); } } return data; } } - } Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPDFBox3741.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPDFBox3741.java?rev=1883487&r1=1883486&r2=1883487&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPDFBox3741.java (original) +++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPDFBox3741.java Mon Nov 16 17:54:52 2020 @@ -15,13 +15,14 @@ */ package org.apache.pdfbox.preflight; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + import java.io.File; import java.io.IOException; import org.apache.pdfbox.preflight.parser.PreflightParser; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @@ -41,8 +42,8 @@ public class TestPDFBox3741 .validate(new File("src/test/resources/PDFBOX-3741.pdf")); // Error should be: // 2.4.3: Invalid Color space, /DeviceGray default for operator "Tj" can't be used without Color Profile - Assert.assertFalse("File PDFBOX-3741.pdf should be detected as not PDF/A-1b", result.isValid()); - Assert.assertEquals("List should contain one result", 1, result.getErrorsList().size()); - Assert.assertEquals("2.4.3", result.getErrorsList().get(0).getErrorCode()); + assertFalse(result.isValid(), "File PDFBOX-3741.pdf should be detected as not PDF/A-1b"); + assertEquals(1, result.getErrorsList().size(), "List should contain one result"); + assertEquals(result.getErrorsList().get(0).getErrorCode(), "2.4.3"); } } Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPreflightConfiguration.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPreflightConfiguration.java?rev=1883487&r1=1883486&r2=1883487&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPreflightConfiguration.java (original) +++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPreflightConfiguration.java Mon Nov 16 17:54:52 2020 @@ -20,13 +20,16 @@ ****************************************************************************/ package org.apache.pdfbox.preflight; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.pdfbox.preflight.exception.ValidationException; import org.apache.pdfbox.preflight.process.BookmarkValidationProcess; import org.apache.pdfbox.preflight.process.EmptyValidationProcess; import org.apache.pdfbox.preflight.process.ValidationProcess; import org.apache.pdfbox.preflight.process.reflect.ResourcesValidationProcess; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestPreflightConfiguration { @@ -36,8 +39,8 @@ public class TestPreflightConfiguration { PreflightConfiguration confg = PreflightConfiguration.createPdfA1BConfiguration(); ValidationProcess vp = confg.getInstanceOfProcess(PreflightConfiguration.BOOKMARK_PROCESS); - Assert.assertNotNull(vp); - Assert.assertTrue(vp instanceof BookmarkValidationProcess); + assertNotNull(vp); + assertTrue(vp instanceof BookmarkValidationProcess); } @Test @@ -45,8 +48,8 @@ public class TestPreflightConfiguration { PreflightConfiguration confg = PreflightConfiguration.createPdfA1BConfiguration(); ValidationProcess vp = confg.getInstanceOfProcess(PreflightConfiguration.RESOURCES_PROCESS); - Assert.assertNotNull(vp); - Assert.assertTrue(vp instanceof ResourcesValidationProcess); + assertNotNull(vp); + assertTrue(vp instanceof ResourcesValidationProcess); } @Test @@ -56,8 +59,8 @@ public class TestPreflightConfiguration confg.setErrorOnMissingProcess(false); confg.removeProcess(PreflightConfiguration.BOOKMARK_PROCESS); ValidationProcess vp = confg.getInstanceOfProcess(PreflightConfiguration.BOOKMARK_PROCESS); - Assert.assertNotNull(vp); - Assert.assertTrue(vp instanceof EmptyValidationProcess); + assertNotNull(vp); + assertTrue(vp instanceof EmptyValidationProcess); } @Test @@ -67,43 +70,47 @@ public class TestPreflightConfiguration confg.setErrorOnMissingProcess(false); confg.removePageProcess(PreflightConfiguration.RESOURCES_PROCESS); ValidationProcess vp = confg.getInstanceOfProcess(PreflightConfiguration.RESOURCES_PROCESS); - Assert.assertNotNull(vp); - Assert.assertTrue(vp instanceof EmptyValidationProcess); + assertNotNull(vp); + assertTrue(vp instanceof EmptyValidationProcess); } - @Test(expected=ValidationException.class) + @Test public void testGetMissingValidationProcess() throws Exception { PreflightConfiguration confg = PreflightConfiguration.createPdfA1BConfiguration(); confg.removeProcess(PreflightConfiguration.BOOKMARK_PROCESS); - confg.getInstanceOfProcess(PreflightConfiguration.BOOKMARK_PROCESS); - Assert.fail(); + assertThrows(ValidationException.class, () -> { + confg.getInstanceOfProcess(PreflightConfiguration.BOOKMARK_PROCESS); + }); } - @Test(expected=ValidationException.class) + @Test public void testGetMissingValidationPageProcess() throws Exception { PreflightConfiguration confg = PreflightConfiguration.createPdfA1BConfiguration(); confg.removePageProcess(PreflightConfiguration.RESOURCES_PROCESS); - confg.getInstanceOfProcess(PreflightConfiguration.RESOURCES_PROCESS); - Assert.fail(); + assertThrows(ValidationException.class, () -> { + confg.getInstanceOfProcess(PreflightConfiguration.RESOURCES_PROCESS); + }); } - @Test(expected=ValidationException.class) + @Test public void testGetMissingValidationProcess2() throws Exception { PreflightConfiguration confg = PreflightConfiguration.createPdfA1BConfiguration(); confg.replaceProcess(PreflightConfiguration.BOOKMARK_PROCESS, null); - confg.getInstanceOfProcess(PreflightConfiguration.BOOKMARK_PROCESS); - Assert.fail(); + assertThrows(ValidationException.class, () -> { + confg.getInstanceOfProcess(PreflightConfiguration.BOOKMARK_PROCESS); + }); } - @Test(expected=ValidationException.class) + @Test public void testGetMissingValidationPageProcess2() throws Exception { PreflightConfiguration confg = PreflightConfiguration.createPdfA1BConfiguration(); confg.replacePageProcess(PreflightConfiguration.RESOURCES_PROCESS, null); - confg.getInstanceOfProcess(PreflightConfiguration.RESOURCES_PROCESS); - Assert.fail(); + assertThrows(ValidationException.class, () -> { + confg.getInstanceOfProcess(PreflightConfiguration.RESOURCES_PROCESS); + }); } } Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPreflightPath.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPreflightPath.java?rev=1883487&r1=1883486&r2=1883487&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPreflightPath.java (original) +++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestPreflightPath.java Mon Nov 16 17:54:52 2020 @@ -21,11 +21,11 @@ package org.apache.pdfbox.preflight; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestPreflightPath { Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestValidDirectory.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestValidDirectory.java?rev=1883487&r1=1883486&r2=1883487&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestValidDirectory.java (original) +++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/TestValidDirectory.java Mon Nov 16 17:54:52 2020 @@ -21,39 +21,30 @@ package org.apache.pdfbox.preflight; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import org.apache.pdfbox.preflight.parser.PreflightParser; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; -@RunWith(Parameterized.class) public class TestValidDirectory { - - protected File target = null; - - public TestValidDirectory(File file) - { - this.target = file; - } - - @Test - public void validate() throws Exception + @ParameterizedTest + @MethodSource("initializeParameters") + public void validate(File target) throws Exception { System.out.println(target); ValidationResult result = PreflightParser.validate(target); - Assert.assertTrue("Validation of " + target, result.isValid()); + assertTrue(result.isValid(), "Validation of " + target); } - @Parameters - public static Collection<Object[]> initializeParameters() throws Exception + public static Collection<File> initializeParameters() throws Exception { // check directory File directory = null; @@ -77,21 +68,20 @@ public class TestValidDirectory // create list if (directory == null) { - return new ArrayList<>(0); + return Collections.emptyList(); } else { File[] files = directory.listFiles(); - List<Object[]> data = new ArrayList<>(files.length); + List<File> data = new ArrayList<>(files.length); for (File file : files) { if (file.isFile()) { - data.add(new Object[] { file }); + data.add(file); } } return data; } } - }