Skip to content
This repository was archived by the owner on Apr 7, 2026. It is now read-only.

test: cleanup and speed up tests #4376

Merged
gcf-merge-on-green merged 1 commit into from
Mar 4, 2026
Merged

test: cleanup and speed up tests #4376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions google-cloud-spanner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,20 +438,6 @@
<scope>test</scope>
</dependency>

<!-- Used to work around https://github.com/googleapis/sdk-platform-java/issues/3911 -->
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.18.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.18.4</version>
<scope>test</scope>
</dependency>

<!-- Executor tests - The 'provided' scope is overwritten to compile time scope for the profile 'executor-tests' -->
<dependency>
<groupId>com.google.api.grpc</groupId>
Expand Down
2 changes: 0 additions & 2 deletions ...le-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractAsyncTransactionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
import static com.google.cloud.spanner.MockSpannerTestUtil.EMPTY_KEY_VALUE_RESULTSET;
import static com.google.cloud.spanner.MockSpannerTestUtil.INVALID_UPDATE_STATEMENT;
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_MULTIPLE_KEY_VALUE_RESULTSET;
Expand Down Expand Up @@ -56,7 +55,6 @@ public abstract class AbstractAsyncTransactionTest {

@BeforeClass
public static void setup() throws Exception {
disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D);
mockSpanner.putStatementResult(
Expand Down
3 changes: 0 additions & 3 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractMockServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;

import com.google.api.gax.grpc.testing.LocalChannelProvider;
import com.google.cloud.NoCredentials;
import com.google.cloud.spanner.admin.database.v1.MockDatabaseAdminImpl;
Expand Down Expand Up @@ -51,7 +49,6 @@ abstract class AbstractMockServerTest {

@BeforeClass
public static void startMockServer() throws Exception {
disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
mockInstanceAdmin = new MockInstanceAdminImpl();
Expand Down
3 changes: 0 additions & 3 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/AbstractNettyMockServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;

import com.google.api.gax.grpc.testing.LocalChannelProvider;
import com.google.cloud.NoCredentials;
import io.grpc.ForwardingServerCall;
Expand Down Expand Up @@ -54,7 +52,6 @@ abstract class AbstractNettyMockServerTest {

@BeforeClass
public static void startMockServer() throws Exception {
disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.

Expand Down
2 changes: 0 additions & 2 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchCreateSessionsSlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_ONE_KEY_VALUE_RESULTSET;
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_ONE_KEY_VALUE_STATEMENT;
import static com.google.cloud.spanner.MockSpannerTestUtil.SELECT1;
Expand Down Expand Up @@ -60,7 +59,6 @@ public class BatchCreateSessionsSlowTest {

@BeforeClass
public static void startStaticServer() throws Exception {
disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
mockSpanner.putStatementResult(
Expand Down
2 changes: 0 additions & 2 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/ChannelUsageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
import static java.util.stream.Collectors.toSet;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
Expand Down Expand Up @@ -106,7 +105,6 @@ public static Collection<Object[]> data() {

@BeforeClass
public static void startServer() throws Exception {
disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
mockSpanner.putStatementResult(StatementResult.query(SELECT1, SELECT1_RESULTSET));
Expand Down
2 changes: 0 additions & 2 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_COLUMN_NAMES;
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_ONE_KEY_VALUE_RESULTSET;
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_ONE_KEY_VALUE_STATEMENT;
Expand Down Expand Up @@ -192,7 +191,6 @@ public class DatabaseClientImplTest {

@BeforeClass
public static void startStaticServer() throws Exception {
disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
mockSpanner.putStatementResult(StatementResult.update(UPDATE_STATEMENT, UPDATE_COUNT));
Expand Down
2 changes: 0 additions & 2 deletions .../java/com/google/cloud/spanner/DatabaseClientImplWithDefaultRWTransactionOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
import static com.google.cloud.spanner.MockSpannerTestUtil.INVALID_SELECT_STATEMENT;
import static com.google.cloud.spanner.MockSpannerTestUtil.SELECT1;
import static com.google.cloud.spanner.MockSpannerTestUtil.SELECT1_RESULTSET;
Expand Down Expand Up @@ -84,7 +83,6 @@ public class DatabaseClientImplWithDefaultRWTransactionOptionsTest {

@BeforeClass
public static void startStaticServer() throws Exception {
disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
mockSpanner.putStatementResult(StatementResult.update(UPDATE_STATEMENT, UPDATE_COUNT));
Expand Down
73 changes: 0 additions & 73 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/DisableDefaultMtlsProvider.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/InlineBeginTransactionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
import static com.google.cloud.spanner.SpannerApiFutures.get;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals;
Expand Down Expand Up @@ -141,7 +140,6 @@ public class InlineBeginTransactionTest {

@BeforeClass
public static void startStaticServer() throws Exception {
disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
mockSpanner.putStatementResult(StatementResult.update(UPDATE_STATEMENT, UPDATE_COUNT));
Expand Down
2 changes: 0 additions & 2 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetrySpanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThrows;
Expand Down Expand Up @@ -167,7 +166,6 @@ public static void setupOpenTelemetry() {

@BeforeClass
public static void startStaticServer() throws Exception {
disableDefaultMtlsProvider();
// Incorporating OpenCensus tracer to ensure that OpenTraces traces are utilized if enabled,
// regardless of the presence of OpenCensus tracer.
java.lang.reflect.Field field = Tracing.class.getDeclaredField("traceComponent");
Expand Down
2 changes: 0 additions & 2 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/PgNumericTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

Expand Down Expand Up @@ -84,7 +83,6 @@ public class PgNumericTest {

@BeforeClass
public static void beforeClass() throws Exception {
disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D);

Expand Down
2 changes: 0 additions & 2 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/ReadAsyncTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
import static com.google.cloud.spanner.MockSpannerTestUtil.*;
import static com.google.cloud.spanner.SpannerApiFutures.get;
import static com.google.common.truth.Truth.assertThat;
Expand Down Expand Up @@ -70,7 +69,6 @@ public class ReadAsyncTest {

@BeforeClass
public static void setup() throws Exception {
disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.putStatementResult(
StatementResult.query(READ_ONE_KEY_VALUE_STATEMENT, READ_ONE_KEY_VALUE_RESULTSET));
Expand Down
2 changes: 0 additions & 2 deletions ...anner/src/test/java/com/google/cloud/spanner/ReadWriteTransactionWithInlineBeginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
Expand Down Expand Up @@ -102,7 +101,6 @@ public class ReadWriteTransactionWithInlineBeginTest {

@BeforeClass
public static void startStaticServer() throws Exception {
disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
mockSpanner.putStatementResult(StatementResult.update(UPDATE_STATEMENT, UPDATE_COUNT));
Expand Down
2 changes: 0 additions & 2 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/RequestIdMockServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
Expand Down Expand Up @@ -103,7 +102,6 @@ public static void setup() throws Exception {
assumeTrue(System.getenv("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS") == null);
assumeTrue(System.getenv("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW") == null);

disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.

Expand Down
2 changes: 0 additions & 2 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThrows;
Expand Down Expand Up @@ -122,7 +121,6 @@ public static void startStaticServer() throws Exception {
"This test is only supported on JDK11 and lower",
JavaVersionUtil.getJavaMajorVersion() < 12);

disableDefaultMtlsProvider();
// Use a little reflection to set the test tracer.
// This is not possible in Java 12 and later.
java.lang.reflect.Field field = Tracing.class.getDeclaredField("traceComponent");
Expand Down
2 changes: 0 additions & 2 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerGaxRetryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
Expand Down Expand Up @@ -112,7 +111,6 @@ public class SpannerGaxRetryTest {

@BeforeClass
public static void startStaticServer() throws Exception {
disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
mockSpanner.putStatementResult(StatementResult.query(SELECT1AND2, SELECT1_RESULTSET));
Expand Down
2 changes: 0 additions & 2 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerThreadsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
Expand Down Expand Up @@ -94,7 +93,6 @@ public static void startServer() throws Exception {
+ " emulator is running",
System.getenv("SPANNER_EMULATOR_HOST") == null);

disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
mockSpanner.putStatementResult(StatementResult.query(SELECT1AND2, SELECT1_RESULTSET));
Expand Down
3 changes: 0 additions & 3 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/StandardBenchmarkMockServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;

import com.google.api.gax.grpc.testing.LocalChannelProvider;
import com.google.api.gax.rpc.TransportChannelProvider;
import com.google.cloud.spanner.MockSpannerServiceImpl.SimulatedExecutionTime;
Expand Down Expand Up @@ -85,7 +83,6 @@ class StandardBenchmarkMockServer {
private LocalChannelProvider channelProvider;

TransportChannelProvider start() throws Exception {
disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
mockSpanner.putStatementResult(StatementResult.update(UPDATE_STATEMENT, UPDATE_COUNT));
Expand Down
2 changes: 0 additions & 2 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionChannelHintTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.google.cloud.spanner;

import static com.google.cloud.spanner.DisableDefaultMtlsProvider.disableDefaultMtlsProvider;
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_COLUMN_NAMES;
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_ONE_KEY_VALUE_RESULTSET;
import static com.google.cloud.spanner.MockSpannerTestUtil.READ_ONE_KEY_VALUE_STATEMENT;
Expand Down Expand Up @@ -104,7 +103,6 @@ public class TransactionChannelHintTest {

@BeforeClass
public static void startServer() throws Exception {
disableDefaultMtlsProvider();
mockSpanner = new MockSpannerServiceImpl();
mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
mockSpanner.putStatementResult(StatementResult.query(SELECT1, SELECT1_RESULTSET));
Expand Down
Loading
Loading