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

@ -15,7 +15,7 @@
package google.registry.tldconfig.idn;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.expectThrows;
import static google.registry.testing.JUnitBackports.assertThrows;
import com.google.common.collect.ImmutableList;
import java.net.URI;
@ -107,7 +107,7 @@ public class IdnTableTest {
public void testMissingUrl_throwsNpe() {
ImmutableList<String> of = ImmutableList.of("# Policy: https://love.example/policy.html");
NullPointerException thrown =
expectThrows(
assertThrows(
NullPointerException.class, () -> IdnTable.createFrom("sloth", of, Optional.empty()));
assertThat(thrown).hasMessageThat().contains("sloth missing '# URL:");
}
@ -116,7 +116,7 @@ public class IdnTableTest {
public void testMissingPolicy_throwsNpe() {
ImmutableList<String> of = ImmutableList.of("# URL: https://love.example/sloth.txt");
NullPointerException thrown =
expectThrows(
assertThrows(
NullPointerException.class, () -> IdnTable.createFrom("sloth", of, Optional.empty()));
assertThat(thrown).hasMessageThat().contains("sloth missing '# Policy:");
}