You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2020/11/15 17:28:08 UTC
svn commit: r1883456 - in
/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel:
graphics/optionalcontent/ graphics/state/ interactive/action/
interactive/annotation/
Author: lehmi
Date: Sun Nov 15 17:28:08 2020
New Revision: 1883456
URL: http://svn.apache.org/viewvc?rev=1883456&view=rev
Log:
PDFBOX-5017: switch test to junit5
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/TestOptionalContentGroups.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/state/RenderingIntentTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionURITest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/AppearanceGenerationTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDCircleAnnotationTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDSquareAnnotationTest.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/TestOptionalContentGroups.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/TestOptionalContentGroups.java?rev=1883456&r1=1883455&r2=1883456&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/TestOptionalContentGroups.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/TestOptionalContentGroups.java Sun Nov 15 17:28:08 2020
@@ -16,6 +16,14 @@
*/
package org.apache.pdfbox.pdmodel.graphics.optionalcontent;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+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.awt.Color;
import java.awt.image.BufferedImage;
import java.awt.image.DataBufferInt;
@@ -27,8 +35,6 @@ import java.util.HashSet;
import java.util.Set;
import javax.imageio.ImageIO;
-import junit.framework.TestCase;
-
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -42,19 +48,19 @@ import org.apache.pdfbox.pdmodel.font.PD
import org.apache.pdfbox.pdmodel.font.PDType1Font;
import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentProperties.BaseState;
import org.apache.pdfbox.rendering.PDFRenderer;
-import org.junit.Assert;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Tests optional content group functionality (also called layers).
*/
-public class TestOptionalContentGroups extends TestCase
+public class TestOptionalContentGroups
{
- private final File testResultsDir = new File("target/test-output");
+ private static final File testResultsDir = new File("target/test-output");
- @Override
- protected void setUp() throws Exception
+ @BeforeAll
+ static void setUp()
{
- super.setUp();
testResultsDir.mkdirs();
}
@@ -62,6 +68,7 @@ public class TestOptionalContentGroups e
* Tests OCG generation.
* @throws Exception if an error occurs
*/
+ @Test
public void testOCGGeneration() throws Exception
{
PDDocument doc = new PDDocument();
@@ -155,6 +162,7 @@ public class TestOptionalContentGroups e
* Tests OCG functions on a loaded PDF.
* @throws Exception if an error occurs
*/
+ @Test
public void testOCGConsumption() throws Exception
{
File pdfFile = new File(testResultsDir, "ocg-generation.pdf");
@@ -213,6 +221,7 @@ public class TestOptionalContentGroups e
}
}
+ @Test
public void testOCGsWithSameNameCanHaveDifferentVisibility() throws Exception
{
try (PDDocument doc = new PDDocument())
@@ -287,6 +296,7 @@ public class TestOptionalContentGroups e
*
* @throws IOException
*/
+ @Test
public void testOCGGenerationSameNameCanHaveSameVisibilityOff() throws IOException
{
BufferedImage expectedImage;
@@ -431,6 +441,6 @@ public class TestOptionalContentGroups e
// compare images
DataBufferInt expectedData = (DataBufferInt) expectedImage.getRaster().getDataBuffer();
DataBufferInt actualData = (DataBufferInt) actualImage.getRaster().getDataBuffer();
- Assert.assertArrayEquals(expectedData.getData(), actualData.getData());
+ assertArrayEquals(expectedData.getData(), actualData.getData());
}
}
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/state/RenderingIntentTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/state/RenderingIntentTest.java?rev=1883456&r1=1883455&r2=1883456&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/state/RenderingIntentTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/state/RenderingIntentTest.java Sun Nov 15 17:28:08 2020
@@ -16,8 +16,9 @@
*/
package org.apache.pdfbox.pdmodel.graphics.state;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
public class RenderingIntentTest
{
@@ -31,7 +32,7 @@ public class RenderingIntentTest
final RenderingIntent retval = RenderingIntent.fromString(value);
// Assert result
- Assert.assertEquals(RenderingIntent.ABSOLUTE_COLORIMETRIC, retval);
+ assertEquals(RenderingIntent.ABSOLUTE_COLORIMETRIC, retval);
}
@Test
@@ -44,7 +45,7 @@ public class RenderingIntentTest
final RenderingIntent retval = RenderingIntent.fromString(value);
// Assert result
- Assert.assertEquals(RenderingIntent.RELATIVE_COLORIMETRIC, retval);
+ assertEquals(RenderingIntent.RELATIVE_COLORIMETRIC, retval);
}
@Test
@@ -57,7 +58,7 @@ public class RenderingIntentTest
final RenderingIntent retval = RenderingIntent.fromString(value);
// Assert result
- Assert.assertEquals(RenderingIntent.PERCEPTUAL, retval);
+ assertEquals(RenderingIntent.PERCEPTUAL, retval);
}
@Test
@@ -70,7 +71,7 @@ public class RenderingIntentTest
final RenderingIntent retval = RenderingIntent.fromString(value);
// Assert result
- Assert.assertEquals(RenderingIntent.SATURATION, retval);
+ assertEquals(RenderingIntent.SATURATION, retval);
}
@Test
@@ -83,7 +84,7 @@ public class RenderingIntentTest
final RenderingIntent retval = RenderingIntent.fromString(value);
// Assert result
- Assert.assertEquals(RenderingIntent.RELATIVE_COLORIMETRIC, retval);
+ assertEquals(RenderingIntent.RELATIVE_COLORIMETRIC, retval);
}
@Test
@@ -96,7 +97,7 @@ public class RenderingIntentTest
final String retval = objectUnderTest.stringValue();
// Assert result
- Assert.assertEquals("AbsoluteColorimetric", retval);
+ assertEquals("AbsoluteColorimetric", retval);
}
@Test
@@ -109,6 +110,6 @@ public class RenderingIntentTest
final boolean retval = objectUnderTest.isFill();
// Assert result
- Assert.assertEquals(true, retval);
+ assertEquals(true, retval);
}
}
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionURITest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionURITest.java?rev=1883456&r1=1883455&r2=1883456&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionURITest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionURITest.java Sun Nov 15 17:28:08 2020
@@ -18,9 +18,9 @@ package org.apache.pdfbox.pdmodel.intera
import java.io.IOException;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import org.junit.jupiter.api.Test;
/**
*
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/AppearanceGenerationTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/AppearanceGenerationTest.java?rev=1883456&r1=1883455&r2=1883456&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/AppearanceGenerationTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/AppearanceGenerationTest.java Sun Nov 15 17:28:08 2020
@@ -17,8 +17,8 @@
package org.apache.pdfbox.pdmodel.interactive.annotation;
-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.IOException;
@@ -33,9 +33,9 @@ import org.apache.pdfbox.pdfparser.PDFSt
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
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;
/*
* Tests the appearance generation for annotations generated using
@@ -71,7 +71,7 @@ public class AppearanceGenerationTest
private static final File OUT_DIR = new File("target/test-output/pdmodel/interactive/annotation");
private static final String NAME_OF_PDF = "AnnotationTypes.pdf";
- @Before
+ @BeforeEach
public void setUp() throws IOException
{
document = Loader.loadPDF(new File(IN_DIR, NAME_OF_PDF));
@@ -101,22 +101,27 @@ public class AppearanceGenerationTest
List<Object> tokensForPdfbox = streamParser.parse();
- assertEquals("The number of tokens in the content stream should be the same", tokensForOriginal.size(),tokensForPdfbox.size());
+ assertEquals(tokensForOriginal.size(), tokensForPdfbox.size(),
+ "The number of tokens in the content stream should be the same");
int actualToken = 0;
for (Object tokenForOriginal : tokensForOriginal)
{
Object tokenForPdfbox = tokensForPdfbox.get(actualToken);
- assertEquals("The tokens should have the same type", tokenForOriginal.getClass().getName(), tokenForPdfbox.getClass().getName());
+ assertEquals(tokenForOriginal.getClass().getName(), tokenForPdfbox.getClass().getName(),
+ "The tokens should have the same type");
if (tokenForOriginal instanceof Operator)
{
- assertEquals("The operator generated by PDFBox should be the same Operator",
- ((Operator) tokenForOriginal).getName(), ((Operator )tokenForPdfbox).getName());
+ assertEquals(((Operator) tokenForOriginal).getName(),
+ ((Operator) tokenForPdfbox).getName(),
+ "The operator generated by PDFBox should be the same Operator");
} else if (tokenForOriginal instanceof COSFloat)
{
- assertTrue("The difference between the numbers should be smaller than " + DELTA,
- (Math.abs(((COSFloat)tokenForOriginal).floatValue() - ((COSFloat)tokenForPdfbox).floatValue()) < DELTA));
+ assertTrue(
+ Math.abs(((COSFloat) tokenForOriginal).floatValue()
+ - ((COSFloat) tokenForPdfbox).floatValue()) < DELTA,
+ "The difference between the numbers should be smaller than " + DELTA);
}
actualToken++;
}
@@ -142,7 +147,7 @@ public class AppearanceGenerationTest
}
}
- @After
+ @AfterEach
public void tearDown() throws IOException
{
document.close();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationTest.java?rev=1883456&r1=1883455&r2=1883456&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationTest.java Sun Nov 15 17:28:08 2020
@@ -20,10 +20,10 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
import org.apache.pdfbox.pdmodel.interactive.form.PDTextField;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* Test for the PDAnnotation classes.
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDCircleAnnotationTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDCircleAnnotationTest.java?rev=1883456&r1=1883455&r2=1883456&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDCircleAnnotationTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDCircleAnnotationTest.java Sun Nov 15 17:28:08 2020
@@ -17,8 +17,8 @@
package org.apache.pdfbox.pdmodel.interactive.annotation;
import org.apache.pdfbox.cos.COSName;
-import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
/**
*
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDSquareAnnotationTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDSquareAnnotationTest.java?rev=1883456&r1=1883455&r2=1883456&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDSquareAnnotationTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDSquareAnnotationTest.java Sun Nov 15 17:28:08 2020
@@ -29,11 +29,11 @@ import org.apache.pdfbox.pdmodel.common.
import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
import org.apache.pdfbox.util.Matrix;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
-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.File;
import java.io.IOException;
@@ -55,8 +55,8 @@ public class PDSquareAnnotationTest
private static final File IN_DIR = new File("src/test/resources/org/apache/pdfbox/pdmodel/interactive/annotation");
private static final String NAME_OF_PDF = "PDSquareAnnotationTest.pdf";
- @Before
- public void setUp() throws IOException
+ @BeforeAll
+ static void setUp() throws IOException
{
rectangle = new PDRectangle();
rectangle.setLowerLeftX(91.5958f);
@@ -119,17 +119,18 @@ public class PDSquareAnnotationTest
PDAnnotationSquareCircle annotation = (PDAnnotationSquareCircle) annotations.get(0);
// test the correct setting of the appearance stream
- assertNotNull("Appearance dictionary shall not be null", annotation.getAppearance());
- assertNotNull("Normal appearance shall not be null", annotation.getAppearance().getNormalAppearance());
+ assertNotNull(annotation.getAppearance(), "Appearance dictionary shall not be null");
+ assertNotNull(annotation.getAppearance().getNormalAppearance(),
+ "Normal appearance shall not be null");
PDAppearanceStream appearanceStream = annotation.getAppearance().getNormalAppearance().getAppearanceStream();
- assertNotNull("Appearance stream shall not be null", appearanceStream);
+ assertNotNull(appearanceStream, "Appearance stream shall not be null");
assertEquals(rectangle.getLowerLeftX(), appearanceStream.getBBox().getLowerLeftX(), DELTA);
assertEquals(rectangle.getLowerLeftY(), appearanceStream.getBBox().getLowerLeftY(), DELTA);
assertEquals(rectangle.getWidth(), appearanceStream.getBBox().getWidth(), DELTA);
assertEquals(rectangle.getHeight(), appearanceStream.getBBox().getHeight(), DELTA);
Matrix matrix = appearanceStream.getMatrix();
- assertNotNull("Matrix shall not be null", matrix);
+ assertNotNull(matrix, "Matrix shall not be null");
// should have been translated to a 0 origin
assertEquals(-rectangle.getLowerLeftX(), matrix.getTranslateX(), DELTA);
@@ -137,7 +138,7 @@ public class PDSquareAnnotationTest
// test the content of the appearance stream
PDStream contentStream = appearanceStream.getContentStream();
- assertNotNull("Content stream shall not be null", contentStream);
+ assertNotNull(contentStream, "Content stream shall not be null");
PDFStreamParser parser = new PDFStreamParser(appearanceStream);
List<Object> tokens = parser.parse();