mirror of
https://github.com/google/nomulus.git
synced 2025-05-16 09:27:16 +02:00
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:
parent
f96a0b7da9
commit
606b470cd0
180 changed files with 1325 additions and 1381 deletions
|
@ -16,7 +16,7 @@ package google.registry.ui.forms;
|
|||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static com.google.common.truth.Truth8.assertThat;
|
||||
import static google.registry.testing.JUnitBackports.expectThrows;
|
||||
import static google.registry.testing.JUnitBackports.assertThrows;
|
||||
import static org.hamcrest.MatcherAssert.assertThat;
|
||||
import static org.hamcrest.Matchers.equalTo;
|
||||
|
||||
|
@ -47,7 +47,7 @@ public class FormFieldsTest {
|
|||
@Test
|
||||
public void testXsNormalizedString_containsNonSpaceWhitespace_fails() {
|
||||
FormFieldException thrown =
|
||||
expectThrows(
|
||||
assertThrows(
|
||||
FormFieldException.class,
|
||||
() -> FormFields.XS_NORMALIZED_STRING.convert(" hello \r\n\t there\n"));
|
||||
assertThat(
|
||||
|
@ -71,7 +71,7 @@ public class FormFieldsTest {
|
|||
@Test
|
||||
public void testXsEppE164PhoneNumber_localizedNumber_fails() {
|
||||
FormFieldException thrown =
|
||||
expectThrows(
|
||||
assertThrows(
|
||||
FormFieldException.class, () -> FormFields.PHONE_NUMBER.convert("(212) 565-0000"));
|
||||
assertThat(thrown)
|
||||
.hasMessageThat()
|
||||
|
@ -96,7 +96,7 @@ public class FormFieldsTest {
|
|||
@Test
|
||||
public void testXsEppRoid_missingHyphen_fails() {
|
||||
FormFieldException thrown =
|
||||
expectThrows(FormFieldException.class, () -> FormFields.ROID.convert("SH8013REP"));
|
||||
assertThrows(FormFieldException.class, () -> FormFields.ROID.convert("SH8013REP"));
|
||||
assertThat(thrown).hasMessageThat().contains("Please enter a valid EPP ROID, e.g. SH8013-REP");
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue