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 2014/10/24 21:11:28 UTC

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

Author: tilman
Date: Fri Oct 24 19:11:27 2014
New Revision: 1634121

URL: http://svn.apache.org/r1634121
Log:
PDFBOX-2453: skip tests which trigger OpenJDK 7 bug

Modified:
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java?rev=1634121&r1=1634120&r2=1634121&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactoryTest.java Fri Oct 24 19:11:27 2014
@@ -111,9 +111,11 @@ public class JPEGFactoryTest extends Tes
      */
     public void testCreateFromImageINT_ARGB() throws IOException
     {
-        // workaround Open JDK 6 bug
-        if (System.getProperty("java.runtime.name").equals("OpenJDK Runtime Environment") &&
-            System.getProperty("java.specification.version").equals("1.6"))
+        // workaround Open JDK bug
+        // http://bugs.java.com/bugdatabase/view_bug.do?bug_id=7044758
+        if (System.getProperty("java.runtime.name").equals("OpenJDK Runtime Environment")
+                && (System.getProperty("java.specification.version").equals("1.6")
+                || System.getProperty("java.specification.version").equals("1.7")))
         {
             return;
         }
@@ -142,7 +144,7 @@ public class JPEGFactoryTest extends Tes
         assertNotNull(ximage.getSoftMask());
         validate(ximage.getSoftMask(), 8, width, height, "jpg", PDDeviceGray.INSTANCE.getName());
         assertTrue(colorCount(ximage.getSoftMask().getImage()) > image.getHeight() / 10);
-        
+
         doWritePDF(document, ximage, testResultsDir, "jpeg-intargb.pdf");
     }
 
@@ -152,9 +154,11 @@ public class JPEGFactoryTest extends Tes
      */
     public void testCreateFromImage4BYTE_ABGR() throws IOException
     {
-        // workaround Open JDK 6 bug
-        if (System.getProperty("java.runtime.name").equals("OpenJDK Runtime Environment") &&
-            System.getProperty("java.specification.version").equals("1.6"))
+        // workaround Open JDK bug
+        // http://bugs.java.com/bugdatabase/view_bug.do?bug_id=7044758
+        if (System.getProperty("java.runtime.name").equals("OpenJDK Runtime Environment")
+                && (System.getProperty("java.specification.version").equals("1.6")
+                || System.getProperty("java.specification.version").equals("1.7")))
         {
             return;
         }