From dba56310e4b67749481c795b7cf4b6a11af7f6c7 Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Wed, 28 Feb 2024 18:52:49 -0500
Subject: [PATCH] chore: Add env var test to github CI

---
 .github/workflows/ci.yaml                     | 25 ++++++++++++++++---
 .../api/gax/rpc/EndpointContextTest.java      |  5 +---
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5344f99886..494fd9781b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -21,7 +21,14 @@ jobs:
       - name: Unit Tests
         run: |
           mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
-              -Dfmt.skip -DenableTestCoverage
+              -Dfmt.skip -DenableTestCoverage -Dsurefire.failIfNoSpecifiedTests=false \
+              -Dtest=\!EndpointContextTest#endpointContextBuild_universeDomainEnvVarSet
+      - run: echo "GOOGLE_CLOUD_UNIVERSE_DOMAIN=random.com" >> $GITHUB_ENV
+      - name: EndpointContext Env Var Test
+        run: |
+          mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
+              -Dfmt.skip -DenableTestCoverage -Dsurefire.failIfNoSpecifiedTests=false \
+              -Dtest=EndpointContextTest#endpointContextBuild_universeDomainEnvVarSet
       - run: bazelisk version
       - name: Install Maven modules
         run: |
@@ -63,7 +70,14 @@ jobs:
       - name: Unit Tests
         run: |
           mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
-              -Dfmt.skip -DenableTestCoverage
+              -Dfmt.skip -DenableTestCoverage -Dsurefire.failIfNoSpecifiedTests=false \
+              -Dtest=\!EndpointContextTest#endpointContextBuild_universeDomainEnvVarSet
+      - run: echo "GOOGLE_CLOUD_UNIVERSE_DOMAIN=random.com" >> $GITHUB_ENV
+      - name: EndpointContext Env Var Test
+        run: |
+          mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
+              -Dfmt.skip -DenableTestCoverage -Dsurefire.failIfNoSpecifiedTests=false \
+              -Dtest=EndpointContextTest#endpointContextBuild_universeDomainEnvVarSet
       - run: bazelisk version
       - name: Install Maven modules
         run: |
@@ -97,7 +111,12 @@ jobs:
           # the "jvm" system property.
           mvn verify --batch-mode --no-transfer-progress -Dcheckstyle.skip \
               -Dfmt.skip \
-              -Djvm="${JAVA8_HOME}/bin/java"
+              -Djvm="${JAVA8_HOME}/bin/java" -Dsurefire.failIfNoSpecifiedTests=false \
+              -Dtest=\!EndpointContextTest#endpointContextBuild_universeDomainEnvVarSet
+          export GOOGLE_CLOUD_UNIVERSE_DOMAIN=random.com
+          mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
+              -Dfmt.skip -DenableTestCoverage -Dsurefire.failIfNoSpecifiedTests=false \
+              -Dtest=EndpointContextTest#endpointContextBuild_universeDomainEnvVarSet
 
   build-java8-gapic-generator-java:
     name: "build(8) for gapic-generator-java"
diff --git a/gax-java/gax/src/test/java/com/google/api/gax/rpc/EndpointContextTest.java b/gax-java/gax/src/test/java/com/google/api/gax/rpc/EndpointContextTest.java
index 473458f1ce..2422e9cc8e 100644
--- a/gax-java/gax/src/test/java/com/google/api/gax/rpc/EndpointContextTest.java
+++ b/gax-java/gax/src/test/java/com/google/api/gax/rpc/EndpointContextTest.java
@@ -340,15 +340,12 @@ public void endpointContextBuild_gdchFlow_noUniverseDomain_customEndpoint() thro
         .isEqualTo(Credentials.GOOGLE_DEFAULT_UNIVERSE);
   }
 
-  // JUnit has limitations with mocking Environment Variable. For this test, we simply replicate the
-  // behavior in `build()` by setting the universe domain to an env var value. Keeping this test
-  // case scenario if a future solution for testing env vars exists.
   @Test
   public void endpointContextBuild_universeDomainEnvVarSet() throws IOException {
     String envVarUniverseDomain = "random.com";
     EndpointContext endpointContext =
         defaultEndpointContextBuilder
-            .setUniverseDomain(envVarUniverseDomain)
+            .setUniverseDomain(null)
             .setClientSettingsEndpoint(null)
             .build();
     Truth.assertThat(endpointContext.resolvedEndpoint()).isEqualTo("test.random.com:443");