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

[jahewson]

Author: jahewson
Date: Mon Jun 30 23:51:53 2014
New Revision: 1606948

URL: http://svn.apache.org/r1606948
Log:
PDFBOX-2150: skip tests which trigger OpenJDK 6 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=1606948&r1=1606947&r2=1606948&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
 Mon Jun 30 23:51:53 2014
@@ -112,10 +112,12 @@ public class JPEGFactoryTest extends Tes
      */
     public void testCreateFromImageINT_ARGB() throws IOException
     {
-        System.getProperties().list(System.out);
-
-        // Open JDK 6 bug
-        
Assume.assumeFalse(System.getProperty("java.version").equals("1.6.0_30"));
+        // workaround Open JDK 6 bug
+        if (System.getProperty("java.runtime.name").equals("OpenJDK Runtime 
Environment") &&
+            System.getProperty("java.specification.version").equals("1.6"))
+        {
+            return;
+        }
 
         PDDocument document = new PDDocument();
         BufferedImage image = 
ImageIO.read(JPEGFactoryTest.class.getResourceAsStream("jpeg.jpg"));
@@ -151,8 +153,12 @@ public class JPEGFactoryTest extends Tes
      */
     public void testCreateFromImage4BYTE_ABGR() throws IOException
     {
-        // Open JDK 6 bug
-        
Assume.assumeFalse(System.getProperty("java.version").equals("1.6.0_30"));
+        // workaround Open JDK 6 bug
+        if (System.getProperty("java.runtime.name").equals("OpenJDK Runtime 
Environment") &&
+            System.getProperty("java.specification.version").equals("1.6"))
+        {
+            return;
+        }
 
         PDDocument document = new PDDocument();
         BufferedImage image = 
ImageIO.read(JPEGFactoryTest.class.getResourceAsStream("jpeg.jpg"));