Browse Source

Merge pull request #57 from csmith/test-deps

Fix test deprecations.
pull/58/head
Greg Holmes 7 years ago
parent
commit
3805192dc2

+ 2
- 3
src/test/java/com/dmdirc/util/collections/ObservableListDecoratorTest.java View File

25
 import java.util.Arrays;
25
 import java.util.Arrays;
26
 import java.util.LinkedList;
26
 import java.util.LinkedList;
27
 import java.util.List;
27
 import java.util.List;
28
-
29
 import org.junit.Before;
28
 import org.junit.Before;
30
 import org.junit.Test;
29
 import org.junit.Test;
31
 
30
 
32
 import static org.junit.Assert.assertEquals;
31
 import static org.junit.Assert.assertEquals;
33
 import static org.junit.Assert.assertFalse;
32
 import static org.junit.Assert.assertFalse;
34
 import static org.junit.Assert.assertTrue;
33
 import static org.junit.Assert.assertTrue;
34
+import static org.mockito.ArgumentMatchers.any;
35
 import static org.mockito.Mockito.anyInt;
35
 import static org.mockito.Mockito.anyInt;
36
-import static org.mockito.Mockito.anyObject;
37
 import static org.mockito.Mockito.mock;
36
 import static org.mockito.Mockito.mock;
38
 import static org.mockito.Mockito.never;
37
 import static org.mockito.Mockito.never;
39
 import static org.mockito.Mockito.verify;
38
 import static org.mockito.Mockito.verify;
92
     @Test
91
     @Test
93
     public void testClearingEmptyListDoesntFireListener() {
92
     public void testClearingEmptyListDoesntFireListener() {
94
         obslist.clear();
93
         obslist.clear();
95
-        verify(observer, never()).onItemsRemoved(anyObject(), anyInt(), anyInt());
94
+        verify(observer, never()).onItemsRemoved(any(), anyInt(), anyInt());
96
     }
95
     }
97
 
96
 
98
     @Test
97
     @Test

+ 1
- 4
src/test/java/com/dmdirc/util/io/DownloaderTest.java View File

26
 import com.google.common.collect.Maps;
26
 import com.google.common.collect.Maps;
27
 import com.google.common.jimfs.Configuration;
27
 import com.google.common.jimfs.Configuration;
28
 import com.google.common.jimfs.Jimfs;
28
 import com.google.common.jimfs.Jimfs;
29
-
30
 import java.io.ByteArrayInputStream;
29
 import java.io.ByteArrayInputStream;
31
 import java.io.ByteArrayOutputStream;
30
 import java.io.ByteArrayOutputStream;
32
 import java.io.IOException;
31
 import java.io.IOException;
36
 import java.nio.file.Files;
35
 import java.nio.file.Files;
37
 import java.nio.file.Path;
36
 import java.nio.file.Path;
38
 import java.util.Map;
37
 import java.util.Map;
39
-
40
 import org.junit.Before;
38
 import org.junit.Before;
41
 import org.junit.Test;
39
 import org.junit.Test;
42
 import org.junit.runner.RunWith;
40
 import org.junit.runner.RunWith;
46
 import static org.junit.Assert.assertEquals;
44
 import static org.junit.Assert.assertEquals;
47
 import static org.junit.Assert.assertFalse;
45
 import static org.junit.Assert.assertFalse;
48
 import static org.junit.Assert.assertTrue;
46
 import static org.junit.Assert.assertTrue;
47
+import static org.mockito.ArgumentMatchers.anyBoolean;
49
 import static org.mockito.ArgumentMatchers.anyFloat;
48
 import static org.mockito.ArgumentMatchers.anyFloat;
50
-import static org.mockito.Matchers.anyBoolean;
51
-import static org.mockito.Matchers.anyInt;
52
 import static org.mockito.Mockito.atLeastOnce;
49
 import static org.mockito.Mockito.atLeastOnce;
53
 import static org.mockito.Mockito.never;
50
 import static org.mockito.Mockito.never;
54
 import static org.mockito.Mockito.verify;
51
 import static org.mockito.Mockito.verify;

+ 2
- 2
src/test/java/com/dmdirc/util/io/StreamReaderTest.java View File

28
 import org.junit.runner.RunWith;
28
 import org.junit.runner.RunWith;
29
 import org.mockito.runners.MockitoJUnitRunner;
29
 import org.mockito.runners.MockitoJUnitRunner;
30
 
30
 
31
-import static org.mockito.Matchers.any;
32
-import static org.mockito.Matchers.anyInt;
31
+import static org.mockito.ArgumentMatchers.any;
32
+import static org.mockito.ArgumentMatchers.anyInt;
33
 import static org.mockito.Mockito.atLeastOnce;
33
 import static org.mockito.Mockito.atLeastOnce;
34
 import static org.mockito.Mockito.spy;
34
 import static org.mockito.Mockito.spy;
35
 import static org.mockito.Mockito.verify;
35
 import static org.mockito.Mockito.verify;

Loading…
Cancel
Save