assertThrows changes. Fixed TestUtils getDefaultExpireTime to represent time in UTC.

Author: vverman

oauth2_http/javatests/com/google/auth/TestUtils.java

@@ -56,6 +56,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 import javax.annotation.Nullable;
 
 /** Utilities for test code under com.google.auth. */
@@ -150,8 +151,10 @@ public static HttpResponseException buildHttpResponseException(
   public static String getDefaultExpireTime() {
     Calendar calendar = Calendar.getInstance();
     calendar.setTime(new Date());
-    calendar.add(Calendar.SECOND, 3000);
-    return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(calendar.getTime());
+    calendar.add(Calendar.SECOND, 300);
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+    dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+    return dateFormat.format(calendar.getTime());
   }
 
   private TestUtils() {}

oauth2_http/javatests/com/google/auth/oauth2/ExternalAccountAuthorizedUserCredentialsTest.java

@@ -38,6 +38,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -1243,7 +1244,6 @@ public void testRefresh_trustBoundarySuccess() throws IOException {
     TrustBoundary trustBoundary = credentials.getTrustBoundary();
     assertNotNull(trustBoundary);
     assertEquals(TestUtils.TRUST_BOUNDARY_ENCODED_LOCATION, trustBoundary.getEncodedLocations());
-    TrustBoundary.setEnvironmentProviderForTest(null);
   }
 
   @Test
@@ -1262,15 +1262,15 @@ public void testRefresh_trustBoundaryFails_incorrectAudience() throws IOExceptio
             .setTokenUrl(TOKEN_URL)
             .build();
 
-    try {
-      credentials.refresh();
-      fail("Expected IOException to be thrown.");
-    } catch (IOException e) {
-      assertEquals(
-          "The provided audience is not in the correct format for a workforce pool.",
-          e.getMessage());
-    }
-    TrustBoundary.setEnvironmentProviderForTest(null);
+    IOException exception =
+        assertThrows(
+            IOException.class,
+            () -> {
+              credentials.refresh();
+            });
+    assertEquals(
+        "The provided audience is not in the correct format for a workforce pool.",
+        exception.getMessage());
   }
 
   @Test

oauth2_http/javatests/com/google/auth/oauth2/ExternalAccountCredentialsTest.java

@@ -36,6 +36,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -1287,15 +1288,25 @@ public void getTrustBoundaryUrl_workforce() throws IOException {
     assertEquals(expectedUrl, credentials.getTrustBoundaryUrl());
   }
 
-  @Test(expected = IOException.class)
-  public void getTrustBoundaryUrl_invalidAudience_throws() throws IOException {
+  @Test
+  public void getTrustBoundaryUrl_invalidAudience_throws() {
     ExternalAccountCredentials credentials =
         TestExternalAccountCredentials.newBuilder()
             .setAudience("invalid-audience")
             .setSubjectTokenType("subject_token_type")
             .setCredentialSource(new TestCredentialSource(FILE_CREDENTIAL_SOURCE_MAP))
             .build();
-    credentials.getTrustBoundaryUrl();
+
+    IOException exception =
+        assertThrows(
+            IOException.class,
+            () -> {
+              credentials.getTrustBoundaryUrl();
+            });
+
+    assertEquals(
+        "The provided audience is not in a valid format for either a workload identity pool or a workforce pool.",
+        exception.getMessage());
   }
 
   @Test