You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2020/11/17 15:42:06 UTC
svn commit: r1883541 -
/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/
Author: msahyoun
Date: Tue Nov 17 15:42:06 2020
New Revision: 1883541
URL: http://svn.apache.org/viewvc?rev=1883541&view=rev
Log:
PDFBOX-5017: switch to JUnit5
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/AcroFormsRotationTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/AlignmentTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/ControlCharacterTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/HandleDifferentDALevelsTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/MultilineFieldsTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFlattenTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoiceTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceStringTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureFieldTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDTextFieldTest.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/AcroFormsRotationTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/AcroFormsRotationTest.java?rev=1883541&r1=1883540&r2=1883541&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/AcroFormsRotationTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/AcroFormsRotationTest.java Tue Nov 17 15:42:06 2020
@@ -23,9 +23,9 @@ import java.io.IOException;
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.rendering.TestPDFToImage;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class AcroFormsRotationTest
{
@@ -39,7 +39,7 @@ public class AcroFormsRotationTest
private PDDocument document;
private PDAcroForm acroForm;
- @Before
+ @BeforeEach
public void setUp() throws IOException
{
document = Loader.loadPDF(new File(IN_DIR, NAME_OF_PDF));
@@ -106,7 +106,7 @@ public class AcroFormsRotationTest
}
}
- @After
+ @AfterEach
public void tearDown() throws IOException
{
document.close();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/AlignmentTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/AlignmentTest.java?rev=1883541&r1=1883540&r2=1883541&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/AlignmentTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/AlignmentTest.java Tue Nov 17 15:42:06 2020
@@ -22,9 +22,9 @@ import java.io.IOException;
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.rendering.TestPDFToImage;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class AlignmentTest
{
@@ -37,7 +37,7 @@ public class AlignmentTest
private PDDocument document;
private PDAcroForm acroForm;
- @Before
+ @BeforeEach
public void setUp() throws IOException
{
document = Loader.loadPDF(new File(IN_DIR, NAME_OF_PDF));
@@ -113,7 +113,7 @@ public class AlignmentTest
}
}
- @After
+ @AfterEach
public void tearDown() throws IOException
{
document.close();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/ControlCharacterTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/ControlCharacterTest.java?rev=1883541&r1=1883540&r2=1883541&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/ControlCharacterTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/ControlCharacterTest.java Tue Nov 17 15:42:06 2020
@@ -16,7 +16,8 @@
*/
package org.apache.pdfbox.pdmodel.interactive.form;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.File;
import java.io.IOException;
@@ -29,9 +30,9 @@ import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdfparser.PDFStreamParser;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test handling some special characters when setting a fields value.
@@ -65,17 +66,19 @@ public class ControlCharacterTest {
private PDDocument document;
private PDAcroForm acroForm;
- @Before
+ @BeforeEach
public void setUp() throws IOException
{
document = Loader.loadPDF(new File(IN_DIR, NAME_OF_PDF));
acroForm = document.getDocumentCatalog().getAcroForm();
}
- @Test(expected=IllegalArgumentException.class)
+ @Test
public void characterNUL() throws IOException
{
- acroForm.getField("pdfbox-nul").setValue("NUL\0NUL");
+ assertThrows(IllegalArgumentException.class, () -> {
+ acroForm.getField("pdfbox-nul").setValue("NUL\0NUL");
+ });
}
@Test
@@ -168,7 +171,7 @@ public class ControlCharacterTest {
assertEquals(pdfboxValues, acrobatValues);
}
- @After
+ @AfterEach
public void tearDown() throws IOException
{
document.close();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/HandleDifferentDALevelsTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/HandleDifferentDALevelsTest.java?rev=1883541&r1=1883540&r2=1883541&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/HandleDifferentDALevelsTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/HandleDifferentDALevelsTest.java Tue Nov 17 15:42:06 2020
@@ -16,7 +16,7 @@
*/
package org.apache.pdfbox.pdmodel.interactive.form;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.IOException;
@@ -26,9 +26,9 @@ import org.apache.pdfbox.Loader;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class HandleDifferentDALevelsTest
{
@@ -39,7 +39,7 @@ public class HandleDifferentDALevelsTest
private PDDocument document;
private PDAcroForm acroForm;
- @Before
+ @BeforeEach
public void setUp() throws IOException
{
document = Loader.loadPDF(new File(IN_DIR, NAME_OF_PDF));
@@ -83,7 +83,7 @@ public class HandleDifferentDALevelsTest
for (PDAnnotationWidget widget : widgets)
{
String contentAsString = new String(widget.getNormalAppearanceStream().getContentStream().toByteArray());
- assertTrue("font setting in content stream shall be " + fieldFontSetting, contentAsString.indexOf(fieldFontSetting) > 0);
+ assertTrue(contentAsString.indexOf(fieldFontSetting) > 0, "font setting in content stream shall be " + fieldFontSetting);
}
}
@@ -99,11 +99,11 @@ public class HandleDifferentDALevelsTest
String widgetFontSetting = getFontSettingFromDA(widget);
String fontSetting = widgetFontSetting == null ? fieldFontSetting : widgetFontSetting;
String contentAsString = new String(widget.getNormalAppearanceStream().getContentStream().toByteArray());
- assertTrue("font setting in content stream shall be " + fontSetting, contentAsString.indexOf(fontSetting) > 0);
+ assertTrue(contentAsString.indexOf(fontSetting) > 0, "font setting in content stream shall be " + fontSetting);
}
}
- @After
+ @AfterEach
public void tearDown() throws IOException
{
document.close();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/MultilineFieldsTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/MultilineFieldsTest.java?rev=1883541&r1=1883540&r2=1883541&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/MultilineFieldsTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/MultilineFieldsTest.java Tue Nov 17 15:42:06 2020
@@ -17,7 +17,7 @@
package org.apache.pdfbox.pdmodel.interactive.form;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.File;
import java.io.IOException;
@@ -32,9 +32,9 @@ import org.apache.pdfbox.pdfparser.PDFSt
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
import org.apache.pdfbox.rendering.TestPDFToImage;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class MultilineFieldsTest
{
@@ -48,7 +48,7 @@ public class MultilineFieldsTest
private PDDocument document;
private PDAcroForm acroForm;
- @Before
+ @BeforeEach
public void setUp() throws IOException
{
document = Loader.loadPDF(new File(IN_DIR, NAME_OF_PDF));
@@ -151,10 +151,10 @@ public class MultilineFieldsTest
List<String> acrobatLines = getTextLinesFromAppearanceStream(fieldInput);
fieldInput.setValue(fieldValue);
List<String> pdfboxLines = getTextLinesFromAppearanceStream(fieldInput);
- assertEquals("Number of lines generated by PDFBox shall match Acrobat", acrobatLines.size(),pdfboxLines.size());
+ assertEquals(acrobatLines.size(),pdfboxLines.size(), "Number of lines generated by PDFBox shall match Acrobat");
for (int i = 0; i < acrobatLines.size(); i++)
{
- assertEquals("Number of characters per lines generated by PDFBox shall match Acrobat", acrobatLines.get(i).length(), pdfboxLines.get(i).length());
+ assertEquals(acrobatLines.get(i).length(), pdfboxLines.get(i).length(), "Number of characters per lines generated by PDFBox shall match Acrobat");
}
document.close();
}
@@ -203,7 +203,7 @@ public class MultilineFieldsTest
}
- @After
+ @AfterEach
public void tearDown() throws IOException
{
document.close();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFlattenTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFlattenTest.java?rev=1883541&r1=1883540&r2=1883541&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFlattenTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFlattenTest.java Tue Nov 17 15:42:06 2020
@@ -16,7 +16,8 @@
*/
package org.apache.pdfbox.pdmodel.interactive.form;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.awt.image.BufferedImage;
import java.io.File;
@@ -33,9 +34,8 @@ import org.apache.pdfbox.pdmodel.PDDocum
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.rendering.PDFRenderer;
import org.apache.pdfbox.rendering.TestPDFToImage;
-import static org.junit.Assert.fail;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test flatten different forms and compare with rendering.
@@ -50,7 +50,7 @@ public class PDAcroFormFlattenTest
private static final File IN_DIR = new File("target/test-output/flatten/in");
private static final File OUT_DIR = new File("target/test-output/flatten/out");
- @Before
+ @BeforeEach
public void setUp()
{
IN_DIR.mkdirs();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java?rev=1883541&r1=1883540&r2=1883541&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java Tue Nov 17 15:42:06 2020
@@ -16,8 +16,8 @@
*/
package org.apache.pdfbox.pdmodel.interactive.form;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.IOException;
import java.net.URL;
@@ -35,7 +35,7 @@ import org.apache.pdfbox.pdmodel.fixup.A
import org.apache.pdfbox.pdmodel.fixup.AcroFormDefaultFixup;
import org.apache.pdfbox.pdmodel.fixup.processor.AcroFormOrphanWidgetsProcessor;
import org.apache.pdfbox.pdmodel.font.PDFont;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for building AcroForm entries form Widget annotations.
@@ -72,9 +72,9 @@ public class PDAcroFormFromAnnotsTest
// need to do a low level cos access as the PDModel access will build the AcroForm
COSDictionary cosAcroForm = (COSDictionary) catalog.getCOSObject().getDictionaryObject(COSName.ACRO_FORM);
COSArray cosFields = (COSArray) cosAcroForm.getDictionaryObject(COSName.FIELDS);
- assertEquals("Initially there shall be 0 fields", 0, cosFields.size());
+ assertEquals(0, cosFields.size(), "Initially there shall be 0 fields");
PDAcroForm acroForm = catalog.getAcroForm();
- assertEquals("After rebuild there shall be " + numFormFieldsByAcrobat + " fields", numFormFieldsByAcrobat, acroForm.getFields().size());
+ assertEquals(numFormFieldsByAcrobat, acroForm.getFields().size(), "After rebuild there shall be " + numFormFieldsByAcrobat + " fields");
}
}
@@ -107,9 +107,9 @@ public class PDAcroFormFromAnnotsTest
// need to do a low level cos access as the PDModel access will build the AcroForm
COSDictionary cosAcroForm = (COSDictionary) catalog.getCOSObject().getDictionaryObject(COSName.ACRO_FORM);
COSArray cosFields = (COSArray) cosAcroForm.getDictionaryObject(COSName.FIELDS);
- assertEquals("Initially there shall be 0 fields", 0, cosFields.size());
+ assertEquals(0, cosFields.size(), "Initially there shall be 0 fields");
PDAcroForm acroForm = catalog.getAcroForm(new AcroFormDefaultFixup(testPdf));
- assertEquals("After rebuild there shall be " + numFormFieldsByAcrobat + " fields", numFormFieldsByAcrobat, acroForm.getFields().size());
+ assertEquals(numFormFieldsByAcrobat, acroForm.getFields().size(), "After rebuild there shall be " + numFormFieldsByAcrobat + " fields");
}
}
@@ -135,9 +135,9 @@ public class PDAcroFormFromAnnotsTest
COSDictionary cosAcroForm = (COSDictionary) catalog.getCOSObject().getDictionaryObject(COSName.ACRO_FORM);
COSArray cosFields = (COSArray) cosAcroForm.getDictionaryObject(COSName.FIELDS);
numCosFormFields = cosFields.size();
- assertEquals("Initially there shall be 0 fields", 0, cosFields.size());
+ assertEquals(0, cosFields.size(), "Initially there shall be 0 fields");
PDAcroForm acroForm = catalog.getAcroForm(null);
- assertEquals("After call without correction there shall be " + numCosFormFields + " fields", numCosFormFields, acroForm.getFields().size());
+ assertEquals(numCosFormFields, acroForm.getFields().size(), "After call without correction there shall be " + numCosFormFields + " fields");
}
}
@@ -160,9 +160,9 @@ public class PDAcroFormFromAnnotsTest
// need to do a low level cos access as the PDModel access will build the AcroForm
COSDictionary cosAcroForm = (COSDictionary) catalog.getCOSObject().getDictionaryObject(COSName.ACRO_FORM);
COSArray cosFields = (COSArray) cosAcroForm.getDictionaryObject(COSName.FIELDS);
- assertEquals("Initially there shall be 0 fields", 0, cosFields.size());
+ assertEquals(0, cosFields.size(), "Initially there shall be 0 fields");
PDAcroForm acroForm = catalog.getAcroForm();
- assertEquals("After call with default correction there shall be 0 fields", 0, acroForm.getFields().size());
+ assertEquals(0, acroForm.getFields().size(), "After call with default correction there shall be 0 fields");
}
}
@@ -202,9 +202,9 @@ public class PDAcroFormFromAnnotsTest
// need to do a low level cos access as the PDModel access will build the AcroForm
COSDictionary cosAcroForm = (COSDictionary) catalog.getCOSObject().getDictionaryObject(COSName.ACRO_FORM);
COSArray cosFields = (COSArray) cosAcroForm.getDictionaryObject(COSName.FIELDS);
- assertEquals("Initially there shall be 0 fields", 0, cosFields.size());
+ assertEquals(0, cosFields.size(), "Initially there shall be 0 fields");
PDAcroForm acroForm = catalog.getAcroForm(new CreateFieldsFixup(testPdf));
- assertEquals("After rebuild there shall be " + numFormFieldsByAcrobat + " fields", numFormFieldsByAcrobat, acroForm.getFields().size());
+ assertEquals(numFormFieldsByAcrobat, acroForm.getFields().size(), "After rebuild there shall be " + numFormFieldsByAcrobat + " fields");
// the the fields found are contained in the map
for (PDField field : acroForm.getFieldTree())
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormTest.java?rev=1883541&r1=1883540&r2=1883541&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormTest.java Tue Nov 17 15:42:06 2020
@@ -16,12 +16,12 @@
*/
package org.apache.pdfbox.pdmodel.interactive.form;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+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 static org.junit.jupiter.api.Assertions.fail;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -42,9 +42,9 @@ import org.apache.pdfbox.pdmodel.font.PD
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
import org.apache.pdfbox.rendering.TestPDFToImage;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test for the PDButton class.
@@ -59,7 +59,7 @@ public class PDAcroFormTest
private static final File OUT_DIR = new File("target/test-output");
private static final File IN_DIR = new File("src/test/resources/org/apache/pdfbox/pdmodel/interactive/form");
- @Before
+ @BeforeEach
public void setUp()
{
document = new PDDocument();
@@ -349,7 +349,7 @@ public class PDAcroFormTest
}
}
- @After
+ @AfterEach
public void tearDown() throws IOException
{
document.close();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java?rev=1883541&r1=1883540&r2=1883541&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDButtonTest.java Tue Nov 17 15:42:06 2020
@@ -16,11 +16,13 @@
*/
package org.apache.pdfbox.pdmodel.interactive.form;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+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 static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.io.FileInputStream;
@@ -33,10 +35,9 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
-import org.junit.After;
-import static org.junit.Assert.assertNotEquals;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
@@ -58,7 +59,7 @@ public class PDButtonTest
private PDAcroForm acrobatAcroForm;
- @Before
+ @BeforeEach
public void setUp() throws IOException
{
document = new PDDocument();
@@ -122,7 +123,7 @@ public class PDButtonTest
radioButton.setValue("Off");
for (PDAnnotationWidget widget : radioButton.getWidgets())
{
- assertEquals("The widget should be set to Off", COSName.Off, widget.getCOSObject().getItem(COSName.AS));
+ assertEquals(COSName.Off, widget.getCOSObject().getItem(COSName.AS), "The widget should be set to Off");
}
}
@@ -291,36 +292,44 @@ public class PDButtonTest
assertEquals("Option3",checkbox.getWidgets().get(3).getAppearanceState().getName());
}
- @Test(expected=IllegalArgumentException.class)
+ @Test
public void setCheckboxInvalidValue() throws IOException
{
PDCheckBox checkbox = (PDCheckBox) acrobatAcroForm.getField("Checkbox");
// Set a value which doesn't match the radio button list
- checkbox.setValue("InvalidValue");
+ assertThrows(IllegalArgumentException.class, () -> {
+ checkbox.setValue("InvalidValue");
+ });
}
- @Test(expected=IllegalArgumentException.class)
+ @Test
public void setCheckboxGroupInvalidValue() throws IOException
{
PDCheckBox checkbox = (PDCheckBox) acrobatAcroForm.getField("CheckboxGroup");
// Set a value which doesn't match the radio button list
- checkbox.setValue("InvalidValue");
+ assertThrows(IllegalArgumentException.class, () -> {
+ checkbox.setValue("InvalidValue");
+ });
}
- @Test(expected=IllegalArgumentException.class)
+ @Test
public void setAbstractedCheckboxInvalidValue() throws IOException
{
PDField checkbox = acrobatAcroForm.getField("Checkbox");
// Set a value which doesn't match the radio button list
- checkbox.setValue("InvalidValue");
+ assertThrows(IllegalArgumentException.class, () -> {
+ checkbox.setValue("InvalidValue");
+ });
}
- @Test(expected=IllegalArgumentException.class)
+ @Test
public void setAbstractedCheckboxGroupInvalidValue() throws IOException
{
PDField checkbox = acrobatAcroForm.getField("CheckboxGroup");
- // Set a value which doesn't match the radio button list
- checkbox.setValue("InvalidValue");
+ // Set a value which doesn't match the radio button list
+ assertThrows(IllegalArgumentException.class, () -> {
+ checkbox.setValue("InvalidValue");
+ });
}
@Test
@@ -381,23 +390,27 @@ public class PDButtonTest
radioButton.getWidgets().get(1).getCOSObject().getDictionaryObject(COSName.AS));
}
- @Test(expected=IllegalArgumentException.class)
+ @Test
public void setRadioButtonInvalidValue() throws IOException
{
PDRadioButton radioButton = (PDRadioButton) acrobatAcroForm.getField("RadioButtonGroup");
- // Set a value which doesn't match the radio button list
- radioButton.setValue("InvalidValue");
+ // Set a value which doesn't match the radio button list
+ assertThrows(IllegalArgumentException.class, () -> {
+ radioButton.setValue("InvalidValue");
+ });
}
- @Test(expected=IllegalArgumentException.class)
+ @Test
public void setAbstractedRadioButtonInvalidValue() throws IOException
{
PDField radioButton = acrobatAcroForm.getField("RadioButtonGroup");
- // Set a value which doesn't match the radio button list
- radioButton.setValue("InvalidValue");
+ // Set a value which doesn't match the radio button list
+ assertThrows(IllegalArgumentException.class, () -> {
+ radioButton.setValue("InvalidValue");
+ });
}
- @After
+ @AfterEach
public void tearDown() throws IOException
{
document.close();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoiceTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoiceTest.java?rev=1883541&r1=1883540&r2=1883541&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoiceTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoiceTest.java Tue Nov 17 15:42:06 2020
@@ -16,9 +16,9 @@
*/
package org.apache.pdfbox.pdmodel.interactive.form;
-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 java.util.ArrayList;
import java.util.List;
@@ -27,8 +27,8 @@ import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.pdmodel.PDDocument;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test for the PDChoice class.
@@ -40,7 +40,7 @@ public class PDChoiceTest
private PDAcroForm acroForm;
private List<String> options;
- @Before
+ @BeforeEach
public void setUp()
{
document = new PDDocument();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceStringTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceStringTest.java?rev=1883541&r1=1883540&r2=1883541&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceStringTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceStringTest.java Tue Nov 17 15:42:06 2020
@@ -16,7 +16,8 @@
*/
package org.apache.pdfbox.pdmodel.interactive.form;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.IOException;
@@ -25,8 +26,8 @@ import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.pdmodel.PDResources;
import org.apache.pdfbox.pdmodel.font.PDType1Font;
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class PDDefaultAppearanceStringTest
{
@@ -34,7 +35,7 @@ public class PDDefaultAppearanceStringTe
private PDResources resources;
private COSName fontResourceName;
- @Before
+ @BeforeEach
public void setUp()
{
resources = new PDResources();
@@ -58,17 +59,21 @@ public class PDDefaultAppearanceStringTe
assertEquals(0.627, defaultAppearanceString.getFontColor().getComponents()[2], 0.0001);
}
- @Test(expected=IOException.class)
+ @Test
public void testFontResourceUnavailable() throws IOException
{
COSString sampleString = new COSString("/Helvetica 12 Tf 0.019 0.305 0.627 rg");
- new PDDefaultAppearanceString(sampleString, resources);
+ assertThrows(IOException.class, () -> {
+ new PDDefaultAppearanceString(sampleString, resources);
+ });
}
- @Test(expected=IOException.class)
+ @Test
public void testWrongNumberOfColorArguments() throws IOException
{
COSString sampleString = new COSString("/Helvetica 12 Tf 0.305 0.627 rg");
- new PDDefaultAppearanceString(sampleString, resources);
+ assertThrows(IOException.class, () -> {
+ new PDDefaultAppearanceString(sampleString, resources);
+ });
}
}
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureFieldTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureFieldTest.java?rev=1883541&r1=1883540&r2=1883541&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureFieldTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureFieldTest.java Tue Nov 17 15:42:06 2020
@@ -16,6 +16,10 @@
*/
package org.apache.pdfbox.pdmodel.interactive.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -26,11 +30,8 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
import org.apache.pdfbox.pdmodel.interactive.digitalsignature.PDSignature;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test for the PDSignatureField class.
@@ -41,7 +42,7 @@ public class PDSignatureFieldTest
private PDDocument document;
private PDAcroForm acroForm;
- @Before
+ @BeforeEach
public void setUp()
{
document = new PDDocument();
@@ -68,13 +69,14 @@ public class PDSignatureFieldTest
assertNotNull(acroForm.getField("SignatureField"));
}
- @Test(expected=UnsupportedOperationException.class)
+ @Test
public void setValueForAbstractedSignatureField()
{
PDSignatureField sigField = new PDSignatureField(acroForm);
sigField.setPartialName("SignatureField");
-
- sigField.setValue("Can't set value using String");
+ assertThrows(UnsupportedOperationException.class, () -> {
+ sigField.setValue("Can't set value using String");
+ });
}
/**
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDTextFieldTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDTextFieldTest.java?rev=1883541&r1=1883540&r2=1883541&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDTextFieldTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDTextFieldTest.java Tue Nov 17 15:42:06 2020
@@ -16,15 +16,14 @@
*/
package org.apache.pdfbox.pdmodel.interactive.form;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
-import org.junit.Before;
-import org.junit.Test;
-
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test for the PDSignatureField class.
@@ -35,7 +34,7 @@ public class PDTextFieldTest
private PDDocument document;
private PDAcroForm acroForm;
- @Before
+ @BeforeEach
public void setUp()
{
document = new PDDocument();