commit f976021e9528ce3a0d1e15659c66bc3a987cbe06
author David Pursehouse <dpursehouse@collab.net> Wed May 22 18:39:22 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Wed May 22 18:52:35 2019 +0900
tree 667a59eb775bdc363a71603ecafe713fb1395500
parent ca847cf70b2534468a5f6ad0fd09f73885cda4bb

MultipleQuotaPluginsIT: Migrate from try-catch-fail to assertThrows

Change-Id: I6dd14778f50c36a6282eafe5df7062d74477b8bc

javatests/com/google/gerrit/acceptance/server/quota/MultipleQuotaPluginsIT.java

diff --git a/javatests/com/google/gerrit/acceptance/server/quota/MultipleQuotaPluginsIT.java b/javatests/com/google/gerrit/acceptance/server/quota/MultipleQuotaPluginsIT.java
index 8b9ffc5..1caaf00 100644
--- a/javatests/com/google/gerrit/acceptance/server/quota/MultipleQuotaPluginsIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/quota/MultipleQuotaPluginsIT.java
@@ -15,6 +15,7 @@
 package com.google.gerrit.acceptance.server.quota;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.replay;
@@ -98,12 +99,11 @@
     replay(quotaEnforcerA);
     replay(quotaEnforcerB);
 
-    try {
-      quotaBackend.user(identifiedAdmin).requestToken("testGroup");
-      fail("expected a NullPointerException");
-    } catch (NullPointerException e) {
-      assertThat(exception).isEqualTo(e);
-    }
+    NullPointerException thrown =
+        assertThrows(
+            NullPointerException.class,
+            () -> quotaBackend.user(identifiedAdmin).requestToken("testGroup"));
+    assertThat(exception).isEqualTo(thrown);
 
     verify(quotaEnforcerA);
   }