Skip to content

Commit

Permalink
Update test dependencies
Browse files Browse the repository at this point in the history
This updates JUnit, TestContainers, Lombok, and Mockito together as it
wasn't possible to only update TestContainers alone since it also
depends on JUnit, see PR #2972.
The same applies to Mockito.

These changes were necessary to update Mockito to v4:

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

Calling `property()` on a mocked `StandardVertex` resulted in a
`NullPointer` exception, but we can also simply use a `DetachedProperty`
as all accesses to that property on the vertex are also already mocked.

Signed-off-by: Florian Hockmann <fh@florian-hockmann.de>
  • Loading branch information
FlorianHockmann committed Jun 30, 2022
1 parent 6573fbb commit b44aa6f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 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
Expand Up @@ -15,6 +15,7 @@
package org.janusgraph.graphdb.database;

import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedProperty;
import org.janusgraph.core.JanusGraphElement;
import org.janusgraph.core.PropertyKey;
import org.janusgraph.core.schema.Parameter;
Expand Down Expand Up @@ -126,7 +127,7 @@ private JanusGraphElement mockIndexAppliesTo(MixedIndexType mit, boolean indexab
private JanusGraphElement mockIndexableElement(String key, String value, boolean indexable) {
StandardJanusGraphTx tx = mock(StandardJanusGraphTx.class);
JanusGraphElement indexableElement = spy(new StandardVertex(tx, 1L, ElementLifeCycle.New));
Property pk2 = indexableElement.property(key, value);
Property pk2 = new DetachedProperty(key, value);
Iterator it = Arrays.asList(pk2).iterator();
doReturn(it).when(indexableElement).properties(key);
if (indexable)
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
Expand Up @@ -57,9 +57,9 @@
<properties>
<titan.compatible-versions>1.0.0,1.1.0-SNAPSHOT</titan.compatible-versions>
<tinkerpop.version>3.5.3</tinkerpop.version>
<junit-platform.version>1.8.1</junit-platform.version>
<junit.version>5.8.1</junit.version>
<mockito.version>3.12.4</mockito.version>
<junit-platform.version>1.8.2</junit-platform.version>
<junit.version>5.8.2</junit.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 Expand Up @@ -108,7 +108,7 @@
<cassandra.version.sha256>bbe772956c841158e3228c3b6c8fc38cece6bceeface695473c59c0573039bf1</cassandra.version.sha256>
<cassandra-driver.version>4.14.1</cassandra-driver.version>
<scylladb.version>4.4.0</scylladb.version>
<testcontainers.version>1.16.2</testcontainers.version>
<testcontainers.version>1.17.2</testcontainers.version>
<easymock.version>4.3</easymock.version>
<protobuf.version>3.21.1</protobuf.version>
<grpc.version>1.47.0</grpc.version>
Expand Down Expand Up @@ -1147,7 +1147,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.18</version>
<version>1.18.24</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down

1 comment on commit b44aa6f

@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: b44aa6f Previous: 7adbba6 Ratio
org.janusgraph.MgmtOlapJobBenchmark.runRemoveIndex 114.33446810452196 ms/op 115.50350859175475 ms/op 0.99
org.janusgraph.JanusGraphSpeedBenchmark.basicAddAndDelete 13091.376943637955 ms/op 16300.184954180237 ms/op 0.80
org.janusgraph.GraphCentricQueryBenchmark.getVertices 2257.1661992124054 ms/op 2428.923466905251 ms/op 0.93
org.janusgraph.MgmtOlapJobBenchmark.runReindex 359.40913797999997 ms/op 417.5135216876923 ms/op 0.86
org.janusgraph.JanusGraphSpeedBenchmark.basicCount 346.62158918858387 ms/op 395.27303250862536 ms/op 0.88

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

Please sign in to comment.