Automatically refactor more exception testing to use new JUnit rules

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=178911894
This commit is contained in:
mcilwain 2017-08-14 09:20:03 -04:00 committed by Ben McIlwain
parent 36ad38e5df
commit 7dc224627f
125 changed files with 1970 additions and 1982 deletions

View file

@ -15,11 +15,10 @@
package google.registry.tools.params;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.expectThrows;
import google.registry.model.registry.Registry.TldState;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@ -27,9 +26,6 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class EnumParameterTest {
@Rule
public final ExpectedException thrown = ExpectedException.none();
// There's no additional functionality exposed by this (or any other) EnumParameter, but using
// this in the test as EnumParameter is abstract.
private final TldStateParameter instance = new TldStateParameter();
@ -41,9 +37,11 @@ public class EnumParameterTest {
@Test
public void testFailure_badValue() throws Exception {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage(
"No enum constant google.registry.model.registry.Registry.TldState.GENERAL_SUNRUSH");
instance.convert("GENERAL_SUNRUSH");
IllegalArgumentException thrown =
expectThrows(IllegalArgumentException.class, () -> instance.convert("GENERAL_SUNRUSH"));
assertThat(thrown)
.hasMessageThat()
.contains(
"No enum constant google.registry.model.registry.Registry.TldState.GENERAL_SUNRUSH");
}
}