Skip to content

Commit 4e38a84

Browse files
author
gdgate
authored
Merge pull request #1095 from gooddata/mockito
Replace Mockito deprecated APIs Reviewed-by: Jiri Mikulasek <jiri.mikulasek@gooddata.com> https://github.com/jimirocks
2 parents ff17b96 + 0503d0f commit 4e38a84

5 files changed

Lines changed: 23 additions & 31 deletions

File tree

‎gooddata-java/src/test/java/com/gooddata/sdk/service/AbstractServiceTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111
import org.springframework.http.HttpMethod;
1212
import org.springframework.http.HttpStatus;
1313
import org.springframework.http.client.ClientHttpResponse;
14-
import org.springframework.web.client.RequestCallback;
1514
import org.springframework.web.client.ResponseExtractor;
1615
import org.springframework.web.client.RestTemplate;
1716
import org.testng.annotations.BeforeMethod;
1817
import org.testng.annotations.Test;
1918

2019
import java.util.concurrent.TimeUnit;
2120

22-
import static org.mockito.Matchers.any;
21+
import static org.mockito.ArgumentMatchers.any;
2322
import static org.mockito.Mockito.mock;
2423
import static org.mockito.Mockito.when;
2524

‎gooddata-java/src/test/java/com/gooddata/sdk/service/dataload/processes/ProcessServiceTest.java‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,28 +30,22 @@
3030
import java.io.File;
3131
import java.io.FileOutputStream;
3232
import java.io.IOException;
33-
import java.io.InputStream;
3433
import java.net.URI;
3534
import java.util.Collection;
3635
import java.util.Random;
3736

3837
import static com.gooddata.sdk.common.util.ResourceUtils.OBJECT_MAPPER;
3938
import static java.lang.String.format;
4039
import static java.net.URI.create;
41-
import static java.util.Arrays.asList;
4240
import static org.hamcrest.CoreMatchers.is;
4341
import static org.hamcrest.MatcherAssert.assertThat;
44-
import static org.hamcrest.Matchers.contains;
4542
import static org.hamcrest.Matchers.empty;
4643
import static org.hamcrest.Matchers.hasSize;
47-
import static org.mockito.Matchers.any;
48-
import static org.mockito.Matchers.anyString;
49-
import static org.mockito.Matchers.eq;
50-
import static org.mockito.Matchers.notNull;
51-
import static org.mockito.Mockito.mock;
52-
import static org.mockito.Mockito.verify;
53-
import static org.mockito.Mockito.verifyZeroInteractions;
54-
import static org.mockito.Mockito.when;
44+
import static org.mockito.ArgumentMatchers.any;
45+
import static org.mockito.ArgumentMatchers.anyString;
46+
import static org.mockito.ArgumentMatchers.eq;
47+
import static org.mockito.ArgumentMatchers.notNull;
48+
import static org.mockito.Mockito.*;
5549
import static org.springframework.http.HttpMethod.GET;
5650
import static org.testng.Assert.assertNotNull;
5751
import static org.testng.Assert.assertTrue;
@@ -107,7 +101,7 @@ public void shouldDeploySmallProcessUsingAPI() throws Exception {
107101
assertNotNull(entityCaptor.getValue().getBody());
108102
assertTrue(entityCaptor.getValue().getBody() instanceof MultiValueMap);
109103

110-
verifyZeroInteractions(dataStoreService);
104+
verifyNoInteractions(dataStoreService);
111105
}
112106

113107
@Test
@@ -121,7 +115,7 @@ public void shouldDeployLargeProcessUsingWebDAV() throws Exception {
121115

122116
processService.createProcess(project, process, createProcessOfSize(2048));
123117

124-
verify(dataStoreService).upload(anyString(), notNull(InputStream.class));
118+
verify(dataStoreService).upload(anyString(), notNull());
125119
}
126120

127121
private static File createProcessOfSize(int size) throws Exception {

‎gooddata-java/src/test/java/com/gooddata/sdk/service/dataset/DatasetServiceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import static java.lang.String.format;
2929
import static org.hamcrest.MatcherAssert.assertThat;
3030
import static org.hamcrest.Matchers.nullValue;
31-
import static org.mockito.Matchers.anyString;
32-
import static org.mockito.Matchers.eq;
31+
import static org.mockito.ArgumentMatchers.anyString;
32+
import static org.mockito.ArgumentMatchers.eq;
3333
import static org.mockito.Mockito.doThrow;
3434
import static org.mockito.Mockito.when;
3535

‎gooddata-java/src/test/java/com/gooddata/sdk/service/md/MetadataServiceTest.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.gooddata.sdk.model.md.visualization.VisualizationClass;
1414
import com.gooddata.sdk.model.project.Project;
1515
import com.gooddata.sdk.service.GoodDataSettings;
16-
import org.mockito.Matchers;
1716
import org.mockito.Mock;
1817
import org.mockito.MockitoAnnotations;
1918
import org.springframework.http.HttpStatus;
@@ -29,6 +28,7 @@
2928
import static com.gooddata.sdk.common.util.ResourceUtils.readObjectFromResource;
3029
import static java.lang.String.format;
3130
import static java.util.Arrays.asList;
31+
import static java.util.Collections.singletonList;
3232
import static org.hamcrest.CoreMatchers.*;
3333
import static org.hamcrest.MatcherAssert.assertThat;
3434
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
@@ -61,7 +61,6 @@ public void testCreateObjNullResponse() {
6161
}
6262

6363
@Test(expectedExceptions = ObjCreateException.class)
64-
@SuppressWarnings("unchecked")
6564
public void testCreateObjGDRestException() {
6665
final Obj obj = mock(Obj.class);
6766
when(restTemplate.postForObject(Obj.URI, obj, UriResponse.class, PROJECT_ID))
@@ -82,7 +81,7 @@ public void testCreateObj() {
8281
final Obj obj = mock(Obj.class);
8382
final Obj resultObj = mock(Obj.class);
8483

85-
when(restTemplate.postForObject(eq(Obj.CREATE_WITH_ID_URI), eq(obj), Matchers.<Class<Obj>>any(), eq(PROJECT_ID)))
84+
when(restTemplate.postForObject(eq(Obj.CREATE_WITH_ID_URI), eq(obj), any(), eq(PROJECT_ID)))
8685
.thenReturn(resultObj);
8786

8887
final Obj result = service.createObj(project, obj);
@@ -139,7 +138,7 @@ public void testGetObjsByUrisNullUris() {
139138

140139
@Test
141140
public void testGetObjsByUris() {
142-
final BulkGetUris request = new BulkGetUris(Collections.singletonList(URI));
141+
final BulkGetUris request = new BulkGetUris(singletonList(URI));
143142
final BulkGet response = readObjectFromResource("/md/bulk-get.json", BulkGet.class);
144143
when(restTemplate.postForObject(BulkGet.URI, request, BulkGet.class, PROJECT_ID)).thenReturn(response);
145144

@@ -149,14 +148,14 @@ public void testGetObjsByUris() {
149148

150149
@Test(expectedExceptions = GoodDataException.class)
151150
public void testGetObjsByUrisWithClientSideHTTPError() {
152-
final BulkGetUris request = new BulkGetUris(Collections.singletonList(""));
151+
final BulkGetUris request = new BulkGetUris(singletonList(""));
153152
when(restTemplate.postForObject(BulkGet.URI, request, BulkGet.class, PROJECT_ID)).thenThrow(new RestClientException(""));
154153
service.getObjsByUris(project, request.getItems());
155154
}
156155

157156
@Test(expectedExceptions = GoodDataRestException.class)
158157
public void testGetObjsByUrisWithServerSideHTTPError() {
159-
final BulkGetUris request = new BulkGetUris(Collections.singletonList(""));
158+
final BulkGetUris request = new BulkGetUris(singletonList(""));
160159
when(restTemplate.postForObject(BulkGet.URI, request, BulkGet.class, PROJECT_ID)).thenThrow(new GoodDataRestException(500, "", "", "", ""));
161160
service.getObjsByUris(project, request.getItems());
162161
}
@@ -273,7 +272,7 @@ public void testGetObjUriToFindOneObjByTitle() {
273272
final String uri = "myURI";
274273
final String title = "myTitle";
275274
when(restTemplate.getForObject(Query.URI, Query.class, project.getId(), "queryables")).thenReturn(queryResult);
276-
when(queryResult.getEntries()).thenReturn(asList(resultEntry));
275+
when(queryResult.getEntries()).thenReturn(singletonList(resultEntry));
277276
when(resultEntry.getTitle()).thenReturn(title);
278277
when(resultEntry.getUri()).thenReturn(uri);
279278

@@ -298,7 +297,7 @@ public void testGetObjUriNothingFound() {
298297
final Entry resultEntry = mock(Entry.class);
299298
final String title = "myTitle";
300299
when(restTemplate.getForObject(Query.URI, Query.class, project.getId(), "queryables")).thenReturn(queryResult);
301-
when(queryResult.getEntries()).thenReturn(asList(resultEntry));
300+
when(queryResult.getEntries()).thenReturn(singletonList(resultEntry));
302301

303302
service.getObjUri(project, Queryable.class, Restriction.title(title));
304303
}
@@ -311,7 +310,7 @@ public void testGetObjToFindOneObjById() {
311310
final String uri = "myURI";
312311
final String id = "myId";
313312
when(restTemplate.getForObject(Query.URI, Query.class, project.getId(), "queryables")).thenReturn(queryResult);
314-
when(queryResult.getEntries()).thenReturn(asList(resultEntry));
313+
when(queryResult.getEntries()).thenReturn(singletonList(resultEntry));
315314
when(resultEntry.getIdentifier()).thenReturn(id);
316315
when(resultEntry.getUri()).thenReturn(uri);
317316
when(restTemplate.getForObject(uri, Queryable.class)).thenReturn(intendedResult);
@@ -337,7 +336,7 @@ public void testGetObjNothingFound() {
337336
final Entry resultEntry = mock(Entry.class);
338337
final String title = "myTitle";
339338
when(restTemplate.getForObject(Query.URI, Query.class, project.getId(), "queryables")).thenReturn(queryResult);
340-
when(queryResult.getEntries()).thenReturn(asList(resultEntry));
339+
when(queryResult.getEntries()).thenReturn(singletonList(resultEntry));
341340

342341
service.getObj(project, Queryable.class, Restriction.title(title));
343342
}

‎gooddata-java/src/test/java/com/gooddata/sdk/service/md/maintenance/ExportImportServiceTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
package com.gooddata.sdk.service.md.maintenance;
77

8-
import static org.mockito.Matchers.any;
9-
import static org.mockito.Matchers.eq;
8+
import static org.mockito.ArgumentMatchers.any;
9+
import static org.mockito.ArgumentMatchers.eq;
1010
import static org.mockito.Mockito.when;
1111

1212
import com.gooddata.sdk.common.GoodDataRestException;
@@ -41,15 +41,15 @@ public void setUp() throws Exception {
4141
}
4242

4343
@Test(expectedExceptions = ExportImportException.class)
44-
public void testCreatePartialExportError() throws Exception {
44+
public void testCreatePartialExportError() {
4545
when(restTemplate.postForObject(eq(PartialMdExport.URI), any(PartialMdExport.class), eq(PartialMdArtifact.class), eq(PROJECT_ID)))
4646
.thenThrow(new GoodDataRestException(400, "request", "Failed", "export", "error"));
4747

4848
service.partialExport(project, new PartialMdExport(false, false, "uri123"));
4949
}
5050

5151
@Test(expectedExceptions = ExportImportException.class)
52-
public void testCreatePartialImportError() throws Exception {
52+
public void testCreatePartialImportError() {
5353
when(restTemplate.postForObject(eq(PartialMdExportToken.URI), any(PartialMdExportToken.class), eq(UriResponse.class), eq(PROJECT_ID)))
5454
.thenThrow(new GoodDataRestException(400, "request", "Failed", "import", "error"));
5555

0 commit comments

Comments
 (0)