You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2021/02/27 09:46:02 UTC
svn commit: r1886972 - in
/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel:
font/PDFontTest.java graphics/image/CCITTFactoryTest.java
graphics/image/JPEGFactoryTest.java
Author: tilman
Date: Sat Feb 27 09:46:02 2021
New Revision: 1886972
URL: http://svn.apache.org/viewvc?rev=1886972&view=rev
Log:
PDFBOX-4892: replace @BeforeEach with @BeforeAll because it's only needed once
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.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
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java?rev=1886972&r1=1886971&r2=1886972&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java Sat Feb 27 09:46:02 2021
@@ -46,7 +46,7 @@ import org.apache.pdfbox.pdmodel.PDPageC
import org.apache.pdfbox.pdmodel.font.encoding.WinAnsiEncoding;
import org.apache.pdfbox.rendering.PDFRenderer;
import org.apache.pdfbox.text.PDFTextStripper;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
@@ -61,8 +61,8 @@ class PDFontTest
{
private static final File OUT_DIR = new File("target/test-output");
- @BeforeEach
- public void setUp() throws Exception
+ @BeforeAll
+ static void setUp() throws Exception
{
OUT_DIR.mkdirs();
}
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=1886972&r1=1886971&r2=1886972&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 Sat Feb 27 09:46:02 2021
@@ -16,11 +16,14 @@
package org.apache.pdfbox.pdmodel.graphics.image;
import java.awt.image.BufferedImage;
+
import java.io.File;
import java.io.IOException;
+
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.Arrays;
+
import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
import javax.imageio.stream.ImageInputStream;
@@ -32,8 +35,6 @@ 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;
@@ -41,6 +42,9 @@ import static org.junit.jupiter.api.Asse
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
/**
* Unit tests for CCITTFactory
*
@@ -48,12 +52,12 @@ import static org.junit.jupiter.api.Asse
*/
class CCITTFactoryTest
{
- private final File testResultsDir = new File("target/test-output/graphics");
+ private static final File TESTRESULTSDIR = new File("target/test-output/graphics");
- @BeforeEach
- protected void setUp()
+ @BeforeAll
+ static void setUp()
{
- testResultsDir.mkdirs();
+ TESTRESULTSDIR.mkdirs();
}
/**
@@ -90,10 +94,10 @@ class CCITTFactoryTest
contentStream.drawImage(ximage4, 0, 0);
}
- document.save(testResultsDir + "/singletiff.pdf");
+ document.save(TESTRESULTSDIR + "/singletiff.pdf");
}
- try (PDDocument document = Loader.loadPDF(new File(testResultsDir, "singletiff.pdf")))
+ try (PDDocument document = Loader.loadPDF(new File(TESTRESULTSDIR, "singletiff.pdf")))
{
assertEquals(2, document.getNumberOfPages());
}
@@ -141,10 +145,10 @@ class CCITTFactoryTest
assertEquals(countTiffImages, pdfPageNum);
- document.save(testResultsDir + "/multitiff.pdf");
+ document.save(TESTRESULTSDIR + "/multitiff.pdf");
}
- try (PDDocument document = Loader.loadPDF(new File(testResultsDir, "multitiff.pdf"), (String) null))
+ try (PDDocument document = Loader.loadPDF(new File(TESTRESULTSDIR, "multitiff.pdf"), (String) null))
{
assertEquals(countTiffImages, document.getNumberOfPages());
}
@@ -170,10 +174,10 @@ class CCITTFactoryTest
contentStream.drawImage(ximage3, 0, 0, ximage3.getWidth(), ximage3.getHeight());
}
- document.save(testResultsDir + "/singletifffrombi.pdf");
+ document.save(TESTRESULTSDIR + "/singletifffrombi.pdf");
}
- try (PDDocument document = Loader.loadPDF(new File(testResultsDir, "singletifffrombi.pdf")))
+ try (PDDocument document = Loader.loadPDF(new File(TESTRESULTSDIR, "singletifffrombi.pdf")))
{
assertEquals(1, document.getNumberOfPages());
}
@@ -207,10 +211,10 @@ class CCITTFactoryTest
contentStream.drawImage(ximage3, 0, 0, ximage3.getWidth(), ximage3.getHeight());
}
- document.save(testResultsDir + "/singletifffromchessbi.pdf");
+ document.save(TESTRESULTSDIR + "/singletifffromchessbi.pdf");
}
- try (PDDocument document = Loader.loadPDF(new File(testResultsDir, "singletifffromchessbi.pdf")))
+ try (PDDocument document = Loader.loadPDF(new File(TESTRESULTSDIR, "singletifffromchessbi.pdf")))
{
assertEquals(1, document.getNumberOfPages());
}
@@ -225,7 +229,7 @@ class CCITTFactoryTest
{
// copy the source file to a temp directory, as we will be deleting it
String tiffG3Path = "src/test/resources/org/apache/pdfbox/pdmodel/graphics/image/ccittg3.tif";
- File copiedTiffFile = new File(testResultsDir, "ccittg3.tif");
+ File copiedTiffFile = new File(TESTRESULTSDIR, "ccittg3.tif");
Files.copy(new File(tiffG3Path).toPath(), copiedTiffFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
PDDocument document = new PDDocument();
CCITTFactory.createFromFile(document, copiedTiffFile);
@@ -241,7 +245,7 @@ class CCITTFactoryTest
{
// copy the source file to a temp directory, as we will be deleting it
String tiffG3Path = "src/test/resources/org/apache/pdfbox/pdmodel/graphics/image/ccittg3.tif";
- File copiedTiffFile = new File(testResultsDir, "ccittg3n.tif");
+ File copiedTiffFile = new File(TESTRESULTSDIR, "ccittg3n.tif");
Files.copy(new File(tiffG3Path).toPath(), copiedTiffFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
PDDocument document = new PDDocument();
CCITTFactory.createFromFile(document, copiedTiffFile, 0);
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=1886972&r1=1886971&r2=1886972&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 Sat Feb 27 09:46:02 2021
@@ -17,11 +17,14 @@ package org.apache.pdfbox.pdmodel.graphi
import java.awt.Graphics;
import java.awt.image.BufferedImage;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+
import java.util.Arrays;
+
import javax.imageio.ImageIO;
import org.apache.pdfbox.Loader;
@@ -31,8 +34,6 @@ 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;
@@ -43,6 +44,9 @@ import static org.junit.jupiter.api.Asse
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
/**
* Unit tests for JPEGFactory
*
@@ -50,12 +54,12 @@ import static org.junit.jupiter.api.Asse
*/
class JPEGFactoryTest
{
- private final File testResultsDir = new File("target/test-output/graphics");
+ private static final File TESTRESULTSDIR = new File("target/test-output/graphics");
- @BeforeEach
- protected void setUp()
+ @BeforeAll
+ static void setUp()
{
- testResultsDir.mkdirs();
+ TESTRESULTSDIR.mkdirs();
}
/**
@@ -70,8 +74,8 @@ class JPEGFactoryTest
PDImageXObject ximage = JPEGFactory.createFromStream(document, stream);
validate(ximage, 8, 344, 287, "jpg", PDDeviceRGB.INSTANCE.getName());
- doWritePDF(document, ximage, testResultsDir, "jpegrgbstream.pdf");
- checkJpegStream(testResultsDir, "jpegrgbstream.pdf", JPEGFactoryTest.class.getResourceAsStream("jpeg.jpg"));
+ doWritePDF(document, ximage, TESTRESULTSDIR, "jpegrgbstream.pdf");
+ checkJpegStream(TESTRESULTSDIR, "jpegrgbstream.pdf", JPEGFactoryTest.class.getResourceAsStream("jpeg.jpg"));
}
/*
@@ -86,8 +90,8 @@ class JPEGFactoryTest
PDImageXObject ximage = JPEGFactory.createFromStream(document, stream);
validate(ximage, 8, 343, 287, "jpg", PDDeviceCMYK.INSTANCE.getName());
- doWritePDF(document, ximage, testResultsDir, "jpegcmykstream.pdf");
- checkJpegStream(testResultsDir, "jpegcmykstream.pdf", JPEGFactoryTest.class.getResourceAsStream("jpegcmyk.jpg"));
+ doWritePDF(document, ximage, TESTRESULTSDIR, "jpegcmykstream.pdf");
+ checkJpegStream(TESTRESULTSDIR, "jpegcmykstream.pdf", JPEGFactoryTest.class.getResourceAsStream("jpegcmyk.jpg"));
}
/**
@@ -102,8 +106,8 @@ class JPEGFactoryTest
PDImageXObject ximage = JPEGFactory.createFromStream(document, stream);
validate(ximage, 8, 344, 287, "jpg", PDDeviceGray.INSTANCE.getName());
- doWritePDF(document, ximage, testResultsDir, "jpeg256stream.pdf");
- checkJpegStream(testResultsDir, "jpeg256stream.pdf", JPEGFactoryTest.class.getResourceAsStream("jpeg256.jpg"));
+ doWritePDF(document, ximage, TESTRESULTSDIR, "jpeg256stream.pdf");
+ checkJpegStream(TESTRESULTSDIR, "jpeg256stream.pdf", JPEGFactoryTest.class.getResourceAsStream("jpeg256.jpg"));
}
/**
@@ -119,7 +123,7 @@ class JPEGFactoryTest
PDImageXObject ximage = JPEGFactory.createFromImage(document, image);
validate(ximage, 8, 344, 287, "jpg", PDDeviceRGB.INSTANCE.getName());
- doWritePDF(document, ximage, testResultsDir, "jpegrgb.pdf");
+ doWritePDF(document, ximage, TESTRESULTSDIR, "jpegrgb.pdf");
}
/**
@@ -135,7 +139,7 @@ class JPEGFactoryTest
PDImageXObject ximage = JPEGFactory.createFromImage(document, image);
validate(ximage, 8, 344, 287, "jpg", PDDeviceGray.INSTANCE.getName());
- doWritePDF(document, ximage, testResultsDir, "jpeg256.pdf");
+ doWritePDF(document, ximage, TESTRESULTSDIR, "jpeg256.pdf");
}
/**
@@ -180,7 +184,7 @@ class JPEGFactoryTest
validate(ximage.getSoftMask(), 8, width, height, "jpg", PDDeviceGray.INSTANCE.getName());
assertTrue(colorCount(ximage.getSoftMask().getImage()) > image.getHeight() / 10);
- doWritePDF(document, ximage, testResultsDir, "jpeg-intargb.pdf");
+ doWritePDF(document, ximage, TESTRESULTSDIR, "jpeg-intargb.pdf");
}
/**
@@ -225,7 +229,7 @@ class JPEGFactoryTest
validate(ximage.getSoftMask(), 8, width, height, "jpg", PDDeviceGray.INSTANCE.getName());
assertTrue(colorCount(ximage.getSoftMask().getImage()) > image.getHeight() / 10);
- doWritePDF(document, ximage, testResultsDir, "jpeg-4bargb.pdf");
+ doWritePDF(document, ximage, TESTRESULTSDIR, "jpeg-4bargb.pdf");
}
/**
@@ -269,7 +273,7 @@ class JPEGFactoryTest
validate(ximage, 8, width, height, "jpg", PDDeviceRGB.INSTANCE.getName());
assertNull(ximage.getSoftMask());
- doWritePDF(document, ximage, testResultsDir, "jpeg-ushort555rgb.pdf");
+ doWritePDF(document, ximage, TESTRESULTSDIR, "jpeg-ushort555rgb.pdf");
}
// check whether it is possible to extract the jpeg stream exactly