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

Made test case more robust when running headless on Windows.

Browse Source
This commit is contained in:
Harald Kuhr 2017-11-18 14:25:15 +01:00
parent b68848f58f
commit 719b6e7883
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -540,7 +540,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
} }
} }
protected final void assertImageDataEquals(String message, BufferedImage expected, BufferedImage actual) { public static void assertImageDataEquals(String message, BufferedImage expected, BufferedImage actual) {
assertNotNull("Expected image was null", expected); assertNotNull("Expected image was null", expected);
assertNotNull("Actual image was null!", actual); assertNotNull("Actual image was null!", actual);
@ -1447,7 +1447,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
ImageTypeSpecifier valid = pValidTypes.next(); ImageTypeSpecifier valid = pValidTypes.next();
boolean removed = illegalTypes.remove(valid); boolean removed = illegalTypes.remove(valid);
// TODO: 4BYTE_ABGR (6) and 4BYTE_ABGR_PRE (7) is essentially the same type... // TODO: 4BYTE_ABGR (6) and 4BYTE_ABGR_PRE (7) is essentially the same type...
// #$@*%$! ImageTypeSpecifier.equals is not well-defined // #$@*%$! ImageTypeSpecifier.equals is not well-defined
if (!removed) { if (!removed) {
for (Iterator<ImageTypeSpecifier> iterator = illegalTypes.iterator(); iterator.hasNext();) { for (Iterator<ImageTypeSpecifier> iterator = illegalTypes.iterator(); iterator.hasNext();) {
@ -1550,15 +1550,8 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
assertNotSame("Multiple reads return same (mutable) image", one, two); assertNotSame("Multiple reads return same (mutable) image", one, two);
Graphics2D g = one.createGraphics(); one.setRGB(0, 0, Color.BLUE.getRGB());
try { two.setRGB(0, 0, Color.RED.getRGB());
g.setColor(Color.WHITE);
g.setXORMode(Color.BLACK);
g.fillRect(0, 0, one.getWidth(), one.getHeight());
}
finally {
g.dispose();
}
assertTrue(one.getRGB(0, 0) != two.getRGB(0, 0)); assertTrue(one.getRGB(0, 0) != two.getRGB(0, 0));
} }
@ -1574,7 +1567,7 @@ public abstract class ImageReaderAbstractTest<T extends ImageReader> {
int images = reader.getNumImages(true); int images = reader.getNumImages(true);
for (int i = 0; i < images; i++) { for (int i = 0; i < images; i++) {
int thumbnails = reader.getNumThumbnails(0); int thumbnails = reader.getNumThumbnails(0);
for (int j = 0; j < thumbnails; j++) { for (int j = 0; j < thumbnails; j++) {
BufferedImage one = reader.readThumbnail(i, j); BufferedImage one = reader.readThumbnail(i, j);
BufferedImage two = reader.readThumbnail(i, j); BufferedImage two = reader.readThumbnail(i, j);