From 52ce49a02caddaa3ca722d6957e9c9e39a798f8b Mon Sep 17 00:00:00 2001 From: mcilwain Date: Tue, 12 Dec 2017 16:21:26 -0800 Subject: [PATCH] Manually migrate some ExceptionRules to Junit 4.13 style asserts These testing helper functions can't be handled by the automatic refactoring tool because they're taking in expected exception details as parameters. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=178832406 --- .../flows/contact/ContactDeleteFlowTest.java | 23 ++++++++++--------- .../DomainApplicationCreateFlowTest.java | 4 ++-- .../DomainApplicationUpdateFlowTest.java | 4 ++-- .../flows/domain/DomainCheckFlowTest.java | 4 ++-- .../flows/domain/DomainCreateFlowTest.java | 11 ++++----- .../flows/domain/DomainUpdateFlowTest.java | 4 ++-- .../flows/host/HostCreateFlowTest.java | 9 ++++---- .../flows/host/HostDeleteFlowTest.java | 10 ++++---- .../flows/host/HostUpdateFlowTest.java | 8 +++---- .../flows/session/LoginFlowTestCase.java | 7 +++--- .../registry/tools/CreateTldCommandTest.java | 19 ++++++++------- .../registry/tools/UpdateTldCommandTest.java | 13 ++++++----- 12 files changed, 60 insertions(+), 56 deletions(-) diff --git a/javatests/google/registry/flows/contact/ContactDeleteFlowTest.java b/javatests/google/registry/flows/contact/ContactDeleteFlowTest.java index 6c724469f..6fc1f3fa1 100644 --- a/javatests/google/registry/flows/contact/ContactDeleteFlowTest.java +++ b/javatests/google/registry/flows/contact/ContactDeleteFlowTest.java @@ -14,6 +14,7 @@ package google.registry.flows.contact; +import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.ContactResourceSubject.assertAboutContacts; import static google.registry.testing.DatastoreHelper.assertNoBillingEvents; import static google.registry.testing.DatastoreHelper.createTld; @@ -22,6 +23,7 @@ import static google.registry.testing.DatastoreHelper.newDomainResource; import static google.registry.testing.DatastoreHelper.persistActiveContact; import static google.registry.testing.DatastoreHelper.persistDeletedContact; import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.JUnitBackports.expectThrows; import com.google.common.collect.ImmutableSet; import google.registry.flows.ResourceFlowTestCase; @@ -82,17 +84,6 @@ public class ContactDeleteFlowTest runFlow(); } - private void doFailingStatusTest(StatusValue statusValue, Class exception) - throws Exception { - persistResource( - newContactResource(getUniqueIdFromCommand()).asBuilder() - .setStatusValues(ImmutableSet.of(statusValue)) - .build()); - thrown.expect(exception); - thrown.expectMessage(statusValue.getXmlName()); - runFlow(); - } - @Test public void testFailure_existedButWasClientDeleteProhibited() throws Exception { doFailingStatusTest( @@ -111,6 +102,16 @@ public class ContactDeleteFlowTest StatusValue.PENDING_DELETE, ResourceStatusProhibitsOperationException.class); } + private void doFailingStatusTest(StatusValue statusValue, Class exception) + throws Exception { + persistResource( + newContactResource(getUniqueIdFromCommand()).asBuilder() + .setStatusValues(ImmutableSet.of(statusValue)) + .build()); + Exception e = expectThrows(exception, this::runFlow); + assertThat(e).hasMessageThat().contains(statusValue.getXmlName()); + } + @Test public void testFailure_unauthorizedClient() throws Exception { sessionMetadata.setClientId("NewRegistrar"); diff --git a/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java b/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java index 93384c4be..5fc7182d8 100644 --- a/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java @@ -33,6 +33,7 @@ import static google.registry.testing.DatastoreHelper.persistReservedList; import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.DomainApplicationSubject.assertAboutApplications; import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions; +import static google.registry.testing.JUnitBackports.assertThrows; import static google.registry.util.DateTimeUtils.START_OF_TIME; import static java.util.Comparator.comparing; import static org.joda.money.CurrencyUnit.EUR; @@ -1736,8 +1737,7 @@ public class DomainApplicationCreateFlowTest setEppInput("domain_create_sunrise_signed_mark_uppercase.xml"); eppLoader.replaceAll("TEST-VALIDATE.tld", domainName); persistContactsAndHosts(); - thrown.expect(exception); - runFlow(); + assertThrows(exception, this::runFlow); } @Test diff --git a/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java b/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java index 96a54f8b9..f6380a774 100644 --- a/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java @@ -28,6 +28,7 @@ import static google.registry.testing.DatastoreHelper.persistActiveHost; import static google.registry.testing.DatastoreHelper.persistReservedList; import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.DomainApplicationSubject.assertAboutApplications; +import static google.registry.testing.JUnitBackports.assertThrows; import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.collect.ImmutableMap; @@ -333,8 +334,7 @@ public class DomainApplicationUpdateFlowTest setEppInput(xmlFilename); persistReferencedEntities(); persistNewApplication(); - thrown.expect(expectedException); - runFlow(); + assertThrows(expectedException, this::runFlow); } @Test diff --git a/javatests/google/registry/flows/domain/DomainCheckFlowTest.java b/javatests/google/registry/flows/domain/DomainCheckFlowTest.java index 4bb1a4251..354685e32 100644 --- a/javatests/google/registry/flows/domain/DomainCheckFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainCheckFlowTest.java @@ -24,6 +24,7 @@ import static google.registry.testing.DatastoreHelper.persistDeletedDomain; import static google.registry.testing.DatastoreHelper.persistPremiumList; import static google.registry.testing.DatastoreHelper.persistReservedList; import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.JUnitBackports.assertThrows; import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.money.CurrencyUnit.USD; @@ -304,8 +305,7 @@ public class DomainCheckFlowTest private void doFailingBadLabelTest(String label, Class expectedException) throws Exception { setEppInput("domain_check_template.xml", ImmutableMap.of("LABEL", label)); - thrown.expect(expectedException); - runFlow(); + assertThrows(expectedException, this::runFlow); } @Test diff --git a/javatests/google/registry/flows/domain/DomainCreateFlowTest.java b/javatests/google/registry/flows/domain/DomainCreateFlowTest.java index 1d012af72..4013a20e1 100644 --- a/javatests/google/registry/flows/domain/DomainCreateFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainCreateFlowTest.java @@ -43,6 +43,7 @@ import static google.registry.testing.DatastoreHelper.persistReservedList; import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.DomainResourceSubject.assertAboutDomains; import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions; +import static google.registry.testing.JUnitBackports.assertThrows; import static google.registry.testing.JUnitBackports.expectThrows; import static google.registry.testing.TaskQueueHelper.assertDnsTasksEnqueued; import static google.registry.testing.TaskQueueHelper.assertNoDnsTasksEnqueued; @@ -637,9 +638,8 @@ public class DomainCreateFlowTest extends ResourceFlowTestCase exception) throws Exception { + private void doFailingHostNameTest(String hostName, Class exception) + throws Exception { setEppHostCreateInputWithIps(hostName); - thrown.expect(exception); - runFlow(); + assertThrows(exception, this::runFlow); } @Test diff --git a/javatests/google/registry/flows/host/HostDeleteFlowTest.java b/javatests/google/registry/flows/host/HostDeleteFlowTest.java index 489e07563..2639fb4e2 100644 --- a/javatests/google/registry/flows/host/HostDeleteFlowTest.java +++ b/javatests/google/registry/flows/host/HostDeleteFlowTest.java @@ -14,6 +14,7 @@ package google.registry.flows.host; +import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.DatastoreHelper.assertNoBillingEvents; import static google.registry.testing.DatastoreHelper.createTld; import static google.registry.testing.DatastoreHelper.newDomainApplication; @@ -23,6 +24,7 @@ import static google.registry.testing.DatastoreHelper.persistActiveHost; import static google.registry.testing.DatastoreHelper.persistDeletedHost; import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.HostResourceSubject.assertAboutHosts; +import static google.registry.testing.JUnitBackports.expectThrows; import static google.registry.testing.TaskQueueHelper.assertNoDnsTasksEnqueued; import com.google.common.collect.ImmutableMap; @@ -97,12 +99,12 @@ public class HostDeleteFlowTest extends ResourceFlowTestCase exception) throws Exception { persistResource( - newHostResource("ns1.example.tld").asBuilder() + newHostResource("ns1.example.tld") + .asBuilder() .setStatusValues(ImmutableSet.of(statusValue)) .build()); - thrown.expect(exception); - thrown.expectMessage(statusValue.getXmlName()); - runFlow(); + Exception e = expectThrows(exception, this::runFlow); + assertThat(e).hasMessageThat().contains(statusValue.getXmlName()); } @Test diff --git a/javatests/google/registry/flows/host/HostUpdateFlowTest.java b/javatests/google/registry/flows/host/HostUpdateFlowTest.java index fb01d2342..598779d32 100644 --- a/javatests/google/registry/flows/host/HostUpdateFlowTest.java +++ b/javatests/google/registry/flows/host/HostUpdateFlowTest.java @@ -33,6 +33,8 @@ import static google.registry.testing.DomainResourceSubject.assertAboutDomains; import static google.registry.testing.GenericEppResourceSubject.assertAboutEppResources; import static google.registry.testing.HistoryEntrySubject.assertAboutHistoryEntries; import static google.registry.testing.HostResourceSubject.assertAboutHosts; +import static google.registry.testing.JUnitBackports.assertThrows; +import static google.registry.testing.JUnitBackports.expectThrows; import static google.registry.testing.TaskQueueHelper.assertDnsTasksEnqueued; import static google.registry.testing.TaskQueueHelper.assertNoDnsTasksEnqueued; import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; @@ -371,8 +373,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase192.0.2.22", "1080:0:0:0:8:800:200C:417A"); - thrown.expect(exception); - runFlow(); + assertThrows(exception, this::runFlow); } @Test diff --git a/javatests/google/registry/flows/session/LoginFlowTestCase.java b/javatests/google/registry/flows/session/LoginFlowTestCase.java index d7dfda43c..f8ce37005 100644 --- a/javatests/google/registry/flows/session/LoginFlowTestCase.java +++ b/javatests/google/registry/flows/session/LoginFlowTestCase.java @@ -17,6 +17,7 @@ package google.registry.flows.session; import static google.registry.testing.DatastoreHelper.deleteResource; import static google.registry.testing.DatastoreHelper.loadRegistrar; import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.JUnitBackports.assertThrows; import google.registry.flows.EppException.UnimplementedExtensionException; import google.registry.flows.EppException.UnimplementedObjectServiceException; @@ -60,11 +61,9 @@ public abstract class LoginFlowTestCase extends FlowTestCase { } // Also called in subclasses. - void doFailingTest(String xmlFilename, Class exception) - throws Exception { + void doFailingTest(String xmlFilename, Class exception) throws Exception { setEppInput(xmlFilename); - thrown.expect(exception); - runFlow(); + assertThrows(exception, this::runFlow); } @Test diff --git a/javatests/google/registry/tools/CreateTldCommandTest.java b/javatests/google/registry/tools/CreateTldCommandTest.java index 9e2e6c099..5ebb5e670 100644 --- a/javatests/google/registry/tools/CreateTldCommandTest.java +++ b/javatests/google/registry/tools/CreateTldCommandTest.java @@ -617,13 +617,16 @@ public class CreateTldCommandTest extends CommandTestCase { private void runFailureReservedListsTest( String reservedLists, Class errorClass, String errorMsg) throws Exception { - thrown.expect(errorClass); - thrown.expectMessage(errorMsg); - runCommandForced( - "--reserved_lists", - reservedLists, - "--roid_suffix=Q9JYB4C", - "--dns_writers=VoidDnsWriter", - "xn--q9jyb4c"); + Exception e = + expectThrows( + errorClass, + () -> + runCommandForced( + "--reserved_lists", + reservedLists, + "--roid_suffix=Q9JYB4C", + "--dns_writers=VoidDnsWriter", + "xn--q9jyb4c")); + assertThat(e).hasMessageThat().isEqualTo(errorMsg); } } diff --git a/javatests/google/registry/tools/UpdateTldCommandTest.java b/javatests/google/registry/tools/UpdateTldCommandTest.java index e554b5316..3cfbe80fa 100644 --- a/javatests/google/registry/tools/UpdateTldCommandTest.java +++ b/javatests/google/registry/tools/UpdateTldCommandTest.java @@ -21,6 +21,7 @@ import static google.registry.testing.DatastoreHelper.createTld; import static google.registry.testing.DatastoreHelper.persistPremiumList; import static google.registry.testing.DatastoreHelper.persistReservedList; import static google.registry.testing.DatastoreHelper.persistResource; +import static google.registry.testing.JUnitBackports.expectThrows; import static google.registry.util.DateTimeUtils.END_OF_TIME; import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.money.CurrencyUnit.JPY; @@ -934,11 +935,11 @@ public class UpdateTldCommandTest extends CommandTestCase { } private void runFailureReservedListsTest( - String reservedLists, - Class errorClass, - String errorMsg) throws Exception { - thrown.expect(errorClass); - thrown.expectMessage(errorMsg); - runCommandForced("--reserved_lists", reservedLists, "xn--q9jyb4c"); + String reservedLists, Class errorClass, String errorMsg) + throws Exception { + Exception e = + expectThrows( + errorClass, () -> runCommandForced("--reserved_lists", reservedLists, "xn--q9jyb4c")); + assertThat(e).hasMessageThat().isEqualTo(errorMsg); } }