From 552ab24658d628b3d0cfc7b907b8bd09e96a2d55 Mon Sep 17 00:00:00 2001 From: Andreas Kohn Date: Mon, 17 Mar 2014 12:11:49 +0100 Subject: [PATCH] Fix conditions in #showEm() * return when the pOriginal is null, not when it is non-null (Eclipse noticed a definitive NPE) * return when running in headless mode (unit tests via maven) --- .../java/com/twelvemonkeys/image/ImageUtilTestCase.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common/common-image/src/test/java/com/twelvemonkeys/image/ImageUtilTestCase.java b/common/common-image/src/test/java/com/twelvemonkeys/image/ImageUtilTestCase.java index fbd9a232..0fbcdcaf 100755 --- a/common/common-image/src/test/java/com/twelvemonkeys/image/ImageUtilTestCase.java +++ b/common/common-image/src/test/java/com/twelvemonkeys/image/ImageUtilTestCase.java @@ -439,7 +439,11 @@ public class ImageUtilTestCase extends TestCase { } private void showEm(final BufferedImage pOriginal, final BufferedImage pNotSharpened, final BufferedImage pSharpened, final BufferedImage pSharpenedDefault, final BufferedImage pSharpenedMore, final String pTitle) { - if (pOriginal != null) { + if (pOriginal == null) { + return; + } + + if (GraphicsEnvironment.isHeadless()) { return; } @@ -571,4 +575,4 @@ public class ImageUtilTestCase extends TestCase { assertNotNull("Image was null", image); assertTrue(image.getColorModel() instanceof IndexColorModel); } -} \ No newline at end of file +}