Merge pull request #49 from greboid/dev2

Add a horrible unit test for StreamUtils.

build.gradle

@@ -30,7 +30,7 @@ dependencies {
     compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.0'
 
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.17'
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.17'
     testCompile group: 'com.google.jimfs', name: 'jimfs', version: '1.0'
 }
 

test/com/dmdirc/util/io/StreamUtilsTest.java

@@ -24,12 +24,16 @@ package com.dmdirc.util.io;
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.io.InputStream;
 
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.verify;
 
@@ -37,6 +41,7 @@ import static org.mockito.Mockito.verify;
 @RunWith(MockitoJUnitRunner.class)
 public class StreamUtilsTest {
 
+    @Rule public ExpectedException thrown = ExpectedException.none();
     @Mock private Closeable closeable;
 
     @Test
@@ -45,6 +50,17 @@ public class StreamUtilsTest {
         StreamUtils.close(null);
     }
 
+    @Test
+    public void testReadStream() throws Exception {
+        final InputStream inputStream = getClass().getResource("test5.txt").openStream();
+        StreamUtils.readStream(inputStream);
+        inputStream.close();
+        thrown.expect(IOException.class);
+        thrown.expectMessage("Stream closed");
+        final int result = inputStream.read();
+        assertEquals(-1, result);
+    }
+
     @Test
     public void testCloseWithIoException() throws IOException {
         doThrow(new IOException("Oops")).when(closeable).close();