zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-06-27 23:03:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge JUnitBackport's expectThrows into assertThrows

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

11
javatests/google/registry/tools/GetResourceByKeyCommandTest.java
View file

@ -23,7 +23,6 @@ import static google.registry.testing.DatastoreHelper.persistDeletedContact;
import static google.registry.testing.DatastoreHelper.persistDeletedDomain;
import static google.registry.testing.DatastoreHelper.persistDeletedHost;
import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.testing.JUnitBackports.expectThrows;
import static org.joda.time.DateTimeZone.UTC;
import com.beust.jcommander.ParameterException;
@ -72,7 +71,7 @@ public class GetResourceByKeyCommandTest extends CommandTestCase<GetResourceByKe
public void testFailure_domain_oneDoesNotExist() throws Exception {
persistActiveDomain("example.tld");
NullPointerException thrown =
expectThrows(
assertThrows(
NullPointerException.class,
() ->
runCommand(
@ -121,7 +120,7 @@ public class GetResourceByKeyCommandTest extends CommandTestCase<GetResourceByKe
public void testFailure_contact_oneDoesNotExist() throws Exception {
persistActiveContact("sh8013");
NullPointerException thrown =
expectThrows(
assertThrows(
NullPointerException.class,
() ->
runCommand(
@ -170,7 +169,7 @@ public class GetResourceByKeyCommandTest extends CommandTestCase<GetResourceByKe
public void testFailure_host_oneDoesNotExist() throws Exception {
persistActiveHost("ns1.example.tld");
NullPointerException thrown =
expectThrows(
assertThrows(
NullPointerException.class,
() ->
runCommand(
@ -206,7 +205,7 @@ public class GetResourceByKeyCommandTest extends CommandTestCase<GetResourceByKe
@Test
public void testFailure_keyDoesNotExist() throws Exception {
NullPointerException thrown =
expectThrows(
assertThrows(
NullPointerException.class,
() -> runCommand("agR0ZXN0chULEgpEb21haW5CYXNlIgUyLVRMRAw"));
assertThat(thrown)
@ -217,7 +216,7 @@ public class GetResourceByKeyCommandTest extends CommandTestCase<GetResourceByKe
@Test
public void testFailure_nonsenseKey() throws Exception {
IllegalArgumentException thrown =
expectThrows(
assertThrows(
IllegalArgumentException.class, () -> runCommand("agR0ZXN0chULEgpEb21haW5CYXN"));
assertThat(thrown).hasMessageThat().contains("Could not parse Reference");
}