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

ImageReaderAbstractTest refactorings.

Browse Source 
(cherry picked from commit 9fdbc3b1fc)
This commit is contained in:
Harald Kuhr
2020-10-14 17:06:35 +02:00
parent 1ace3a6d5f
commit 769acc8726
22 changed files with 251 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/BigTIFFImageReaderTest.java
View File

@@ -46,7 +46,11 @@ import java.util.List;
* @version $Id: BigTIFFImageReaderTest.java,v 1.0 26/04/2017 harald.kuhr Exp$
*/
public class BigTIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader> {
private static final BigTIFFImageReaderSpi SPI = new BigTIFFImageReaderSpi();
@Override
protected ImageReaderSpi createProvider() {
return new BigTIFFImageReaderSpi();
}
@Override
protected List<TestData> getTestData() {
@@ -62,21 +66,6 @@ public class BigTIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageRea
);
}
@Override
protected ImageReaderSpi createProvider() {
return SPI;
}
@Override
protected Class<TIFFImageReader> getReaderClass() {
return TIFFImageReader.class;
}
@Override
protected TIFFImageReader createReader() {
return SPI.createReaderInstance(null);
}
@Override
protected List<String> getFormatNames() {
return Arrays.asList("bigtiff", "BigTIFF", "BIGTIFF");

25
imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java
View File

@@ -71,7 +71,10 @@ import static org.mockito.Mockito.*;
*/
public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader> {
private static final TIFFImageReaderSpi SPI = new TIFFImageReaderSpi();
@Override
protected ImageReaderSpi createProvider() {
return new TIFFImageReaderSpi();
}
@Override
protected List<TestData> getTestData() {
@@ -182,20 +185,6 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
new TestData(getClassLoaderResource("/tiff/depth/flower-rgb-planar-04.tif"), new Dimension(73, 43)) // RGB 4 bit/sample
);
}
@Override
protected ImageReaderSpi createProvider() {
return SPI;
}
@Override
protected Class<TIFFImageReader> getReaderClass() {
return TIFFImageReader.class;
}
@Override
protected TIFFImageReader createReader() {
return SPI.createReaderInstance(null);
}
@Override
protected List<String> getFormatNames() {
@@ -844,7 +833,7 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
}
@Test
public void testReadUnsupported() {
public void testReadUnsupported() throws IOException {
ImageReader reader = createReader();
for (TestData data : getUnsupportedTestData()) {
@@ -866,7 +855,7 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
}
@Test
public void testStreamMetadataNonNull() {
public void testStreamMetadataNonNull() throws IOException {
ImageReader reader = createReader();
for (TestData data : getTestData()) {
@@ -906,7 +895,7 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
}
@Test
public void testReadRaster() {
public void testReadRaster() throws IOException {
ImageReader reader = createReader();
for (TestData data : getTestData()) {