From 94dd7e0e0c429f10500081d56784a6f20fcff3d4 Mon Sep 17 00:00:00 2001 From: Gabriel Barbier Date: Mon, 3 Apr 2023 17:19:45 +0200 Subject: [PATCH 1/2] Update Mockito and JUnit --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 9f0aea199..f8d76e534 100644 --- a/pom.xml +++ b/pom.xml @@ -55,9 +55,9 @@ 6.0.0 2.1.1 - 5.8.2 + 5.9.2 1.15.3 - 4.4.0 + 5.2.0 1.3 1.19.0 @@ -429,7 +429,7 @@ uk.org.webcompere system-stubs-jupiter - 1.2.0 + 2.0.2 test From 582bd665b7a9d501944150feaffaf7d3eaa4b012 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Thu, 13 Apr 2023 13:22:37 +0200 Subject: [PATCH 2/2] Applied replacement: Mockito.any() ==> Mockito.any(Object[].class) Co-authored-by: Gabriel Barbier --- src/test/java/org/gitlab4j/api/TestCommitDiscussionsApi.java | 2 +- src/test/java/org/gitlab4j/api/TestEpicDiscussionsApi.java | 2 +- .../java/org/gitlab4j/api/TestExternalStatusCheckApi.java | 4 ++-- src/test/java/org/gitlab4j/api/TestIssueDiscussionsApi.java | 2 +- .../java/org/gitlab4j/api/TestMergeRequestDiscussionsApi.java | 2 +- src/test/java/org/gitlab4j/api/TestReleaseLinksApi.java | 2 +- src/test/java/org/gitlab4j/api/TestSnippetDiscussionsApi.java | 2 +- src/test/java/org/gitlab4j/api/TestStreams.java | 2 +- src/test/java/org/gitlab4j/api/TestUnitMergeRequestApi.java | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/java/org/gitlab4j/api/TestCommitDiscussionsApi.java b/src/test/java/org/gitlab4j/api/TestCommitDiscussionsApi.java index e6c083aca..00ace3d0f 100644 --- a/src/test/java/org/gitlab4j/api/TestCommitDiscussionsApi.java +++ b/src/test/java/org/gitlab4j/api/TestCommitDiscussionsApi.java @@ -35,7 +35,7 @@ public void setUp() throws Exception { response = new MockResponse(Discussion.class, null, "commit-discussions.json"); when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient); when(gitLabApiClient.validateSecretToken(any())).thenReturn(true); - when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any())).thenReturn(response); + when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response); } @Test diff --git a/src/test/java/org/gitlab4j/api/TestEpicDiscussionsApi.java b/src/test/java/org/gitlab4j/api/TestEpicDiscussionsApi.java index 47f9d5312..329cfcd39 100644 --- a/src/test/java/org/gitlab4j/api/TestEpicDiscussionsApi.java +++ b/src/test/java/org/gitlab4j/api/TestEpicDiscussionsApi.java @@ -34,7 +34,7 @@ public void setUp() throws Exception { response = new MockResponse(Discussion.class, null, "epic-discussions.json"); when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient); when(gitLabApiClient.validateSecretToken(any())).thenReturn(true); - when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any())).thenReturn(response); + when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response); } @Test diff --git a/src/test/java/org/gitlab4j/api/TestExternalStatusCheckApi.java b/src/test/java/org/gitlab4j/api/TestExternalStatusCheckApi.java index fd5010936..c9f539ff0 100644 --- a/src/test/java/org/gitlab4j/api/TestExternalStatusCheckApi.java +++ b/src/test/java/org/gitlab4j/api/TestExternalStatusCheckApi.java @@ -64,7 +64,7 @@ private void initGetExternalStatusChecks() throws Exception, IOException { response = new MockResponse(ExternalStatusCheck.class, null, "external-status-checks.json"); when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient); when(gitLabApiClient.validateSecretToken(any())).thenReturn(true); - when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any())).thenReturn(response); + when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response); } @Test @@ -96,6 +96,6 @@ private void initGetExternalStatusCheckStatuses() throws Exception, IOException response = new MockResponse(ExternalStatusCheckStatus.class, null, "external-status-check-statuses.json"); when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient); when(gitLabApiClient.validateSecretToken(any())).thenReturn(true); - when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any())).thenReturn(response); + when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response); } } diff --git a/src/test/java/org/gitlab4j/api/TestIssueDiscussionsApi.java b/src/test/java/org/gitlab4j/api/TestIssueDiscussionsApi.java index f78e907a3..1b0db64c1 100644 --- a/src/test/java/org/gitlab4j/api/TestIssueDiscussionsApi.java +++ b/src/test/java/org/gitlab4j/api/TestIssueDiscussionsApi.java @@ -34,7 +34,7 @@ public void setUp() throws Exception { response = new MockResponse(Discussion.class, null, "issue-discussions.json"); when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient); when(gitLabApiClient.validateSecretToken(any())).thenReturn(true); - when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any())).thenReturn(response); + when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response); } @Test diff --git a/src/test/java/org/gitlab4j/api/TestMergeRequestDiscussionsApi.java b/src/test/java/org/gitlab4j/api/TestMergeRequestDiscussionsApi.java index 26a51ed71..2dd0bfa44 100644 --- a/src/test/java/org/gitlab4j/api/TestMergeRequestDiscussionsApi.java +++ b/src/test/java/org/gitlab4j/api/TestMergeRequestDiscussionsApi.java @@ -34,7 +34,7 @@ public void setUp() throws Exception { response = new MockResponse(Discussion.class, null, "merge-request-discussions.json"); when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient); when(gitLabApiClient.validateSecretToken(any())).thenReturn(true); - when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any())).thenReturn(response); + when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response); } @Test diff --git a/src/test/java/org/gitlab4j/api/TestReleaseLinksApi.java b/src/test/java/org/gitlab4j/api/TestReleaseLinksApi.java index cf7cf691e..ffac0b2f2 100644 --- a/src/test/java/org/gitlab4j/api/TestReleaseLinksApi.java +++ b/src/test/java/org/gitlab4j/api/TestReleaseLinksApi.java @@ -63,6 +63,6 @@ private void initGetLinks() throws Exception, IOException { response = new MockResponse(Link.class, null, "links.json"); when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient); when(gitLabApiClient.validateSecretToken(any())).thenReturn(true); - when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any())).thenReturn(response); + when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response); } } diff --git a/src/test/java/org/gitlab4j/api/TestSnippetDiscussionsApi.java b/src/test/java/org/gitlab4j/api/TestSnippetDiscussionsApi.java index e62272523..cf2b6197b 100644 --- a/src/test/java/org/gitlab4j/api/TestSnippetDiscussionsApi.java +++ b/src/test/java/org/gitlab4j/api/TestSnippetDiscussionsApi.java @@ -34,7 +34,7 @@ public void setUp() throws Exception { response = new MockResponse(Discussion.class, null, "snippet-discussions.json"); when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient); when(gitLabApiClient.validateSecretToken(any())).thenReturn(true); - when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any())).thenReturn(response); + when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response); } @Test diff --git a/src/test/java/org/gitlab4j/api/TestStreams.java b/src/test/java/org/gitlab4j/api/TestStreams.java index 61b8df85f..e4df351e8 100644 --- a/src/test/java/org/gitlab4j/api/TestStreams.java +++ b/src/test/java/org/gitlab4j/api/TestStreams.java @@ -48,7 +48,7 @@ public void setup() throws Exception { response = new MockResponse(User.class, null, "user-list.json"); when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient); when(gitLabApiClient.validateSecretToken(any())).thenReturn(true); - when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any())).thenReturn(response); + when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response); } @Test diff --git a/src/test/java/org/gitlab4j/api/TestUnitMergeRequestApi.java b/src/test/java/org/gitlab4j/api/TestUnitMergeRequestApi.java index 57d0e4cdd..683e4f3ee 100644 --- a/src/test/java/org/gitlab4j/api/TestUnitMergeRequestApi.java +++ b/src/test/java/org/gitlab4j/api/TestUnitMergeRequestApi.java @@ -33,7 +33,7 @@ public void setUp() throws Exception { when(mockGitLabApi.getApiClient()).thenReturn(mockedGitLabApiClient); when(mockedGitLabApiClient.validateSecretToken(any())).thenReturn(true); - when(mockedGitLabApiClient.put(attributeCaptor.capture(), Mockito.any())) + when(mockedGitLabApiClient.put(attributeCaptor.capture(), Mockito.any(Object[].class))) .thenReturn(mockedResponse); }