svn commit: r1775054 - in /xmlgraphics/fop-pdf-images/trunk: lib/fontbox-2.0.3.jar lib/fontbox-2.0.4.jar lib/pdfbox-2.0.3.jar lib/pdfbox-2.0.4.jar test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java

Author: ssteiner
Date: Mon Dec 19 11:00:18 2016
New Revision: 1775054

URL: http://svn.apache.org/viewvc?rev=1775054&view=rev
Log:
FOP-2674: Update to PDFBox 2.0.4

Added:
    xmlgraphics/fop-pdf-images/trunk/lib/fontbox-2.0.4.jar   (with props)
    xmlgraphics/fop-pdf-images/trunk/lib/pdfbox-2.0.4.jar   (with props)
Removed:
    xmlgraphics/fop-pdf-images/trunk/lib/fontbox-2.0.3.jar
    xmlgraphics/fop-pdf-images/trunk/lib/pdfbox-2.0.3.jar
Modified:
    xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java

Added: xmlgraphics/fop-pdf-images/trunk/lib/fontbox-2.0.4.jar
URL: http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/lib/fontbox-2.0.4.jar?rev=1775054&view=auto
==============================================================================
Binary file - no diff available.

Propchange: xmlgraphics/fop-pdf-images/trunk/lib/fontbox-2.0.4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: xmlgraphics/fop-pdf-images/trunk/lib/pdfbox-2.0.4.jar
URL: http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/lib/pdfbox-2.0.4.jar?rev=1775054&view=auto
==============================================================================
Binary file - no diff available.

Propchange: xmlgraphics/fop-pdf-images/trunk/lib/pdfbox-2.0.4.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java?rev=1775054&r1=1775053&r2=1775054&view=diff
==============================================================================
--- xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java (original)
+++ xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java Mon Dec 19 11:00:18 2016
@@ -535,10 +535,18 @@ public class PDFBoxAdapterTestCase {
         Assert.assertEquals(item.getClass(), Integer.class);
         Assert.assertEquals(pdfCache.size(), 11);
 
-        item = objectCachePerFile.values().iterator().next();
-        Assert.assertEquals(item.getClass(), PDFDictionary.class);
-        item = objectCachePerFile.keySet().iterator().next();
-        Assert.assertEquals(item.getClass(), String.class);
+        int pdfDictionary = 0;
+        int strings = 0;
+        for (Map.Entry<Object, Object> o : objectCachePerFile.entrySet()) {
+            if (o.getValue().getClass().equals(PDFDictionary.class)) {
+                pdfDictionary++;
+            }
+            if (o.getKey() instanceof String) {
+                strings++;
+            }
+        }
+        Assert.assertEquals(pdfDictionary, 26);
+        Assert.assertEquals(strings, 34);
         Assert.assertEquals(objectCachePerFile.size(), 45);
     }
 }