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 7a12da6f..654ccd19 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 @@ -513,9 +513,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase> 16) & 0xff, (expectedRGB[i] >> 16) & 0xff, 5); - assertEquals((actualRGB >> 8) & 0xff, (expectedRGB[i] >> 8) & 0xff, 5); - assertEquals((actualRGB) & 0xff, (expectedRGB[i]) & 0xff, 5); + assertRGBEquals(expectedRGB[i], actualRGB); } } @@ -543,9 +541,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase> 16) & 0xff, (expectedRGB[i] >> 16) & 0xff, 5); - assertEquals((actualRGB >> 8) & 0xff, (expectedRGB[i] >> 8) & 0xff, 5); - assertEquals((actualRGB) & 0xff, (expectedRGB[i]) & 0xff, 5); + assertRGBEquals(expectedRGB[i], actualRGB); } } @@ -680,12 +676,19 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase> 16) & 0xff, (expectedRGB[i] >> 16) & 0xff, 5); - assertEquals((actualRGB >> 8) & 0xff, (expectedRGB[i] >> 8) & 0xff, 5); - assertEquals((actualRGB ) & 0xff, (expectedRGB[i] ) & 0xff, 5); + assertRGBEquals(expectedRGB[i], actualRGB); } } + /** + * Slightly fuzzy RGB equals method. Tolerance +/-5 steps. + */ + private void assertRGBEquals(int expectedRGB, int actualRGB) { + assertEquals((expectedRGB >> 16) & 0xff, (actualRGB >> 16) & 0xff, 5); + assertEquals((expectedRGB >> 8) & 0xff, (actualRGB >> 8) & 0xff, 5); + assertEquals((expectedRGB ) & 0xff, (actualRGB ) & 0xff, 5); + } + // 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.... @@ -716,8 +719,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase