From 53e8618bdd1beb9e88cbe0d45f3cdd5e665e78f0 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 22 May 2019 19:10:14 +0900 Subject: [PATCH] RequestScopeOperationsImplTest: Migrate from try-catch-fail to assertThrows Change-Id: Ia74e25bb38178b643fd12d4f6cc13b09d0d0f6ef --- .../request/RequestScopeOperationsImplTest.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/javatests/com/google/gerrit/acceptance/testsuite/request/RequestScopeOperationsImplTest.java b/javatests/com/google/gerrit/acceptance/testsuite/request/RequestScopeOperationsImplTest.java index 4d0bb525e1..90f581d52f 100644 --- a/javatests/com/google/gerrit/acceptance/testsuite/request/RequestScopeOperationsImplTest.java +++ b/javatests/com/google/gerrit/acceptance/testsuite/request/RequestScopeOperationsImplTest.java @@ -16,8 +16,8 @@ package com.google.gerrit.acceptance.testsuite.request; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static com.google.common.truth.Truth.assert_; import static com.google.common.truth.Truth8.assertThat; +import static com.google.gerrit.testing.GerritJUnit.assertThrows; import com.google.common.collect.ImmutableSet; import com.google.gerrit.acceptance.AbstractDaemonTest; @@ -68,12 +68,9 @@ public class RequestScopeOperationsImplTest extends AbstractDaemonTest { @Test public void setApiUserToNonExistingUser() throws Exception { fastCheckCurrentUser(admin.id()); - try { - requestScopeOperations.setApiUser(Account.id(sequences.nextAccountId())); - assert_().fail("expected RuntimeException"); - } catch (RuntimeException e) { - // Expected. - } + assertThrows( + RuntimeException.class, + () -> requestScopeOperations.setApiUser(Account.id(sequences.nextAccountId()))); checkCurrentUser(admin.id()); }