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

Code clean-up after merge + Rewrote test to use JUnit 4.

Browse Source
This commit is contained in:
Harald Kuhr 2014-03-20 18:01:20 +01:00
parent 7430d0053a
commit 64668807e0
1 changed files with 34 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
common/common-image/src/test/java/com/twelvemonkeys/image/ImageUtilTestCase.java
View File

@ -1,27 +1,18 @@
package com.twelvemonkeys.image; package com.twelvemonkeys.image;
import junit.framework.TestCase; import org.junit.Test;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.IndexColorModel; import java.awt.image.IndexColorModel;
import java.awt.image.RenderedImage; import java.awt.image.RenderedImage;
import java.io.InputStream; import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
/** import static org.junit.Assert.*;
* Created by IntelliJ IDEA.
* public class ImageUtilTestCase {
* @author $author wmhakur$
* @version $id: $
* To change this template use Options | File Templates.
*/
public class ImageUtilTestCase extends TestCase {
private final static String IMAGE_NAME = "/sunflower.jpg"; private final static String IMAGE_NAME = "/sunflower.jpg";
private BufferedImage original; private BufferedImage original;
@ -56,6 +47,7 @@ public class ImageUtilTestCase extends TestCase {
} }
*/ */
@Test
public void testToBufferedImageNull() { public void testToBufferedImageNull() {
BufferedImage img = null; BufferedImage img = null;
boolean threwRuntimeException = false; boolean threwRuntimeException = false;
@ -73,6 +65,7 @@ public class ImageUtilTestCase extends TestCase {
assertTrue(threwRuntimeException); assertTrue(threwRuntimeException);
} }
@Test
public void testToBufferedImageTypeNull() { public void testToBufferedImageTypeNull() {
BufferedImage img = null; BufferedImage img = null;
boolean threwRuntimeException = false; boolean threwRuntimeException = false;
@ -90,6 +83,7 @@ public class ImageUtilTestCase extends TestCase {
assertTrue(threwRuntimeException); assertTrue(threwRuntimeException);
} }
@Test
public void testImageIsNotBufferedImage() { public void testImageIsNotBufferedImage() {
// Should not be a buffered image // Should not be a buffered image
assertFalse( assertFalse(
@ -98,6 +92,7 @@ public class ImageUtilTestCase extends TestCase {
); );
} }
@Test
public void testToBufferedImage() { public void testToBufferedImage() {
BufferedImage sameAsImage = ImageUtil.toBuffered((RenderedImage) image); BufferedImage sameAsImage = ImageUtil.toBuffered((RenderedImage) image);
BufferedImage bufferedScaled = ImageUtil.toBuffered(scaled); BufferedImage bufferedScaled = ImageUtil.toBuffered(scaled);
@ -115,6 +110,7 @@ public class ImageUtilTestCase extends TestCase {
|| bufferedScaled.getPropertyNames().length == 0); || bufferedScaled.getPropertyNames().length == 0);
} }
@Test
public void testToBufferedImageType() { public void testToBufferedImageType() {
// Assumes image is TYPE_INT_ARGB // Assumes image is TYPE_INT_ARGB
BufferedImage converted = ImageUtil.toBuffered(image, BufferedImage.TYPE_BYTE_INDEXED); BufferedImage converted = ImageUtil.toBuffered(image, BufferedImage.TYPE_BYTE_INDEXED);
@ -136,6 +132,7 @@ public class ImageUtilTestCase extends TestCase {
assertEquals(image.getHeight(), convertedToo.getHeight()); assertEquals(image.getHeight(), convertedToo.getHeight());
} }
@Test
public void testBrightness() { public void testBrightness() {
final BufferedImage original = this.original; final BufferedImage original = this.original;
assertNotNull(original); assertNotNull(original);
@ -215,7 +212,7 @@ public class ImageUtilTestCase extends TestCase {
*/ */
} }
@Test
public void testContrast() { public void testContrast() {
final BufferedImage original = this.original; final BufferedImage original = this.original;
@ -273,7 +270,6 @@ public class ImageUtilTestCase extends TestCase {
else { else {
assertTrue("Contrast should be increased or same", oB <= cB && cB <= dB); assertTrue("Contrast should be increased or same", oB <= cB && cB <= dB);
} }
} }
} }
// Assumed: Only primary colors (w/b/r/g/b/c/y/m) // Assumed: Only primary colors (w/b/r/g/b/c/y/m)
@ -369,6 +365,7 @@ public class ImageUtilTestCase extends TestCase {
*/ */
} }
@Test
public void testSharpen() { public void testSharpen() {
final BufferedImage original = this.original; final BufferedImage original = this.original;
@ -390,10 +387,10 @@ public class ImageUtilTestCase extends TestCase {
final BufferedImage sharpenedDefault = ImageUtil.sharpen(original, 0.3f); final BufferedImage sharpenedDefault = ImageUtil.sharpen(original, 0.3f);
final BufferedImage sharpenedMore = ImageUtil.sharpen(original, 1.3f); final BufferedImage sharpenedMore = ImageUtil.sharpen(original, 1.3f);
long diffOriginal = 0; // long diffOriginal = 0;
long diffSharpened = 0; // long diffSharpened = 0;
long diffDefault = 0; // long diffDefault = 0;
long diffMore = 0; // long diffMore = 0;
long absDiffOriginal = 0; long absDiffOriginal = 0;
long absDiffSharpened = 0; long absDiffSharpened = 0;
@ -412,10 +409,10 @@ public class ImageUtilTestCase extends TestCase {
int pdRGB = 0x00FFFFFF & sharpenedDefault.getRGB(x - 1, y); int pdRGB = 0x00FFFFFF & sharpenedDefault.getRGB(x - 1, y);
int pmRGB = 0x00FFFFFF & sharpenedMore.getRGB(x - 1, y); int pmRGB = 0x00FFFFFF & sharpenedMore.getRGB(x - 1, y);
diffOriginal += poRGB - oRGB; // diffOriginal += poRGB - oRGB;
diffSharpened += psRGB - sRGB; // diffSharpened += psRGB - sRGB;
diffDefault += pdRGB - dRGB; // diffDefault += pdRGB - dRGB;
diffMore += pmRGB - mRGB; // diffMore += pmRGB - mRGB;
absDiffOriginal += Math.abs(poRGB - oRGB); absDiffOriginal += Math.abs(poRGB - oRGB);
absDiffSharpened += Math.abs(psRGB - sRGB); absDiffSharpened += Math.abs(psRGB - sRGB);
@ -424,10 +421,6 @@ public class ImageUtilTestCase extends TestCase {
} }
} }
//*
showEm(original, notSharpened, sharpened, sharpenedDefault, sharpenedMore, "sharpen");
//*/
// assertEquals("Difference should not change", diffOriginal, diffSharpened); // assertEquals("Difference should not change", diffOriginal, diffSharpened);
assertTrue("Abs difference should increase", absDiffOriginal < absDiffSharpened); assertTrue("Abs difference should increase", absDiffOriginal < absDiffSharpened);
// assertEquals("Difference should not change", diffOriginal, diffDefault); // assertEquals("Difference should not change", diffOriginal, diffDefault);
@ -438,66 +431,7 @@ public class ImageUtilTestCase extends TestCase {
assertTrue("Abs difference should increase", absDiffSharpened < absDiffMore); assertTrue("Abs difference should increase", absDiffSharpened < absDiffMore);
} }
private void showEm(final BufferedImage pOriginal, final BufferedImage pNotSharpened, final BufferedImage pSharpened, final BufferedImage pSharpenedDefault, final BufferedImage pSharpenedMore, final String pTitle) { @Test
if (pOriginal == null) {
return;
}
if (GraphicsEnvironment.isHeadless()) {
return;
}
try {
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
JFrame frame = new JFrame("Sunflower - " + pTitle);
frame.setSize(pOriginal.getWidth() * 4, pOriginal.getHeight() * 2);
Canvas canvas = new Canvas() {
public void paint(Graphics g) {
// Draw original for comparison
g.drawImage(pOriginal, 0, 0, null);
// This should look like original
g.drawImage(pNotSharpened, 0, pOriginal.getHeight(), null);
// Different versions
g.drawImage(pSharpened, pOriginal.getWidth(), 0, null);
g.drawImage(pSharpenedDefault, pOriginal.getWidth() * 2, 0, null);
g.drawImage(pSharpenedMore, pOriginal.getWidth() * 3, 0, null);
}
};
frame.getContentPane().add(canvas);
frame.addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) {
synchronized (ImageUtilTestCase.this) {
ImageUtilTestCase.this.notify();
}
}
});
frame.setVisible(true);
}
});
}
catch (InterruptedException e) {
throw new RuntimeException(e);
}
catch (InvocationTargetException e) {
throw new RuntimeException(e);
}
synchronized (ImageUtilTestCase.this) {
try {
ImageUtilTestCase.this.wait();
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}
}
public void testBlur() { public void testBlur() {
final BufferedImage original = this.original; final BufferedImage original = this.original;
@ -519,17 +453,16 @@ public class ImageUtilTestCase extends TestCase {
final BufferedImage blurredDefault = ImageUtil.blur(original, 1.5f); final BufferedImage blurredDefault = ImageUtil.blur(original, 1.5f);
final BufferedImage blurredMore = ImageUtil.blur(original, 3f); final BufferedImage blurredMore = ImageUtil.blur(original, 3f);
long diffOriginal = 0; // long diffOriginal = 0;
long diffBlurred = 0; // long diffBlurred = 0;
long diffDefault = 0; // long diffDefault = 0;
long diffMore = 0; // long diffMore = 0;
long absDiffOriginal = 0; long absDiffOriginal = 0;
long absDiffBlurred = 0; long absDiffBlurred = 0;
long absDiffDefault = 0; long absDiffDefault = 0;
long absDiffMore = 0; long absDiffMore = 0;
for (int y = 0; y < original.getHeight(); y++) { for (int y = 0; y < original.getHeight(); y++) {
for (int x = 1; x < original.getWidth(); x++) { for (int x = 1; x < original.getWidth(); x++) {
int oRGB = 0x00FFFFFF & original.getRGB(x, y); int oRGB = 0x00FFFFFF & original.getRGB(x, y);
@ -542,10 +475,10 @@ public class ImageUtilTestCase extends TestCase {
int pdRGB = 0x00FFFFFF & blurredDefault.getRGB(x - 1, y); int pdRGB = 0x00FFFFFF & blurredDefault.getRGB(x - 1, y);
int pmRGB = 0x00FFFFFF & blurredMore.getRGB(x - 1, y); int pmRGB = 0x00FFFFFF & blurredMore.getRGB(x - 1, y);
diffOriginal += poRGB - oRGB; // diffOriginal += poRGB - oRGB;
diffBlurred += pbRGB - bRGB; // diffBlurred += pbRGB - bRGB;
diffDefault += pdRGB - dRGB; // diffDefault += pdRGB - dRGB;
diffMore += pmRGB - mRGB; // diffMore += pmRGB - mRGB;
absDiffOriginal += Math.abs(poRGB - oRGB); absDiffOriginal += Math.abs(poRGB - oRGB);
absDiffBlurred += Math.abs(pbRGB - bRGB); absDiffBlurred += Math.abs(pbRGB - bRGB);
@ -554,8 +487,6 @@ public class ImageUtilTestCase extends TestCase {
} }
} }
showEm(original, notBlurred, blurred, blurredDefault, blurredMore, "blur");
// assertEquals("Difference should not change", diffOriginal, diffBlurred); // assertEquals("Difference should not change", diffOriginal, diffBlurred);
assertTrue(String.format("Abs difference should decrease: %s <= %s", absDiffOriginal, absDiffBlurred), absDiffOriginal > absDiffBlurred); assertTrue(String.format("Abs difference should decrease: %s <= %s", absDiffOriginal, absDiffBlurred), absDiffOriginal > absDiffBlurred);
// assertEquals("Difference should not change", diffOriginal, diffDefault); // assertEquals("Difference should not change", diffOriginal, diffDefault);
@ -566,6 +497,7 @@ public class ImageUtilTestCase extends TestCase {
assertTrue("Abs difference should decrease", absDiffBlurred > absDiffMore); assertTrue("Abs difference should decrease", absDiffBlurred > absDiffMore);
} }
@Test
public void testIndexImage() { public void testIndexImage() {
BufferedImage sunflower = original; BufferedImage sunflower = original;