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 2018/06/30 14:24:01 UTC

svn commit: r1834742 - /pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/ValidateXImage.java

Author: tilman
Date: Sat Jun 30 14:24:01 2018
New Revision: 1834742

URL: http://svn.apache.org/viewvc?rev=1834742&view=rev
Log:
PDFBOX-4071: improve message; use jdk7 try-with-resources

Modified:
    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/image/ValidateXImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/ValidateXImage.java?rev=1834742&r1=1834741&r2=1834742&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 Sat Jun 30 14:24:01 2018
@@ -96,10 +96,11 @@ public class ValidateXImage
 
         PDPage page = new PDPage();
         document.addPage(page);
-        PDPageContentStream contentStream = new PDPageContentStream(document, page, AppendMode.APPEND, false);
-        contentStream.drawImage(ximage, 150, 300);
-        contentStream.drawImage(ximage, 200, 350);
-        contentStream.close();
+        try (PDPageContentStream contentStream = new PDPageContentStream(document, page, AppendMode.APPEND, false))
+        {
+            contentStream.drawImage(ximage, 150, 300);
+            contentStream.drawImage(ximage, 200, 350);
+        }
         
         // check that the resource map is up-to-date
         assertEquals(1, count(document.getPage(0).getResources().getXObjectNames()));
@@ -143,13 +144,10 @@ public class ValidateXImage
             {
                 if (expectedImage.getRGB(x, y) != actualImage.getRGB(x, y))
                 {
-                    errMsg = String.format("(%d,%d) %08X != %08X", x, y, expectedImage.getRGB(x, y), actualImage.getRGB(x, y));
+                    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));
             }
         }
     }
-
-    
-
 }