From ef26dabf32834968584379198613bce3313e7b7e Mon Sep 17 00:00:00 2001 From: mcilwain Date: Thu, 1 Mar 2018 11:36:03 -0800 Subject: [PATCH] Add domain lifecycle test for renew with total term >10 years Also some minor cleanup to make renewal testdata files easier to reuse. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=187508329 --- .../flows/EppLifecycleDomainTest.java | 15 +++++ .../flows/domain/DomainRenewFlowTest.java | 56 ++++++++++++------- .../flows/domain/testdata/domain_renew.xml | 4 +- .../domain/testdata/domain_renew_response.xml | 4 +- .../registry/flows/testdata/domain_renew.xml | 13 +++++ ...omain_renew_response_exceeds_max_years.xml | 11 ++++ 6 files changed, 79 insertions(+), 24 deletions(-) create mode 100644 javatests/google/registry/flows/testdata/domain_renew.xml create mode 100644 javatests/google/registry/flows/testdata/domain_renew_response_exceeds_max_years.xml diff --git a/javatests/google/registry/flows/EppLifecycleDomainTest.java b/javatests/google/registry/flows/EppLifecycleDomainTest.java index 48fff6a1b..26c906083 100644 --- a/javatests/google/registry/flows/EppLifecycleDomainTest.java +++ b/javatests/google/registry/flows/EppLifecycleDomainTest.java @@ -817,6 +817,21 @@ public class EppLifecycleDomainTest extends EppTestCase { assertCommandAndResponse("logout.xml", "logout_response.xml"); } + @Test + public void testRenewalFails_whenTotalTermExceeds10Years() throws Exception { + assertCommandAndResponse("login_valid.xml", "login_response.xml"); + // Creates domain with 2 year expiration. + createFakesite(); + // Attempt to renew for 9 years, adding up to a total greater than the allowed max of 10 years. + assertCommandAndResponse( + "domain_renew.xml", + ImmutableMap.of("DOMAIN", "fakesite.example", "EXPDATE", "2002-06-01", "YEARS", "9"), + "domain_renew_response_exceeds_max_years.xml", + ImmutableMap.of(), + DateTime.parse("2000-06-07T00:00:00Z")); + assertCommandAndResponse("logout.xml", "logout_response.xml"); + } + @Test public void testDomainDeletionCancelsPendingTransfer() throws Exception { // Register the domain as the first registrar. diff --git a/javatests/google/registry/flows/domain/DomainRenewFlowTest.java b/javatests/google/registry/flows/domain/DomainRenewFlowTest.java index e5353d6bd..94601ec46 100644 --- a/javatests/google/registry/flows/domain/DomainRenewFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainRenewFlowTest.java @@ -83,14 +83,11 @@ public class DomainRenewFlowTest extends ResourceFlowTestCase - example.tld + %DOMAIN% 2000-04-03 - 5 + %YEARS% ABC-12345 diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew_response.xml b/javatests/google/registry/flows/domain/testdata/domain_renew_response.xml index 236b2652a..9a498c1ee 100644 --- a/javatests/google/registry/flows/domain/testdata/domain_renew_response.xml +++ b/javatests/google/registry/flows/domain/testdata/domain_renew_response.xml @@ -6,8 +6,8 @@ - example.tld - 2005-04-03T22:00:00.0Z + %DOMAIN% + %EXDATE% diff --git a/javatests/google/registry/flows/testdata/domain_renew.xml b/javatests/google/registry/flows/testdata/domain_renew.xml new file mode 100644 index 000000000..83a334a22 --- /dev/null +++ b/javatests/google/registry/flows/testdata/domain_renew.xml @@ -0,0 +1,13 @@ + + + + + %DOMAIN% + %EXPDATE% + %YEARS% + + + ABC-12345 + + diff --git a/javatests/google/registry/flows/testdata/domain_renew_response_exceeds_max_years.xml b/javatests/google/registry/flows/testdata/domain_renew_response_exceeds_max_years.xml new file mode 100644 index 000000000..91e9c3eac --- /dev/null +++ b/javatests/google/registry/flows/testdata/domain_renew_response_exceeds_max_years.xml @@ -0,0 +1,11 @@ + + + + New registration period exceeds maximum number of years (10) + + + ABC-12345 + server-trid + + +