mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-28 18:55:37 +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/model/rde/RdeRevisionTest.java
+6 -6
View File
@@ -19,7 +19,7 @@ import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.model.rde.RdeMode.FULL;
import static google.registry.model.rde.RdeRevision.getNextRevision;
import static google.registry.model.rde.RdeRevision.saveRevision;
import static google.registry.testing.JUnitBackports.expectThrows;
import static google.registry.testing.JUnitBackports.assertThrows;
import com.google.common.base.VerifyException;
import com.googlecode.objectify.VoidWork;
@@ -67,7 +67,7 @@ public class RdeRevisionTest {
@Test
public void testSaveRevision_objectDoesntExist_newRevisionIsOne_throwsVe() throws Exception {
VerifyException thrown =
expectThrows(
assertThrows(
VerifyException.class,
() ->
ofy()
@@ -85,7 +85,7 @@ public class RdeRevisionTest {
public void testSaveRevision_objectExistsAtZero_newRevisionIsZero_throwsVe() throws Exception {
save("melancholy", DateTime.parse("1984-12-18TZ"), FULL, 0);
VerifyException thrown =
expectThrows(
assertThrows(
VerifyException.class,
() ->
ofy()
@@ -119,7 +119,7 @@ public class RdeRevisionTest {
public void testSaveRevision_objectExistsAtZero_newRevisionIsTwo_throwsVe() throws Exception {
save("melancholy", DateTime.parse("1984-12-18TZ"), FULL, 0);
VerifyException thrown =
expectThrows(
assertThrows(
VerifyException.class,
() ->
ofy()
@@ -136,7 +136,7 @@ public class RdeRevisionTest {
@Test
public void testSaveRevision_negativeRevision_throwsIae() throws Exception {
IllegalArgumentException thrown =
expectThrows(
assertThrows(
IllegalArgumentException.class,
() ->
ofy()
@@ -153,7 +153,7 @@ public class RdeRevisionTest {
@Test
public void testSaveRevision_callerNotInTransaction_throwsIse() throws Exception {
IllegalStateException thrown =
expectThrows(
assertThrows(
IllegalStateException.class,
() -> saveRevision("frenzy", DateTime.parse("1984-12-18TZ"), FULL, 1));
assertThat(thrown).hasMessageThat().contains("transaction");