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

Merge pull request #56 from csmith/master

Update dependencies.
pull/57/head
Greg Holmes 7 роки тому
джерело
коміт
efcdd0ca47

+ 2
- 2
build.gradle Переглянути файл

25
 
25
 
26
 dependencies {
26
 dependencies {
27
     compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
27
     compile group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
28
-    compile group: 'com.google.auto.value', name: 'auto-value', version: '1.2'
28
+    compile group: 'com.google.auto.value', name: 'auto-value', version: '1.3'
29
     compile group: 'com.google.guava', name:'guava', version: '19.0'
29
     compile group: 'com.google.guava', name:'guava', version: '19.0'
30
 
30
 
31
     testCompile group: 'junit', name: 'junit', version: '4.12'
31
     testCompile group: 'junit', name: 'junit', version: '4.12'
32
-    testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'
32
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '2.2.7'
33
     testCompile group: 'com.google.jimfs', name: 'jimfs', version: '1.1'
33
     testCompile group: 'com.google.jimfs', name: 'jimfs', version: '1.1'
34
 }
34
 }
35
 
35
 

+ 2
- 2
src/test/java/com/dmdirc/util/io/DownloaderTest.java Переглянути файл

46
 import static org.junit.Assert.assertEquals;
46
 import static org.junit.Assert.assertEquals;
47
 import static org.junit.Assert.assertFalse;
47
 import static org.junit.Assert.assertFalse;
48
 import static org.junit.Assert.assertTrue;
48
 import static org.junit.Assert.assertTrue;
49
+import static org.mockito.ArgumentMatchers.anyFloat;
49
 import static org.mockito.Matchers.anyBoolean;
50
 import static org.mockito.Matchers.anyBoolean;
50
 import static org.mockito.Matchers.anyInt;
51
 import static org.mockito.Matchers.anyInt;
51
 import static org.mockito.Mockito.atLeastOnce;
52
 import static org.mockito.Mockito.atLeastOnce;
70
                 "OMG IM A FAKE DOWNLOAD".getBytes("UTF-8"));
71
                 "OMG IM A FAKE DOWNLOAD".getBytes("UTF-8"));
71
         when(mockedConnection.getInputStream()).thenReturn(is);
72
         when(mockedConnection.getInputStream()).thenReturn(is);
72
         when(mockedConnection.getOutputStream()).thenReturn(os);
73
         when(mockedConnection.getOutputStream()).thenReturn(os);
73
-        when(mockedConnection.getLastModified()).thenReturn(10L, (Long)11L);
74
     }
74
     }
75
 
75
 
76
     @Test
76
     @Test
137
         assertEquals(Lists.newArrayList("OMG IM A FAKE DOWNLOAD"), Files.readAllLines(file,
137
         assertEquals(Lists.newArrayList("OMG IM A FAKE DOWNLOAD"), Files.readAllLines(file,
138
                 Charset.forName("UTF-8")));
138
                 Charset.forName("UTF-8")));
139
         verify(listener).setIndeterminate(anyBoolean());
139
         verify(listener).setIndeterminate(anyBoolean());
140
-        verify(listener, atLeastOnce()).downloadProgress(anyInt());
140
+        verify(listener, atLeastOnce()).downloadProgress(anyFloat());
141
     }
141
     }
142
 
142
 
143
     private class TestableDownloader extends Downloader {
143
     private class TestableDownloader extends Downloader {

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