formatting and changing the tests to use assertThrows

Author: aeitzman

oauth2_http/java/com/google/auth/mtls/WorkloadCertificateConfiguration.java

@@ -62,11 +62,9 @@ String getPrivateKeyPath() {
     return privateKeyPath;
   }
 
-
-
   static WorkloadCertificateConfiguration fromCertificateConfigurationStream(
       InputStream certConfigStream) throws IOException {
-    if (certConfigStream == null){
+    if (certConfigStream == null) {
       throw new IllegalArgumentException("certConfigStream must not be null.");
     }
 

oauth2_http/java/com/google/auth/mtls/X509Provider.java

@@ -52,19 +52,21 @@ public X509Provider(String certConfigPathOverride) {
     this.certConfigPathOverride = certConfigPathOverride;
   }
 
-  public X509Provider(){
+  public X509Provider() {
     this(null);
   }
 
   /**
    * Finds the certificate configuration file, then builds a Keystore using the X.509 certificate
    * and private key pointed to by the configuration. This will check the following locations in
    * order.
+   *
    * <ul>
    *   <li>The certificate config override path, if set.
    *   <li>The path pointed to by the "GOOGLE_API_CERTIFICATE_CONFIG" environment variable
    *   <li>The well known gcloud location for the certificate configuration file.
    * </ul>
+   *
    * @return a KeyStore containing the X.509 certificate specified by the certificate configuration.
    * @throws IOException if there is an error retrieving the certificate configuration.
    */

oauth2_http/javatests/com/google/auth/mtls/WorkloadCertificateConfigurationTest.java

@@ -33,12 +33,14 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import com.google.api.client.json.GenericJson;
 import com.google.auth.TestUtils;
 import java.io.IOException;
 import java.io.InputStream;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class WorkloadCertificateConfigurationTest {
@@ -60,15 +62,9 @@ public void workloadCertificateConfig_fromStreamMissingCertPath_Fails() throws I
     String privateKeyPath = "key.crt";
     InputStream configStream = writeWorkloadCertificateConfigStream(certPath, privateKeyPath);
 
-    try {
-      WorkloadCertificateConfiguration config =
-          WorkloadCertificateConfiguration.fromCertificateConfigurationStream(configStream);
-      fail("Expected an error due to missing the certificate path field.");
-    } catch (IllegalArgumentException e) {
-      assertEquals(
-          "The cert_path field must be provided in the workload certificate configuration.",
-          e.getMessage());
-    }
+    IllegalArgumentException exception =
+        Assert.assertThrows(IllegalArgumentException.class, () -> WorkloadCertificateConfiguration.fromCertificateConfigurationStream(configStream));
+    assertTrue(exception.getMessage().contains("The cert_path field must be provided in the workload certificate configuration."));
   }
 
   @Test
@@ -77,15 +73,9 @@ public void workloadCertificateConfig_fromStreamMissingPrivateKeyPath_Fails() th
     String privateKeyPath = "";
     InputStream configStream = writeWorkloadCertificateConfigStream(certPath, privateKeyPath);
 
-    try {
-      WorkloadCertificateConfiguration config =
-          WorkloadCertificateConfiguration.fromCertificateConfigurationStream(configStream);
-      fail("Expected an error due to missing the private key path field.");
-    } catch (IllegalArgumentException e) {
-      assertEquals(
-          "The key_path field must be provided in the workload certificate configuration.",
-          e.getMessage());
-    }
+    IllegalArgumentException exception =
+        Assert.assertThrows(IllegalArgumentException.class, () -> WorkloadCertificateConfiguration.fromCertificateConfigurationStream(configStream));
+    assertTrue(exception.getMessage().contains("The key_path field must be provided in the workload certificate configuration."));
   }
 
   @Test
@@ -94,31 +84,19 @@ public void workloadCertificateConfig_fromStreamMissingWorkload_Fails() throws I
     json.put("cert_configs", new GenericJson());
     InputStream configStream = TestUtils.jsonToInputStream(json);
 
-    try {
-      WorkloadCertificateConfiguration config =
-          WorkloadCertificateConfiguration.fromCertificateConfigurationStream(configStream);
-      fail("Expected an error due to missing the workload field.");
-    } catch (IllegalArgumentException e) {
-      assertEquals(
-          "A workload certificate configuration must be provided in the cert_configs object.",
-          e.getMessage());
-    }
+    IllegalArgumentException exception =
+        Assert.assertThrows(IllegalArgumentException.class, () -> WorkloadCertificateConfiguration.fromCertificateConfigurationStream(configStream));
+    assertTrue(exception.getMessage().contains("A workload certificate configuration must be provided in the cert_configs object."));
   }
 
   @Test
   public void workloadCertificateConfig_fromStreamMissingCertConfig_Fails() throws IOException {
     GenericJson json = new GenericJson();
     InputStream configStream = TestUtils.jsonToInputStream(json);
 
-    try {
-      WorkloadCertificateConfiguration config =
-          WorkloadCertificateConfiguration.fromCertificateConfigurationStream(configStream);
-      fail("Expected an error due to missing the cert_config field.");
-    } catch (IllegalArgumentException e) {
-      assertEquals(
-          "The cert_configs object must be provided in the certificate configuration file.",
-          e.getMessage());
-    }
+    IllegalArgumentException exception =
+        Assert.assertThrows(IllegalArgumentException.class, () -> WorkloadCertificateConfiguration.fromCertificateConfigurationStream(configStream));
+    assertTrue(exception.getMessage().contains("The cert_configs object must be provided in the certificate configuration file."));
   }
 
   static InputStream writeWorkloadCertificateConfigStream(String certPath, String privateKeyPath)

oauth2_http/javatests/com/google/auth/mtls/X509ProviderTest.java

@@ -46,6 +46,7 @@
 import java.security.cert.CertificateFactory;
 import java.util.HashMap;
 import java.util.Map;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class X509ProviderTest {
@@ -93,13 +94,9 @@ public void x509Provider_fileDoesntExist_throws() {
             "Error reading certificate configuration file value '%s': File does not exist.",
             certConfigPath);
 
-    try {
-      testProvider.getKeyStore();
-      fail("No key stores expected.");
-    } catch (IOException e) {
-      String message = e.getMessage();
-      assertTrue(message.equals(expectedErrorMessage));
-    }
+    IOException exception =
+        Assert.assertThrows(IOException.class, () -> testProvider.getKeyStore());
+    assertTrue(exception.getMessage().contains(expectedErrorMessage));
   }
 
   @Test
@@ -113,13 +110,9 @@ public void x509Provider_emptyFile_throws() {
             "Error reading certificate configuration file value '%s': no JSON input found",
             certConfigPath);
 
-    try {
-      testProvider.getKeyStore();
-      fail("No key store expected.");
-    } catch (IOException e) {
-      String message = e.getMessage();
-      assertTrue(message.equals(expectedErrorMessage));
-    }
+    IOException exception =
+        Assert.assertThrows(IOException.class, () -> testProvider.getKeyStore());
+    assertTrue(exception.getMessage().contains(expectedErrorMessage));
   }
 
   @Test
@@ -203,7 +196,9 @@ static class TestX509Provider extends X509Provider {
     private Map<String, String> variables;
     private Map<String, String> properties;
 
-    TestX509Provider() {this(null);}
+    TestX509Provider() {
+      this(null);
+    }
 
     TestX509Provider(String filePathOverride) {
       super(filePathOverride);