Author: lehmi
Date: Sun Nov 15 16:42:47 2020
New Revision: 1883451
URL: http://svn.apache.org/viewvc?rev=1883451&view=rev
Log:
PDFBOX-5017: switch test to junit5
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAcroFormsTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAnnotationsTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/OverlayTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PageExtractorTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageLayoutTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageModeTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestFDF.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentInformation.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageAnnotationsFiltering.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageContentStream.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageTransitions.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageTree.java
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAcroFormsTest.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAcroFormsTest.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAcroFormsTest.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAcroFormsTest.java
Sun Nov 15 16:42:47 2020
@@ -16,9 +16,9 @@
*/
package org.apache.pdfbox.multipdf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.File;
@@ -34,8 +34,8 @@ import org.apache.pdfbox.multipdf.PDFMer
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
import org.apache.pdfbox.pdmodel.interactive.form.PDField;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test merging different PDFs with AcroForms.
@@ -48,7 +48,7 @@ public class MergeAcroFormsTest
private static final File OUT_DIR = new File("target/test-output/merge/");
private static final File TARGET_PDF_DIR = new File("target/pdfs");
- @Before
+ @BeforeEach
public void setUp()
{
OUT_DIR.mkdirs();
@@ -77,20 +77,22 @@ public class MergeAcroFormsTest
PDAcroForm compliantAcroForm =
compliantDocument.getDocumentCatalog().getAcroForm();
PDAcroForm toBeComparedAcroForm =
toBeCompared.getDocumentCatalog().getAcroForm();
- assertEquals("There shall be the same number of root fields",
- compliantAcroForm.getFields().size(),
- toBeComparedAcroForm.getFields().size());
+ assertEquals(compliantAcroForm.getFields().size(),
+ toBeComparedAcroForm.getFields().size(),
+ "There shall be the same number of root fields");
for (PDField compliantField : compliantAcroForm.getFieldTree())
{
- assertNotNull("There shall be a field with the same FQN",
toBeComparedAcroForm.getField(compliantField.getFullyQualifiedName()));
+
assertNotNull(toBeComparedAcroForm.getField(compliantField.getFullyQualifiedName()),
+ "There shall be a field with the same FQN");
PDField toBeComparedField =
toBeComparedAcroForm.getField(compliantField.getFullyQualifiedName());
compareFieldProperties(compliantField, toBeComparedField);
}
for (PDField toBeComparedField :
toBeComparedAcroForm.getFieldTree())
{
- assertNotNull("There shall be a field with the same FQN",
compliantAcroForm.getField(toBeComparedField.getFullyQualifiedName()));
+
assertNotNull(compliantAcroForm.getField(toBeComparedField.getFullyQualifiedName()),
+ "There shall be a field with the same FQN");
PDField compliantField =
compliantAcroForm.getField(toBeComparedField.getFullyQualifiedName());
compareFieldProperties(toBeComparedField, compliantField);
}
@@ -114,11 +116,13 @@ public class MergeAcroFormsTest
if (sourceBase != null)
{
- assertEquals("The content of the field properties shall be the
same",sourceBase.toString(), toBeComparedBase.toString());
+ assertEquals(sourceBase.toString(),
toBeComparedBase.toString(),
+ "The content of the field properties shall be the
same");
}
else
{
- assertNull("If the source property is null the compared
property shall be null too", toBeComparedBase);
+ assertNull(toBeComparedBase,
+ "If the source property is null the compared property
shall be null too");
}
}
}
@@ -150,13 +154,16 @@ public class MergeAcroFormsTest
// Test merge result
try (PDDocument mergedPDF = Loader.loadPDF(pdfOutput))
{
- assertEquals("There shall be 2 pages", 2,
mergedPDF.getNumberOfPages());
-
- assertNotNull("There shall be an /Annots entry for the first
page", mergedPDF.getPage(0).getCOSObject().getDictionaryObject(COSName.ANNOTS));
- assertEquals("There shall be 1 annotation for the first page", 1,
mergedPDF.getPage(0).getAnnotations().size());
-
- assertNotNull("There shall be an /Annots entry for the second
page", mergedPDF.getPage(1).getCOSObject().getDictionaryObject(COSName.ANNOTS));
- assertEquals("There shall be 1 annotation for the second page", 1,
mergedPDF.getPage(0).getAnnotations().size());
+ assertEquals(2, mergedPDF.getNumberOfPages(), "There shall be 2
pages");
+
assertNotNull(mergedPDF.getPage(0).getCOSObject().getDictionaryObject(COSName.ANNOTS),
+ "There shall be an /Annots entry for the first page");
+ assertEquals(1, mergedPDF.getPage(0).getAnnotations().size(),
+ "There shall be 1 annotation for the first page");
+
+
assertNotNull(mergedPDF.getPage(1).getCOSObject().getDictionaryObject(COSName.ANNOTS),
+ "There shall be an /Annots entry for the second page");
+ assertEquals(1, mergedPDF.getPage(0).getAnnotations().size(),
+ "There shall be 1 annotation for the second page");
}
}
@@ -185,17 +192,21 @@ public class MergeAcroFormsTest
// Test merge result
try (PDDocument mergedPDF = Loader.loadPDF(pdfOutput))
{
- assertEquals("There shall be 2 pages", 2,
mergedPDF.getNumberOfPages());
+ assertEquals(2, mergedPDF.getNumberOfPages(), "There shall be 2
pages");
PDAcroForm acroForm = mergedPDF.getDocumentCatalog().getAcroForm();
PDField formField = acroForm.getField("Testfeld");
- assertNotNull("There shall be an /AP entry for the field",
formField.getCOSObject().getDictionaryObject(COSName.AP));
- assertNotNull("There shall be a /V entry for the field",
formField.getCOSObject().getDictionaryObject(COSName.V));
+
assertNotNull(formField.getCOSObject().getDictionaryObject(COSName.AP),
+ "There shall be an /AP entry for the field");
+
assertNotNull(formField.getCOSObject().getDictionaryObject(COSName.V),
+ "There shall be a /V entry for the field");
formField = acroForm.getField("Testfeld2");
- assertNotNull("There shall be an /AP entry for the field",
formField.getCOSObject().getDictionaryObject(COSName.AP));
- assertNotNull("There shall be a /V entry for the field",
formField.getCOSObject().getDictionaryObject(COSName.V));
+
assertNotNull(formField.getCOSObject().getDictionaryObject(COSName.AP),
+ "There shall be an /AP entry for the field");
+
assertNotNull(formField.getCOSObject().getDictionaryObject(COSName.V),
+ "There shall be a /V entry for the field");
}
}
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAnnotationsTest.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAnnotationsTest.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAnnotationsTest.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/MergeAnnotationsTest.java
Sun Nov 15 16:42:47 2020
@@ -16,8 +16,8 @@
*/
package org.apache.pdfbox.multipdf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.FileInputStream;
@@ -32,8 +32,8 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentNameDestinationDictionary;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test merging different PDFs with Annotations.
@@ -43,7 +43,7 @@ public class MergeAnnotationsTest
private static final File OUT_DIR = new File("target/test-output/merge/");
private static final File TARGET_PDF_DIR = new File("target/pdfs");
- @Before
+ @BeforeEach
public void setUp()
{
OUT_DIR.mkdirs();
@@ -72,13 +72,14 @@ public class MergeAnnotationsTest
// Test merge result
PDDocument mergedPDF = Loader.loadPDF(pdfOutput);
- assertEquals("There shall be 6 pages", 6,
mergedPDF.getNumberOfPages());
+ assertEquals(6, mergedPDF.getNumberOfPages(), "There shall be 6
pages");
PDDocumentNameDestinationDictionary destinations =
mergedPDF.getDocumentCatalog().getDests();
// Each document has 3 annotations with 2 entries in the /Dests
dictionary per annotation. One for the
// source and one for the target.
- assertEquals("There shall be 12 entries", 12,
destinations.getCOSObject().entrySet().size());
+ assertEquals(12, destinations.getCOSObject().entrySet().size(),
+ "There shall be 12 entries");
List<PDAnnotation> sourceAnnotations01 =
mergedPDF.getPage(0).getAnnotations();
List<PDAnnotation> sourceAnnotations02 =
mergedPDF.getPage(3).getAnnotations();
@@ -87,14 +88,20 @@ public class MergeAnnotationsTest
List<PDAnnotation> targetAnnotations02 =
mergedPDF.getPage(5).getAnnotations();
// Test for the first set of annotations to be merged an linked
correctly
- assertEquals("There shall be 3 source annotations at the first
page", 3, sourceAnnotations01.size());
- assertEquals("There shall be 3 source annotations at the third
page", 3, targetAnnotations01.size());
- assertTrue("The annotations shall match to each other",
testAnnotationsMatch(sourceAnnotations01, targetAnnotations01));
+ assertEquals(3, sourceAnnotations01.size(),
+ "There shall be 3 source annotations at the first page");
+ assertEquals(3, targetAnnotations01.size(),
+ "There shall be 3 source annotations at the third page");
+ assertTrue(testAnnotationsMatch(sourceAnnotations01,
targetAnnotations01),
+ "The annotations shall match to each other");
// Test for the second set of annotations to be merged an linked
correctly
- assertEquals("There shall be 3 source annotations at the first
page", 3, sourceAnnotations02.size());
- assertEquals("There shall be 3 source annotations at the third
page", 3, targetAnnotations02.size());
- assertTrue("The annotations shall match to each other",
testAnnotationsMatch(sourceAnnotations02, targetAnnotations02));
+ assertEquals(3, sourceAnnotations02.size(),
+ "There shall be 3 source annotations at the first page");
+ assertEquals(3, targetAnnotations02.size(),
+ "There shall be 3 source annotations at the third page");
+ assertTrue(testAnnotationsMatch(sourceAnnotations02,
targetAnnotations02),
+ "The annotations shall match to each other");
mergedPDF.close();
}
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/OverlayTest.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/OverlayTest.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/OverlayTest.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/OverlayTest.java
Sun Nov 15 16:42:47 2020
@@ -17,6 +17,9 @@
package org.apache.pdfbox.multipdf;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.awt.image.BufferedImage;
import java.awt.image.DataBufferInt;
import java.io.File;
@@ -29,12 +32,9 @@ import org.apache.pdfbox.pdmodel.PDPageC
import org.apache.pdfbox.pdmodel.font.PDFont;
import org.apache.pdfbox.pdmodel.font.PDType1Font;
import org.apache.pdfbox.rendering.PDFRenderer;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
*
@@ -49,23 +49,13 @@ public class OverlayTest
{
}
- @BeforeClass
- public static void setUpClass()
- {
- }
-
- @AfterClass
- public static void tearDownClass()
- {
- }
-
- @Before
+ @BeforeEach
public void setUp()
{
OUT_DIR.mkdirs();
}
- @After
+ @AfterEach
public void tearDown()
{
}
@@ -106,14 +96,14 @@ public class OverlayTest
resultDocument.close();
// compare images
- Assert.assertEquals(modelImage.getWidth(), resultImage.getWidth());
- Assert.assertEquals(modelImage.getHeight(), resultImage.getHeight());
- Assert.assertEquals(modelImage.getType(), resultImage.getType());
+ assertEquals(modelImage.getWidth(), resultImage.getWidth());
+ assertEquals(modelImage.getHeight(), resultImage.getHeight());
+ assertEquals(modelImage.getType(), resultImage.getType());
DataBufferInt modelDataBuffer = (DataBufferInt)
modelImage.getRaster().getDataBuffer();
DataBufferInt resultDataBuffer = (DataBufferInt)
resultImage.getRaster().getDataBuffer();
- Assert.assertArrayEquals(modelDataBuffer.getData(),
resultDataBuffer.getData());
+ assertArrayEquals(modelDataBuffer.getData(),
resultDataBuffer.getData());
}
// code used to create the base file
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java
Sun Nov 15 16:42:47 2020
@@ -15,11 +15,13 @@
*/
package org.apache.pdfbox.multipdf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.awt.Color;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
-import junit.framework.TestCase;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.Loader;
@@ -30,6 +32,7 @@ import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDPageContentStream;
import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
import
org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentProperties;
+import org.junit.jupiter.api.Test;
/**
* Test suite for PDFCloneUtility, see PDFBOX-2052.
@@ -37,13 +40,14 @@ import org.apache.pdfbox.pdmodel.graphic
* @author Cornelis Hoeflake
* @author Tilman Hausherr
*/
-public class PDFCloneUtilityTest extends TestCase
+public class PDFCloneUtilityTest
{
/**
* original (minimal) test from PDFBOX-2052.
*
* @throws IOException
*/
+ @Test
public void testClonePDFWithCosArrayStream() throws IOException
{
try (PDDocument srcDoc = new PDDocument();
@@ -63,6 +67,7 @@ public class PDFCloneUtilityTest extends
*
* @throws IOException
*/
+ @Test
public void testClonePDFWithCosArrayStream2() throws IOException
{
final String TESTDIR = "target/test-output/clone/";
@@ -115,6 +120,7 @@ public class PDFCloneUtilityTest extends
*
* @throws IOException
*/
+ @Test
public void testDirectIndirect() throws IOException
{
try (PDDocument doc1 = new PDDocument())
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
Sun Nov 15 16:42:47 2020
@@ -15,6 +15,11 @@
*/
package org.apache.pdfbox.multipdf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.awt.image.BufferedImage;
import java.io.BufferedReader;
import java.io.File;
@@ -29,8 +34,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
@@ -55,7 +58,8 @@ import org.apache.pdfbox.pdmodel.interac
import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
import org.apache.pdfbox.pdmodel.interactive.form.PDField;
import org.apache.pdfbox.rendering.PDFRenderer;
-import org.junit.Assert;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test suite for PDFMergerUtility.
@@ -63,23 +67,17 @@ import org.junit.Assert;
* @author Maruan Sahyoun (PDF files)
* @author Tilman Hausherr (code)
*/
-public class PDFMergerUtilityTest extends TestCase
+public class PDFMergerUtilityTest
{
final String SRCDIR = "src/test/resources/input/merge/";
final String TARGETTESTDIR = "target/test-output/merge/";
private static final File TARGETPDFDIR = new File("target/pdfs");
final int DPI = 96;
- @Override
- protected void setUp() throws Exception
+ @BeforeEach
+ protected void setUp()
{
- super.setUp();
-
new File(TARGETTESTDIR).mkdirs();
- if (!new File(TARGETTESTDIR).exists())
- {
- throw new IOException("could not create output directory");
- }
}
@@ -94,6 +92,7 @@ public class PDFMergerUtilityTest extend
*
* @throws IOException if something goes wrong.
*/
+ @Test
public void testPDFMergerUtility() throws IOException
{
checkMergeIdentical("PDFBox.GlobalResourceMergeTest.Doc01.decoded.pdf",
@@ -115,6 +114,7 @@ public class PDFMergerUtilityTest extend
*
* @throws IOException if something goes wrong.
*/
+ @Test
public void testJpegCcitt() throws IOException
{
checkMergeIdentical("jpegrgb.pdf",
@@ -130,6 +130,7 @@ public class PDFMergerUtilityTest extend
}
// see PDFBOX-2893
+ @Test
public void testPDFMergerUtility2() throws IOException
{
checkMergeIdentical("PDFBox.GlobalResourceMergeTest.Doc01.pdf",
@@ -149,6 +150,7 @@ public class PDFMergerUtilityTest extend
*
* @throws IOException
*/
+ @Test
public void testPDFMergerOpenAction() throws IOException
{
try (PDDocument doc1 = new PDDocument())
@@ -192,6 +194,7 @@ public class PDFMergerUtilityTest extend
*
* @throws IOException
*/
+ @Test
public void testStructureTreeMerge() throws IOException
{
PDFMergerUtility pdfMergerUtility = new PDFMergerUtility();
@@ -231,6 +234,7 @@ public class PDFMergerUtilityTest extend
*
* @throws IOException
*/
+ @Test
public void testStructureTreeMerge2() throws IOException
{
PDFMergerUtility pdfMergerUtility = new PDFMergerUtility();
@@ -279,6 +283,7 @@ public class PDFMergerUtilityTest extend
*
* @throws IOException
*/
+ @Test
public void testStructureTreeMerge3() throws IOException
{
PDFMergerUtility pdfMergerUtility = new PDFMergerUtility();
@@ -317,6 +322,7 @@ public class PDFMergerUtilityTest extend
*
* @throws IOException
*/
+ @Test
public void testStructureTreeMerge4() throws IOException
{
PDFMergerUtility pdfMergerUtility = new PDFMergerUtility();
@@ -354,6 +360,7 @@ public class PDFMergerUtilityTest extend
*
* @throws IOException
*/
+ @Test
public void testStructureTreeMerge5() throws IOException
{
PDFMergerUtility pdfMergerUtility = new PDFMergerUtility();
@@ -389,6 +396,7 @@ public class PDFMergerUtilityTest extend
*
* @throws IOException
*/
+ @Test
public void testStructureTreeMerge6() throws IOException
{
PDFMergerUtility pdfMergerUtility = new PDFMergerUtility();
@@ -439,6 +447,7 @@ public class PDFMergerUtilityTest extend
*
* @throws IOException
*/
+ @Test
public void testStructureTreeMerge7() throws IOException
{
PDFMergerUtility pdfMergerUtility = new PDFMergerUtility();
@@ -478,6 +487,7 @@ public class PDFMergerUtilityTest extend
/**
* PDFBOX-4009: Test that ParentTreeNextKey is recalculated correctly.
*/
+ @Test
public void testMissingParentTreeNextKey() throws IOException
{
PDFMergerUtility pdfMergerUtility = new PDFMergerUtility();
@@ -505,6 +515,7 @@ public class PDFMergerUtilityTest extend
*
* @throws IOException
*/
+ @Test
public void testStructureTreeMergeIDTree() throws IOException
{
PDFMergerUtility pdfMergerUtility = new PDFMergerUtility();
@@ -548,6 +559,7 @@ public class PDFMergerUtilityTest extend
*
* @throws IOException
*/
+ @Test
public void testMergeBogusStructParents1() throws IOException
{
PDFMergerUtility pdfMergerUtility = new PDFMergerUtility();
@@ -569,6 +581,7 @@ public class PDFMergerUtilityTest extend
*
* @throws IOException
*/
+ @Test
public void testMergeBogusStructParents2() throws IOException
{
PDFMergerUtility pdfMergerUtility = new PDFMergerUtility();
@@ -590,6 +603,7 @@ public class PDFMergerUtilityTest extend
*
* @throws IOException
*/
+ @Test
public void testParentTree() throws IOException
{
PDDocument doc = Loader
@@ -645,9 +659,9 @@ public class PDFMergerUtilityTest extend
{
if (widget.getStructParent() >= 0)
{
- assertTrue("field '" + field.getFullyQualifiedName() +
"' /StructParent " +
- widget.getStructParent() + " missing in
/ParentTree",
- keySet.contains(widget.getStructParent()));
+ assertTrue(keySet.contains(widget.getStructParent()),
+ "field '" + field.getFullyQualifiedName() + "'
/StructParent "
+ + widget.getStructParent() + " missing
in /ParentTree");
}
}
}
@@ -662,8 +676,8 @@ public class PDFMergerUtilityTest extend
{
if (ann.getStructParent() >= 0)
{
- assertTrue("/StructParent " + ann.getStructParent() + "
missing in /ParentTree",
- keySet.contains(ann.getStructParent()));
+ assertTrue(keySet.contains(ann.getStructParent()),
+ "/StructParent " + ann.getStructParent() + "
missing in /ParentTree");
}
}
}
@@ -676,6 +690,7 @@ public class PDFMergerUtilityTest extend
*
* @throws IOException
*/
+ @Test
public void testFileDeletion() throws IOException
{
File outFile = new File(TARGETTESTDIR, "PDFBOX-4383-result.pdf");
@@ -838,12 +853,14 @@ public class PDFMergerUtilityTest extend
COSBase item = kdict.getItem(COSName.OBJ);
if (item instanceof COSObject)
{
- Assert.assertNotEquals("Annotation page is not
in the page tree: " + item, -1, pageTree.indexOf(page));
+ assertNotEquals(-1, pageTree.indexOf(page),
+ "Annotation page is not in the page
tree: " + item);
}
else
{
// don't display because of stack overflow
- Assert.assertNotEquals("Annotation page is not
in the page tree", -1, pageTree.indexOf(page));
+ assertNotEquals(-1, pageTree.indexOf(page),
+ "Annotation page is not in the page
tree");
}
}
}
@@ -935,7 +952,7 @@ public class PDFMergerUtilityTest extend
PDPage page = structureElement.getPage();
if (page != null)
{
- Assert.assertNotEquals("Page is not in the page tree", -1,
pageTree.indexOf(page));
+ assertNotEquals(-1, pageTree.indexOf(page), "Page is not in the
page tree");
}
}
}
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PageExtractorTest.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PageExtractorTest.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
Binary files - no diff available.
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java
Sun Nov 15 16:42:47 2020
@@ -16,13 +16,14 @@
*/
package org.apache.pdfbox.multipdf;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.awt.Color;
import java.awt.geom.AffineTransform;
import java.io.File;
import java.io.IOException;
-import junit.framework.TestCase;
-
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -38,21 +39,20 @@ import org.apache.pdfbox.pdmodel.graphic
import
org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentGroup;
import
org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentProperties;
import org.apache.pdfbox.util.Matrix;
+import org.junit.jupiter.api.BeforeAll;
/**
* Tests the {@link org.apache.pdfbox.multipdf.LayerUtility} class.
*
*/
-public class TestLayerUtility extends TestCase
+public class TestLayerUtility
{
private final File testResultsDir = new File("target/test-output");
- /** {@inheritDoc} */
- @Override
+ @BeforeAll
protected void setUp() throws Exception
{
- super.setUp();
testResultsDir.mkdirs();
}
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageLayoutTest.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageLayoutTest.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageLayoutTest.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageLayoutTest.java
Sun Nov 15 16:42:47 2020
@@ -18,9 +18,9 @@ package org.apache.pdfbox.pdmodel;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Test;
public class PageLayoutTest
{
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageModeTest.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageModeTest.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageModeTest.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/PageModeTest.java
Sun Nov 15 16:42:47 2020
@@ -16,8 +16,10 @@
*/
package org.apache.pdfbox.pdmodel;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
public class PageModeTest
{
@@ -31,7 +33,7 @@ public class PageModeTest
final PageMode retval = PageMode.fromString(value);
// Assert result
- Assert.assertEquals(PageMode.FULL_SCREEN, retval);
+ assertEquals(PageMode.FULL_SCREEN, retval);
}
@Test
@@ -44,7 +46,7 @@ public class PageModeTest
final PageMode retval = PageMode.fromString(value);
// Assert result
- Assert.assertEquals(PageMode.USE_THUMBS, retval);
+ assertEquals(PageMode.USE_THUMBS, retval);
}
@Test
@@ -57,7 +59,7 @@ public class PageModeTest
final PageMode retval = PageMode.fromString(value);
// Assert result
- Assert.assertEquals(PageMode.USE_OPTIONAL_CONTENT, retval);
+ assertEquals(PageMode.USE_OPTIONAL_CONTENT, retval);
}
@Test
@@ -70,7 +72,7 @@ public class PageModeTest
final PageMode retval = PageMode.fromString(value);
// Assert result
- Assert.assertEquals(PageMode.USE_NONE, retval);
+ assertEquals(PageMode.USE_NONE, retval);
}
@Test
@@ -83,7 +85,7 @@ public class PageModeTest
final PageMode retval = PageMode.fromString(value);
// Assert result
- Assert.assertEquals(PageMode.USE_ATTACHMENTS, retval);
+ assertEquals(PageMode.USE_ATTACHMENTS, retval);
}
@Test
@@ -96,19 +98,19 @@ public class PageModeTest
final PageMode retval = PageMode.fromString(value);
// Assert result
- Assert.assertEquals(PageMode.USE_OUTLINES, retval);
+ assertEquals(PageMode.USE_OUTLINES, retval);
}
@Test
public void fromStringInputNotNullOutputIllegalArgumentException()
{
- Assert.assertThrows(IllegalArgumentException.class, () ->
PageMode.fromString(""));
+ assertThrows(IllegalArgumentException.class, () ->
PageMode.fromString(""));
}
@Test
public void fromStringInputNotNullOutputIllegalArgumentException2()
{
- Assert.assertThrows(IllegalArgumentException.class, () ->
PageMode.fromString("Dulacb`ecj"));
+ assertThrows(IllegalArgumentException.class, () ->
PageMode.fromString("Dulacb`ecj"));
}
@Test
@@ -121,6 +123,6 @@ public class PageModeTest
final String retval = objectUnderTest.stringValue();
// Assert result
- Assert.assertEquals("UseOC", retval);
+ assertEquals("UseOC", retval);
}
}
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestFDF.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestFDF.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestFDF.java
(original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestFDF.java
Sun Nov 15 16:42:47 2020
@@ -16,18 +16,20 @@
*/
package org.apache.pdfbox.pdmodel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.net.URISyntaxException;
import java.util.List;
-import junit.framework.TestCase;
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.pdmodel.fdf.FDFDocument;
import org.apache.pdfbox.pdmodel.fdf.FDFField;
import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
+import org.junit.jupiter.api.Test;
/**
* This will test the FDF algorithms in PDFBox.
@@ -36,7 +38,7 @@ import org.apache.pdfbox.pdmodel.interac
* @author Tilman Hausherr
*
*/
-public class TestFDF extends TestCase
+public class TestFDF
{
/**
* Test load two simple fdf files with two fields. One of the files does
not have a
@@ -45,6 +47,7 @@ public class TestFDF extends TestCase
* @throws URISyntaxException
* @throws IOException
*/
+ @Test
public void testLoad2() throws URISyntaxException, IOException
{
checkFields("/org/apache/pdfbox/pdfparser/withcatalog.fdf");
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java
Sun Nov 15 16:42:47 2020
@@ -29,13 +29,13 @@ import java.util.Locale;
import org.apache.pdfbox.Loader;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Test case introduced with PDFBOX-1581.
@@ -45,7 +45,7 @@ public class TestPDDocument
{
static private final File TESTRESULTSDIR = new File("target/test-output");
- @BeforeClass
+ @BeforeAll
static public void setUp() throws Exception
{
TESTRESULTSDIR.mkdirs();
@@ -170,7 +170,7 @@ public class TestPDDocument
{
pw.write("<script language='JavaScript'>");
}
- assertThrows("parsing should fail", IOException.class, () ->
Loader.loadPDF(f));
+ assertThrows(IOException.class, () -> Loader.loadPDF(f), "parsing
should fail");
try
{
Files.delete(f.toPath());
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentCatalog.java
Sun Nov 15 16:42:47 2020
@@ -24,11 +24,11 @@ import org.apache.pdfbox.Loader;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.graphics.color.PDOutputIntent;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test PDDocument Catalog functionality.
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentInformation.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentInformation.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentInformation.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocumentInformation.java
Sun Nov 15 16:42:47 2020
@@ -16,22 +16,27 @@
*/
package org.apache.pdfbox.pdmodel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import java.util.Arrays;
import java.util.List;
import org.apache.pdfbox.Loader;
-
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
/**
* This class tests the extraction of document-level metadata.
* @author Neil McErlean
* @since 1.3.0
*/
-public class TestPDDocumentInformation extends TestCase
+public class TestPDDocumentInformation
{
+ @Test
public void testMetadataExtraction() throws Exception
{
// This document has been selected for this test as it contains custom
metadata.
@@ -39,28 +44,30 @@ public class TestPDDocumentInformation e
{
PDDocumentInformation info = doc.getDocumentInformation();
- assertEquals("Wrong author", "Brian Carrier", info.getAuthor());
- assertNotNull("Wrong creationDate", info.getCreationDate());
- assertEquals("Wrong creator", "Acrobat PDFMaker 8.1 for Word",
info.getCreator());
- assertNull("Wrong keywords", info.getKeywords());
- assertNotNull("Wrong modificationDate", info.getModificationDate());
- assertEquals("Wrong producer", "Acrobat Distiller 8.1.0 (Windows)",
info.getProducer());
- assertNull("Wrong subject", info.getSubject());
- assertNull("Wrong trapped", info.getTrapped());
+ assertEquals("Brian Carrier", info.getAuthor(), "Wrong author");
+ assertNotNull(info.getCreationDate(), "Wrong creationDate");
+ assertEquals("Acrobat PDFMaker 8.1 for Word", info.getCreator(),
"Wrong creator");
+ assertNull(info.getKeywords(), "Wrong keywords");
+ assertNotNull(info.getModificationDate(), "Wrong modificationDate");
+ assertEquals("Acrobat Distiller 8.1.0 (Windows)",
info.getProducer(), "Wrong producer");
+ assertNull(info.getSubject(), "Wrong subject");
+ assertNull(info.getTrapped(), "Wrong trapped");
List<String> expectedMetadataKeys = Arrays.asList("CreationDate",
"Author", "Creator",
"Producer",
"ModDate", "Company",
"SourceModified",
"Title");
- assertEquals("Wrong metadata key count",
expectedMetadataKeys.size(),
-
info.getMetadataKeys().size());
+ assertEquals(expectedMetadataKeys.size(),
info.getMetadataKeys().size(),
+ "Wrong metadata key count");
for (String key : expectedMetadataKeys)
{
- assertTrue("Missing metadata key:" + key,
info.getMetadataKeys().contains(key));
+ assertTrue(info.getMetadataKeys().contains(key), "Missing
metadata key:" + key);
}
// Custom metadata fields.
- assertEquals("Wrong company", "Basis Technology Corp.",
info.getCustomMetadataValue("Company"));
- assertEquals("Wrong sourceModified", "D:20080819181502",
info.getCustomMetadataValue("SourceModified"));
+ assertEquals("Basis Technology Corp.",
info.getCustomMetadataValue("Company"),
+ "Wrong company");
+ assertEquals("D:20080819181502",
info.getCustomMetadataValue("SourceModified"),
+ "Wrong sourceModified");
}
}
@@ -69,6 +76,7 @@ public class TestPDDocumentInformation e
*
* @throws Exception
*/
+ @Test
public void testPDFBox3068() throws Exception
{
try (PDDocument doc = Loader
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageAnnotationsFiltering.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageAnnotationsFiltering.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageAnnotationsFiltering.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageAnnotationsFiltering.java
Sun Nov 15 16:42:47 2020
@@ -16,6 +16,9 @@
*/
package org.apache.pdfbox.pdmodel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.IOException;
import java.util.List;
@@ -26,9 +29,8 @@ import org.apache.pdfbox.pdmodel.interac
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationLink;
import
org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationRubberStamp;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationSquare;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* This unit test validates the correct working behavior of PDPage annotations
@@ -42,7 +44,7 @@ public class TestPDPageAnnotationsFilter
// test mock page for annotations filtering
private PDPage page;
- @Before
+ @BeforeEach
public void initMock()
{
COSDictionary mockedPageWithAnnotations = new COSDictionary();
@@ -58,17 +60,17 @@ public class TestPDPageAnnotationsFilter
public void validateNoFiltering() throws IOException
{
List<PDAnnotation> annotations = page.getAnnotations();
- Assert.assertEquals(3, annotations.size());
- Assert.assertTrue(annotations.get(0) instanceof
PDAnnotationRubberStamp);
- Assert.assertTrue(annotations.get(1) instanceof PDAnnotationSquare);
- Assert.assertTrue(annotations.get(2) instanceof PDAnnotationLink);
+ assertEquals(3, annotations.size());
+ assertTrue(annotations.get(0) instanceof PDAnnotationRubberStamp);
+ assertTrue(annotations.get(1) instanceof PDAnnotationSquare);
+ assertTrue(annotations.get(2) instanceof PDAnnotationLink);
}
@Test
public void validateAllFiltered() throws IOException
{
List<PDAnnotation> annotations = page.getAnnotations(annotation ->
false);
- Assert.assertEquals(0, annotations.size());
+ assertEquals(0, annotations.size());
}
@Test
@@ -76,8 +78,8 @@ public class TestPDPageAnnotationsFilter
{
List<PDAnnotation> annotations = page.getAnnotations(annotation ->
(annotation instanceof PDAnnotationLink || annotation instanceof
PDAnnotationSquare));
- Assert.assertEquals(2, annotations.size());
- Assert.assertTrue(annotations.get(0) instanceof PDAnnotationSquare);
- Assert.assertTrue(annotations.get(1) instanceof PDAnnotationLink);
+ assertEquals(2, annotations.size());
+ assertTrue(annotations.get(0) instanceof PDAnnotationSquare);
+ assertTrue(annotations.get(1) instanceof PDAnnotationLink);
}
-}
\ No newline at end of file
+}
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageContentStream.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageContentStream.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageContentStream.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageContentStream.java
Sun Nov 15 16:42:47 2020
@@ -16,20 +16,23 @@
*/
package org.apache.pdfbox.pdmodel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.io.IOException;
import java.util.List;
-import junit.framework.TestCase;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.pdfparser.PDFStreamParser;
import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
+import org.junit.jupiter.api.Test;
/**
* @author Yegor Kozlov
*/
-public class TestPDPageContentStream extends TestCase
+public class TestPDPageContentStream
{
+ @Test
public void testSetCmykColors() throws IOException
{
try (PDDocument doc = new PDDocument())
@@ -85,6 +88,7 @@ public class TestPDPageContentStream ext
}
}
+ @Test
public void testSetRGBandGColors() throws IOException
{
try (PDDocument doc = new PDDocument())
@@ -137,6 +141,7 @@ public class TestPDPageContentStream ext
*
* @throws IOException
*/
+ @Test
public void testMissingContentStream() throws IOException
{
PDPage page = new PDPage();
@@ -150,6 +155,7 @@ public class TestPDPageContentStream ext
*
* @throws IOException
*/
+ @Test
public void testCloseContract() throws IOException
{
try (PDDocument doc = new PDDocument())
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageTransitions.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageTransitions.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageTransitions.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageTransitions.java
Sun Nov 15 16:42:47 2020
@@ -16,7 +16,7 @@
*/
package org.apache.pdfbox.pdmodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -28,7 +28,7 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.interactive.pagenavigation.PDTransition;
import
org.apache.pdfbox.pdmodel.interactive.pagenavigation.PDTransitionDirection;
import org.apache.pdfbox.pdmodel.interactive.pagenavigation.PDTransitionStyle;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Andrea Vacondio
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageTree.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageTree.java?rev=1883451&r1=1883450&r2=1883451&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageTree.java
(original)
+++
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDPageTree.java
Sun Nov 15 16:42:47 2020
@@ -16,7 +16,7 @@
*/
package org.apache.pdfbox.pdmodel;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
@@ -24,8 +24,8 @@ import org.apache.pdfbox.Loader;
import
org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
import
org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
/**
* @author Andrea Vacondio
@@ -35,7 +35,7 @@ public class TestPDPageTree
{
private PDDocument doc;
- @After
+ @AfterEach
public void tearDown() throws IOException
{
if (doc != null)
@@ -97,9 +97,10 @@ public class TestPDPageTree
document.addPage(pageTwo);
document.getPages().insertBefore(pageThree, pageTwo);
- assertEquals("Page one should be placed at index 0.",
0,(document.getPages().indexOf(pageOne)));
- assertEquals("Page two should be placed at index 2.",
2,(document.getPages().indexOf(pageTwo)));
- assertEquals("Page three should be placed at index 1.",
1,(document.getPages().indexOf(pageThree)));
+ assertEquals(0, (document.getPages().indexOf(pageOne)),
+ "Page one should be placed at index 0.");
+ assertEquals(2,(document.getPages().indexOf(pageTwo)),"Page two
should be placed at index 2.");
+ assertEquals(1,(document.getPages().indexOf(pageThree)),"Page
three should be placed at index 1.");
}
}
@@ -114,9 +115,12 @@ public class TestPDPageTree
document.addPage(pageTwo);
document.getPages().insertAfter(pageThree, pageTwo);
- assertEquals("Page one should be placed at index 0.",
0,(document.getPages().indexOf(pageOne)));
- assertEquals("Page two should be placed at index 1.",
1,(document.getPages().indexOf(pageTwo)));
- assertEquals("Page three should be placed at index 2.",
2,(document.getPages().indexOf(pageThree)));
+ assertEquals(0, (document.getPages().indexOf(pageOne)),
+ "Page one should be placed at index 0.");
+ assertEquals(1, (document.getPages().indexOf(pageTwo)),
+ "Page two should be placed at index 1.");
+ assertEquals(2, (document.getPages().indexOf(pageThree)),
+ "Page three should be placed at index 2.");
}
}
}
