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:19:19 UTC
svn commit: r1883455 - in
/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics: ./
blend/ color/ image/
Author: lehmi
Date: Sun Nov 15 17:19:19 2020
New Revision: 1883455
URL: http://svn.apache.org/viewvc?rev=1883455&view=rev
Log:
PDFBOX-5017: switch test to junit5
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/PDLineDashPatternTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendModeTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceCMYKTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBasedTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/color/PDLabTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactoryTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactoryTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObjectTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImageTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PNGConverterTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/ValidateXImage.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/PDLineDashPatternTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/PDLineDashPatternTest.java?rev=1883455&r1=1883454&r2=1883455&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/PDLineDashPatternTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/PDLineDashPatternTest.java Sun Nov 15 17:19:19 2020
@@ -20,11 +20,12 @@
package org.apache.pdfbox.pdmodel.graphics;
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSFloat;
import org.apache.pdfbox.cos.COSInteger;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendModeTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendModeTest.java?rev=1883455&r1=1883454&r2=1883455&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendModeTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendModeTest.java Sun Nov 15 17:19:19 2020
@@ -16,9 +16,10 @@
*/
package org.apache.pdfbox.pdmodel.graphics.blend;
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.pdfbox.cos.COSName;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceCMYKTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceCMYKTest.java?rev=1883455&r1=1883454&r2=1883455&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceCMYKTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceCMYKTest.java Sun Nov 15 17:19:19 2020
@@ -18,15 +18,16 @@
package org.apache.pdfbox.pdmodel.graphics.color;
import java.io.IOException;
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
/**
* Test for power user creation of a custom default CMYK color space.
*
* @author John Hewson
*/
-public class PDDeviceCMYKTest extends TestCase
+public class PDDeviceCMYKTest
{
+ @Test
public void testCMYK() throws IOException
{
PDDeviceCMYK.INSTANCE = new CustomDeviceCMYK();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBasedTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBasedTest.java?rev=1883455&r1=1883454&r2=1883455&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBasedTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBasedTest.java Sun Nov 15 17:19:19 2020
@@ -16,9 +16,9 @@
package org.apache.pdfbox.pdmodel.graphics.color;
import org.apache.pdfbox.pdmodel.PDDocument;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import org.junit.jupiter.api.Test;
/**
*
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/color/PDLabTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/color/PDLabTest.java?rev=1883455&r1=1883454&r2=1883455&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/color/PDLabTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/color/PDLabTest.java Sun Nov 15 17:19:19 2020
@@ -15,23 +15,28 @@
*/
package org.apache.pdfbox.pdmodel.graphics.color;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.Arrays;
-import junit.framework.TestCase;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.pdmodel.common.PDRange;
+import org.junit.jupiter.api.Test;
/**
*
* @author Tilman Hausherr
*/
-public class PDLabTest extends TestCase
+public class PDLabTest
{
/**
* This test checks that getting default values do not alter the object,
* and checks getters and setters.
*/
+ @Test
public void testLAB()
{
PDLab pdLab = new PDLab();
@@ -43,17 +48,17 @@ public class PDLabTest extends TestCase
assertEquals(3, pdLab.getNumberOfComponents());
assertNotNull(pdLab.getInitialColor());
assertTrue(Arrays.equals(new float[]{0,0,0}, pdLab.getInitialColor().getComponents()));
- assertEquals(0f, pdLab.getBlackPoint().getX());
- assertEquals(0f, pdLab.getBlackPoint().getY());
- assertEquals(0f, pdLab.getBlackPoint().getZ());
- assertEquals(1f, pdLab.getWhitepoint().getX());
- assertEquals(1f, pdLab.getWhitepoint().getY());
- assertEquals(1f, pdLab.getWhitepoint().getZ());
- assertEquals(-100f, pdLab.getARange().getMin());
- assertEquals(100f, pdLab.getARange().getMax());
- assertEquals(-100f, pdLab.getBRange().getMin());
- assertEquals(100f, pdLab.getBRange().getMax());
- assertEquals("read operations should not change the size of /Lab objects", 0, dict.size());
+ assertEquals(0f, pdLab.getBlackPoint().getX(), 0f);
+ assertEquals(0f, pdLab.getBlackPoint().getY(), 0f);
+ assertEquals(0f, pdLab.getBlackPoint().getZ(), 0f);
+ assertEquals(1f, pdLab.getWhitepoint().getX(), 0f);
+ assertEquals(1f, pdLab.getWhitepoint().getY(), 0f);
+ assertEquals(1f, pdLab.getWhitepoint().getZ(), 0f);
+ assertEquals(-100f, pdLab.getARange().getMin(), 0f);
+ assertEquals(100f, pdLab.getARange().getMax(), 0f);
+ assertEquals(-100f, pdLab.getBRange().getMin(), 0f);
+ assertEquals(100f, pdLab.getBRange().getMax(), 0f);
+ assertEquals(0, dict.size(), "read operations should not change the size of /Lab objects");
dict.toString(); // rev 1571125 did a stack overflow here
// test setting specific values
@@ -65,10 +70,10 @@ public class PDLabTest extends TestCase
pdRange.setMin(3);
pdRange.setMax(4);
pdLab.setBRange(pdRange);
- assertEquals(-1f, pdLab.getARange().getMin());
- assertEquals(2f, pdLab.getARange().getMax());
- assertEquals(3f, pdLab.getBRange().getMin());
- assertEquals(4f, pdLab.getBRange().getMax());
+ assertEquals(-1f, pdLab.getARange().getMin(), 0f);
+ assertEquals(2f, pdLab.getARange().getMax(), 0f);
+ assertEquals(3f, pdLab.getBRange().getMin(), 0f);
+ assertEquals(4f, pdLab.getBRange().getMax(), 0f);
PDTristimulus pdTristimulus = new PDTristimulus();
pdTristimulus.setX(5);
pdTristimulus.setY(6);
@@ -79,12 +84,12 @@ public class PDLabTest extends TestCase
pdTristimulus.setY(9);
pdTristimulus.setZ(10);
pdLab.setBlackPoint(pdTristimulus);
- assertEquals(5f, pdLab.getWhitepoint().getX());
- assertEquals(6f, pdLab.getWhitepoint().getY());
- assertEquals(7f, pdLab.getWhitepoint().getZ());
- assertEquals(8f, pdLab.getBlackPoint().getX());
- assertEquals(9f, pdLab.getBlackPoint().getY());
- assertEquals(10f, pdLab.getBlackPoint().getZ());
+ assertEquals(5f, pdLab.getWhitepoint().getX(), 0f);
+ assertEquals(6f, pdLab.getWhitepoint().getY(), 0f);
+ assertEquals(7f, pdLab.getWhitepoint().getZ(), 0f);
+ assertEquals(8f, pdLab.getBlackPoint().getX(), 0f);
+ assertEquals(9f, pdLab.getBlackPoint().getY(), 0f);
+ assertEquals(10f, pdLab.getBlackPoint().getZ(), 0f);
assertTrue(Arrays.equals(new float[]{0,0,3}, pdLab.getInitialColor().getComponents()));
}
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactoryTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactoryTest.java?rev=1883455&r1=1883454&r2=1883455&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactoryTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactoryTest.java Sun Nov 15 17:19:19 2020
@@ -24,7 +24,6 @@ import java.util.Arrays;
import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
import javax.imageio.stream.ImageInputStream;
-import junit.framework.TestCase;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.Loader;
@@ -33,24 +32,27 @@ import org.apache.pdfbox.pdmodel.common.
import org.apache.pdfbox.pdmodel.PDPageContentStream;
import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.apache.pdfbox.pdmodel.graphics.image.ValidateXImage.checkIdent;
import static org.apache.pdfbox.pdmodel.graphics.image.ValidateXImage.validate;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Unit tests for CCITTFactory
*
* @author Tilman Hausherr
*/
-public class CCITTFactoryTest extends TestCase
+public class CCITTFactoryTest
{
private final File testResultsDir = new File("target/test-output/graphics");
- @Override
- protected void setUp() throws Exception
+ @BeforeEach
+ protected void setUp()
{
- super.setUp();
testResultsDir.mkdirs();
}
@@ -58,6 +60,7 @@ public class CCITTFactoryTest extends Te
* Tests CCITTFactory#createFromRandomAccess(PDDocument document,
* RandomAccess reader) with a single page TIFF
*/
+ @Test
public void testCreateFromRandomAccessSingle() throws IOException
{
String tiffG3Path = "src/test/resources/org/apache/pdfbox/pdmodel/graphics/image/ccittg3.tif";
@@ -97,6 +100,7 @@ public class CCITTFactoryTest extends Te
* Tests CCITTFactory#createFromRandomAccess(PDDocument document,
* RandomAccess reader) with a multi page TIFF
*/
+ @Test
public void testCreateFromRandomAccessMulti() throws IOException
{
String tiffPath = "src/test/resources/org/apache/pdfbox/pdmodel/graphics/image/ccittg4multi.tif";
@@ -143,6 +147,7 @@ public class CCITTFactoryTest extends Te
imageReader.dispose();
}
+ @Test
public void testCreateFromBufferedImage() throws IOException
{
String tiffG4Path = "src/test/resources/org/apache/pdfbox/pdmodel/graphics/image/ccittg4.tif";
@@ -168,11 +173,12 @@ public class CCITTFactoryTest extends Te
document.close();
}
+ @Test
public void testCreateFromBufferedChessImage() throws IOException
{
PDDocument document = new PDDocument();
BufferedImage bim = new BufferedImage(343, 287, BufferedImage.TYPE_BYTE_BINARY);
- Assert.assertNotEquals((bim.getWidth() / 8) * 8, bim.getWidth()); // not mult of 8
+ assertNotEquals((bim.getWidth() / 8) * 8, bim.getWidth()); // not mult of 8
int col = 0;
for (int x = 0; x < bim.getWidth(); ++x)
{
@@ -206,6 +212,7 @@ public class CCITTFactoryTest extends Te
* Tests that CCITTFactory#createFromFile(PDDocument document, File file) doesn't lock the
* source file
*/
+ @Test
public void testCreateFromFileLock() throws IOException
{
// copy the source file to a temp directory, as we will be deleting it
@@ -221,6 +228,7 @@ public class CCITTFactoryTest extends Te
* Tests that CCITTFactory#createFromFile(PDDocument document, File file, int number) doesn't
* lock the source file
*/
+ @Test
public void testCreateFromFileNumberLock() throws IOException
{
// copy the source file to a temp directory, as we will be deleting it
@@ -236,6 +244,7 @@ public class CCITTFactoryTest extends Te
* Tests that byte/short tag values are read correctly (ignoring possible garbage in remaining
* bytes).
*/
+ @Test
public void testByteShortPaddedWithGarbage() throws IOException
{
try (PDDocument document = new PDDocument())
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java?rev=1883455&r1=1883454&r2=1883455&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java Sun Nov 15 17:19:19 2020
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import javax.imageio.ImageIO;
-import junit.framework.TestCase;
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.cos.COSName;
@@ -32,25 +31,30 @@ import org.apache.pdfbox.pdmodel.PDDocum
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceCMYK;
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.apache.pdfbox.pdmodel.graphics.image.ValidateXImage.colorCount;
import static org.apache.pdfbox.pdmodel.graphics.image.ValidateXImage.doWritePDF;
import static org.apache.pdfbox.pdmodel.graphics.image.ValidateXImage.validate;
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+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;
/**
* Unit tests for JPEGFactory
*
* @author Tilman Hausherr
*/
-public class JPEGFactoryTest extends TestCase
+public class JPEGFactoryTest
{
private final File testResultsDir = new File("target/test-output/graphics");
- @Override
- protected void setUp() throws Exception
+ @BeforeEach
+ protected void setUp()
{
- super.setUp();
testResultsDir.mkdirs();
}
@@ -58,6 +62,7 @@ public class JPEGFactoryTest extends Tes
* Tests JPEGFactory#createFromStream(PDDocument document, InputStream
* stream) with color JPEG file
*/
+ @Test
public void testCreateFromStream() throws IOException
{
PDDocument document = new PDDocument();
@@ -73,6 +78,7 @@ public class JPEGFactoryTest extends Tes
* Tests JPEGFactory#createFromStream(PDDocument document, InputStream
* stream) with CMYK color JPEG file
*/
+ @Test
public void testCreateFromStreamCMYK() throws IOException
{
PDDocument document = new PDDocument();
@@ -88,6 +94,7 @@ public class JPEGFactoryTest extends Tes
* Tests JPEGFactory#createFromStream(PDDocument document, InputStream
* stream) with gray JPEG file
*/
+ @Test
public void testCreateFromStream256() throws IOException
{
PDDocument document = new PDDocument();
@@ -103,6 +110,7 @@ public class JPEGFactoryTest extends Tes
* Tests RGB JPEGFactory#createFromImage(PDDocument document, BufferedImage
* image) with color JPEG image
*/
+ @Test
public void testCreateFromImageRGB() throws IOException
{
PDDocument document = new PDDocument();
@@ -118,6 +126,7 @@ public class JPEGFactoryTest extends Tes
* Tests RGB JPEGFactory#createFromImage(PDDocument document, BufferedImage
* image) with gray JPEG image
*/
+ @Test
public void testCreateFromImage256() throws IOException
{
PDDocument document = new PDDocument();
@@ -133,6 +142,7 @@ public class JPEGFactoryTest extends Tes
* Tests ARGB JPEGFactory#createFromImage(PDDocument document, BufferedImage
* image)
*/
+ @Test
public void testCreateFromImageINT_ARGB() throws IOException
{
// workaround Open JDK bug
@@ -177,6 +187,7 @@ public class JPEGFactoryTest extends Tes
* Tests ARGB JPEGFactory#createFromImage(PDDocument document, BufferedImage
* image)
*/
+ @Test
public void testCreateFromImage4BYTE_ABGR() throws IOException
{
// workaround Open JDK bug
@@ -222,6 +233,7 @@ public class JPEGFactoryTest extends Tes
* image), see also PDFBOX-4674.
* @throws java.io.IOException
*/
+ @Test
public void testCreateFromImageUSHORT_555_RGB() throws IOException
{
// workaround Open JDK bug
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactoryTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactoryTest.java?rev=1883455&r1=1883454&r2=1883455&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactoryTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactoryTest.java Sun Nov 15 17:19:19 2020
@@ -36,7 +36,6 @@ import java.io.IOException;
import java.util.Hashtable;
import java.util.Random;
import javax.imageio.ImageIO;
-import junit.framework.TestCase;
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -49,22 +48,28 @@ import static org.apache.pdfbox.pdmodel.
import static org.apache.pdfbox.pdmodel.graphics.image.ValidateXImage.colorCount;
import static org.apache.pdfbox.pdmodel.graphics.image.ValidateXImage.doWritePDF;
import static org.apache.pdfbox.pdmodel.graphics.image.ValidateXImage.validate;
+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 org.apache.pdfbox.rendering.PDFRenderer;
-import org.junit.Assert;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for LosslessFactory
*
* @author Tilman Hausherr
*/
-public class LosslessFactoryTest extends TestCase
+public class LosslessFactoryTest
{
- private final File testResultsDir = new File("target/test-output/graphics");
+ private static final File testResultsDir = new File("target/test-output/graphics");
- @Override
- protected void setUp() throws Exception
+ @BeforeAll
+ static void setUp()
{
- super.setUp();
testResultsDir.mkdirs();
}
@@ -74,6 +79,7 @@ public class LosslessFactoryTest extends
*
* @throws java.io.IOException
*/
+ @Test
public void testCreateLosslessFromImageRGB() throws IOException
{
PDDocument document = new PDDocument();
@@ -96,7 +102,7 @@ public class LosslessFactoryTest extends
BufferedImage bitonalImage = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_BYTE_BINARY);
// avoid multiple of 8 to test padding
- Assert.assertNotEquals(0, bitonalImage.getWidth() % 8);
+ assertNotEquals(0, bitonalImage.getWidth() % 8);
g = bitonalImage.getGraphics();
g.drawImage(image, 0, 0, null);
@@ -131,6 +137,7 @@ public class LosslessFactoryTest extends
*
* @throws java.io.IOException
*/
+ @Test
public void testCreateLosslessFromImageINT_ARGB() throws IOException
{
PDDocument document = new PDDocument();
@@ -170,6 +177,7 @@ public class LosslessFactoryTest extends
*
* @throws java.io.IOException
*/
+ @Test
public void testCreateLosslessFromImageBITMASK_INT_ARGB() throws IOException
{
doBitmaskTransparencyTest(BufferedImage.TYPE_INT_ARGB, "bitmaskintargb.pdf");
@@ -181,6 +189,7 @@ public class LosslessFactoryTest extends
*
* @throws java.io.IOException
*/
+ @Test
public void testCreateLosslessFromImageBITMASK4BYTE_ABGR() throws IOException
{
doBitmaskTransparencyTest(BufferedImage.TYPE_4BYTE_ABGR, "bitmask4babgr.pdf");
@@ -192,6 +201,7 @@ public class LosslessFactoryTest extends
*
* @throws java.io.IOException
*/
+ @Test
public void testCreateLosslessFromImage4BYTE_ABGR() throws IOException
{
PDDocument document = new PDDocument();
@@ -242,6 +252,7 @@ public class LosslessFactoryTest extends
*
* @throws java.io.IOException
*/
+ @Test
public void testCreateLosslessFromImageUSHORT_555_RGB() throws IOException
{
PDDocument document = new PDDocument();
@@ -280,6 +291,7 @@ public class LosslessFactoryTest extends
*
* @throws java.io.IOException
*/
+ @Test
public void testCreateLosslessFromTransparentGIF() throws IOException
{
PDDocument document = new PDDocument();
@@ -309,6 +321,7 @@ public class LosslessFactoryTest extends
*
* @throws java.io.IOException
*/
+ @Test
public void testCreateLosslessFromTransparent1BitGIF() throws IOException
{
PDDocument document = new PDDocument();
@@ -337,6 +350,7 @@ public class LosslessFactoryTest extends
*
* @throws java.io.IOException
*/
+ @Test
public void testCreateLosslessFromGovdocs032163() throws IOException
{
PDDocument document = new PDDocument();
@@ -370,7 +384,8 @@ public class LosslessFactoryTest extends
{
errMsg = String.format("(%d,%d) %06X != %06X", x, y, expectedImage.getRGB(x, y) & 0xFFFFFF, actualImage.getRGB(x, y) & 0xFFFFFF);
}
- assertEquals(errMsg, expectedImage.getRGB(x, y) & 0xFFFFFF, actualImage.getRGB(x, y) & 0xFFFFFF);
+ assertEquals(expectedImage.getRGB(x, y) & 0xFFFFFF,
+ actualImage.getRGB(x, y) & 0xFFFFFF, errMsg);
}
}
}
@@ -420,7 +435,7 @@ public class LosslessFactoryTest extends
{
String errMsg = String.format("(%d,%d) Channel %d %04X != %04X", x, y, i, expectedValue,
actualValue);
- assertEquals(errMsg, expectedValue, actualValue);
+ assertEquals(expectedValue, actualValue, errMsg);
}
}
}
@@ -493,7 +508,7 @@ public class LosslessFactoryTest extends
BufferedImage maskImage = ximage.getSoftMask().getImage();
// avoid multiple of 8 to test padding
- Assert.assertNotEquals(0, maskImage.getWidth() % 8);
+ assertNotEquals(0, maskImage.getWidth() % 8);
assertEquals(Transparency.OPAQUE, maskImage.getTransparency());
for (int x = 0; x < width; ++x)
@@ -539,6 +554,7 @@ public class LosslessFactoryTest extends
/**
* Test lossless encoding of CMYK images
*/
+ @Test
public void testCreateLosslessFromImageCMYK() throws IOException
{
PDDocument document = new PDDocument();
@@ -558,6 +574,7 @@ public class LosslessFactoryTest extends
//checkIdent(imageCMYK, ximage.getImage());
}
+ @Test
public void testCreateLosslessFrom16Bit() throws IOException
{
PDDocument document = new PDDocument();
@@ -580,6 +597,7 @@ public class LosslessFactoryTest extends
doWritePDF(document, ximage, testResultsDir, "misc-16bit.pdf");
}
+ @Test
public void testCreateLosslessFromImageINT_BGR() throws IOException
{
PDDocument document = new PDDocument();
@@ -594,6 +612,7 @@ public class LosslessFactoryTest extends
checkIdent(image, ximage.getImage());
}
+ @Test
public void testCreateLosslessFromImageINT_RGB() throws IOException
{
PDDocument document = new PDDocument();
@@ -608,6 +627,7 @@ public class LosslessFactoryTest extends
checkIdent(image, ximage.getImage());
}
+ @Test
public void testCreateLosslessFromImageBYTE_3BGR() throws IOException
{
PDDocument document = new PDDocument();
@@ -622,6 +642,7 @@ public class LosslessFactoryTest extends
checkIdent(image, ximage.getImage());
}
+ @Test
public void testCreateLosslessFrom16BitPNG() throws IOException
{
PDDocument document = new PDDocument();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObjectTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObjectTest.java?rev=1883455&r1=1883454&r2=1883455&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObjectTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObjectTest.java Sun Nov 15 17:19:19 2020
@@ -16,6 +16,9 @@
*/
package org.apache.pdfbox.pdmodel.graphics.image;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.FileInputStream;
@@ -24,8 +27,7 @@ import java.net.URISyntaxException;
import javax.imageio.ImageIO;
import org.apache.pdfbox.io.IOUtils;
import org.apache.pdfbox.pdmodel.PDDocument;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test that the convenience methods are really doing what's expected, and having the same as
@@ -129,7 +131,7 @@ public class PDImageXObjectTest
BufferedImage bim = ImageIO.read(PDImageXObjectTest.class.getResourceAsStream(filename));
PDImageXObject expectedImage = LosslessFactory.createFromImage(doc, bim);
- Assert.assertEquals(expectedImage.getSuffix(), image.getSuffix());
+ assertEquals(expectedImage.getSuffix(), image.getSuffix());
checkIdentARGB(image.getImage(), expectedImage.getImage());
}
}
@@ -144,7 +146,7 @@ public class PDImageXObjectTest
PDImageXObject expectedImage = CCITTFactory.createFromFile(doc, file);
- Assert.assertEquals(expectedImage.getSuffix(), image.getSuffix());
+ assertEquals(expectedImage.getSuffix(), image.getSuffix());
checkIdentARGB(image.getImage(), expectedImage.getImage());
}
}
@@ -159,7 +161,7 @@ public class PDImageXObjectTest
PDImageXObject expectedImage = JPEGFactory.createFromStream(doc, new FileInputStream(file));
- Assert.assertEquals(expectedImage.getSuffix(), image.getSuffix());
+ assertEquals(expectedImage.getSuffix(), image.getSuffix());
checkIdentARGB(image.getImage(), expectedImage.getImage());
}
}
@@ -175,7 +177,7 @@ public class PDImageXObjectTest
BufferedImage bim = ImageIO.read(PDImageXObjectTest.class.getResourceAsStream(filename));
PDImageXObject expectedImage = LosslessFactory.createFromImage(doc, bim);
- Assert.assertEquals(expectedImage.getSuffix(), image.getSuffix());
+ assertEquals(expectedImage.getSuffix(), image.getSuffix());
checkIdentARGB(image.getImage(), expectedImage.getImage());
}
}
@@ -190,7 +192,7 @@ public class PDImageXObjectTest
PDImageXObject expectedImage = CCITTFactory.createFromFile(doc, file);
- Assert.assertEquals(expectedImage.getSuffix(), image.getSuffix());
+ assertEquals(expectedImage.getSuffix(), image.getSuffix());
checkIdentARGB(image.getImage(), expectedImage.getImage());
}
}
@@ -205,7 +207,7 @@ public class PDImageXObjectTest
PDImageXObject expectedImage = JPEGFactory.createFromStream(doc, new FileInputStream(file));
- Assert.assertEquals(expectedImage.getSuffix(), image.getSuffix());
+ assertEquals(expectedImage.getSuffix(), image.getSuffix());
checkIdentARGB(image.getImage(), expectedImage.getImage());
}
}
@@ -221,7 +223,7 @@ public class PDImageXObjectTest
BufferedImage bim = ImageIO.read(PDImageXObjectTest.class.getResourceAsStream(filename));
PDImageXObject expectedImage = LosslessFactory.createFromImage(doc, bim);
- Assert.assertEquals(expectedImage.getSuffix(), image.getSuffix());
+ assertEquals(expectedImage.getSuffix(), image.getSuffix());
checkIdentARGB(image.getImage(), expectedImage.getImage());
}
}
@@ -236,7 +238,7 @@ public class PDImageXObjectTest
PDImageXObject expectedImage = CCITTFactory.createFromFile(doc, file);
- Assert.assertEquals(expectedImage.getSuffix(), image.getSuffix());
+ assertEquals(expectedImage.getSuffix(), image.getSuffix());
checkIdentARGB(image.getImage(), expectedImage.getImage());
}
}
@@ -251,7 +253,7 @@ public class PDImageXObjectTest
PDImageXObject expectedImage = JPEGFactory.createFromStream(doc, new FileInputStream(file));
- Assert.assertEquals(expectedImage.getSuffix(), image.getSuffix());
+ assertEquals(expectedImage.getSuffix(), image.getSuffix());
checkIdentARGB(image.getImage(), expectedImage.getImage());
}
}
@@ -271,7 +273,7 @@ public class PDImageXObjectTest
BufferedImage bim = ImageIO.read(PDImageXObjectTest.class.getResourceAsStream(filename));
PDImageXObject expectedImage = LosslessFactory.createFromImage(doc, bim);
- Assert.assertEquals(expectedImage.getSuffix(), image.getSuffix());
+ assertEquals(expectedImage.getSuffix(), image.getSuffix());
checkIdentARGB(image.getImage(), expectedImage.getImage());
}
}
@@ -287,7 +289,7 @@ public class PDImageXObjectTest
PDImageXObject expectedImage = CCITTFactory.createFromFile(doc, file);
- Assert.assertEquals(expectedImage.getSuffix(), image.getSuffix());
+ assertEquals(expectedImage.getSuffix(), image.getSuffix());
checkIdentARGB(image.getImage(), expectedImage.getImage());
}
}
@@ -303,7 +305,7 @@ public class PDImageXObjectTest
PDImageXObject expectedImage = JPEGFactory.createFromStream(doc, new FileInputStream(file));
- Assert.assertEquals(expectedImage.getSuffix(), image.getSuffix());
+ assertEquals(expectedImage.getSuffix(), image.getSuffix());
checkIdentARGB(image.getImage(), expectedImage.getImage());
}
}
@@ -314,8 +316,8 @@ public class PDImageXObjectTest
int w = expectedImage.getWidth();
int h = expectedImage.getHeight();
- Assert.assertEquals(w, actualImage.getWidth());
- Assert.assertEquals(h, actualImage.getHeight());
+ assertEquals(w, actualImage.getWidth());
+ assertEquals(h, actualImage.getHeight());
for (int y = 0; y < h; ++y)
{
for (int x = 0; x < w; ++x)
@@ -324,7 +326,7 @@ public class PDImageXObjectTest
{
errMsg = String.format("(%d,%d) %06X != %06X", x, y, expectedImage.getRGB(x, y), actualImage.getRGB(x, y));
}
- Assert.assertEquals(errMsg, expectedImage.getRGB(x, y), actualImage.getRGB(x, y));
+ assertEquals(expectedImage.getRGB(x, y), actualImage.getRGB(x, y), errMsg);
}
}
}
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImageTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImageTest.java?rev=1883455&r1=1883454&r2=1883455&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImageTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PDInlineImageTest.java Sun Nov 15 17:19:19 2020
@@ -15,6 +15,10 @@
*/
package org.apache.pdfbox.pdmodel.graphics.image;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.awt.Color;
import java.awt.Paint;
import java.awt.image.BufferedImage;
@@ -22,7 +26,6 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import javax.imageio.ImageIO;
-import junit.framework.TestCase;
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.cos.COSArray;
@@ -34,20 +37,21 @@ import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDPageContentStream;
import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
import org.apache.pdfbox.rendering.PDFRenderer;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Unit tests for PDInlineImage
*
* @author Tilman Hausherr
*/
-public class PDInlineImageTest extends TestCase
+public class PDInlineImageTest
{
- private final File testResultsDir = new File("target/test-output/graphics");
+ private static final File testResultsDir = new File("target/test-output/graphics");
- @Override
- protected void setUp() throws Exception
+ @BeforeAll
+ static void setUp()
{
- super.setUp();
testResultsDir.mkdirs();
}
@@ -55,6 +59,7 @@ public class PDInlineImageTest extends T
* Tests PDInlineImage#PDInlineImage(COSDictionary parameters, byte[] data,
* Map<String, PDColorSpace> colorSpaces)
*/
+ @Test
public void testInlineImage() throws IOException
{
COSDictionary dict = new COSDictionary();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PNGConverterTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PNGConverterTest.java?rev=1883455&r1=1883454&r2=1883455&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PNGConverterTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/PNGConverterTest.java Sun Nov 15 17:19:19 2020
@@ -43,21 +43,22 @@ import org.apache.pdfbox.pdmodel.graphic
import static org.apache.pdfbox.pdmodel.graphics.image.LosslessFactoryTest.checkIdentRaw;
import static org.apache.pdfbox.pdmodel.graphics.image.ValidateXImage.checkIdent;
-import org.junit.Assert;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
public class PNGConverterTest
{
+ private static final File parentDir = new File("target/test-output/graphics/graphics");
- @Before
- public void setup()
+ @BeforeAll
+ static void setup()
{
//noinspection ResultOfMethodCallIgnored
parentDir.mkdirs();
@@ -160,8 +161,6 @@ public class PNGConverterTest
checkImageConvertFail("png_gray_with_gama.png");
}
- private final File parentDir = new File("target/test-output/graphics/graphics");
-
private void checkImageConvertFail(String name) throws IOException
{
try (PDDocument doc = new PDDocument())
@@ -382,7 +381,7 @@ public class PNGConverterTest
// (PDICCBased.is_sRGB() fails in openjdk on that data, maybe it is not a "real" sRGB)
ICC_Profile rgbProfile = ICC_Profile.getInstance(ColorSpace.CS_sRGB);
byte[] sRGB_bytes = rgbProfile.getData();
- Assert.assertArrayEquals(sRGB_bytes, iccColorspace.getPDStream().toByteArray());
+ assertArrayEquals(sRGB_bytes, iccColorspace.getPDStream().toByteArray());
}
}
}
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/ValidateXImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/ValidateXImage.java?rev=1883455&r1=1883454&r2=1883455&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/ValidateXImage.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/ValidateXImage.java Sun Nov 15 17:19:19 2020
@@ -15,6 +15,10 @@
*/
package org.apache.pdfbox.pdmodel.graphics.image;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.awt.Point;
import java.awt.color.ColorSpace;
import java.awt.image.BufferedImage;
@@ -42,10 +46,6 @@ import org.apache.pdfbox.pdmodel.PDPageC
import org.apache.pdfbox.rendering.PDFRenderer;
import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertTrue;
-
/**
* Helper class to do some validations for PDImageXObject.
*
@@ -192,7 +192,7 @@ public class ValidateXImage
{
errMsg = String.format("(%d,%d) expected: <%08X> but was: <%08X>; ", x, y, expectedImage.getRGB(x, y), actualImage.getRGB(x, y));
}
- assertEquals(errMsg, expectedImage.getRGB(x, y), actualImage.getRGB(x, y));
+ assertEquals(expectedImage.getRGB(x, y), actualImage.getRGB(x, y), errMsg);
}
}
}