From 478ed62cd1af993cb84215f9fa55557476a48aff Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Thu, 30 Jun 2016 14:15:29 +0200
Subject: [PATCH] Refactoring, pulling assertRGBEquals method up.

---
 .../imageio/util/ImageReaderAbstractTest.java | 10 +++++++
 .../plugins/jpeg/JPEGImageReaderTest.java     | 28 ++++++++-----------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java
index a92f75c2..e559406a 100644
--- a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java
+++ b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java
@@ -1602,6 +1602,16 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
         return getClass().getResource(pName);
     }
 
+    /**
+     * Slightly fuzzy RGB equals method. Variable tolerance.
+     */
+    protected void assertRGBEquals(String message, int expectedRGB, int actualRGB, int tolerance) {
+        assertEquals(message, (expectedRGB >>> 24) & 0xff, (actualRGB >>> 24) & 0xff, 0);
+        assertEquals(message, (expectedRGB >> 16) & 0xff, (actualRGB >> 16) & 0xff, tolerance);
+        assertEquals(message, (expectedRGB >>  8) & 0xff, (actualRGB >>  8) & 0xff, tolerance);
+        assertEquals(message, (expectedRGB      ) & 0xff, (actualRGB      ) & 0xff, tolerance);
+    }
+
     static final protected class TestData {
         private final Object input;
         private final List<Dimension> sizes;
diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
index 3ce7a4bf..c55eae6a 100644
--- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
+++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
@@ -956,7 +956,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
                     int rgb = imageRGB.getRGB(x, y);
 
                     if (rgb != cmykAsRGB) {
-                        assertRGBEquals(String.format("Diff at [%d, %d]: %s != %s", x, y, String.format("#%04x", cmykAsRGB), String.format("#%04x", rgb)), rgb, cmykAsRGB, 2);
+                        assertRGBEquals(String.format("Diff at [%d, %d]: #%04x != #%04x", x, y, cmykAsRGB, rgb), rgb, cmykAsRGB, 2);
                     }
                 }
             }
@@ -1002,12 +1002,6 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
         assertRGBEquals("RGB values differ", expectedRGB, actualRGB, 5);
     }
 
-    private void assertRGBEquals(String message, int expectedRGB, int actualRGB, int tolerance) {
-        assertEquals(message, (expectedRGB >> 16) & 0xff, (actualRGB >> 16) & 0xff, tolerance);
-        assertEquals(message, (expectedRGB >>  8) & 0xff, (actualRGB >>  8) & 0xff, tolerance);
-        assertEquals(message, (expectedRGB      ) & 0xff, (actualRGB      ) & 0xff, tolerance);
-    }
-
     // Regression: Test subsampling offset within  of bounds
     // NOTE: These tests assumes the reader will read at least 1024 scanlines (if available) each iteration,
     //       this might change in the future. If so, the tests will no longer test what tey are supposed to....
@@ -1037,8 +1031,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
         assertNotNull(image);
 
         // Make sure correct color is actually read, not just left empty
-        assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 2));
-        assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 1));
+        assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 2));
+        assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 1));
     }
 
     @Test
@@ -1054,8 +1048,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
         assertNotNull(image);
 
         // Make sure correct color is actually read, not just left empty
-        assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 2));
-        assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 1));
+        assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 2));
+        assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 1));
     }
 
     @Test
@@ -1071,8 +1065,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
         assertNotNull(image);
 
         // Make sure correct color is actually read, not just left empty
-        assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 2));
-        assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 1));
+        assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 2));
+        assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 1));
     }
 
     @Test
@@ -1101,8 +1095,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
         assertNotNull(image);
 
         // Make sure correct color is actually read, not just left empty
-        assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 2));
-        assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 1));
+        assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 2));
+        assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 1));
     }
 
     @Test
@@ -1118,8 +1112,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
         assertNotNull(image);
 
         // Make sure correct color is actually read, not just left empty
-        assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 2));
-        assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 1));
+        assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 2));
+        assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 1));
     }
 
     @Test