Author: msahyoun
Date: Mon Nov 16 18:25:07 2020
New Revision: 1883489
URL: http://svn.apache.org/viewvc?rev=1883489&view=rev
Log:
PDFBOX-5017: switch test to junit5
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/AbstractTestAction.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestForbiddenAction.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestGotoAction.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestGotoRemoteAction.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestHideAction.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestNamedAction.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestSubmitAction.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestThreadAction.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestUriAction.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestMetadataFiles.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestSynchronizedMetadataValidation.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/parser/TestPreflightConfiguration.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/parser/TestXmlResultParser.java
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/AbstractTestAction.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/AbstractTestAction.java?rev=1883489&r1=1883488&r2=1883489&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/AbstractTestAction.java
(original)
+++
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/AbstractTestAction.java
Mon Nov 16 18:25:07 2020
@@ -21,6 +21,9 @@
package org.apache.pdfbox.preflight.action.pdfa1b;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import java.util.List;
@@ -36,8 +39,7 @@ import org.apache.pdfbox.preflight.Prefl
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
import org.apache.pdfbox.preflight.action.AbstractActionManager;
import org.apache.pdfbox.preflight.action.ActionManagerFactory;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+
public abstract class AbstractTestAction
{
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestForbiddenAction.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestForbiddenAction.java?rev=1883489&r1=1883488&r2=1883489&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestForbiddenAction.java
(original)
+++
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestForbiddenAction.java
Mon Nov 16 18:25:07 2020
@@ -24,7 +24,7 @@ package org.apache.pdfbox.preflight.acti
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.preflight.PreflightConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestForbiddenAction extends AbstractTestAction
{
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestGotoAction.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestGotoAction.java?rev=1883489&r1=1883488&r2=1883489&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestGotoAction.java
(original)
+++
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestGotoAction.java
Mon Nov 16 18:25:07 2020
@@ -26,7 +26,7 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.interactive.action.PDActionGoTo;
import
org.apache.pdfbox.pdmodel.interactive.documentnavigation.destination.PDDestination;
import org.apache.pdfbox.preflight.PreflightConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestGotoAction extends AbstractTestAction
{
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestGotoRemoteAction.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestGotoRemoteAction.java?rev=1883489&r1=1883488&r2=1883489&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestGotoRemoteAction.java
(original)
+++
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestGotoRemoteAction.java
Mon Nov 16 18:25:07 2020
@@ -26,7 +26,7 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.common.filespecification.PDFileSpecification;
import org.apache.pdfbox.pdmodel.interactive.action.PDActionRemoteGoTo;
import org.apache.pdfbox.preflight.PreflightConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestGotoRemoteAction extends AbstractTestAction
{
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestHideAction.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestHideAction.java?rev=1883489&r1=1883488&r2=1883489&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestHideAction.java
(original)
+++
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestHideAction.java
Mon Nov 16 18:25:07 2020
@@ -24,7 +24,7 @@ package org.apache.pdfbox.preflight.acti
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.preflight.PreflightConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestHideAction extends AbstractTestAction
{
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestNamedAction.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestNamedAction.java?rev=1883489&r1=1883488&r2=1883489&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestNamedAction.java
(original)
+++
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestNamedAction.java
Mon Nov 16 18:25:07 2020
@@ -24,7 +24,7 @@ package org.apache.pdfbox.preflight.acti
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.preflight.PreflightConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestNamedAction extends AbstractTestAction
{
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestSubmitAction.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestSubmitAction.java?rev=1883489&r1=1883488&r2=1883489&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestSubmitAction.java
(original)
+++
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestSubmitAction.java
Mon Nov 16 18:25:07 2020
@@ -25,7 +25,7 @@ import org.apache.pdfbox.cos.COSDictiona
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.common.filespecification.PDFileSpecification;
import org.apache.pdfbox.preflight.PreflightConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestSubmitAction extends AbstractTestAction
{
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestThreadAction.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestThreadAction.java?rev=1883489&r1=1883488&r2=1883489&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestThreadAction.java
(original)
+++
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestThreadAction.java
Mon Nov 16 18:25:07 2020
@@ -24,7 +24,7 @@ package org.apache.pdfbox.preflight.acti
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.preflight.PreflightConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestThreadAction extends AbstractTestAction
{
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestUriAction.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestUriAction.java?rev=1883489&r1=1883488&r2=1883489&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestUriAction.java
(original)
+++
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/action/pdfa1b/TestUriAction.java
Mon Nov 16 18:25:07 2020
@@ -28,7 +28,7 @@ import org.apache.pdfbox.pdmodel.interac
import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript;
import org.apache.pdfbox.pdmodel.interactive.action.PDActionURI;
import org.apache.pdfbox.preflight.PreflightConstants;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestUriAction extends AbstractTestAction
{
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestMetadataFiles.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestMetadataFiles.java?rev=1883489&r1=1883488&r2=1883489&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestMetadataFiles.java
(original)
+++
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestMetadataFiles.java
Mon Nov 16 18:25:07 2020
@@ -21,16 +21,17 @@
package org.apache.pdfbox.preflight.metadata;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.io.IOException;
import org.apache.pdfbox.preflight.ValidationResult;
import org.apache.pdfbox.preflight.parser.PreflightParser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
public class TestMetadataFiles
{
@@ -40,27 +41,22 @@ public class TestMetadataFiles
String testfileDirectory =
"src/test/resources/org/apache/pdfbox/preflight/metadata/";
File validFile = new File(testfileDirectory +
"PDFAMetaDataValidationTestTrailingNul.pdf");
- assertTrue("Metadata test file " + validFile + " has to be valid ",
checkPDF(validFile));
+ assertTrue(checkPDF(validFile), "Metadata test file " + validFile + "
has to be valid ");
File invalidFile1 = new File(testfileDirectory
+ "PDFAMetaDataValidationTestTrailingSpaces.pdf");
- assertFalse("Metadata test file " + invalidFile1 + " has to be invalid
",
- checkPDF(invalidFile1));
+ assertFalse(checkPDF(invalidFile1), "Metadata test file " +
invalidFile1 + " has to be invalid ");
File invalidFile2 = new File(testfileDirectory
+ "PDFAMetaDataValidationTestTrailingControlChar.pdf");
- assertFalse("Metadata test file " + invalidFile2 + " has to be invalid
",
- checkPDF(invalidFile2));
+ assertFalse(checkPDF(invalidFile2), "Metadata test file " +
invalidFile2 + " has to be invalid ");
File invalidFile3 = new File(testfileDirectory +
"PDFAMetaDataValidationTestMiddleNul.pdf");
- assertFalse("Metadata test file " + invalidFile3 + " has to be invalid
",
- checkPDF(invalidFile3));
+ assertFalse(checkPDF(invalidFile3), "Metadata test file " +
invalidFile3 + " has to be invalid ");
File invalidFile4 = new File(testfileDirectory
+ "PDFAMetaDataValidationTestMiddleControlChar.pdf");
- assertFalse("Metadata test file " + invalidFile4 + " has to be invalid
",
- checkPDF(invalidFile4));
-
+ assertFalse(checkPDF(invalidFile4), "Metadata test file " +
invalidFile4 + " has to be invalid ");
}
private boolean checkPDF(File pdf)
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestSynchronizedMetadataValidation.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestSynchronizedMetadataValidation.java?rev=1883489&r1=1883488&r2=1883489&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestSynchronizedMetadataValidation.java
(original)
+++
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestSynchronizedMetadataValidation.java
Mon Nov 16 18:25:07 2020
@@ -21,13 +21,16 @@
package org.apache.pdfbox.preflight.metadata;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.IOException;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.List;
-import org.junit.Assert;
-
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentInformation;
import org.apache.pdfbox.preflight.PreflightConstants;
@@ -37,10 +40,11 @@ import org.apache.xmpbox.XMPMetadata;
import org.apache.xmpbox.schema.AdobePDFSchema;
import org.apache.xmpbox.schema.DublinCoreSchema;
import org.apache.xmpbox.schema.XMPBasicSchema;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
/**
* Test Class of SynchronizedMetaDataValidation (for 6-7-3 Isartor Tests)
@@ -59,13 +63,13 @@ public class TestSynchronizedMetadataVal
protected static SynchronizedMetaDataValidation sync;
protected List<ValidationError> ve;
- @BeforeClass
+ @BeforeAll
public static void initSynchronizedMetadataValidation()
{
sync = new SynchronizedMetaDataValidation();
}
- @Before
+ @BeforeEach
public void initNewDocumentInformation() throws Exception
{
doc = new PDDocument();
@@ -78,10 +82,12 @@ public class TestSynchronizedMetadataVal
*
* @throws ValidationException
*/
- @Test(expected = ValidationException.class)
+ @Test
public void TestNullDocument() throws ValidationException
{
- sync.validateMetadataSynchronization(null, metadata);
+ assertThrows(ValidationException.class, () -> {
+ sync.validateMetadataSynchronization(null, metadata);
+ });
}
/**
@@ -89,10 +95,12 @@ public class TestSynchronizedMetadataVal
*
* @throws ValidationException
*/
- @Test(expected = ValidationException.class)
+ @Test
public void TestNullMetaData() throws ValidationException
{
- sync.validateMetadataSynchronization(doc, null);
+ assertThrows(ValidationException.class, () -> {
+ sync.validateMetadataSynchronization(doc, null);
+ });
}
/**
@@ -107,7 +115,7 @@ public class TestSynchronizedMetadataVal
{
ve = sync.validateMetadataSynchronization(doc, metadata);
// Test without any information
- Assert.assertEquals(0, ve.size());
+ assertEquals(0, ve.size());
}
catch (ValidationException e)
{
@@ -149,7 +157,7 @@ public class TestSynchronizedMetadataVal
// Test Detection of an Empty XMP (without any schemas)
for (ValidationError valid : ve)
{
-
Assert.assertEquals(PreflightConstants.ERROR_METADATA_MISMATCH,
valid.getErrorCode());
+ assertEquals(PreflightConstants.ERROR_METADATA_MISMATCH,
valid.getErrorCode());
}
}
catch (ValidationException e)
@@ -195,7 +203,7 @@ public class TestSynchronizedMetadataVal
{
ve = sync.validateMetadataSynchronization(doc, metadata);
// Test Detection of absent XMP values
- Assert.assertEquals(8, ve.size());
+ assertEquals(8, ve.size());
}
catch (ValidationException e)
{
@@ -209,7 +217,7 @@ public class TestSynchronizedMetadataVal
*
* @throws Exception
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testNullArrayValue() throws Exception
{
// building temporary XMP metadata
@@ -218,18 +226,22 @@ public class TestSynchronizedMetadataVal
// AUTHOR
dico.setAuthor("dicoAuthor");
- dc.addCreator(null);
-
+ assertThrows(IllegalArgumentException.class, () -> {
+ dc.addCreator(null);
+ });
+
// SUBJECT
dico.setSubject("dicoSubj");
- dc.addSubject(null);
+ assertThrows(IllegalArgumentException.class, () -> {
+ dc.addSubject(null);
+ });
// Launching synchronization test
try
{
ve = sync.validateMetadataSynchronization(doc, metadata);
// Test unsychronized value
- Assert.assertEquals(2, ve.size());
+ assertEquals(2, ve.size());
}
catch (ValidationException e)
@@ -288,7 +300,7 @@ public class TestSynchronizedMetadataVal
{
ve = sync.validateMetadataSynchronization(doc, metadata);
// Test unsychronized value
- Assert.assertEquals(8, ve.size());
+ assertEquals(8, ve.size());
}
catch (ValidationException e)
{
@@ -344,7 +356,7 @@ public class TestSynchronizedMetadataVal
{
ve = sync.validateMetadataSynchronization(doc, metadata);
// Test unsychronized value
- Assert.assertEquals(8, ve.size());
+ assertEquals(8, ve.size());
}
catch (ValidationException e)
{
@@ -398,7 +410,7 @@ public class TestSynchronizedMetadataVal
{
ve = sync.validateMetadataSynchronization(doc, metadata);
// Checking all is synchronized
- Assert.assertEquals(0, ve.size());
+ assertEquals(0, ve.size());
}
catch (ValidationException e)
{
@@ -415,7 +427,7 @@ public class TestSynchronizedMetadataVal
public void checkSchemaAccessException() throws Exception
{
Throwable cause = new Throwable();
- Assert.assertSame(cause, sync.schemaAccessException("test",
cause).getCause());
+ assertSame(cause, sync.schemaAccessException("test",
cause).getCause());
}
/**
@@ -468,7 +480,7 @@ public class TestSynchronizedMetadataVal
ve = sync.validateMetadataSynchronization(doc, metadata);
for (ValidationError valid : ve)
{
-
Assert.assertEquals(PreflightConstants.ERROR_METADATA_WRONG_NS_PREFIX,
valid.getErrorCode());
+
assertEquals(PreflightConstants.ERROR_METADATA_WRONG_NS_PREFIX,
valid.getErrorCode());
}
}
catch (ValidationException e)
@@ -534,7 +546,7 @@ public class TestSynchronizedMetadataVal
try
{
ve = sync.validateMetadataSynchronization(doc, metadata);
- Assert.assertTrue(ve.isEmpty());
+ assertTrue(ve.isEmpty());
}
catch (ValidationException e)
{
@@ -568,7 +580,7 @@ public class TestSynchronizedMetadataVal
{
ve = sync.validateMetadataSynchronization(doc, metadata);
// Test unsychronized value
- Assert.assertEquals(0, ve.size());
+ assertEquals(0, ve.size());
}
catch (ValidationException e)
{
@@ -576,7 +588,7 @@ public class TestSynchronizedMetadataVal
}
}
- @After
+ @AfterEach
public void checkErrors() throws Exception
{
try
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/parser/TestPreflightConfiguration.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/parser/TestPreflightConfiguration.java?rev=1883489&r1=1883488&r2=1883489&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/parser/TestPreflightConfiguration.java
(original)
+++
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/parser/TestPreflightConfiguration.java
Mon Nov 16 18:25:07 2020
@@ -21,23 +21,27 @@
package org.apache.pdfbox.preflight.parser;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.pdfbox.preflight.PreflightConfiguration;
import org.apache.pdfbox.preflight.PreflightContext;
import org.apache.pdfbox.preflight.exception.MissingValidationProcessException;
import org.apache.pdfbox.preflight.exception.ValidationException;
import org.apache.pdfbox.preflight.process.ValidationProcess;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class TestPreflightConfiguration
{
- @Test(expected = MissingValidationProcessException.class)
+ @Test
public void testGetValidationProcess_MissingProcess() throws Exception
{
PreflightConfiguration configuration =
PreflightConfiguration.createPdfA1BConfiguration();
- configuration.getInstanceOfProcess("unknownProcess");
+ assertThrows(MissingValidationProcessException.class, () -> {
+ configuration.getInstanceOfProcess("unknownProcess");
+ });
}
@Test
@@ -45,7 +49,9 @@ public class TestPreflightConfiguration
{
PreflightConfiguration configuration =
PreflightConfiguration.createPdfA1BConfiguration();
configuration.setErrorOnMissingProcess(false);
- configuration.getInstanceOfProcess("unknownProcess");
+ assertDoesNotThrow(() -> {
+ configuration.getInstanceOfProcess("unknownProcess");
+ });
}
@Test
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/parser/TestXmlResultParser.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/parser/TestXmlResultParser.java?rev=1883489&r1=1883488&r2=1883489&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/parser/TestXmlResultParser.java
(original)
+++
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/parser/TestXmlResultParser.java
Mon Nov 16 18:25:07 2020
@@ -20,15 +20,16 @@
****************************************************************************/
package org.apache.pdfbox.preflight.parser;
-
import org.apache.pdfbox.preflight.ValidationResult;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
@@ -47,7 +48,7 @@ public class TestXmlResultParser
protected XPath xpath;
- @Before
+ @BeforeEach
public void before() throws Exception
{
document =
DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
@@ -61,9 +62,9 @@ public class TestXmlResultParser
ValidationResult result = new ValidationResult(false);
result.addError(new ValidationResult.ValidationError("7"));
parser.createResponseWithError(document, "pdftype", result, preflight);
- Assert.assertNotNull(xpath.evaluate("errors[@count='1']", preflight,
XPathConstants.NODE));
+ assertNotNull(xpath.evaluate("errors[@count='1']", preflight,
XPathConstants.NODE));
NodeList nl = (NodeList)xpath.evaluate("errors/error[@count='1']",
preflight, XPathConstants.NODESET);
- Assert.assertEquals(1,nl.getLength());
+ assertEquals(1,nl.getLength());
}
@Test
@@ -73,9 +74,9 @@ public class TestXmlResultParser
result.addError(new ValidationResult.ValidationError("7"));
result.addError(new ValidationResult.ValidationError(ERROR_CODE));
parser.createResponseWithError(document, "pdftype", result, preflight);
- Assert.assertNotNull(xpath.evaluate("errors[@count='2']", preflight,
XPathConstants.NODE));
+ assertNotNull(xpath.evaluate("errors[@count='2']", preflight,
XPathConstants.NODE));
NodeList nl = (NodeList)xpath.evaluate("errors/error[@count='1']",
preflight, XPathConstants.NODESET);
- Assert.assertEquals(2,nl.getLength());
+ assertEquals(2,nl.getLength());
}
@Test
@@ -85,11 +86,11 @@ public class TestXmlResultParser
result.addError(new ValidationResult.ValidationError(ERROR_CODE));
result.addError(new ValidationResult.ValidationError(ERROR_CODE));
parser.createResponseWithError(document,"pdftype",result,preflight);
- Assert.assertNotNull(xpath.evaluate("errors[@count='2']", preflight,
XPathConstants.NODE));
- Assert.assertNotNull(xpath.evaluate("errors/error[@count='2']",
preflight, XPathConstants.NODE));
+ assertNotNull(xpath.evaluate("errors[@count='2']", preflight,
XPathConstants.NODE));
+ assertNotNull(xpath.evaluate("errors/error[@count='2']", preflight,
XPathConstants.NODE));
Element code =
(Element)xpath.evaluate("errors/error[@count='2']/code", preflight,
XPathConstants.NODE);
- Assert.assertNotNull(code);
- Assert.assertEquals(ERROR_CODE,code.getTextContent());
+ assertNotNull(code);
+ assertEquals(ERROR_CODE,code.getTextContent());
}
@Test
@@ -99,9 +100,9 @@ public class TestXmlResultParser
result.addError(new
ValidationResult.ValidationError(ERROR_CODE,"message 1"));
result.addError(new
ValidationResult.ValidationError(ERROR_CODE,"message 2"));
parser.createResponseWithError(document, "pdftype", result, preflight);
- Assert.assertNotNull(xpath.evaluate("errors[@count='2']", preflight,
XPathConstants.NODE));
+ assertNotNull(xpath.evaluate("errors[@count='2']", preflight,
XPathConstants.NODE));
NodeList nl = (NodeList)xpath.evaluate("errors/error[@count='1']",
preflight, XPathConstants.NODESET);
- Assert.assertEquals(2,nl.getLength());
+ assertEquals(2,nl.getLength());
}
