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

Test clean-up.

Browse Source
This commit is contained in:
Harald Kuhr 2017-01-05 16:47:54 +01:00
parent ed6f70fb6d
commit 99144358a5
2 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/exif/EXIFReaderTest.java
View File

@ -51,6 +51,7 @@ import static org.junit.Assert.*;
* @author last modified by $Author: haraldk$ * @author last modified by $Author: haraldk$
* @version $Id: EXIFReaderTest.java,v 1.0 23.12.11 13:50 haraldk Exp$ * @version $Id: EXIFReaderTest.java,v 1.0 23.12.11 13:50 haraldk Exp$
*/ */
@SuppressWarnings("deprecation")
public class EXIFReaderTest extends MetadataReaderAbstractTest { public class EXIFReaderTest extends MetadataReaderAbstractTest {
@Override @Override
protected InputStream getData() throws IOException { protected InputStream getData() throws IOException {

49
imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/exif/EXIFWriterTest.java
View File

@ -39,7 +39,6 @@ import org.junit.Test;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.imageio.stream.ImageOutputStream; import javax.imageio.stream.ImageOutputStream;
import javax.imageio.stream.ImageOutputStreamImpl;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -56,6 +55,7 @@ import static org.junit.Assert.assertNotNull;
* @author last modified by $Author: haraldk$ * @author last modified by $Author: haraldk$
* @version $Id: TIFFWriterTest.java,v 1.0 18.07.13 09:53 haraldk Exp$ * @version $Id: TIFFWriterTest.java,v 1.0 18.07.13 09:53 haraldk Exp$
*/ */
@SuppressWarnings("deprecation")
public class EXIFWriterTest extends MetadataWriterAbstractTest { public class EXIFWriterTest extends MetadataWriterAbstractTest {
@Override @Override
@ -63,13 +63,13 @@ public class EXIFWriterTest extends MetadataWriterAbstractTest {
return getResource("/exif/exif-jpeg-segment.bin").openStream(); return getResource("/exif/exif-jpeg-segment.bin").openStream();
} }
protected TIFFReader createReader() { protected EXIFReader createReader() {
return new TIFFReader(); return new EXIFReader();
} }
@Override @Override
protected TIFFWriter createWriter() { protected EXIFWriter createWriter() {
return new TIFFWriter(); return new EXIFWriter();
} }
@Test @Test
@ -202,43 +202,4 @@ public class EXIFWriterTest extends MetadataWriterAbstractTest {
assertEquals(original, read); assertEquals(original, read);
} }
@Test
public void testComputeIFDSize() throws IOException {
ArrayList<Entry> entries = new ArrayList<>();
entries.add(new TIFFEntry(TIFF.TAG_ORIENTATION, TIFF.TYPE_SHORT, 1));
entries.add(new TIFFEntry(TIFF.TAG_IMAGE_WIDTH, TIFF.TYPE_SHORT, 1600));
entries.add(new AbstractEntry(TIFF.TAG_IMAGE_HEIGHT, 900) {});
entries.add(new TIFFEntry(TIFF.TAG_ARTIST, TIFF.TYPE_ASCII, "Harald K."));
entries.add(new AbstractEntry(TIFF.TAG_SOFTWARE, "TwelveMonkeys ImageIO") {});
TIFFWriter writer = createWriter();
ImageOutputStream stream = new NullImageOutputStream();
writer.write(entries, stream);
assertEquals(stream.getStreamPosition(), writer.computeIFDSize(entries) + 12);
}
private static class NullImageOutputStream extends ImageOutputStreamImpl {
@Override
public void write(int b) throws IOException {
streamPos++;
}
@Override
public void write(byte[] b, int off, int len) throws IOException {
streamPos += len;
}
@Override
public int read() throws IOException {
throw new UnsupportedOperationException("Method read not implemented");
}
@Override
public int read(byte[] b, int off, int len) throws IOException {
throw new UnsupportedOperationException("Method read not implemented");
}
}
} }