diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index c1e4732cf9..eaa64e9362 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -282,15 +282,10 @@ truth test - org.mockito - mockito-all - 1.10.19 - - - org.objenesis - objenesis - - + + org.mockito + mockito-core + 4.0.0 test diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncRunnerImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncRunnerImplTest.java index e1057663df..936e471189 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncRunnerImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncRunnerImplTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncTransactionManagerImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncTransactionManagerImplTest.java index aebc99ee96..84f7fb0db9 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncTransactionManagerImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncTransactionManagerImplTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class AsyncTransactionManagerImplTest { diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/JavaVersionUtil.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/JavaVersionUtil.java new file mode 100644 index 0000000000..acca12118c --- /dev/null +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/JavaVersionUtil.java @@ -0,0 +1,35 @@ +/* + * Copyright 2021 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.spanner; + +/** Util class for getting the Java version the tests are executed on. */ +public class JavaVersionUtil { + + /** Returns the major Java version (e.g. 8, 11, 17) */ + public static int getJavaMajorVersion() { + String version = System.getProperty("java.version"); + if (version.startsWith("1.")) { + version = version.substring(2, 3); + } else { + int dot = version.indexOf("."); + if (dot != -1) { + version = version.substring(0, dot); + } + } + return Integer.parseInt(version); + } +} diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java index badfaac640..61dcef2902 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/PartitionedDmlTransactionTest.java @@ -19,8 +19,8 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyMap; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyMap; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResumableStreamIteratorTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResumableStreamIteratorTest.java index 8f4f0803bd..b3e94433c1 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResumableStreamIteratorTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ResumableStreamIteratorTest.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.verify; import com.google.api.client.util.BackOff; +import com.google.cloud.spanner.AbstractResultSet.ResumableStreamIterator; import com.google.common.collect.AbstractIterator; import com.google.common.collect.Lists; import com.google.protobuf.ByteString; @@ -37,18 +38,19 @@ import io.opencensus.trace.EndSpanOptions; import io.opencensus.trace.Span; import java.io.IOException; +import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.concurrent.TimeUnit; import javax.annotation.Nullable; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import org.mockito.Mockito; -import org.mockito.internal.util.reflection.Whitebox; /** Unit tests for {@link AbstractResultSet.ResumableStreamIterator}. */ @RunWith(JUnit4.class) @@ -156,8 +158,12 @@ public void simple() { @Test public void closedSpan() { + Assume.assumeTrue( + "This test is only supported on JDK11 and lower", + JavaVersionUtil.getJavaMajorVersion() < 12); + Span span = mock(Span.class); - Whitebox.setInternalState(this.resumableStreamIterator, "span", span); + setInternalState(ResumableStreamIterator.class, this.resumableStreamIterator, "span", span); ResultSetStream s1 = Mockito.mock(ResultSetStream.class); Mockito.when(starter.startStream(null)).thenReturn(new ResultSetIterator(s1)); @@ -236,9 +242,14 @@ public void restartWithHoldBackMidStream() { @Test public void retryableErrorWithoutRetryInfo() throws IOException { + Assume.assumeTrue( + "This test is only supported on JDK11 and lower", + JavaVersionUtil.getJavaMajorVersion() < 12); + BackOff backOff = mock(BackOff.class); Mockito.when(backOff.nextBackOffMillis()).thenReturn(1L); - Whitebox.setInternalState(this.resumableStreamIterator, "backOff", backOff); + setInternalState( + ResumableStreamIterator.class, this.resumableStreamIterator, "backOff", backOff); ResultSetStream s1 = Mockito.mock(ResultSetStream.class); Mockito.when(starter.startStream(null)).thenReturn(new ResultSetIterator(s1)); @@ -446,4 +457,18 @@ static List consumeAtMost(int n, Iterator iterator) { } return r; } + + /** + * Sets a private static final field to a specific value. This is only supported on Java11 and + * lower. + */ + private static void setInternalState(Class c, Object target, String field, Object value) { + try { + Field f = c.getDeclaredField(field); + f.setAccessible(true); + f.set(target, value); + } catch (Exception e) { + throw new RuntimeException("Unable to set internal state on a private field.", e); + } + } } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionClientTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionClientTest.java index 6ec64d7fdd..7c2710156c 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionClientTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionClientTest.java @@ -149,10 +149,10 @@ public void batchCreateAndCloseSessions() { Mockito.eq(dbName), Mockito.anyInt(), Mockito.eq(labels), Mockito.anyMap())) .then( invocation -> { - Map options = invocation.getArgumentAt(3, Map.class); + Map options = invocation.getArgument(3, Map.class); Long channelHint = (Long) options.get(Option.CHANNEL_HINT); usedChannels.add(channelHint); - int sessionCount = invocation.getArgumentAt(1, Integer.class); + int sessionCount = invocation.getArgument(1, Integer.class); List res = new ArrayList<>(); for (int i = 1; i <= sessionCount; i++) { res.add( @@ -209,10 +209,10 @@ public void batchCreateSessionsDistributesMultipleRequestsOverChannels() { Mockito.eq(dbName), Mockito.anyInt(), Mockito.eq(labels), Mockito.anyMap())) .then( invocation -> { - Map options = invocation.getArgumentAt(3, Map.class); + Map options = invocation.getArgument(3, Map.class); Long channelHint = (Long) options.get(Option.CHANNEL_HINT); usedChannelHints.add(channelHint); - int sessionCount = invocation.getArgumentAt(1, Integer.class); + int sessionCount = invocation.getArgument(1, Integer.class); List res = new ArrayList<>(); for (int i = 1; i <= sessionCount; i++) { res.add( @@ -290,13 +290,13 @@ public void batchCreateSessionsWithExceptions() { Mockito.eq(dbName), Mockito.anyInt(), Mockito.anyMap(), Mockito.anyMap())) .then( invocation -> { - Map options = invocation.getArgumentAt(3, Map.class); + Map options = invocation.getArgument(3, Map.class); Long channelHint = (Long) options.get(Option.CHANNEL_HINT); if (errorOnChannels.contains(channelHint)) { throw SpannerExceptionFactory.newSpannerException( ErrorCode.RESOURCE_EXHAUSTED, "could not create any more sessions"); } else { - int sessionCount = invocation.getArgumentAt(1, Integer.class); + int sessionCount = invocation.getArgument(1, Integer.class); List res = new ArrayList<>(); for (int i = 1; i <= sessionCount; i++) { res.add( @@ -354,7 +354,7 @@ public void batchCreateSessionsServerReturnsLessSessionsPerBatch() { Mockito.eq(dbName), Mockito.anyInt(), Mockito.anyMap(), Mockito.anyMap())) .then( invocation -> { - int sessionCount = invocation.getArgumentAt(1, Integer.class); + int sessionCount = invocation.getArgument(1, Integer.class); List res = new ArrayList<>(); for (int i = 1; i <= Math.min(MAX_SESSIONS_PER_BATCH, sessionCount); i++) { res.add( diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java index 0ba89f54a6..cf4e6dda81 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java @@ -92,11 +92,7 @@ public void setUp() { DatabaseId db = DatabaseId.of(dbName); Session sessionProto = Session.newBuilder().setName(sessionName).build(); - Mockito.when( - rpc.createSession( - Mockito.eq(dbName), - Mockito.anyMapOf(String.class, String.class), - optionsCaptor.capture())) + Mockito.when(rpc.createSession(Mockito.eq(dbName), Mockito.anyMap(), optionsCaptor.capture())) .thenReturn(sessionProto); Transaction txn = Transaction.newBuilder().setId(ByteString.copyFromUtf8("TEST")).build(); Mockito.when( diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolMaintainerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolMaintainerTest.java index e7c8f3ded5..160e32d084 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolMaintainerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolMaintainerTest.java @@ -17,7 +17,7 @@ package com.google.cloud.spanner; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -77,9 +77,9 @@ private void setupMockSessionCreation() { invocation -> { executor.submit( () -> { - int sessionCount = invocation.getArgumentAt(0, Integer.class); + int sessionCount = invocation.getArgument(0, Integer.class); SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); for (int i = 0; i < sessionCount; i++) { consumer.onSessionReady(setupMockSession(mockSession())); } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolStressTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolStressTest.java index cab395d2c2..ada30d0c8e 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolStressTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolStressTest.java @@ -17,7 +17,7 @@ package com.google.cloud.spanner; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -96,7 +96,7 @@ private void setupSpanner(DatabaseId db) { invocation -> { createExecutor.submit( () -> { - int sessionCount = invocation.getArgumentAt(0, Integer.class); + int sessionCount = invocation.getArgument(0, Integer.class); for (int s = 0; s < sessionCount; s++) { SessionImpl session; synchronized (lock) { @@ -108,7 +108,7 @@ private void setupSpanner(DatabaseId db) { } } SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(session); } }); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java index 47ceb35619..4efe2cfef3 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java @@ -28,12 +28,12 @@ import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.atMost; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; @@ -154,9 +154,9 @@ private void setupMockSessionCreation() { invocation -> { executor.submit( () -> { - int sessionCount = invocation.getArgumentAt(0, Integer.class); + int sessionCount = invocation.getArgument(0, Integer.class); SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); for (int i = 0; i < sessionCount; i++) { consumer.onSessionReady(mockSession()); } @@ -229,7 +229,7 @@ public void poolClosureClosesLeakedSessions() throws Exception { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(sessions.pop()); }); return null; @@ -277,7 +277,7 @@ public void poolClosureFailsPendingReadWaiters() throws Exception { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(session1); }); return null; @@ -289,7 +289,7 @@ public void poolClosureFailsPendingReadWaiters() throws Exception { insideCreation.countDown(); releaseCreation.await(); SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(session2); return null; }); @@ -323,7 +323,7 @@ public void poolClosureFailsPendingWriteWaiters() throws Exception { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(session1); }); return null; @@ -335,7 +335,7 @@ public void poolClosureFailsPendingWriteWaiters() throws Exception { insideCreation.countDown(); releaseCreation.await(); SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(session2); return null; }); @@ -369,7 +369,7 @@ public void poolClosesEvenIfCreationFails() throws Exception { insideCreation.countDown(); releaseCreation.await(); SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionCreateFailure( SpannerExceptionFactory.newSpannerException(new RuntimeException()), 1); return null; @@ -397,7 +397,7 @@ public void poolClosureFailsNewRequests() { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(session); }); return null; @@ -437,7 +437,7 @@ public void creationExceptionPropagatesToReadSession() { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionCreateFailure( SpannerExceptionFactory.newSpannerException(ErrorCode.INTERNAL, ""), 1); return null; @@ -464,7 +464,7 @@ public void failOnPoolExhaustion() { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(mockSession()); }); return null; @@ -500,7 +500,7 @@ public void idleSessionCleanup() throws Exception { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(sessions.pop()); }); return null; @@ -558,9 +558,9 @@ public void keepAlive() throws Exception { invocation -> { executor.submit( () -> { - int sessionCount = invocation.getArgumentAt(0, Integer.class); + int sessionCount = invocation.getArgument(0, Integer.class); SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); for (int i = 0; i < sessionCount; i++) { consumer.onSessionReady(session); } @@ -664,7 +664,7 @@ public void testSessionNotFoundSingleUse() { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(closedSession); }); return null; @@ -674,7 +674,7 @@ public void testSessionNotFoundSingleUse() { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(openSession); }); return null; @@ -708,7 +708,7 @@ public void testSessionNotFoundReadOnlyTransaction() { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(closedSession); }); return null; @@ -718,7 +718,7 @@ public void testSessionNotFoundReadOnlyTransaction() { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(openSession); }); return null; @@ -819,7 +819,7 @@ public void testSessionNotFoundReadWriteTransaction() { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(closedSession); }); return null; @@ -829,7 +829,7 @@ public void testSessionNotFoundReadWriteTransaction() { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(openSession); }); return null; @@ -927,7 +927,7 @@ public void testSessionNotFoundWrite() { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(closedSession); }); return null; @@ -937,7 +937,7 @@ public void testSessionNotFoundWrite() { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(openSession); }); return null; @@ -970,7 +970,7 @@ public void testSessionNotFoundWriteAtLeastOnce() { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(closedSession); }); return null; @@ -980,7 +980,7 @@ public void testSessionNotFoundWriteAtLeastOnce() { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(openSession); }); return null; @@ -1009,7 +1009,7 @@ public void testSessionNotFoundPartitionedUpdate() { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(closedSession); }); return null; @@ -1019,7 +1019,7 @@ public void testSessionNotFoundPartitionedUpdate() { executor.submit( () -> { SessionConsumerImpl consumer = - invocation.getArgumentAt(2, SessionConsumerImpl.class); + invocation.getArgument(2, SessionConsumerImpl.class); consumer.onSessionReady(openSession); }); return null; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java index d6963377b3..dec7e59c4b 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java @@ -100,22 +100,11 @@ public class SpanTest { .withDescription("Non-retryable test exception.") .asRuntimeException(); - private static int getVersion() { - String version = System.getProperty("java.version"); - if (version.startsWith("1.")) { - version = version.substring(2, 3); - } else { - int dot = version.indexOf("."); - if (dot != -1) { - version = version.substring(0, dot); - } - } - return Integer.parseInt(version); - } - @BeforeClass public static void startStaticServer() throws Exception { - Assume.assumeTrue("This test is only supported on JDK11 and lower", getVersion() < 12); + Assume.assumeTrue( + "This test is only supported on JDK11 and lower", + JavaVersionUtil.getJavaMajorVersion() < 12); mockSpanner = new MockSpannerServiceImpl(); mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions. diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionContextImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionContextImplTest.java index b7035f64fa..0cb2b5d29a 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionContextImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionContextImplTest.java @@ -17,8 +17,8 @@ package com.google.cloud.spanner; import static org.junit.Assert.assertThrows; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyMap; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyMap; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java index af2ad12df7..9ca2c77f62 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java @@ -282,7 +282,7 @@ public void inlineBegin() { ResultSet.Builder builder = ResultSet.newBuilder() .setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build()); - ExecuteSqlRequest request = invocation.getArgumentAt(0, ExecuteSqlRequest.class); + ExecuteSqlRequest request = invocation.getArgument(0, ExecuteSqlRequest.class); if (request.getTransaction() != null && request.getTransaction().hasBegin()) { transactionsStarted.incrementAndGet(); builder.setMetadata( diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java index 499825c190..95595607bc 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java @@ -106,7 +106,7 @@ public void setUp() { ResultSet.Builder builder = ResultSet.newBuilder() .setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build()); - ExecuteSqlRequest request = invocation.getArgumentAt(0, ExecuteSqlRequest.class); + ExecuteSqlRequest request = invocation.getArgument(0, ExecuteSqlRequest.class); if (request.getTransaction().hasBegin() && request.getTransaction().getBegin().hasReadWrite()) { builder.setMetadata( diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/AutocommitDmlModeTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/AutocommitDmlModeTest.java index e5e4b41b75..78834f69c8 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/AutocommitDmlModeTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/AutocommitDmlModeTest.java @@ -18,7 +18,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionImplTest.java index 5337a9f2f9..f68581ee84 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionImplTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionImplTest.java @@ -30,9 +30,9 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyListOf; -import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyList; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -79,7 +79,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import org.mockito.Matchers; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -213,7 +212,7 @@ private static DdlClient createDefaultMockDdlClient() { ApiFuture futureMetadata = ApiFutures.immediateFuture(metadata); when(operation.getMetadata()).thenReturn(futureMetadata); when(ddlClient.executeDdl(anyString())).thenCallRealMethod(); - when(ddlClient.executeDdl(anyListOf(String.class))).thenReturn(operation); + when(ddlClient.executeDdl(anyList())).thenReturn(operation); return ddlClient; } catch (Exception e) { throw new RuntimeException(e); @@ -256,10 +255,10 @@ public static ConnectionImpl createConnection(final ConnectionOptions options) { throw SpannerExceptionFactory.newSpannerException( ErrorCode.FAILED_PRECONDITION, "No query has returned with any data yet"); }); - when(dbClient.singleUseReadOnlyTransaction(Matchers.any(TimestampBound.class))) + when(dbClient.singleUseReadOnlyTransaction(any(TimestampBound.class))) .thenReturn(singleUseReadOnlyTx); - when(dbClient.transactionManager(Mockito.anyVararg())) + when(dbClient.transactionManager(any())) .thenAnswer( invocation -> { TransactionContext txContext = mock(TransactionContext.class); @@ -280,7 +279,7 @@ public static ConnectionImpl createConnection(final ConnectionOptions options) { return new SimpleTransactionManager(txContext, options.isReturnCommitStats()); }); - when(dbClient.readOnlyTransaction(Matchers.any(TimestampBound.class))) + when(dbClient.readOnlyTransaction(any(TimestampBound.class))) .thenAnswer( invocation -> { ReadOnlyTransaction tx = mock(ReadOnlyTransaction.class); @@ -1356,7 +1355,7 @@ public void testMergeQueryOptions() { DatabaseClient dbClient = mock(DatabaseClient.class); final UnitOfWork unitOfWork = mock(UnitOfWork.class); when(unitOfWork.executeQueryAsync( - any(ParsedStatement.class), any(AnalyzeMode.class), Mockito.anyVararg())) + any(ParsedStatement.class), any(AnalyzeMode.class), Mockito.any())) .thenReturn(ApiFutures.immediateFuture(mock(ResultSet.class))); try (ConnectionImpl impl = new ConnectionImpl(connectionOptions, spannerPool, ddlClient, dbClient) { @@ -1455,7 +1454,7 @@ public void testStatementTagAlwaysAllowed() { DatabaseClient dbClient = mock(DatabaseClient.class); final UnitOfWork unitOfWork = mock(UnitOfWork.class); when(unitOfWork.executeQueryAsync( - any(ParsedStatement.class), any(AnalyzeMode.class), Mockito.anyVararg())) + any(ParsedStatement.class), any(AnalyzeMode.class), Mockito.any())) .thenReturn(ApiFutures.immediateFuture(mock(ResultSet.class))); try (ConnectionImpl connection = new ConnectionImpl(connectionOptions, spannerPool, ddlClient, dbClient) { @@ -1559,7 +1558,7 @@ public void testTransactionTagNotAllowedAfterTransactionStarted() { // Indicate that a transaction has been started. when(unitOfWork.getState()).thenReturn(UnitOfWorkState.STARTED); when(unitOfWork.executeQueryAsync( - any(ParsedStatement.class), any(AnalyzeMode.class), Mockito.anyVararg())) + any(ParsedStatement.class), any(AnalyzeMode.class), Mockito.any())) .thenReturn(ApiFutures.immediateFuture(mock(ResultSet.class))); when(unitOfWork.rollbackAsync()).thenReturn(ApiFutures.immediateFuture(null)); try (ConnectionImpl connection = diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementExecutorTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementExecutorTest.java index 41a87d31b9..a9b3a06b53 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementExecutorTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementExecutorTest.java @@ -19,7 +19,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementWithOneParameterTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementWithOneParameterTest.java index cfb61154af..fee70f05ea 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementWithOneParameterTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionStatementWithOneParameterTest.java @@ -16,7 +16,7 @@ package com.google.cloud.spanner.connection; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlBatchTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlBatchTest.java index 00ad2a4230..0d310df690 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlBatchTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlBatchTest.java @@ -23,9 +23,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -import static org.mockito.Matchers.anyListOf; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.argThat; +import static org.mockito.Mockito.anyList; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.argThat; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -108,7 +108,7 @@ private DdlClient createDefaultMockDdlClient( ApiFutures.immediateFuture(metadataBuilder.build()); when(operation.getMetadata()).thenReturn(metadataFuture); when(ddlClient.executeDdl(anyString())).thenReturn(operation); - when(ddlClient.executeDdl(anyListOf(String.class))).thenReturn(operation); + when(ddlClient.executeDdl(anyList())).thenReturn(operation); return ddlClient; } catch (Exception e) { throw new RuntimeException(e); @@ -256,7 +256,7 @@ public void testGetStateAndIsActive() { DdlClient client = mock(DdlClient.class); SpannerException exception = mock(SpannerException.class); when(exception.getErrorCode()).thenReturn(ErrorCode.FAILED_PRECONDITION); - doThrow(exception).when(client).executeDdl(anyListOf(String.class)); + doThrow(exception).when(client).executeDdl(anyList()); batch = createSubject(client); assertThat(batch.getState(), is(UnitOfWorkState.STARTED)); assertThat(batch.isActive(), is(true)); @@ -283,17 +283,16 @@ private static IsListOfStringsWithSize isListOfStringsWithSize(int size) { return new IsListOfStringsWithSize(size); } - private static class IsListOfStringsWithSize extends ArgumentMatcher> { + private static class IsListOfStringsWithSize implements ArgumentMatcher> { private final int size; private IsListOfStringsWithSize(int size) { this.size = size; } - @SuppressWarnings("unchecked") @Override - public boolean matches(Object list) { - return ((List) list).size() == size; + public boolean matches(List list) { + return list.size() == size; } } @@ -483,7 +482,7 @@ public void testAbort() { batch.abortBatch(); assertThat(batch.getState(), is(UnitOfWorkState.ABORTED)); verify(client, never()).executeDdl(anyString()); - verify(client, never()).executeDdl(anyListOf(String.class)); + verify(client, never()).executeDdl(anyList()); ParsedStatement statement = mock(ParsedStatement.class); when(statement.getType()).thenReturn(StatementType.DDL); @@ -494,21 +493,21 @@ public void testAbort() { batch = createSubject(client); batch.executeDdlAsync(statement); batch.abortBatch(); - verify(client, never()).executeDdl(anyListOf(String.class)); + verify(client, never()).executeDdl(anyList()); client = createDefaultMockDdlClient(); batch = createSubject(client); batch.executeDdlAsync(statement); batch.executeDdlAsync(statement); batch.abortBatch(); - verify(client, never()).executeDdl(anyListOf(String.class)); + verify(client, never()).executeDdl(anyList()); client = createDefaultMockDdlClient(); batch = createSubject(client); batch.executeDdlAsync(statement); batch.executeDdlAsync(statement); batch.abortBatch(); - verify(client, never()).executeDdl(anyListOf(String.class)); + verify(client, never()).executeDdl(anyList()); boolean exception = false; try { get(batch.runBatchAsync()); @@ -519,7 +518,7 @@ public void testAbort() { exception = true; } assertThat(exception, is(true)); - verify(client, never()).executeDdl(anyListOf(String.class)); + verify(client, never()).executeDdl(anyList()); } @Test diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlClientTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlClientTest.java index f7070b150b..24b4ebf096 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlClientTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DdlClientTest.java @@ -16,9 +16,9 @@ package com.google.cloud.spanner.connection; -import static org.mockito.Matchers.anyListOf; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isNull; +import static org.mockito.Mockito.anyList; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.isNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -54,8 +54,7 @@ public void testExecuteDdl() throws InterruptedException, ExecutionException { @SuppressWarnings("unchecked") OperationFuture operation = mock(OperationFuture.class); when(operation.get()).thenReturn(null); - when(client.updateDatabaseDdl( - eq(instanceId), eq(databaseId), anyListOf(String.class), isNull(String.class))) + when(client.updateDatabaseDdl(eq(instanceId), eq(databaseId), anyList(), isNull())) .thenReturn(operation); DdlClient subject = createSubject(client); String ddl = "CREATE TABLE FOO"; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DmlBatchTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DmlBatchTest.java index 821c9d95f6..10a8d5d46c 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DmlBatchTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DmlBatchTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -import static org.mockito.Matchers.anyListOf; +import static org.mockito.Mockito.anyList; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -161,7 +161,7 @@ public void testGetStateAndIsActive() { assertThat(batch.isActive(), is(false)); UnitOfWork tx = mock(UnitOfWork.class); - when(tx.executeBatchUpdateAsync(anyListOf(ParsedStatement.class))) + when(tx.executeBatchUpdateAsync(anyList())) .thenReturn(ApiFutures.immediateFailedFuture(mock(SpannerException.class))); batch = createSubject(tx); assertThat(batch.getState(), is(UnitOfWorkState.STARTED)); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/EmulatorUtilTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/EmulatorUtilTest.java index e9f9a70ab7..b9c556a960 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/EmulatorUtilTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/EmulatorUtilTest.java @@ -18,7 +18,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -45,7 +46,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import org.mockito.Matchers; @RunWith(JUnit4.class) public class EmulatorUtilTest { @@ -75,9 +75,7 @@ public void testCreateInstanceAndDatabase_bothSucceed() when(spanner.getDatabaseAdminClient()).thenReturn(databaseClient); when(databaseClient.createDatabase( - Matchers.eq("test-instance"), - Matchers.eq("test-database"), - Matchers.eq(ImmutableList.of()))) + eq("test-instance"), eq("test-database"), eq(ImmutableList.of()))) .thenReturn(databaseOperationFuture); when(databaseOperationFuture.get()).thenReturn(mock(Database.class)); @@ -124,9 +122,7 @@ public void testCreateInstanceAndDatabase_bothFailWithAlreadyExists() when(spanner.getDatabaseAdminClient()).thenReturn(databaseClient); when(databaseClient.createDatabase( - Matchers.eq("test-instance"), - Matchers.eq("test-database"), - Matchers.eq(ImmutableList.of()))) + eq("test-instance"), eq("test-database"), eq(ImmutableList.of()))) .thenReturn(databaseOperationFuture); when(databaseOperationFuture.get()) .thenThrow( @@ -231,9 +227,7 @@ public void testCreateInstanceAndDatabase_propagatesOtherErrorsOnDatabaseCreatio when(spanner.getDatabaseAdminClient()).thenReturn(databaseClient); when(databaseClient.createDatabase( - Matchers.eq("test-instance"), - Matchers.eq("test-database"), - Matchers.eq(ImmutableList.of()))) + eq("test-instance"), eq("test-database"), eq(ImmutableList.of()))) .thenReturn(databaseOperationFuture); when(databaseOperationFuture.get()) .thenThrow( @@ -275,9 +269,7 @@ public void testCreateInstanceAndDatabase_propagatesInterruptsOnDatabaseCreation when(spanner.getDatabaseAdminClient()).thenReturn(databaseClient); when(databaseClient.createDatabase( - Matchers.eq("test-instance"), - Matchers.eq("test-database"), - Matchers.eq(ImmutableList.of()))) + eq("test-instance"), eq("test-database"), eq(ImmutableList.of()))) .thenReturn(databaseOperationFuture); when(databaseOperationFuture.get()).thenThrow(new InterruptedException()); diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReadOnlyStalenessTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReadOnlyStalenessTest.java index 58aa18b644..51722b00d4 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReadOnlyStalenessTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReadOnlyStalenessTest.java @@ -18,7 +18,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -36,7 +36,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import org.mockito.Matchers; @RunWith(JUnit4.class) public class ReadOnlyStalenessTest { @@ -54,11 +53,11 @@ private ConnectionImpl createConnection(ConnectionOptions options) { DdlClient ddlClient = mock(DdlClient.class); ReadOnlyTransaction singleUseReadOnlyTx = mock(ReadOnlyTransaction.class); when(singleUseReadOnlyTx.executeQuery(Statement.of(SELECT))).thenReturn(mock(ResultSet.class)); - when(dbClient.singleUseReadOnlyTransaction(Matchers.any(TimestampBound.class))) + when(dbClient.singleUseReadOnlyTransaction(any(TimestampBound.class))) .thenReturn(singleUseReadOnlyTx); ReadOnlyTransaction readOnlyTx = mock(ReadOnlyTransaction.class); when(readOnlyTx.executeQuery(Statement.of(SELECT))).thenReturn(mock(ResultSet.class)); - when(dbClient.readOnlyTransaction(Matchers.any(TimestampBound.class))).thenReturn(readOnlyTx); + when(dbClient.readOnlyTransaction(any(TimestampBound.class))).thenReturn(readOnlyTx); return new ConnectionImpl(options, spannerPool, ddlClient, dbClient); } diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReadWriteTransactionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReadWriteTransactionTest.java index 204a14756f..a4e2397db8 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReadWriteTransactionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ReadWriteTransactionTest.java @@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; +import static org.mockito.Mockito.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SingleUseTransactionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SingleUseTransactionTest.java index 040b01b1c8..c927718d22 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SingleUseTransactionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SingleUseTransactionTest.java @@ -22,8 +22,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -import static org.mockito.Matchers.anyListOf; -import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.anyList; +import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -298,7 +298,7 @@ private DdlClient createDefaultMockDdlClient() { mock(OperationFuture.class); when(operation.get()).thenReturn(null); when(ddlClient.executeDdl(anyString())).thenCallRealMethod(); - when(ddlClient.executeDdl(anyListOf(String.class))).thenReturn(operation); + when(ddlClient.executeDdl(anyList())).thenReturn(operation); return ddlClient; } catch (Exception e) { throw new RuntimeException(e);