Merge JUnitBackport's expectThrows into assertThrows

More information: https://github.com/junit-team/junit5/issues/531

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=187034408
This commit is contained in:
cushon
2018-03-06 18:56:15 -05:00
committed by jianglai
parent f96a0b7da9
commit 606b470cd0
180 changed files with 1325 additions and 1381 deletions
@@ -15,7 +15,7 @@
package google.registry.util;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.expectThrows;
import static google.registry.testing.JUnitBackports.assertThrows;
import google.registry.testing.FakeClock;
import google.registry.testing.FakeSleeper;
@@ -83,7 +83,7 @@ public class RetrierTest {
@Test
public void testRetryableException() throws Exception {
CountingException thrown =
expectThrows(
assertThrows(
CountingException.class,
() -> retrier.callWithRetry(new CountingThrower(3), CountingException.class));
assertThat(thrown).hasMessageThat().contains("3");
@@ -92,7 +92,7 @@ public class RetrierTest {
@Test
public void testUnretryableException() throws Exception {
CountingException thrown =
expectThrows(
assertThrows(
CountingException.class,
() -> retrier.callWithRetry(new CountingThrower(5), IllegalArgumentException.class));
assertThat(thrown).hasMessageThat().contains("1");
@@ -107,7 +107,7 @@ public class RetrierTest {
@Test
public void testRetryFailed_withReporter() throws Exception {
CountingException thrown =
expectThrows(
assertThrows(
CountingException.class,
() -> {
TestReporter reporter = new TestReporter();