mirror of
https://github.com/google/nomulus.git
synced 2025-07-04 18:23:26 +02:00
Merge JUnitBackport's expectThrows into assertThrows
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:
parent
f96a0b7da9
commit
606b470cd0
180 changed files with 1325 additions and 1381 deletions
|
@ -21,7 +21,6 @@ import static google.registry.testing.DatastoreHelper.loadRegistrar;
|
|||
import static google.registry.testing.DatastoreHelper.persistActiveContact;
|
||||
import static google.registry.testing.DatastoreHelper.persistDomainAndEnqueueLordn;
|
||||
import static google.registry.testing.JUnitBackports.assertThrows;
|
||||
import static google.registry.testing.JUnitBackports.expectThrows;
|
||||
import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Mockito.mock;
|
||||
|
@ -165,7 +164,7 @@ public class LordnTaskTest {
|
|||
.setCreationClientId("nonexistentRegistrar")
|
||||
.build();
|
||||
IllegalStateException thrown =
|
||||
expectThrows(IllegalStateException.class, () -> persistDomainAndEnqueueLordn(domain));
|
||||
assertThrows(IllegalStateException.class, () -> persistDomainAndEnqueueLordn(domain));
|
||||
assertThat(thrown)
|
||||
.hasMessageThat()
|
||||
.contains("No registrar found for client id: nonexistentRegistrar");
|
||||
|
@ -204,7 +203,7 @@ public class LordnTaskTest {
|
|||
Queue queue = mock(Queue.class);
|
||||
when(queue.leaseTasks(any(LeaseOptions.class))).thenThrow(TransientFailureException.class);
|
||||
RuntimeException thrown =
|
||||
expectThrows(RuntimeException.class, () -> LordnTask.loadAllTasks(queue, "tld"));
|
||||
assertThrows(RuntimeException.class, () -> LordnTask.loadAllTasks(queue, "tld"));
|
||||
assertThat(thrown).hasMessageThat().contains("Error leasing tasks");
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue