From 99144358a5feb6d7bc5f7f472ed01b2fb9634b7d Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Thu, 5 Jan 2017 16:47:54 +0100
Subject: [PATCH] Test clean-up.

---
 .../imageio/metadata/exif/EXIFReaderTest.java |  1 +
 .../imageio/metadata/exif/EXIFWriterTest.java | 49 ++-----------------
 2 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/exif/EXIFReaderTest.java b/imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/exif/EXIFReaderTest.java
index ee0f3e0e..4a92cfb1 100644
--- a/imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/exif/EXIFReaderTest.java
+++ b/imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/exif/EXIFReaderTest.java
@@ -51,6 +51,7 @@ import static org.junit.Assert.*;
  * @author last modified by $Author: haraldk$
  * @version $Id: EXIFReaderTest.java,v 1.0 23.12.11 13:50 haraldk Exp$
  */
+@SuppressWarnings("deprecation")
 public class EXIFReaderTest extends MetadataReaderAbstractTest {
     @Override
     protected InputStream getData() throws IOException {
diff --git a/imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/exif/EXIFWriterTest.java b/imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/exif/EXIFWriterTest.java
index 411f7010..5cf2085d 100644
--- a/imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/exif/EXIFWriterTest.java
+++ b/imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/exif/EXIFWriterTest.java
@@ -39,7 +39,6 @@ import org.junit.Test;
 
 import javax.imageio.ImageIO;
 import javax.imageio.stream.ImageOutputStream;
-import javax.imageio.stream.ImageOutputStreamImpl;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -56,6 +55,7 @@ import static org.junit.Assert.assertNotNull;
  * @author last modified by $Author: haraldk$
  * @version $Id: TIFFWriterTest.java,v 1.0 18.07.13 09:53 haraldk Exp$
  */
+@SuppressWarnings("deprecation")
 public class EXIFWriterTest extends MetadataWriterAbstractTest {
 
     @Override
@@ -63,13 +63,13 @@ public class EXIFWriterTest extends MetadataWriterAbstractTest {
         return getResource("/exif/exif-jpeg-segment.bin").openStream();
     }
 
-    protected TIFFReader createReader() {
-        return new TIFFReader();
+    protected EXIFReader createReader() {
+        return new EXIFReader();
     }
 
     @Override
-    protected TIFFWriter createWriter() {
-        return new TIFFWriter();
+    protected EXIFWriter createWriter() {
+        return new EXIFWriter();
     }
 
     @Test
@@ -202,43 +202,4 @@ public class EXIFWriterTest extends MetadataWriterAbstractTest {
 
         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");
-        }
-    }
 }