Skip to content

Commit

Permalink
Update to Mockito 4
Browse files Browse the repository at this point in the history
Import of `org.mockito.Matchers` needed to be changed to
`org.mockito.ArgumentMatchers`. `Matchers` was already only an alias
for `ArgumentMatchers` before as described in the release notes:
https://github.com/mockito/mockito/releases/tag/v4.0.0

`any()` is the replacement for `anyObject()`:
mockito/mockito#1931

Signed-off-by: Florian Hockmann <fh@florian-hockmann.de>
  • Loading branch information
FlorianHockmann committed Jun 22, 2022
1 parent a5f549f commit a27b68a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
Expand Up @@ -63,7 +63,6 @@
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.anyObject;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.eq;
Expand Down Expand Up @@ -306,7 +305,7 @@ private CredentialsProvider basicAuthTestBase(final Map<String, String> extraCon
);

final HttpAsyncClientBuilder hacb = mock(HttpAsyncClientBuilder.class);
doReturn(hacb).when(hacb).setDefaultCredentialsProvider(anyObject());
doReturn(hacb).when(hacb).setDefaultCredentialsProvider(any());
hccc.customizeHttpClient(hacb);

final ArgumentCaptor<BasicCredentialsProvider> cpCaptor = ArgumentCaptor.forClass(BasicCredentialsProvider.class);
Expand Down
Expand Up @@ -39,7 +39,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -59,7 +59,7 @@
<tinkerpop.version>3.5.3</tinkerpop.version>
<junit-platform.version>1.8.2</junit-platform.version>
<junit.version>5.8.2</junit.version>
<mockito.version>3.12.4</mockito.version>
<mockito.version>4.6.1</mockito.version>
<jamm.version>0.3.0</jamm.version>
<metrics.version>4.1.18</metrics.version>
<slf4j.version>1.7.35</slf4j.version>
Expand Down

1 comment on commit a27b68a

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark

Benchmark suite Current: a27b68a Previous: a5f549f Ratio
org.janusgraph.MgmtOlapJobBenchmark.runRemoveIndex 115.06522843530657 ms/op 114.05950851272728 ms/op 1.01
org.janusgraph.JanusGraphSpeedBenchmark.basicAddAndDelete 13001.042525633333 ms/op 13461.300170678296 ms/op 0.97
org.janusgraph.GraphCentricQueryBenchmark.getVertices 2290.7853748676653 ms/op 2046.9050105544957 ms/op 1.12
org.janusgraph.MgmtOlapJobBenchmark.runReindex 364.00475893333333 ms/op 349.0224117504762 ms/op 1.04
org.janusgraph.JanusGraphSpeedBenchmark.basicCount 348.2605375821695 ms/op 288.6154362374195 ms/op 1.21

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.