commit b922677b534290f27089eea8dbb687a36980ae49
author jcater <jcater@google.com> Mon Apr 29 12:04:52 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 29 12:06:11 2019 -0700
tree e60edba8c5859dc60771be0e0ccf11e2434c1b2c
parent 72ca770ff13b8ac14c4260ba53dfd93dd0715b57

Automatic cleanup change.

PiperOrigin-RevId: 245795216

src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
index fed06d7..1bcf7e3 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerTest.java
@@ -14,8 +14,8 @@
 package com.google.devtools.build.lib.remote;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
-import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.anyCollection;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
@@ -400,12 +400,8 @@
     IOException err = new IOException("local execution error");
     when(localRunner.exec(eq(spawn), eq(policy))).thenThrow(err);
 
-    try {
-      runner.exec(spawn, policy);
-      fail("expected IOException to be raised");
-    } catch (IOException e) {
-      assertThat(e).isSameAs(err);
-    }
+    IOException e = assertThrows(IOException.class, () -> runner.exec(spawn, policy));
+    assertThat(e).isSameAs(err);
 
     verify(localRunner).exec(eq(spawn), eq(policy));
   }
@@ -427,12 +423,8 @@
     IOException err = new IOException("local execution error");
     when(localRunner.exec(eq(spawn), eq(policy))).thenThrow(err);
 
-    try {
-      runner.exec(spawn, policy);
-      fail("expected IOException to be raised");
-    } catch (IOException e) {
-      assertThat(e).isSameAs(err);
-    }
+    IOException e = assertThrows(IOException.class, () -> runner.exec(spawn, policy));
+    assertThat(e).isSameAs(err);
 
     verify(localRunner).exec(eq(spawn), eq(policy));
   }
@@ -452,12 +444,8 @@
     IOException err = new IOException("local execution error");
     when(localRunner.exec(eq(spawn), eq(policy))).thenThrow(err);
 
-    try {
-      runner.exec(spawn, policy);
-      fail("expected IOException to be raised");
-    } catch (IOException e) {
-      assertThat(e).isSameAs(err);
-    }
+    IOException e = assertThrows(IOException.class, () -> runner.exec(spawn, policy));
+    assertThat(e).isSameAs(err);
 
     verify(localRunner).exec(eq(spawn), eq(policy));
   }
@@ -743,14 +731,9 @@
     Spawn spawn = newSimpleSpawn();
     SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn);
 
-    try {
-      runner.exec(spawn, policy);
-      fail("Exception expected");
-    } catch (SpawnExecException e) {
-      assertThat(e.getSpawnResult().exitCode())
-          .isEqualTo(ExitCode.REMOTE_ERROR.getNumericExitCode());
-      assertThat(e.getSpawnResult().getDetailMessage("", "", false, false)).contains("reasons");
-    }
+    SpawnExecException e = assertThrows(SpawnExecException.class, () -> runner.exec(spawn, policy));
+    assertThat(e.getSpawnResult().exitCode()).isEqualTo(ExitCode.REMOTE_ERROR.getNumericExitCode());
+    assertThat(e.getSpawnResult().getDetailMessage("", "", false, false)).contains("reasons");
   }
 
   @Test
@@ -767,14 +750,9 @@
     Spawn spawn = newSimpleSpawn();
     SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn);
 
-    try {
-      runner.exec(spawn, policy);
-      fail("Exception expected");
-    } catch (SpawnExecException e) {
-      assertThat(e.getSpawnResult().exitCode())
-          .isEqualTo(ExitCode.REMOTE_ERROR.getNumericExitCode());
-      assertThat(e.getSpawnResult().getDetailMessage("", "", false, false)).contains("reasons");
-    }
+    SpawnExecException e = assertThrows(SpawnExecException.class, () -> runner.exec(spawn, policy));
+    assertThat(e.getSpawnResult().exitCode()).isEqualTo(ExitCode.REMOTE_ERROR.getNumericExitCode());
+    assertThat(e.getSpawnResult().getDetailMessage("", "", false, false)).contains("reasons");
   }
 
   @Test
@@ -917,12 +895,8 @@
     SpawnExecutionContext policy = new FakeSpawnExecutionContext(spawn);
 
     // act
-    try {
-      runner.exec(spawn, policy);
-      fail("expected exception");
-    } catch (SpawnExecException e) {
-      assertThat(e.getMessage()).isEqualTo(downloadFailure.getMessage());
-    }
+    SpawnExecException e = assertThrows(SpawnExecException.class, () -> runner.exec(spawn, policy));
+    assertThat(e.getMessage()).isEqualTo(downloadFailure.getMessage());
 
     // assert
     verify(cache).downloadMinimal(eq(succeededAction), anyCollection(), any(), any(), any(), any());