zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-30 14:36:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

Automatically refactor more exception testing to use new JUnit rules

Browse source 
-------------
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
Download patch file Download diff file Expand all files Collapse all files

32
javatests/google/registry/whois/WhoisReaderTest.java
View file

@ -16,6 +16,7 @@ package google.registry.whois;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.DatastoreHelper.createTlds;
import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.testing.LogsSubject.assertAboutLogs;
import com.google.common.testing.TestLogHandler;
@ -26,7 +27,6 @@ import java.util.logging.Level;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@ -35,9 +35,6 @@ import org.junit.runners.JUnit4;
public class WhoisReaderTest {
@Rule public final AppEngineRule appEngine = AppEngineRule.builder().withDatastore().build();
@Rule public final ExpectedException thrown = ExpectedException.none();
private final FakeClock clock = new FakeClock();
private final TestLogHandler testLogHandler = new TestLogHandler();
@ -143,20 +140,17 @@ public class WhoisReaderTest {
@Test
public void testTooManyArgsDomainLookup() throws Exception {
thrown.expect(WhoisException.class);
readCommand("domain example.tld foo.bar");
assertThrows(WhoisException.class, () -> readCommand("domain example.tld foo.bar"));
}
@Test
public void testTooFewArgsDomainLookup() throws Exception {
thrown.expect(WhoisException.class);
readCommand("domain");
assertThrows(WhoisException.class, () -> readCommand("domain"));
}
@Test
public void testIllegalArgDomainLookup() throws Exception {
thrown.expect(WhoisException.class);
readCommand("domain 1.1");
assertThrows(WhoisException.class, () -> readCommand("domain 1.1"));
}
@Test
@ -218,20 +212,17 @@ public class WhoisReaderTest {
@Test
public void testTooManyArgsNameserverLookup() throws Exception {
thrown.expect(WhoisException.class);
readCommand("nameserver ns.example.tld foo.bar");
assertThrows(WhoisException.class, () -> readCommand("nameserver ns.example.tld foo.bar"));
}
@Test
public void testTooFewArgsNameserverLookup() throws Exception {
thrown.expect(WhoisException.class);
readCommand("nameserver");
assertThrows(WhoisException.class, () -> readCommand("nameserver"));
}
@Test
public void testIllegalArgNameserverLookup() throws Exception {
thrown.expect(WhoisException.class);
readCommand("nameserver 1.1");
assertThrows(WhoisException.class, () -> readCommand("nameserver 1.1"));
}
@Test
@ -261,8 +252,7 @@ public class WhoisReaderTest {
@Test
public void testRegistrarLookupNoArgs() throws Exception {
thrown.expect(WhoisException.class);
readCommand("registrar");
assertThrows(WhoisException.class, () -> readCommand("registrar"));
}
@Test
@ -312,8 +302,7 @@ public class WhoisReaderTest {
@Test
public void testNameserverLookupByIpTooManyArgs() throws Exception {
thrown.expect(WhoisException.class);
readCommand("nameserver 43.34.12.213 43.34.12.213");
assertThrows(WhoisException.class, () -> readCommand("nameserver 43.34.12.213 43.34.12.213"));
}
@Test
@ -342,8 +331,7 @@ public class WhoisReaderTest {
@Test
public void testNoArgs() throws Exception {
thrown.expect(WhoisException.class);
readCommand("");
assertThrows(WhoisException.class, () -> readCommand(""));
}
@Test