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 2023/12/31 12:16:25 UTC
svn commit: r1915021 - in /pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox: encryption/TestSymmetricKeyEncryption.java rendering/TestPDFToImage.java text/BidiTest.java text/TestTextStripper.java
Author: lehmi
Date: Sun Dec 31 12:16:25 2023
New Revision: 1915021
URL: http://svn.apache.org/viewvc?rev=1915021&view=rev
Log:
PDFBOX-5695: use formatter for log messages
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/BidiTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java?rev=1915021&r1=1915020&r2=1915021&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java Sun Dec 31 12:16:25 2023
@@ -452,7 +452,7 @@ class TestSymmetricKeyEncryption
Map<String, PDComplexFileSpecification> embeddedFileNames = embeddedFiles.getNames();
assertEquals(1, embeddedFileNames.size());
Map.Entry<String, PDComplexFileSpecification> entry = embeddedFileNames.entrySet().iterator().next();
- LOG.info("Processing embedded file " + entry.getKey() + ":");
+ LOG.info("Processing embedded file {}:", entry.getKey());
PDComplexFileSpecification complexFileSpec = entry.getValue();
PDEmbeddedFile embeddedFile = complexFileSpec.getEmbeddedFile();
@@ -463,7 +463,7 @@ class TestSymmetricKeyEncryption
is.transferTo(fos);
}
- LOG.info(" size: " + embeddedFile.getSize());
+ LOG.info(" size: {}", embeddedFile.getSize());
assertEquals(embeddedFile.getSize(), resultFile.length());
return resultFile;
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=1915021&r1=1915020&r2=1915021&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 Dec 31 12:16:25 2023
@@ -169,7 +169,7 @@ public class TestPDFToImage
PDDocument document = null;
boolean failed = false;
- LOG.info("Opening: " + file.getName());
+ LOG.info("Opening: {}", file.getName());
try
{
new FileOutputStream(new File(outDir, file.getName() + ".parseerror")).close();
@@ -178,7 +178,7 @@ public class TestPDFToImage
if (numPages < 1)
{
failed = true;
- LOG.error("file " + file.getName() + " has < 1 page");
+ LOG.error("file {} has < 1 page", file.getName());
}
else
{
@@ -186,7 +186,7 @@ public class TestPDFToImage
new File(outDir, file.getName() + ".parseerror").deleteOnExit();
}
- LOG.info("Rendering: " + file.getName());
+ LOG.info("Rendering: {}", file.getName());
PDFRenderer renderer = new PDFRenderer(document);
for (int i = 0; i < numPages; i++)
{
@@ -195,7 +195,7 @@ public class TestPDFToImage
BufferedImage image = renderer.renderImageWithDPI(i, 96); // Windows native DPI
new File(outDir, fileName + ".rendererror").delete();
new File(outDir, fileName + ".rendererror").deleteOnExit();
- LOG.info("Writing: " + fileName);
+ LOG.info("Writing: {}", fileName);
new FileOutputStream(new File(outDir, fileName + ".writeerror")).close();
boolean writeSuccess = ImageIO.write(image, "PNG", new File(outDir, fileName));
if (writeSuccess)
@@ -222,7 +222,7 @@ public class TestPDFToImage
catch (IOException e)
{
failed = true;
- LOG.error("Error converting file " + file.getName());
+ LOG.error("Error converting file {}", file.getName());
throw e;
}
finally
@@ -233,7 +233,7 @@ public class TestPDFToImage
}
}
- LOG.info("Comparing: " + file.getName());
+ LOG.info("Comparing: {}", file.getName());
//Now check the resulting files ... did we get identical PNG(s)?
try
@@ -253,7 +253,7 @@ public class TestPDFToImage
if (outFiles.length == 0)
{
failed = true;
- LOG.warn("*** TEST FAILURE *** Output missing for file: " + file.getName());
+ LOG.warn("*** TEST FAILURE *** Output missing for file: {}", file.getName());
}
for (File outFile : outFiles)
{
@@ -262,7 +262,7 @@ public class TestPDFToImage
if (!inFile.exists())
{
failed = true;
- LOG.warn("*** TEST FAILURE *** Input missing for file: " + inFile.getName());
+ LOG.warn("*** TEST FAILURE *** Input missing for file: {}", inFile.getName());
}
else if (!filesAreIdentical(outFile, inFile))
{
@@ -272,23 +272,24 @@ public class TestPDFToImage
if (bim3 != null)
{
failed = true;
- LOG.warn("*** TEST FAILURE *** Input and output not identical for file: " + inFile.getName());
+ LOG.warn("*** TEST FAILURE *** Input and output not identical for file: {}",
+ inFile.getName());
ImageIO.write(bim3, "png", new File(outFile.getAbsolutePath() + "-diff.png"));
System.err.println("Files differ: " + inFile.getAbsolutePath() + "\n" +
" " + outFile.getAbsolutePath());
}
else
{
- LOG.info("*** TEST OK *** for file: " + inFile.getName());
- LOG.info("Deleting: " + outFile.getName());
+ LOG.info("*** TEST OK *** for file: {}", inFile.getName());
+ LOG.info("Deleting: {}", outFile.getName());
outFile.delete();
outFile.deleteOnExit();
}
}
else
{
- LOG.info("*** TEST OK *** for file: " + inFile.getName());
- LOG.info("Deleting: " + outFile.getName());
+ LOG.info("*** TEST OK *** for file: {}", inFile.getName());
+ LOG.info("Deleting: {}", outFile.getName());
outFile.delete();
outFile.deleteOnExit();
}
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/BidiTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/BidiTest.java?rev=1915021&r1=1915020&r2=1915021&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/BidiTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/BidiTest.java Sun Dec 31 12:16:25 2023
@@ -101,11 +101,11 @@ class BidiTest
{
if(bSort)
{
- LOG.info("Preparing to parse " + inFile.getName() + " for sorted test");
+ LOG.info("Preparing to parse {} for sorted test", inFile.getName());
}
else
{
- LOG.info("Preparing to parse " + inFile.getName() + " for standard test");
+ LOG.info("Preparing to parse {} for standard test", inFile.getName());
}
File outFile;
@@ -134,7 +134,7 @@ class BidiTest
if (bLogResult)
{
- LOG.info("Text for " + inFile.getName() + ":");
+ LOG.info("Text for {}:", inFile.getName());
LOG.info(stripper.getText(document));
}
@@ -212,9 +212,9 @@ class BidiTest
if( expectedArray[expectedIndex] != actualArray[actualIndex] )
{
equals = false;
- LOG.warn("Lines differ at index"
- + " expected:" + expectedIndex + "-" + (int)expectedArray[expectedIndex]
- + " actual:" + actualIndex + "-" + (int)actualArray[actualIndex] );
+ LOG.warn("Lines differ at index expected: {}-{} actual: {}-{}", expectedIndex,
+ (int) expectedArray[expectedIndex], actualIndex,
+ (int) actualArray[actualIndex]);
break;
}
expectedIndex = skipWhitespace( expectedArray, expectedIndex );
@@ -227,12 +227,12 @@ class BidiTest
if( expectedIndex != expectedArray.length )
{
equals = false;
- LOG.warn("Expected line is longer at:" + expectedIndex );
+ LOG.warn("Expected line is longer at: {}", expectedIndex);
}
if( actualIndex != actualArray.length )
{
equals = false;
- LOG.warn("Actual line is longer at:" + actualIndex );
+ LOG.warn("Actual line is longer at: {}", actualIndex);
}
}
}
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java?rev=1915021&r1=1915020&r2=1915021&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java Sun Dec 31 12:16:25 2023
@@ -166,9 +166,9 @@ class TestTextStripper
if( expectedArray[expectedIndex] != actualArray[actualIndex] )
{
equals = false;
- LOG.warn("Lines differ at index"
- + " expected:" + expectedIndex + "-" + (int)expectedArray[expectedIndex]
- + " actual:" + actualIndex + "-" + (int)actualArray[actualIndex] );
+ LOG.warn("Lines differ at index expected: {}-{ } actual: {}-{}", expectedIndex,
+ (int) expectedArray[expectedIndex], actualIndex,
+ (int) actualArray[actualIndex]);
break;
}
expectedIndex = skipWhitespace( expectedArray, expectedIndex );
@@ -181,17 +181,18 @@ class TestTextStripper
if( expectedIndex != expectedArray.length )
{
equals = false;
- LOG.warn("Expected line is longer at:" + expectedIndex );
+ LOG.warn("Expected line is longer at: {}", expectedIndex);
}
if( actualIndex != actualArray.length )
{
equals = false;
- LOG.warn("Actual line is longer at:" + actualIndex );
+ LOG.warn("Actual line is longer at: {}", actualIndex);
}
if (expectedArray.length != actualArray.length)
{
equals = false;
- LOG.warn("Expected lines: " + expectedArray.length + ", actual lines: " + actualArray.length);
+ LOG.warn("Expected lines: {}, actual lines: {}", expectedArray.length,
+ actualArray.length);
}
}
}
@@ -236,11 +237,11 @@ class TestTextStripper
{
if(bSort)
{
- LOG.info("Preparing to parse " + inFile.getName() + " for sorted test");
+ LOG.info("Preparing to parse {} for sorted test", inFile.getName());
}
else
{
- LOG.info("Preparing to parse " + inFile.getName() + " for standard test");
+ LOG.info("Preparing to parse {} for standard test", inFile.getName());
}
Files.createDirectories(outDir.toPath());
@@ -284,18 +285,17 @@ class TestTextStripper
if (bLogResult)
{
- LOG.info("Text for " + inFile.getName() + ":");
+ LOG.info("Text for {}:", inFile.getName());
LOG.info(stripper.getText(document));
}
if (!expectedFile.exists())
{
this.bFail = true;
- LOG.error("FAILURE: Input verification file: " + expectedFile.getAbsolutePath() +
- " did not exist");
+ LOG.error("FAILURE: Input verification file: {} does not exist",
+ expectedFile.getAbsolutePath());
return;
}
-
compareResult(expectedFile, outFile, inFile, bSort, diffFile);
}
}
@@ -326,13 +326,10 @@ class TestTextStripper
{
this.bFail = true;
localFail = true;
- LOG.error("FAILURE: Line mismatch for file " + inFile.getName() +
- " (sort = "+bSort+")" +
- " at expected line: " + expectedReader.getLineNumber() +
- " at actual line: " + actualReader.getLineNumber() +
- "\nexpected line was: \"" + expectedLine + "\"" +
- "\nactual line was: \"" + actualLine + "\"" + "\n");
-
+ LOG.error(
+ "FAILURE: Line mismatch for file {} (sort = {}) at expected line: {} at actual line: {}\nexpected line was: \"{}\"\nactual line was: \"{}\"\n",
+ expectedFile.getAbsolutePath(), bSort, expectedReader.getLineNumber(),
+ actualReader.getLineNumber(), expectedLine, actualLine);
//lets report all lines, even though this might produce some verbose logging
//break;
}