Переглянути джерело

Improve test a bit.

pull/49/head
Greg Holmes 9 роки тому
джерело
коміт
d7cc208e09
1 змінених файлів з 10 додано та 6 видалено
  1. 10
    6
      test/com/dmdirc/util/io/StreamUtilsTest.java

+ 10
- 6
test/com/dmdirc/util/io/StreamUtilsTest.java Переглянути файл

26
 import java.io.IOException;
26
 import java.io.IOException;
27
 import java.io.InputStream;
27
 import java.io.InputStream;
28
 
28
 
29
+import org.junit.Rule;
29
 import org.junit.Test;
30
 import org.junit.Test;
31
+import org.junit.rules.ExpectedException;
30
 import org.junit.runner.RunWith;
32
 import org.junit.runner.RunWith;
31
 import org.mockito.Mock;
33
 import org.mockito.Mock;
32
 import org.mockito.runners.MockitoJUnitRunner;
34
 import org.mockito.runners.MockitoJUnitRunner;
33
 
35
 
34
-import static org.mockito.Matchers.any;
35
-import static org.mockito.Matchers.anyInt;
36
-import static org.mockito.Mockito.atLeastOnce;
36
+import static org.junit.Assert.assertEquals;
37
 import static org.mockito.Mockito.doThrow;
37
 import static org.mockito.Mockito.doThrow;
38
-import static org.mockito.Mockito.spy;
39
 import static org.mockito.Mockito.verify;
38
 import static org.mockito.Mockito.verify;
40
 
39
 
41
 @SuppressWarnings("resource")
40
 @SuppressWarnings("resource")
42
 @RunWith(MockitoJUnitRunner.class)
41
 @RunWith(MockitoJUnitRunner.class)
43
 public class StreamUtilsTest {
42
 public class StreamUtilsTest {
44
 
43
 
44
+    @Rule public ExpectedException thrown = ExpectedException.none();
45
     @Mock private Closeable closeable;
45
     @Mock private Closeable closeable;
46
 
46
 
47
     @Test
47
     @Test
52
 
52
 
53
     @Test
53
     @Test
54
     public void testReadStream() throws Exception {
54
     public void testReadStream() throws Exception {
55
-        final InputStream inputStream = spy(getClass().getResource("test5.txt").openStream());
55
+        final InputStream inputStream = getClass().getResource("test5.txt").openStream();
56
         StreamUtils.readStream(inputStream);
56
         StreamUtils.readStream(inputStream);
57
-        verify(inputStream, atLeastOnce()).read(any(byte[].class), anyInt(), anyInt());
57
+        inputStream.close();
58
+        thrown.expect(IOException.class);
59
+        thrown.expectMessage("Stream closed");
60
+        final int result = inputStream.read();
61
+        assertEquals(-1, result);
58
     }
62
     }
59
 
63
 
60
     @Test
64
     @Test

Завантаження…
Відмінити
Зберегти