test(spanner): fix MockAutoTaggingTest test environment pollution (#13268)

sakthivelmanii · web-flow · commit df67a3c8d8cb · 2026-05-26T12:04:24.000+05:30
Cleans up static SpannerOptions.environment pollution between test executions in the test suite by explicitly resetting to the default environment in @before and @after methods. This ensures that System properties enabling or disabling auto-tagging are correctly picked up during test runs.
diff --git a/java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockAutoTaggingTest.java b/java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockAutoTaggingTest.java
@@ -37,12 +37,14 @@ public class MockAutoTaggingTest extends AbstractMockServerTest {
   public void setUpProperties() {
     System.clearProperty("spanner.disable_auto_tagging");
     System.clearProperty("spanner.enable_auto_tagging");
+    SpannerOptions.useDefaultEnvironment();
   }
 
   @After
   public void tearDownProperties() {
     System.clearProperty("spanner.disable_auto_tagging");
     System.clearProperty("spanner.enable_auto_tagging");
+    SpannerOptions.useDefaultEnvironment();
   }
 
   private Spanner createSpanner(boolean enableAutoTag, String targetPackage) {

Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,14 @@ public class MockAutoTaggingTest extends AbstractMockServerTest {`
`37`	`37`	`public void setUpProperties() {`
`38`	`38`	`System.clearProperty("spanner.disable_auto_tagging");`
`39`	`39`	`System.clearProperty("spanner.enable_auto_tagging");`
	`40`	`+ SpannerOptions.useDefaultEnvironment();`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`@After`
`43`	`44`	`public void tearDownProperties() {`
`44`	`45`	`System.clearProperty("spanner.disable_auto_tagging");`
`45`	`46`	`System.clearProperty("spanner.enable_auto_tagging");`
	`47`	`+ SpannerOptions.useDefaultEnvironment();`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`private Spanner createSpanner(boolean enableAutoTag, String targetPackage) {`