From 0ebb980e368f202a170f0b17a99dcd0c6f7fd51d Mon Sep 17 00:00:00 2001 From: Nicole Lee Date: Wed, 1 Jul 2026 15:18:42 +0000 Subject: [PATCH 1/2] chore: use withoutAnnotations() when mocking MetricServiceStub in monitoring exporter test --- .../csm/exporter/BigtableCloudMonitoringExporterTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/exporter/BigtableCloudMonitoringExporterTest.java b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/exporter/BigtableCloudMonitoringExporterTest.java index 2e04d7c5666f..22aca98eba29 100644 --- a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/exporter/BigtableCloudMonitoringExporterTest.java +++ b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/exporter/BigtableCloudMonitoringExporterTest.java @@ -64,7 +64,6 @@ import org.junit.Rule; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; @@ -81,7 +80,7 @@ public class BigtableCloudMonitoringExporterTest { @Rule public final MockitoRule mockitoRule = MockitoJUnit.rule(); - @Mock private MetricServiceStub mockMetricServiceStub; + private MetricServiceStub mockMetricServiceStub; private MetricServiceClient fakeMetricServiceClient; private BigtableCloudMonitoringExporter exporter; @@ -107,6 +106,8 @@ public class BigtableCloudMonitoringExporterTest { @Before public void setUp() { + mockMetricServiceStub = + mock(MetricServiceStub.class, org.mockito.Mockito.withSettings().withoutAnnotations()); fakeMetricServiceClient = new FakeMetricServiceClient(mockMetricServiceStub); exporter = From c77718eb60ee305c87f82b5864c9d9bbd8fbadf2 Mon Sep 17 00:00:00 2001 From: Nicole Lee Date: Wed, 1 Jul 2026 17:50:56 +0000 Subject: [PATCH 2/2] style: use Mockito.withSettings() in test --- .../csm/exporter/BigtableCloudMonitoringExporterTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/exporter/BigtableCloudMonitoringExporterTest.java b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/exporter/BigtableCloudMonitoringExporterTest.java index 22aca98eba29..10c66920c83d 100644 --- a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/exporter/BigtableCloudMonitoringExporterTest.java +++ b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/internal/csm/exporter/BigtableCloudMonitoringExporterTest.java @@ -64,6 +64,7 @@ import org.junit.Rule; import org.junit.Test; import org.mockito.ArgumentCaptor; +import org.mockito.Mockito; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; @@ -107,7 +108,7 @@ public class BigtableCloudMonitoringExporterTest { @Before public void setUp() { mockMetricServiceStub = - mock(MetricServiceStub.class, org.mockito.Mockito.withSettings().withoutAnnotations()); + Mockito.mock(MetricServiceStub.class, Mockito.withSettings().withoutAnnotations()); fakeMetricServiceClient = new FakeMetricServiceClient(mockMetricServiceStub); exporter =