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