Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-05 20:45:29 -04:00
Code Issues Projects Releases Wiki Activity

Refactoring, pulling assertRGBEquals method up.

Browse Source
This commit is contained in:
Harald Kuhr 2016-06-30 14:15:29 +02:00
parent 054499b78a
commit 478ed62cd1
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java
View File

@ -1602,6 +1602,16 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
return getClass().getResource(pName); 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 { static final protected class TestData {
private final Object input; private final Object input;
private final List<Dimension> sizes; private final List<Dimension> sizes;

28
imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
View File

@ -956,7 +956,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
int rgb = imageRGB.getRGB(x, y); int rgb = imageRGB.getRGB(x, y);
if (rgb != cmykAsRGB) { 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); 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 // Regression: Test subsampling offset within of bounds
// NOTE: These tests assumes the reader will read at least 1024 scanlines (if available) each iteration, // 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.... // 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); assertNotNull(image);
// Make sure correct color is actually read, not just left empty // Make sure correct color is actually read, not just left empty
assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 2)); assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 2));
assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 1)); assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 1));
} }
@Test @Test
@ -1054,8 +1048,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
assertNotNull(image); assertNotNull(image);
// Make sure correct color is actually read, not just left empty // Make sure correct color is actually read, not just left empty
assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 2)); assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 2));
assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 1)); assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 1));
} }
@Test @Test
@ -1071,8 +1065,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
assertNotNull(image); assertNotNull(image);
// Make sure correct color is actually read, not just left empty // Make sure correct color is actually read, not just left empty
assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 2)); assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 2));
assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 1)); assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 1));
} }
@Test @Test
@ -1101,8 +1095,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
assertNotNull(image); assertNotNull(image);
// Make sure correct color is actually read, not just left empty // Make sure correct color is actually read, not just left empty
assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 2)); assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 2));
assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 1)); assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 1));
} }
@Test @Test
@ -1118,8 +1112,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
assertNotNull(image); assertNotNull(image);
// Make sure correct color is actually read, not just left empty // Make sure correct color is actually read, not just left empty
assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 2)); assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 2));
assertRGBEquals(0xfefefd, image.getRGB(0, image.getHeight() - 1)); assertRGBEquals(0xfffefefd, image.getRGB(0, image.getHeight() - 1));
} }
@Test @Test