You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by tb...@apache.org on 2015/07/19 19:48:20 UTC
svn commit: r1691835 - in
/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox: multipdf/
pdmodel/graphics/image/ rendering/
Author: tboehme
Date: Sun Jul 19 17:48:20 2015
New Revision: 1691835
URL: http://svn.apache.org/r1691835
Log:
PDFBOX-2883: fix PDDocument.load null parameter ambiguity in test packages classes
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.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/LosslessFactoryTest.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/ValidateXImage.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java?rev=1691835&r1=1691834&r2=1691835&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java Sun Jul 19 17:48:20 2015
@@ -92,8 +92,8 @@ public class PDFCloneUtilityTest extends
// save and reload PDF, so that one can see that the files are legit
dstDoc.save(TESTDIR + CLONEDST);
PDDocument.load(new File(TESTDIR + CLONESRC)).close();
- PDDocument.load(new File(TESTDIR + CLONESRC), null).close();
+ PDDocument.load(new File(TESTDIR + CLONESRC), (String)null).close();
PDDocument.load(new File(TESTDIR + CLONEDST)).close();
- PDDocument.load(new File(TESTDIR + CLONEDST), null).close();
+ PDDocument.load(new File(TESTDIR + CLONEDST), (String)null).close();
}
}
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java?rev=1691835&r1=1691834&r2=1691835&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java Sun Jul 19 17:48:20 2015
@@ -76,7 +76,7 @@ public class PDFMergerUtilityTest extend
boolean useScratchFiles)
throws IOException
{
- PDDocument srcDoc1 = PDDocument.load(new File(SRCDIR, filename1), null);
+ PDDocument srcDoc1 = PDDocument.load(new File(SRCDIR, filename1), (String)null);
int src1PageCount = srcDoc1.getNumberOfPages();
PDFRenderer src1PdfRenderer = new PDFRenderer(srcDoc1);
BufferedImage[] src1ImageTab = new BufferedImage[src1PageCount];
@@ -86,7 +86,7 @@ public class PDFMergerUtilityTest extend
}
srcDoc1.close();
- PDDocument srcDoc2 = PDDocument.load(new File(SRCDIR, filename2), null);
+ PDDocument srcDoc2 = PDDocument.load(new File(SRCDIR, filename2), (String)null);
int src2PageCount = srcDoc2.getNumberOfPages();
PDFRenderer src2PdfRenderer = new PDFRenderer(srcDoc2);
BufferedImage[] src2ImageTab = new BufferedImage[src2PageCount];
@@ -103,7 +103,7 @@ public class PDFMergerUtilityTest extend
pdfMergerUtility.mergeDocuments(useScratchFiles);
PDDocument mergedDoc
- = PDDocument.load(new File(TARGETTESTDIR, mergeFilename), null);
+ = PDDocument.load(new File(TARGETTESTDIR, mergeFilename), (String)null);
PDFRenderer mergePdfRenderer = new PDFRenderer(mergedDoc);
int mergePageCount = mergedDoc.getNumberOfPages();
assertEquals(src1PageCount + src2PageCount, mergePageCount);
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=1691835&r1=1691834&r2=1691835&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 Jul 19 17:48:20 2015
@@ -81,7 +81,7 @@ public class CCITTFactoryTest extends Te
document.save(testResultsDir + "/singletiff.pdf");
document.close();
- document = PDDocument.load(new File(testResultsDir, "singletiff.pdf"), null);
+ document = PDDocument.load(new File(testResultsDir, "singletiff.pdf"), (String)null);
assertEquals(2, document.getNumberOfPages());
document.close();
@@ -130,7 +130,7 @@ public class CCITTFactoryTest extends Te
document.save(testResultsDir + "/multitiff.pdf");
document.close();
- document = PDDocument.load(new File(testResultsDir, "multitiff.pdf"), null);
+ document = PDDocument.load(new File(testResultsDir, "multitiff.pdf"), (String)null);
assertEquals(countTiffImages, document.getNumberOfPages());
document.close();
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=1691835&r1=1691834&r2=1691835&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 Jul 19 17:48:20 2015
@@ -105,7 +105,7 @@ public class LosslessFactoryTest extends
document.save(pdfFile);
document.close();
- document = PDDocument.load(pdfFile, null);
+ document = PDDocument.load(pdfFile, (String)null);
new PDFRenderer(document).renderImage(0);
document.close();
}
@@ -370,7 +370,7 @@ public class LosslessFactoryTest extends
File pdfFile = new File(testResultsDir, pdfFilename);
document.save(pdfFile);
document.close();
- document = PDDocument.load(pdfFile, null);
+ document = PDDocument.load(pdfFile, (String)null);
new PDFRenderer(document).renderImage(0);
document.close();
}
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=1691835&r1=1691834&r2=1691835&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 Jul 19 17:48:20 2015
@@ -178,7 +178,7 @@ public class PDInlineImageTest extends T
document.save(pdfFile);
document.close();
- document = PDDocument.load(pdfFile, null);
+ document = PDDocument.load(pdfFile, (String)null);
new PDFRenderer(document).renderImage(0);
document.close();
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=1691835&r1=1691834&r2=1691835&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 Jul 19 17:48:20 2015
@@ -107,7 +107,7 @@ public class ValidateXImage
document.save(pdfFile);
document.close();
- document = PDDocument.load(pdfFile, null);
+ document = PDDocument.load(pdfFile, (String)null);
assertEquals(1, count(document.getPage(0).getResources().getXObjectNames()));
new PDFRenderer(document).renderImage(0);
document.close();
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=1691835&r1=1691834&r2=1691835&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 Sun Jul 19 17:48:20 2015
@@ -200,7 +200,7 @@ public class TestPDFToImage extends Test
try
{
new FileOutputStream(new File(outDir, file.getName() + ".parseerror")).close();
- document = PDDocument.load(file, null);
+ document = PDDocument.load(file, (String)null);
String outputPrefix = outDir + '/' + file.getName() + "-";
int numPages = document.getNumberOfPages();
if (numPages < 1)
@@ -234,7 +234,7 @@ public class TestPDFToImage extends Test
document.save(tmpFile);
new File(outDir, file.getName() + ".saveerror").delete();
new FileOutputStream(new File(outDir, file.getName() + ".reloaderror")).close();
- PDDocument.load(tmpFile, null).close();
+ PDDocument.load(tmpFile, (String)null).close();
new File(outDir, file.getName() + ".reloaderror").delete();
tmpFile.delete();
}