Improve test a bit.

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

@@ -26,22 +26,22 @@ 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.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.atLeastOnce;
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
 @SuppressWarnings("resource")
 @RunWith(MockitoJUnitRunner.class)
 public class StreamUtilsTest {
 
+    @Rule public ExpectedException thrown = ExpectedException.none();
     @Mock private Closeable closeable;
 
     @Test
@@ -52,9 +52,13 @@ public class StreamUtilsTest {
 
     @Test
     public void testReadStream() throws Exception {
-        final InputStream inputStream = spy(getClass().getResource("test5.txt").openStream());
+        final InputStream inputStream = getClass().getResource("test5.txt").openStream();
         StreamUtils.readStream(inputStream);
-        verify(inputStream, atLeastOnce()).read(any(byte[].class), anyInt(), anyInt());
+        inputStream.close();
+        thrown.expect(IOException.class);
+        thrown.expectMessage("Stream closed");
+        final int result = inputStream.read();
+        assertEquals(-1, result);
     }
 
     @Test