Selaa lähdekoodia

Merge pull request #140 from csmith/test-deps

Fix test deprecations
pull/141/head
Greg Holmes 7 vuotta sitten
vanhempi
commit
8c21b83aee

+ 13
- 6
irc/src/test/java/com/dmdirc/parser/irc/IRCReaderTest.java Näytä tiedosto

24
 
24
 
25
 import com.dmdirc.parser.interfaces.Encoder;
25
 import com.dmdirc.parser.interfaces.Encoder;
26
 import com.dmdirc.parser.irc.IRCReader.ReadLine;
26
 import com.dmdirc.parser.irc.IRCReader.ReadLine;
27
-
28
 import java.io.ByteArrayInputStream;
27
 import java.io.ByteArrayInputStream;
29
 import java.io.IOException;
28
 import java.io.IOException;
30
 import java.io.InputStream;
29
 import java.io.InputStream;
31
 import java.nio.charset.Charset;
30
 import java.nio.charset.Charset;
32
 import java.text.SimpleDateFormat;
31
 import java.text.SimpleDateFormat;
33
-import java.util.Arrays;
34
 import java.util.Date;
32
 import java.util.Date;
35
-
36
 import org.junit.Assert;
33
 import org.junit.Assert;
37
 import org.junit.Test;
34
 import org.junit.Test;
38
 
35
 
39
-import static org.junit.Assert.*;
40
-import static org.mockito.Mockito.*;
36
+import static org.junit.Assert.assertArrayEquals;
37
+import static org.junit.Assert.assertEquals;
38
+import static org.junit.Assert.assertNull;
39
+import static org.junit.Assert.assertTrue;
40
+import static org.mockito.Mockito.any;
41
+import static org.mockito.Mockito.anyInt;
42
+import static org.mockito.Mockito.anyString;
43
+import static org.mockito.Mockito.eq;
44
+import static org.mockito.Mockito.isNull;
45
+import static org.mockito.Mockito.mock;
46
+import static org.mockito.Mockito.verify;
47
+import static org.mockito.Mockito.when;
41
 
48
 
42
 public class IRCReaderTest {
49
 public class IRCReaderTest {
43
 
50
 
72
         final Encoder encoder = mock(Encoder.class);
79
         final Encoder encoder = mock(Encoder.class);
73
 
80
 
74
         when(encoder.encode(isNull(), isNull(),
81
         when(encoder.encode(isNull(), isNull(),
75
-                anyObject(), anyInt(), eq(3)))
82
+                any(), anyInt(), eq(3)))
76
                 .thenReturn("encoded");
83
                 .thenReturn("encoded");
77
 
84
 
78
         final IRCReader reader = new IRCReader(stream, encoder);
85
         final IRCReader reader = new IRCReader(stream, encoder);

+ 4
- 4
irc/src/test/java/com/dmdirc/parser/irc/processors/Process001Test.java Näytä tiedosto

36
 import static org.junit.Assert.assertEquals;
36
 import static org.junit.Assert.assertEquals;
37
 import static org.junit.Assert.assertTrue;
37
 import static org.junit.Assert.assertTrue;
38
 import static org.junit.Assume.assumeFalse;
38
 import static org.junit.Assume.assumeFalse;
39
-import static org.mockito.Matchers.any;
40
-import static org.mockito.Matchers.anyBoolean;
41
-import static org.mockito.Matchers.anyString;
42
-import static org.mockito.Matchers.eq;
39
+import static org.mockito.ArgumentMatchers.any;
40
+import static org.mockito.ArgumentMatchers.anyBoolean;
41
+import static org.mockito.ArgumentMatchers.anyString;
42
+import static org.mockito.ArgumentMatchers.eq;
43
 import static org.mockito.Mockito.doAnswer;
43
 import static org.mockito.Mockito.doAnswer;
44
 import static org.mockito.Mockito.mock;
44
 import static org.mockito.Mockito.mock;
45
 import static org.mockito.Mockito.never;
45
 import static org.mockito.Mockito.never;

Loading…
Peruuta
Tallenna