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-02-26 09:38:17 -08:00 committed by jianglai
parent f96a0b7da9
commit 606b470cd0
180 changed files with 1325 additions and 1381 deletions

View file

@ -19,7 +19,7 @@ import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.testing.DatastoreHelper.createTld;
import static google.registry.testing.DatastoreHelper.persistActiveDomain;
import static google.registry.testing.DatastoreHelper.persistResource;
import static google.registry.testing.JUnitBackports.expectThrows;
import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.util.DateTimeUtils.END_OF_TIME;
import static org.joda.money.CurrencyUnit.USD;
import static org.joda.time.DateTimeZone.UTC;
@ -178,7 +178,7 @@ public class BillingEventTest extends EntityTestCase {
@Test
public void testFailure_syntheticFlagWithoutCreationTime() {
IllegalStateException thrown =
expectThrows(
assertThrows(
IllegalStateException.class,
() ->
oneTime
@ -194,7 +194,7 @@ public class BillingEventTest extends EntityTestCase {
@Test
public void testFailure_syntheticCreationTimeWithoutFlag() {
IllegalStateException thrown =
expectThrows(
assertThrows(
IllegalStateException.class,
() -> oneTime.asBuilder().setSyntheticCreationTime(now.plusDays(10)).build());
assertThat(thrown)
@ -205,7 +205,7 @@ public class BillingEventTest extends EntityTestCase {
@Test
public void testFailure_syntheticFlagWithoutCancellationMatchingKey() {
IllegalStateException thrown =
expectThrows(
assertThrows(
IllegalStateException.class,
() ->
oneTime
@ -223,7 +223,7 @@ public class BillingEventTest extends EntityTestCase {
@Test
public void testFailure_cancellationMatchingKeyWithoutFlag() {
IllegalStateException thrown =
expectThrows(
assertThrows(
IllegalStateException.class,
() ->
oneTime
@ -266,7 +266,7 @@ public class BillingEventTest extends EntityTestCase {
@Test
public void testFailure_cancellation_forGracePeriodWithoutBillingEvent() {
IllegalArgumentException thrown =
expectThrows(
assertThrows(
IllegalArgumentException.class,
() ->
BillingEvent.Cancellation.forGracePeriod(
@ -280,7 +280,7 @@ public class BillingEventTest extends EntityTestCase {
@Test
public void testFailure_cancellationWithNoBillingEvent() {
IllegalStateException thrown =
expectThrows(
assertThrows(
IllegalStateException.class,
() ->
cancellationOneTime
@ -294,7 +294,7 @@ public class BillingEventTest extends EntityTestCase {
@Test
public void testFailure_cancellationWithBothBillingEvents() {
IllegalStateException thrown =
expectThrows(
assertThrows(
IllegalStateException.class,
() ->
cancellationOneTime