commit 4a4a08c6ad808259ddbcd40641ab88e0b89c3384
author David Pursehouse <dpursehouse@collab.net> Wed May 22 16:53:48 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Wed May 22 18:52:35 2019 +0900
tree d16805c8cef995bbceee3a3f2f0d8c1c54b89d41
parent 8c2aa08ffb4598c95acbc05d5aa65fd308869aa8

AddressTest: Migrate from try-catch-fail to assertThrows

Change-Id: I46e49b0136cefe175043d035311ea79876f5fdd0

javatests/com/google/gerrit/mail/AddressTest.java

diff --git a/javatests/com/google/gerrit/mail/AddressTest.java b/javatests/com/google/gerrit/mail/AddressTest.java
index 5607ae9..da26123 100644
--- a/javatests/com/google/gerrit/mail/AddressTest.java
+++ b/javatests/com/google/gerrit/mail/AddressTest.java
@@ -15,7 +15,7 @@
 package com.google.gerrit.mail;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
 
 import org.junit.Test;
 
@@ -96,12 +96,9 @@
   }
 
   private void assertInvalid(String in) {
-    try {
-      Address.parse(in);
-      fail("Expected IllegalArgumentException for " + in);
-    } catch (IllegalArgumentException e) {
-      assertThat(e.getMessage()).isEqualTo("Invalid email address: " + in);
-    }
+    IllegalArgumentException thrown =
+        assertThrows(IllegalArgumentException.class, () -> Address.parse(in));
+    assertThat(thrown).hasMessageThat().isEqualTo("Invalid email address: " + in);
   }
 
   @Test