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 2021/07/20 06:13:15 UTC
svn commit: r1891673 - in
/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox: pdfwriter/
pdmodel/font/ pdmodel/interactive/annotation/ pdmodel/interactive/form/
rendering/
Author: lehmi
Date: Tue Jul 20 06:13:15 2021
New Revision: 1891673
URL: http://svn.apache.org/viewvc?rev=1891673&view=rev
Log:
PDFBOX-4892: removed unneeded constructor, made method static
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/ContentStreamWriterTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.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/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/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/PDAcroFormTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/ContentStreamWriterTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/ContentStreamWriterTest.java?rev=1891673&r1=1891672&r2=1891673&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/ContentStreamWriterTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/ContentStreamWriterTest.java Tue Jul 20 06:13:15 2021
@@ -102,8 +102,8 @@ class ContentStreamWriterTest
}
doc.save(new File(testDirIn, filename));
}
- TestPDFToImage testPDFToImage = new TestPDFToImage(TestPDFToImage.class.getName());
- if (!testPDFToImage.doTestFile(new File(testDirIn, filename), testDirIn.getAbsolutePath(), testDirOut.getAbsolutePath()))
+ if (!TestPDFToImage.doTestFile(new File(testDirIn, filename), testDirIn.getAbsolutePath(),
+ testDirOut.getAbsolutePath()))
{
fail("Rendering failed or is not identical, see in " + testDirOut);
}
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java?rev=1891673&r1=1891672&r2=1891673&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java Tue Jul 20 06:13:15 2021
@@ -234,8 +234,7 @@ class TestFontEmbedding
File IN_DIR = new File("src/test/resources/org/apache/pdfbox/ttf");
// compare rendering
- TestPDFToImage testPDFToImage = new TestPDFToImage(TestPDFToImage.class.getName());
- if (!testPDFToImage.doTestFile(pdf, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
+ if (!TestPDFToImage.doTestFile(pdf, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
{
// don't fail, rendering is different on different systems, result must be viewed manually
System.err.println("Rendering of " + pdf + " failed or is not identical to expected rendering in " + IN_DIR + " directory");
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=1891673&r1=1891672&r2=1891673&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 Tue Jul 20 06:13:15 2021
@@ -139,8 +139,7 @@ class AppearanceGenerationTest
File file = new File(OUT_DIR, NAME_OF_PDF);
document.save(file);
// compare rendering
- TestPDFToImage testPDFToImage = new TestPDFToImage(TestPDFToImage.class.getName());
- if (!testPDFToImage.doTestFile(file, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
+ if (!TestPDFToImage.doTestFile(file, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
{
// don't fail, rendering is different on different systems, result must be viewed manually
System.out.println("Rendering of " + file + " failed or is not identical to expected rendering in " + IN_DIR + " directory");
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=1891673&r1=1891672&r2=1891673&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 Jul 20 06:13:15 2021
@@ -96,8 +96,7 @@ class AcroFormsRotationTest
// compare rendering
File file = new File(OUT_DIR, NAME_OF_PDF);
document.save(file);
- TestPDFToImage testPDFToImage = new TestPDFToImage(TestPDFToImage.class.getName());
- if (!testPDFToImage.doTestFile(file, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
+ if (!TestPDFToImage.doTestFile(file, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
{
// don't fail, rendering is different on different systems, result
// must be viewed manually
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=1891673&r1=1891672&r2=1891673&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 Jul 20 06:13:15 2021
@@ -105,8 +105,7 @@ class AlignmentTest
// compare rendering
File file = new File(OUT_DIR, NAME_OF_PDF);
document.save(file);
- TestPDFToImage testPDFToImage = new TestPDFToImage(TestPDFToImage.class.getName());
- if (!testPDFToImage.doTestFile(file, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
+ if (!TestPDFToImage.doTestFile(file, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
{
// don't fail, rendering is different on different systems, result must be viewed manually
System.err.println ("Rendering of " + file + " failed or is not identical to expected rendering in " + IN_DIR + " directory");
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=1891673&r1=1891672&r2=1891673&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 Jul 20 06:13:15 2021
@@ -98,8 +98,7 @@ class MultilineFieldsTest
// compare rendering
File file = new File(OUT_DIR, NAME_OF_PDF);
document.save(file);
- TestPDFToImage testPDFToImage = new TestPDFToImage(TestPDFToImage.class.getName());
- if (!testPDFToImage.doTestFile(file, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
+ if (!TestPDFToImage.doTestFile(file, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
{
// don't fail, rendering is different on different systems, result must be viewed manually
System.err.println ("Rendering of " + file + " failed or is not identical to expected rendering in " + IN_DIR + " directory");
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=1891673&r1=1891672&r2=1891673&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 Jul 20 06:13:15 2021
@@ -187,8 +187,8 @@ class PDAcroFormFlattenTest
}
// compare rendering
- TestPDFToImage testPDFToImage = new TestPDFToImage(TestPDFToImage.class.getName());
- if (!testPDFToImage.doTestFile(outputFile, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
+ if (!TestPDFToImage.doTestFile(outputFile, IN_DIR.getAbsolutePath(),
+ OUT_DIR.getAbsolutePath()))
{
fail("Rendering of " + outputFile + " failed or is not identical to expected rendering in " + IN_DIR + " directory");
}
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=1891673&r1=1891672&r2=1891673&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 Jul 20 06:13:15 2021
@@ -111,8 +111,7 @@ class PDAcroFormTest
testPdf.save(file);
}
// compare rendering
- TestPDFToImage testPDFToImage = new TestPDFToImage(TestPDFToImage.class.getName());
- if (!testPDFToImage.doTestFile(file, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
+ if (!TestPDFToImage.doTestFile(file, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
{
// don't fail, rendering is different on different systems, result must be viewed manually
System.out.println("Rendering of " + file + " failed or is not identical to expected rendering in " + IN_DIR + " directory");
@@ -146,8 +145,7 @@ class PDAcroFormTest
testPdf.save(file);
}
// compare rendering
- TestPDFToImage testPDFToImage = new TestPDFToImage(TestPDFToImage.class.getName());
- if (!testPDFToImage.doTestFile(file, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
+ if (!TestPDFToImage.doTestFile(file, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
{
// don't fail, rendering is different on different systems, result must be viewed manually
System.out.println("Rendering of " + file + " failed or is not identical to expected rendering in " + IN_DIR + " directory");
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java?rev=1891673&r1=1891672&r2=1891673&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java Tue Jul 20 06:13:15 2021
@@ -64,19 +64,12 @@ public class TestPDFToImage
static String inDir = "src/test/resources/input/rendering";
static String outDir = "target/test-output/rendering/";
-
- final String filename;
/**
- * Test class constructor.
- *
- * @param filename The name of the test class.
- *
- * @throws IOException If there is an error creating the test.
+ * Constructor.
*/
- public TestPDFToImage(String filename) throws IOException
+ public TestPDFToImage()
{
- this.filename = filename;
}
/**
@@ -90,7 +83,8 @@ public class TestPDFToImage
*
* @return
*/
- private BufferedImage createEmptyDiffImage(int minWidth, int minHeight, int maxWidth, int maxHeight)
+ private static BufferedImage createEmptyDiffImage(int minWidth, int minHeight, int maxWidth,
+ int maxHeight)
{
BufferedImage bim3 = new BufferedImage(maxWidth, maxHeight, BufferedImage.TYPE_INT_RGB);
Graphics graphics = bim3.getGraphics();
@@ -117,7 +111,8 @@ public class TestPDFToImage
*
* @throws IOException
*/
- private BufferedImage diffImages(BufferedImage bim1, BufferedImage bim2) throws IOException
+ private static BufferedImage diffImages(BufferedImage bim1, BufferedImage bim2)
+ throws IOException
{
int minWidth = Math.min(bim1.getWidth(), bim2.getWidth());
int minHeight = Math.min(bim1.getHeight(), bim2.getHeight());
@@ -171,7 +166,8 @@ public class TestPDFToImage
* (all identical)
* @throws IOException when there is an exception
*/
- public boolean doTestFile(final File file, String inDir, String outDir) throws IOException
+ public static boolean doTestFile(final File file, String inDir, String outDir)
+ throws IOException
{
PDDocument document = null;
boolean failed = false;
@@ -303,7 +299,7 @@ public class TestPDFToImage
return !failed;
}
- private boolean filesAreIdentical(File left, File right) throws IOException
+ private static boolean filesAreIdentical(File left, File right) throws IOException
{
//http://forum.java.sun.com/thread.jspa?threadID=688105&messageID=4003259
//http://web.archive.org/web/20060515173719/http://forum.java.sun.com/thread.jspa?threadID=688105&messageID=4003259
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java?rev=1891673&r1=1891672&r2=1891673&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java Tue Jul 20 06:13:15 2021
@@ -92,8 +92,7 @@ class TestRendering
new File(OUTPUT_DIR).mkdirs();
// compare rendering
- TestPDFToImage testPDFToImage = new TestPDFToImage(TestPDFToImage.class.getName());
- if (!testPDFToImage.doTestFile(new File(INPUT_DIR, fileName), INPUT_DIR, OUTPUT_DIR))
+ if (!TestPDFToImage.doTestFile(new File(INPUT_DIR, fileName), INPUT_DIR, OUTPUT_DIR))
{
fail("Rendering of " + fileName + " failed or is not identical to expected rendering in " + INPUT_DIR + " directory");
}