From e852e9e15408cb4903a056bb0b3a8a7e005ded4a Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Fri, 16 Oct 2009 17:39:39 +0200 Subject: [PATCH] Fixed a broken test. --- .../util/ImageReaderAbstractTestCase.java | 42 +++++++------------ 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java b/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java index bbfe5387..3b312876 100644 --- a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java +++ b/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java @@ -373,10 +373,8 @@ public abstract class ImageReaderAbstractTestCase extends fail("Image could not be read: " + e); } assertNotNull("Image was null!", image); - assertEquals("Read image has wrong width: " + image.getWidth(), - data.getDimension(0).width, image.getWidth()); - assertEquals("Read image has wrong height: " + image.getHeight(), - data.getDimension(0).height, image.getHeight()); + assertEquals("Read image has wrong width: " + image.getWidth(), data.getDimension(0).width, image.getWidth()); + assertEquals("Read image has wrong height: " + image.getHeight(), data.getDimension(0).height, image.getHeight()); } public void testReadWithDefaultParam() { @@ -392,10 +390,8 @@ public abstract class ImageReaderAbstractTestCase extends fail("Image could not be read: " + e); } assertNotNull("Image was null!", image); - assertEquals("Read image has wrong width: " + image.getWidth(), - data.getDimension(0).width, image.getWidth()); - assertEquals("Read image has wrong height: " + image.getHeight(), - data.getDimension(0).height, image.getHeight()); + assertEquals("Read image has wrong width: " + image.getWidth(), data.getDimension(0).width, image.getWidth()); + assertEquals("Read image has wrong height: " + image.getHeight(), data.getDimension(0).height, image.getHeight()); } public void testReadWithNullParam() { @@ -411,10 +407,8 @@ public abstract class ImageReaderAbstractTestCase extends fail("Image could not be read: " + e); } assertNotNull("Image was null!", image); - assertEquals("Read image has wrong width: " + image.getWidth(), - data.getDimension(0).width, image.getWidth()); - assertEquals("Read image has wrong height: " + image.getHeight(), - data.getDimension(0).height, image.getHeight()); + assertEquals("Read image has wrong width: " + image.getWidth(), data.getDimension(0).width, image.getWidth()); + assertEquals("Read image has wrong height: " + image.getHeight(), data.getDimension(0).height, image.getHeight()); } public void testReadWithSizeParam() { @@ -434,10 +428,8 @@ public abstract class ImageReaderAbstractTestCase extends fail("Image could not be read: " + e); } assertNotNull("Image was null!", image); - assertEquals("Read image has wrong width: " + image.getWidth(), - 10, image.getWidth()); - assertEquals("Read image has wrong height: " + image.getHeight(), - 10, image.getHeight()); + assertEquals("Read image has wrong width: " + image.getWidth(), 10, image.getWidth()); + assertEquals("Read image has wrong height: " + image.getHeight(), 10, image.getHeight()); } } @@ -457,10 +449,8 @@ public abstract class ImageReaderAbstractTestCase extends fail("Image could not be read: " + e); } assertNotNull("Image was null!", image); - assertEquals("Read image has wrong width: ", - (double) data.getDimension(0).width / 5.0, image.getWidth(), 1.0); - assertEquals("Read image has wrong height: ", - (double) data.getDimension(0).height / 5.0, image.getHeight(), 1.0); + assertEquals("Read image has wrong width: ", (double) data.getDimension(0).width / 5.0, image.getWidth(), 1.0); + assertEquals("Read image has wrong height: ", (double) data.getDimension(0).height / 5.0, image.getHeight(), 1.0); } public void testReadWithSourceRegionParam() { @@ -479,10 +469,8 @@ public abstract class ImageReaderAbstractTestCase extends fail("Image could not be read: " + e); } assertNotNull("Image was null!", image); - assertEquals("Read image has wrong width: " + image.getWidth(), - 10, image.getWidth()); - assertEquals("Read image has wrong height: " + image.getHeight(), - 10, image.getHeight()); + assertEquals("Read image has wrong width: " + image.getWidth(), 10, image.getWidth()); + assertEquals("Read image has wrong height: " + image.getHeight(), 10, image.getHeight()); } public void testReadWithSizeAndSourceRegionParam() { @@ -507,10 +495,8 @@ public abstract class ImageReaderAbstractTestCase extends fail("Image could not be read: " + e); } assertNotNull("Image was null!", image); - assertEquals("Read image has wrong width: " + image.getWidth(), - 20, image.getWidth()); - assertEquals("Read image has wrong height: " + image.getHeight(), - 20, image.getHeight()); + assertEquals("Read image has wrong width: " + image.getWidth(), 10, image.getWidth()); + assertEquals("Read image has wrong height: " + image.getHeight(), 10, image.getHeight()); } }