mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-07-31 12:32:50 +00:00
Code Issues Releases 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-03-06 18:56:15 -05: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
javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java
+11 -11
View File
@@ -17,7 +17,7 @@ package google.registry.tools;
import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.DatastoreHelper.createTld;
import static google.registry.testing.JUnitBackports.expectThrows;
import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
import static org.mockito.Mockito.when;
@@ -54,7 +54,7 @@ public class GenerateEscrowDepositCommandTest
@Test
public void testCommand_missingTld() throws Exception {
ParameterException thrown =
expectThrows(
assertThrows(
ParameterException.class,
() ->
runCommand("--watermark=2017-01-01T00:00:00Z", "--mode=thin", "-r 42", "-o test"));
@@ -64,7 +64,7 @@ public class GenerateEscrowDepositCommandTest
@Test
public void testCommand_emptyTld() throws Exception {
IllegalArgumentException thrown =
expectThrows(
assertThrows(
IllegalArgumentException.class,
() ->
runCommand(
@@ -79,7 +79,7 @@ public class GenerateEscrowDepositCommandTest
@Test
public void testCommand_invalidTld() throws Exception {
IllegalArgumentException thrown =
expectThrows(
assertThrows(
IllegalArgumentException.class,
() ->
runCommand(
@@ -94,7 +94,7 @@ public class GenerateEscrowDepositCommandTest
@Test
public void testCommand_missingWatermark() throws Exception {
ParameterException thrown =
expectThrows(
assertThrows(
ParameterException.class,
() -> runCommand("--tld=tld", "--mode=full", "-r 42", "-o test"));
assertThat(thrown)
@@ -105,7 +105,7 @@ public class GenerateEscrowDepositCommandTest
@Test
public void testCommand_emptyWatermark() throws Exception {
IllegalArgumentException thrown =
expectThrows(
assertThrows(
IllegalArgumentException.class,
() -> runCommand("--tld=tld", "--watermark=", "--mode=full", "-r 42", "-o test"));
assertThat(thrown).hasMessageThat().contains("Invalid format: \"\"");
@@ -114,7 +114,7 @@ public class GenerateEscrowDepositCommandTest
@Test
public void testCommand_missingOutdir() throws Exception {
ParameterException thrown =
expectThrows(
assertThrows(
ParameterException.class,
() ->
runCommand(
@@ -125,7 +125,7 @@ public class GenerateEscrowDepositCommandTest
@Test
public void testCommand_emptyOutdir() throws Exception {
ParameterException thrown =
expectThrows(
assertThrows(
ParameterException.class,
() ->
runCommand(
@@ -140,7 +140,7 @@ public class GenerateEscrowDepositCommandTest
@Test
public void testCommand_invalidWatermark() throws Exception {
ParameterException thrown =
expectThrows(
assertThrows(
ParameterException.class,
() ->
runCommand(
@@ -155,7 +155,7 @@ public class GenerateEscrowDepositCommandTest
@Test
public void testCommand_invalidMode() throws Exception {
ParameterException thrown =
expectThrows(
assertThrows(
ParameterException.class,
() ->
runCommand(
@@ -172,7 +172,7 @@ public class GenerateEscrowDepositCommandTest
@Test
public void testCommand_invalidRevision() throws Exception {
ParameterException thrown =
expectThrows(
assertThrows(
ParameterException.class,
() ->
runCommand(