Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2026-05-01 00:00:02 -04:00
Code Issues Projects Releases Wiki Activity

TMI-64: Test case clean-up

Browse Source
This commit is contained in:
Harald Kuhr
2015-04-10 11:06:50 +02:00
parent 0232b63ed8
commit e603ae260d
20 changed files with 171 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderTest.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.twelvemonkeys.imageio.plugins.bmp;
import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase;
import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
import org.junit.Test;
import org.mockito.InOrder;
import org.w3c.dom.Node;
@@ -35,7 +35,7 @@ import static org.mockito.Mockito.*;
* @author last modified by $Author: haraldk$
* @version $Id: BMPImageReaderTest.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$
*/
public class BMPImageReaderTest extends ImageReaderAbstractTestCase<BMPImageReader> {
public class BMPImageReaderTest extends ImageReaderAbstractTest<BMPImageReader> {
protected List<TestData> getTestData() {
return Arrays.asList(
// BMP Suite "Good"
imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/CURImageReaderTest.java
+5 -4
View File
@@ -1,6 +1,6 @@
package com.twelvemonkeys.imageio.plugins.bmp;
import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase;
import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
import org.junit.Ignore;
import org.junit.Test;
@@ -10,6 +10,7 @@ import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static org.junit.Assert.*;
@@ -21,7 +22,7 @@ import static org.junit.Assert.*;
* @author last modified by $Author: haraldk$
* @version $Id: CURImageReaderTest.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$
*/
public class CURImageReaderTest extends ImageReaderAbstractTestCase<CURImageReader> {
public class CURImageReaderTest extends ImageReaderAbstractTest<CURImageReader> {
protected List<TestData> getTestData() {
return Arrays.asList(
new TestData(getClassLoaderResource("/cur/hand.cur"), new Dimension(32, 32)),
@@ -43,11 +44,11 @@ public class CURImageReaderTest extends ImageReaderAbstractTestCase<CURImageRead
}
protected List<String> getFormatNames() {
return Arrays.asList("cur");
return Collections.singletonList("cur");
}
protected List<String> getSuffixes() {
return Arrays.asList("cur");
return Collections.singletonList("cur");
}
protected List<String> getMIMETypes() {
imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/ICOImageReaderTest.java
+5 -4
View File
@@ -1,6 +1,6 @@
package com.twelvemonkeys.imageio.plugins.bmp;
import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase;
import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
import org.junit.Ignore;
import org.junit.Test;
@@ -8,6 +8,7 @@ import javax.imageio.spi.ImageReaderSpi;
import java.awt.*;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
@@ -17,7 +18,7 @@ import java.util.List;
* @author last modified by $Author: haraldk$
* @version $Id: ICOImageReaderTest.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$
*/
public class ICOImageReaderTest extends ImageReaderAbstractTestCase<ICOImageReader> {
public class ICOImageReaderTest extends ImageReaderAbstractTest<ICOImageReader> {
protected List<TestData> getTestData() {
return Arrays.asList(
new TestData(
@@ -56,11 +57,11 @@ public class ICOImageReaderTest extends ImageReaderAbstractTestCase<ICOImageRead
}
protected List<String> getFormatNames() {
return Arrays.asList("ico");
return Collections.singletonList("ico");
}
protected List<String> getSuffixes() {
return Arrays.asList("ico");
return Collections.singletonList("ico");
}
protected List<String> getMIMETypes() {