From 1e7af5d743bccc0114410d55595f9c974361ca66 Mon Sep 17 00:00:00 2001 From: Florian Hockmann Date: Wed, 22 Jun 2022 14:47:54 +0200 Subject: [PATCH] Update test dependencies 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()`: https://github.com/mockito/mockito/pull/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 --- .../diskstorage/es/rest/RestClientSetupTest.java | 3 +-- .../inmemory/InMemoryColumnValueStoreTest.java | 2 +- .../graphdb/database/IndexSerializerTest.java | 3 ++- pom.xml | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/rest/RestClientSetupTest.java b/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/rest/RestClientSetupTest.java index 5df74dd7a0..7b2c8755d8 100644 --- a/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/rest/RestClientSetupTest.java +++ b/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/rest/RestClientSetupTest.java @@ -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; @@ -306,7 +305,7 @@ private CredentialsProvider basicAuthTestBase(final Map extraCon ); final HttpAsyncClientBuilder hacb = mock(HttpAsyncClientBuilder.class); - doReturn(hacb).when(hacb).setDefaultCredentialsProvider(anyObject()); + doReturn(hacb).when(hacb).setDefaultCredentialsProvider(any()); hccc.customizeHttpClient(hacb); final ArgumentCaptor cpCaptor = ArgumentCaptor.forClass(BasicCredentialsProvider.class); diff --git a/janusgraph-inmemory/src/test/java/org/janusgraph/diskstorage/inmemory/InMemoryColumnValueStoreTest.java b/janusgraph-inmemory/src/test/java/org/janusgraph/diskstorage/inmemory/InMemoryColumnValueStoreTest.java index 19ca6200c9..36e77b61c3 100644 --- a/janusgraph-inmemory/src/test/java/org/janusgraph/diskstorage/inmemory/InMemoryColumnValueStoreTest.java +++ b/janusgraph-inmemory/src/test/java/org/janusgraph/diskstorage/inmemory/InMemoryColumnValueStoreTest.java @@ -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; diff --git a/janusgraph-test/src/test/java/org/janusgraph/graphdb/database/IndexSerializerTest.java b/janusgraph-test/src/test/java/org/janusgraph/graphdb/database/IndexSerializerTest.java index 2c859b7648..235a88d873 100644 --- a/janusgraph-test/src/test/java/org/janusgraph/graphdb/database/IndexSerializerTest.java +++ b/janusgraph-test/src/test/java/org/janusgraph/graphdb/database/IndexSerializerTest.java @@ -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; @@ -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) diff --git a/pom.xml b/pom.xml index bc97384441..3e3f0eb895 100644 --- a/pom.xml +++ b/pom.xml @@ -57,9 +57,9 @@ 1.0.0,1.1.0-SNAPSHOT 3.5.3 - 1.8.1 - 5.8.1 - 3.12.4 + 1.8.2 + 5.8.2 + 4.6.1 0.3.0 4.1.18 1.7.35 @@ -108,7 +108,7 @@ bbe772956c841158e3228c3b6c8fc38cece6bceeface695473c59c0573039bf1 4.14.1 4.4.0 - 1.16.2 + 1.17.2 4.3 3.19.2 1.42.1 @@ -1139,7 +1139,7 @@ org.projectlombok lombok - 1.18.18 + 1.18.24 org.osgi