chore: Fix ITGdch tests

Author: lqiu96

sdk-platform-java/java-showcase-3.21.0/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITGdch.java

@@ -156,7 +156,9 @@ void testCreateClient_withGdchCredentialAndNoAudience_defaultsToEndpointBasedAud
     NullPointerException expectedEx =
         assertThrows(NullPointerException.class, () -> initialCredentials.refresh());
     assertTrue(
-        expectedEx.getMessage().contains("Audience are not configured for GDCH service account"));
+        expectedEx
+            .getMessage()
+            .contains("Audience cannot be null or empty for GDCH service account credentials"));
 
     // However, the credentials prepared in ClientContext should be able to refresh since the
     // audience would be
@@ -201,7 +203,7 @@ void testCreateClient_withGdchCredentialWithValidAudience_usesCredentialWithPass
     assertTrue(
         thrownByClientCreds
             .getMessage()
-            .contains("Audience are not configured for GDCH service account"));
+            .contains("Audience cannot be null or empty for GDCH service account credentials"));
 
     // But the credentials prepared in ClientContext should be able to refresh since the audience
     // would be internally

sdk-platform-java/java-showcase-3.21.0/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/util/InterceptingMockTokenServerTransport.java

@@ -18,10 +18,9 @@
 
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.json.JsonFactory;
+import com.google.api.client.json.JsonParser;
 import com.google.api.client.json.gson.GsonFactory;
-import com.google.api.client.json.webtoken.JsonWebSignature;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
-import com.google.auth.TestUtils;
 import com.google.auth.oauth2.MockTokenServerTransport;
 import java.io.IOException;
 import java.util.Map;
@@ -39,10 +38,8 @@ public LowLevelHttpRequest buildRequest(String method, String url) throws IOExce
 
   public String getLastAudienceSent() throws IOException {
     String contentString = lastRequest.getContentAsString();
-    Map<String, String> query = TestUtils.parseQuery(contentString);
-    String assertion = query.get("assertion");
-    JsonWebSignature signature = JsonWebSignature.parse(JSON_FACTORY, assertion);
-    String foundTargetAudience = (String) signature.getPayload().get("api_audience");
-    return foundTargetAudience;
+    JsonParser jsonParser = JSON_FACTORY.createJsonParser(contentString);
+    Map<String, Object> json = jsonParser.parseAndClose(Map.class);
+    return (String) json.get("audience");
   }
 }

sdk-platform-java/java-showcase-3.25.8/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITGdch.java

@@ -156,7 +156,9 @@ void testCreateClient_withGdchCredentialAndNoAudience_defaultsToEndpointBasedAud
     NullPointerException expectedEx =
         assertThrows(NullPointerException.class, () -> initialCredentials.refresh());
     assertTrue(
-        expectedEx.getMessage().contains("Audience are not configured for GDCH service account"));
+        expectedEx
+            .getMessage()
+            .contains("Audience cannot be null or empty for GDCH service account credentials"));
 
     // However, the credentials prepared in ClientContext should be able to refresh since the
     // audience would be
@@ -201,7 +203,7 @@ void testCreateClient_withGdchCredentialWithValidAudience_usesCredentialWithPass
     assertTrue(
         thrownByClientCreds
             .getMessage()
-            .contains("Audience are not configured for GDCH service account"));
+            .contains("Audience cannot be null or empty for GDCH service account credentials"));
 
     // But the credentials prepared in ClientContext should be able to refresh since the audience
     // would be internally

sdk-platform-java/java-showcase-3.25.8/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/util/InterceptingMockTokenServerTransport.java

@@ -18,6 +18,7 @@
 
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.json.JsonFactory;
+import com.google.api.client.json.JsonParser;
 import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.json.webtoken.JsonWebSignature;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
@@ -39,10 +40,8 @@ public LowLevelHttpRequest buildRequest(String method, String url) throws IOExce
 
   public String getLastAudienceSent() throws IOException {
     String contentString = lastRequest.getContentAsString();
-    Map<String, String> query = TestUtils.parseQuery(contentString);
-    String assertion = query.get("assertion");
-    JsonWebSignature signature = JsonWebSignature.parse(JSON_FACTORY, assertion);
-    String foundTargetAudience = (String) signature.getPayload().get("api_audience");
-    return foundTargetAudience;
+    JsonParser jsonParser = JSON_FACTORY.createJsonParser(contentString);
+    Map<String, Object> json = jsonParser.parseAndClose(Map.class);
+    return (String) json.get("audience");
   }
 }

sdk-platform-java/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/util/InterceptingMockTokenServerTransport.java

@@ -18,6 +18,7 @@
 
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.json.JsonFactory;
+import com.google.api.client.json.JsonParser;
 import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.json.webtoken.JsonWebSignature;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
@@ -39,7 +40,8 @@ public LowLevelHttpRequest buildRequest(String method, String url) throws IOExce
 
   public String getLastAudienceSent() throws IOException {
     String contentString = lastRequest.getContentAsString();
-    Map<String, Object> json = JSON_FACTORY.createJsonParser(contentString).parse(Map.class);
+    JsonParser jsonParser = JSON_FACTORY.createJsonParser(contentString);
+    Map<String, Object> json = jsonParser.parseAndClose(Map.class);
     return (String) json.get("audience");
   }
 }