Simplified test cases by relying on Apache Commons IO

Author: cboehme

src/test/java/org/culturegraph/mf/stream/sink/ObjectFileWriterTest.java

@@ -17,8 +17,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assume.assumeThat;
 
 import java.io.File;
@@ -27,6 +26,7 @@
 import java.io.InputStream;
 import java.nio.charset.Charset;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -38,7 +38,7 @@
  */
 public final class ObjectFileWriterTest {
 
-	private static final String OUTPUT = "Überfacture";
+	private static final String DATA = "Überfacture";
 
 	private static final String UTF8_MESSAGE = 
 			"Default encoding is UTF-8: It is not possible to test whether " +
@@ -52,27 +52,22 @@ public final class ObjectFileWriterTest {
 	@Test
 	public void testOutputIsUTF8Encoded() throws IOException {
 		final Charset charsetUTF8 = Charset.forName("UTF-8");
+		
 		assumeThat(UTF8_MESSAGE, Charset.defaultCharset(), not(equalTo(charsetUTF8)));
 
 		final File file = tempFolder.newFile();
 
 		final ObjectFileWriter<String> writer = new ObjectFileWriter<String>(file.getAbsolutePath());
-		writer.process(OUTPUT);
+		writer.process(DATA);
 		writer.closeStream();
 
-		final byte[] expected = (OUTPUT + "\n").getBytes(charsetUTF8); // ObjectFileWriter appends new lines
+		final byte[] bytesWritten;
 		final InputStream stream = new FileInputStream(file);
-		try {
-			int i = 0;
-			int b;
-			while((b = stream.read()) != -1) {
-				assertTrue("File contains more data than expected", i < expected.length);
-				assertEquals("File contains unexpected characters", expected[i], (byte)b);
-				i += 1;
-			}
-		} finally {
-			stream.close();
-		}
+		try { bytesWritten = IOUtils.toByteArray(stream); } 
+		finally { stream.close(); }
+		
+		assertArrayEquals(bytesWritten, (DATA + "\n").getBytes(charsetUTF8));
+		                                // FileObjectWriter appends new lines
 	}
 
 }

src/test/java/org/culturegraph/mf/stream/source/FileOpenerCompressionTest.java

@@ -16,7 +16,6 @@
 package org.culturegraph.mf.stream.source;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -38,14 +37,15 @@
 import org.junit.runners.Parameterized.Parameters;
 
 /**
+ * Tests for file compression in {@link FileOpener}.
+ * 
  * @author Christoph Böhme
  *
  */
 @RunWith(Parameterized.class)
 public final class FileOpenerCompressionTest {
 
-	private static final String COMPRESSED_INPUT = 
-			"This could have been a remarkable sentence.";
+	private static final String DATA = "This could have been a remarkable sentence.";
 
 	// NO CHECKSTYLE VisibilityModifier FOR 3 LINES:
 	// JUnit requires rules to be public
@@ -80,36 +80,28 @@ public static Iterable<Object[]> data() {
 
 	@Test
 	public void testOpenCompressedFiles() throws IOException {
-		final File file = prepareFile(resourcePath);
+		final File file = tempFolder.newFile();
+
+		final InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(resourcePath);
+		try {
+			final OutputStream out = new FileOutputStream(file);
+			try { IOUtils.copy(in, out); }
+			finally { out.close(); }
+		} finally { in.close(); }
 
 		final FileOpener opener = new FileOpener();
 		opener.setCompression(compression);
 		final ObjectBuffer<Reader> buffer = new ObjectBuffer<Reader>();
-		opener.setReceiver(buffer);
-		
+		opener.setReceiver(buffer);	
 		opener.process(file.getAbsolutePath());
 		opener.closeStream();
 
-		final String test = IOUtils.toString(buffer.pop());
-		assertEquals(COMPRESSED_INPUT, test);
-		assertNull("Buffer contains more readers than expected", buffer.pop());
-	}
-	
-	private File prepareFile(final String resource) throws IOException {
-		final File file = tempFolder.newFile();
-		
-		final InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
-		try {
-			final OutputStream out = new FileOutputStream(file);
-			try {
-				IOUtils.copy(in, out);
-			} finally {
-				out.close();
-			}
-		} finally {
-			in.close();
-		}
+		final Reader reader = buffer.pop();
+		final String charsFromFile;
+		try { charsFromFile = IOUtils.toString(reader); }
+		finally { reader.close(); }
 
-		return file;
+		assertEquals(DATA, charsFromFile);
 	}
+	
 }

src/test/java/org/culturegraph/mf/stream/source/FileOpenerTest.java

@@ -18,20 +18,16 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeThat;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.nio.charset.Charset;
 
 import org.apache.commons.io.IOUtils;
-import org.culturegraph.mf.stream.DataFilePath;
 import org.culturegraph.mf.stream.pipe.ObjectBuffer;
 import org.junit.Rule;
 import org.junit.Test;
@@ -45,7 +41,7 @@
  */
 public final class FileOpenerTest {
 
-	private static final String INPUT = "Überfacture";
+	private static final String DATA = "Überfacture";
 
 	private static final String UTF8_MESSAGE = 
 			"Default encoding is UTF-8: It is not possible to test " +
@@ -59,35 +55,27 @@ public final class FileOpenerTest {
 	@Test
 	public void testUtf8IsDefaultEncoding() throws IOException {
 		final Charset charsetUTF8 = Charset.forName("UTF-8");
+		
 		assumeThat(UTF8_MESSAGE, Charset.defaultCharset(), not(equalTo(charsetUTF8)));
 
 		final File file = tempFolder.newFile();
 
 		final OutputStream stream = new FileOutputStream(file);
-		try {
-			stream.write(INPUT.getBytes(charsetUTF8));
-		} finally {
-			stream.close();
-		}
+		try { stream.write(DATA.getBytes(charsetUTF8)); }
+		finally { stream.close(); }
 
 		final FileOpener opener = new FileOpener();
 		final ObjectBuffer<Reader> buffer = new ObjectBuffer<Reader>(); 
-		opener.setReceiver(buffer);	
+		opener.setReceiver(buffer);		
 		opener.process(file.getAbsolutePath());
 		opener.closeStream();
 
 		final Reader reader = buffer.pop();
-		try {
-			int i = 0;
-			int c;
-			while ((c = reader.read()) != -1) {
-				assertTrue("File contains more data than expected", i < INPUT.length());
-				assertEquals("File contains unexpected characters", INPUT.charAt(i), c);
-				i += 1;
-			}
-		} finally {
-			reader.close();
-		}
+		final String charsFromFile;
+		try { charsFromFile = IOUtils.toString(reader); }
+		finally { reader.close(); }
+		
+		assertEquals(DATA, charsFromFile);
 	}
 
 }