Normalize expected exception handling in tests

This removes exception rules that aren't used and switches over
existing uses of ExceptedException to ExceptionRule when possible.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=129013329
This commit is contained in:
Ben McIlwain 2016-08-01 12:25:54 -07:00 committed by Justine Tunney
parent 60fc27646a
commit 9e65acc937
11 changed files with 14 additions and 29 deletions

View file

@ -19,9 +19,9 @@ import static google.registry.testing.DatastoreHelper.createTlds;
import com.google.common.net.InternetDomainName;
import google.registry.testing.AppEngineRule;
import google.registry.testing.ExceptionRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@ -33,7 +33,7 @@ public class RegistriesTest {
public final AppEngineRule appEngine = AppEngineRule.builder().withDatastore().build();
@Rule
public ExpectedException thrown = ExpectedException.none();
public ExceptionRule thrown = new ExceptionRule();
private void initTestTlds() {
createTlds("foo", "a.b.c"); // Test a multipart tld.