Skip to content

Commit 5f5d7cf

Browse files
tomdesairtomdesair
committed
Update Mockito version
1 parent 3717050 commit 5f5d7cf

32 files changed

+183
-185
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ jdk:
55
- oraclejdk11
66
- oraclejdk9
77
- openjdk8
8-
- openjdk7
98
# https://docs.travis-ci.com/user/reference/trusty/#jvm-clojure-groovy-java-scala-images
109
# Oracle JDK 10 is not provided because it reached End of Life in October 2018.
1110

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
</dependency>
7070
<dependency>
7171
<groupId>org.mockito</groupId>
72-
<artifactId>mockito-all</artifactId>
73-
<version>1.10.19</version>
72+
<artifactId>mockito-core</artifactId>
73+
<version>2.23.4</version>
7474
<scope>test</scope>
7575
</dependency>
7676
<dependency>

‎src/main/java/me/desair/tus/server/util/TusServletRequest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@
1616
import javax.servlet.http.HttpServletRequest;
1717
import javax.servlet.http.HttpServletRequestWrapper;
1818

19-
import org.apache.commons.codec.binary.Base64;
20-
import org.apache.commons.io.input.CountingInputStream;
21-
import org.apache.commons.lang3.StringUtils;
22-
2319
import me.desair.tus.server.HttpHeader;
2420
import me.desair.tus.server.TusExtension;
2521
import me.desair.tus.server.checksum.ChecksumAlgorithm;
22+
import org.apache.commons.codec.binary.Base64;
23+
import org.apache.commons.io.input.CountingInputStream;
24+
import org.apache.commons.lang3.StringUtils;
2625

2726
public class TusServletRequest extends HttpServletRequestWrapper {
2827

‎src/test/java/me/desair/tus/server/AbstractTusExtensionIntegrationTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import static org.hamcrest.CoreMatchers.is;
44
import static org.hamcrest.MatcherAssert.assertThat;
55
import static org.hamcrest.Matchers.containsInAnyOrder;
6-
import static org.mockito.Matchers.any;
7-
import static org.mockito.Matchers.anyString;
6+
import static org.mockito.ArgumentMatchers.any;
7+
import static org.mockito.ArgumentMatchers.nullable;
88
import static org.mockito.Mockito.when;
99

1010
import java.io.IOException;
@@ -22,13 +22,13 @@
2222
import org.apache.commons.io.IOUtils;
2323
import org.junit.runner.RunWith;
2424
import org.mockito.Mock;
25-
import org.mockito.runners.MockitoJUnitRunner;
25+
import org.mockito.junit.MockitoJUnitRunner;
2626
import org.slf4j.Logger;
2727
import org.slf4j.LoggerFactory;
2828
import org.springframework.mock.web.MockHttpServletRequest;
2929
import org.springframework.mock.web.MockHttpServletResponse;
3030

31-
@RunWith(MockitoJUnitRunner.class)
31+
@RunWith(MockitoJUnitRunner.Silent.class)
3232
public abstract class AbstractTusExtensionIntegrationTest {
3333

3434
private static final Logger log = LoggerFactory.getLogger(AbstractTusExtensionIntegrationTest.class);
@@ -48,7 +48,7 @@ protected void prepareUploadInfo(Long offset, Long length) throws IOException, T
4848
uploadInfo = new UploadInfo();
4949
uploadInfo.setOffset(offset);
5050
uploadInfo.setLength(length);
51-
when(uploadStorageService.getUploadInfo(anyString(), anyString())).thenReturn(uploadInfo);
51+
when(uploadStorageService.getUploadInfo(nullable(String.class), nullable(String.class))).thenReturn(uploadInfo);
5252
when(uploadStorageService.append(any(UploadInfo.class), any(InputStream.class))).thenReturn(uploadInfo);
5353
}
5454

‎src/test/java/me/desair/tus/server/checksum/ChecksumPatchRequestHandlerTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import static org.hamcrest.CoreMatchers.is;
44
import static org.hamcrest.MatcherAssert.assertThat;
5-
import static org.mockito.Matchers.any;
6-
import static org.mockito.Matchers.anyString;
5+
import static org.mockito.ArgumentMatchers.any;
6+
import static org.mockito.ArgumentMatchers.nullable;
77
import static org.mockito.Mockito.never;
88
import static org.mockito.Mockito.times;
99
import static org.mockito.Mockito.verify;
@@ -21,9 +21,9 @@
2121
import org.junit.runner.RunWith;
2222
import org.mockito.Matchers;
2323
import org.mockito.Mock;
24-
import org.mockito.runners.MockitoJUnitRunner;
24+
import org.mockito.junit.MockitoJUnitRunner;
2525

26-
@RunWith(MockitoJUnitRunner.class)
26+
@RunWith(MockitoJUnitRunner.Silent.class)
2727
public class ChecksumPatchRequestHandlerTest {
2828

2929
private ChecksumPatchRequestHandler handler;
@@ -41,7 +41,7 @@ public void setUp() throws Exception {
4141
UploadInfo info = new UploadInfo();
4242
info.setOffset(2L);
4343
info.setLength(10L);
44-
when(uploadStorageService.getUploadInfo(anyString(), anyString())).thenReturn(info);
44+
when(uploadStorageService.getUploadInfo(nullable(String.class), nullable(String.class))).thenReturn(info);
4545
}
4646

4747
@Test

‎src/test/java/me/desair/tus/server/checksum/validation/ChecksumAlgorithmValidatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
import org.junit.Test;
1616
import org.junit.runner.RunWith;
1717
import org.mockito.Mock;
18-
import org.mockito.runners.MockitoJUnitRunner;
18+
import org.mockito.junit.MockitoJUnitRunner;
1919
import org.springframework.mock.web.MockHttpServletRequest;
2020

21-
@RunWith(MockitoJUnitRunner.class)
21+
@RunWith(MockitoJUnitRunner.Silent.class)
2222
public class ChecksumAlgorithmValidatorTest {
2323

2424
private ChecksumAlgorithmValidator validator;

‎src/test/java/me/desair/tus/server/concatenation/ConcatenationHeadRequestHandlerTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import static org.hamcrest.CoreMatchers.is;
44
import static org.hamcrest.CoreMatchers.nullValue;
55
import static org.hamcrest.MatcherAssert.assertThat;
6-
import static org.mockito.Matchers.anyString;
7-
import static org.mockito.Matchers.eq;
6+
import static org.mockito.ArgumentMatchers.eq;
7+
import static org.mockito.ArgumentMatchers.nullable;
88
import static org.mockito.Mockito.never;
99
import static org.mockito.Mockito.times;
1010
import static org.mockito.Mockito.verify;
@@ -24,11 +24,11 @@
2424
import org.junit.Test;
2525
import org.junit.runner.RunWith;
2626
import org.mockito.Mock;
27-
import org.mockito.runners.MockitoJUnitRunner;
27+
import org.mockito.junit.MockitoJUnitRunner;
2828
import org.springframework.mock.web.MockHttpServletRequest;
2929
import org.springframework.mock.web.MockHttpServletResponse;
3030

31-
@RunWith(MockitoJUnitRunner.class)
31+
@RunWith(MockitoJUnitRunner.Silent.class)
3232
public class ConcatenationHeadRequestHandlerTest {
3333

3434
private ConcatenationHeadRequestHandler handler;
@@ -70,7 +70,7 @@ public void testRegularUpload() throws Exception {
7070
info1.setUploadConcatHeaderValue("Impossible");
7171
info1.setUploadType(UploadType.REGULAR);
7272

73-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), anyString())).thenReturn(info1);
73+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
7474
servletRequest.setRequestURI(info1.getId().toString());
7575

7676
handler.process(HttpMethod.HEAD, new TusServletRequest(servletRequest),
@@ -86,7 +86,7 @@ public void testPartialUpload() throws Exception {
8686
info1.setUploadConcatHeaderValue("partial");
8787
info1.setUploadType(UploadType.PARTIAL);
8888

89-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), anyString())).thenReturn(info1);
89+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
9090
servletRequest.setRequestURI(info1.getId().toString());
9191

9292
handler.process(HttpMethod.HEAD, new TusServletRequest(servletRequest),
@@ -104,7 +104,7 @@ public void testConcatenatedUploadWithLength() throws Exception {
104104
info1.setOffset(10L);
105105
info1.setUploadType(UploadType.CONCATENATED);
106106

107-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), anyString())).thenReturn(info1);
107+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
108108
servletRequest.setRequestURI(info1.getId().toString());
109109

110110
handler.process(HttpMethod.HEAD, new TusServletRequest(servletRequest),
@@ -126,7 +126,7 @@ public void testConcatenatedUploadWithoutLength() throws Exception {
126126
info1.setOffset(8L);
127127
info1.setUploadType(UploadType.CONCATENATED);
128128

129-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), anyString())).thenReturn(info1);
129+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
130130
servletRequest.setRequestURI(info1.getId().toString());
131131

132132
handler.process(HttpMethod.HEAD, new TusServletRequest(servletRequest),

‎src/test/java/me/desair/tus/server/concatenation/ConcatenationPostRequestHandlerTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import static org.hamcrest.CoreMatchers.is;
44
import static org.hamcrest.CoreMatchers.nullValue;
55
import static org.hamcrest.MatcherAssert.assertThat;
6-
import static org.mockito.Matchers.any;
7-
import static org.mockito.Matchers.anyString;
8-
import static org.mockito.Matchers.eq;
6+
import static org.mockito.ArgumentMatchers.any;
7+
import static org.mockito.ArgumentMatchers.eq;
8+
import static org.mockito.ArgumentMatchers.nullable;
99
import static org.mockito.Mockito.never;
1010
import static org.mockito.Mockito.times;
1111
import static org.mockito.Mockito.verify;
@@ -25,11 +25,11 @@
2525
import org.junit.Test;
2626
import org.junit.runner.RunWith;
2727
import org.mockito.Mock;
28-
import org.mockito.runners.MockitoJUnitRunner;
28+
import org.mockito.junit.MockitoJUnitRunner;
2929
import org.springframework.mock.web.MockHttpServletRequest;
3030
import org.springframework.mock.web.MockHttpServletResponse;
3131

32-
@RunWith(MockitoJUnitRunner.class)
32+
@RunWith(MockitoJUnitRunner.Silent.class)
3333
public class ConcatenationPostRequestHandlerTest {
3434

3535
private ConcatenationPostRequestHandler handler;
@@ -71,7 +71,7 @@ public void testRegularUpload() throws Exception {
7171
UploadInfo info1 = new UploadInfo();
7272
info1.setId(UUID.randomUUID());
7373

74-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), anyString())).thenReturn(info1);
74+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
7575
response.setHeader(HttpHeader.LOCATION, info1.getId().toString());
7676

7777
handler.process(HttpMethod.POST, new TusServletRequest(servletRequest), response, uploadStorageService, null);
@@ -90,7 +90,7 @@ public void testPartialUpload() throws Exception {
9090
UploadInfo info1 = new UploadInfo();
9191
info1.setId(UUID.randomUUID());
9292

93-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), anyString())).thenReturn(info1);
93+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
9494
response.setHeader(HttpHeader.LOCATION, info1.getId().toString());
9595
servletRequest.addHeader(HttpHeader.UPLOAD_CONCAT, "partial");
9696

@@ -110,7 +110,7 @@ public void testFinalUpload() throws Exception {
110110
UploadInfo info1 = new UploadInfo();
111111
info1.setId(UUID.randomUUID());
112112

113-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), anyString())).thenReturn(info1);
113+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
114114
response.setHeader(HttpHeader.LOCATION, info1.getId().toString());
115115
servletRequest.addHeader(HttpHeader.UPLOAD_CONCAT, "final; 123 456");
116116

‎src/test/java/me/desair/tus/server/concatenation/validation/PartialUploadsExistValidatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
import org.junit.Test;
1616
import org.junit.runner.RunWith;
1717
import org.mockito.Mock;
18-
import org.mockito.runners.MockitoJUnitRunner;
18+
import org.mockito.junit.MockitoJUnitRunner;
1919
import org.springframework.mock.web.MockHttpServletRequest;
2020

21-
@RunWith(MockitoJUnitRunner.class)
21+
@RunWith(MockitoJUnitRunner.Silent.class)
2222
public class PartialUploadsExistValidatorTest {
2323

2424
private PartialUploadsExistValidator validator;

‎src/test/java/me/desair/tus/server/concatenation/validation/PatchFinalUploadValidatorTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import static org.hamcrest.MatcherAssert.assertThat;
44
import static org.hamcrest.Matchers.is;
55
import static org.junit.Assert.fail;
6-
import static org.mockito.Matchers.anyString;
7-
import static org.mockito.Matchers.eq;
6+
import static org.mockito.ArgumentMatchers.eq;
7+
import static org.mockito.ArgumentMatchers.nullable;
88
import static org.mockito.Mockito.when;
99

1010
import java.util.UUID;
@@ -18,10 +18,10 @@
1818
import org.junit.Test;
1919
import org.junit.runner.RunWith;
2020
import org.mockito.Mock;
21-
import org.mockito.runners.MockitoJUnitRunner;
21+
import org.mockito.junit.MockitoJUnitRunner;
2222
import org.springframework.mock.web.MockHttpServletRequest;
2323

24-
@RunWith(MockitoJUnitRunner.class)
24+
@RunWith(MockitoJUnitRunner.Silent.class)
2525
public class PatchFinalUploadValidatorTest {
2626

2727
private PatchFinalUploadValidator validator;
@@ -63,9 +63,9 @@ public void testValid() throws Exception {
6363
info3.setId(UUID.randomUUID());
6464
info3.setUploadType(null);
6565

66-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), anyString())).thenReturn(info1);
67-
when(uploadStorageService.getUploadInfo(eq(info2.getId().toString()), anyString())).thenReturn(info2);
68-
when(uploadStorageService.getUploadInfo(eq(info3.getId().toString()), anyString())).thenReturn(info3);
66+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
67+
when(uploadStorageService.getUploadInfo(eq(info2.getId().toString()), nullable(String.class))).thenReturn(info2);
68+
when(uploadStorageService.getUploadInfo(eq(info3.getId().toString()), nullable(String.class))).thenReturn(info3);
6969

7070
//When we validate the requests
7171
try {
@@ -101,7 +101,7 @@ public void testInvalidFinal() throws Exception {
101101
info1.setId(UUID.randomUUID());
102102
info1.setUploadType(UploadType.CONCATENATED);
103103

104-
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), anyString())).thenReturn(info1);
104+
when(uploadStorageService.getUploadInfo(eq(info1.getId().toString()), nullable(String.class))).thenReturn(info1);
105105

106106
//When we validate the request
107107
servletRequest.setRequestURI(info1.getId().toString());

0 commit comments

Comments
 (0)