From 719b6e78830fa7b437ac7ecd9deb2b23e235e5f0 Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Sat, 18 Nov 2017 14:25:15 +0100 Subject: [PATCH] Made test case more robust when running headless on Windows. --- .../imageio/util/ImageReaderAbstractTest.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 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 f002a0fb..ea61f61a 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 @@ -540,7 +540,7 @@ public abstract class ImageReaderAbstractTest { } } - 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("Actual image was null!", actual); @@ -1447,7 +1447,7 @@ public abstract class ImageReaderAbstractTest { ImageTypeSpecifier valid = pValidTypes.next(); 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 if (!removed) { for (Iterator iterator = illegalTypes.iterator(); iterator.hasNext();) { @@ -1550,15 +1550,8 @@ public abstract class ImageReaderAbstractTest { assertNotSame("Multiple reads return same (mutable) image", one, two); - Graphics2D g = one.createGraphics(); - try { - g.setColor(Color.WHITE); - g.setXORMode(Color.BLACK); - g.fillRect(0, 0, one.getWidth(), one.getHeight()); - } - finally { - g.dispose(); - } + one.setRGB(0, 0, Color.BLUE.getRGB()); + two.setRGB(0, 0, Color.RED.getRGB()); assertTrue(one.getRGB(0, 0) != two.getRGB(0, 0)); } @@ -1574,7 +1567,7 @@ public abstract class ImageReaderAbstractTest { int images = reader.getNumImages(true); for (int i = 0; i < images; i++) { int thumbnails = reader.getNumThumbnails(0); - + for (int j = 0; j < thumbnails; j++) { BufferedImage one = reader.readThumbnail(i, j); BufferedImage two = reader.readThumbnail(i, j);