From a4ebdc76225eca2a60562d30e2085efd39c4d422 Mon Sep 17 00:00:00 2001 From: mcilwain Date: Mon, 25 Jun 2018 13:37:40 -0700 Subject: [PATCH] Consolidate generic success response XMLs in unit tests EPP reuses the same generic "Command completed successfully" response with result code 1000 for many different operations. There's no need to have separate XML files for all of these different operations given that the response is the same. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=202010442 --- .../flows/EppLifecycleDomainTest.java | 14 ++++---- .../google/registry/flows/EppTestCase.java | 2 +- .../flows/contact/ContactUpdateFlowTest.java | 18 +++++----- ...ponse.xml => generic_success_response.xml} | 0 .../DomainApplicationDeleteFlowTest.java | 18 +++++----- .../DomainApplicationUpdateFlowTest.java | 16 ++++----- .../flows/domain/DomainDeleteFlowTest.java | 10 +++--- .../domain/DomainRestoreRequestFlowTest.java | 17 ++++------ .../flows/domain/DomainUpdateFlowTest.java | 33 ++++++++++--------- ...ponse.xml => generic_success_response.xml} | 0 .../flows/host/HostUpdateFlowTest.java | 22 ++++++------- .../testdata/generic_success_response.xml} | 0 .../flows/session/LoginFlowTestCase.java | 2 +- .../testdata/generic_success_response.xml} | 0 ...pdate_add_nameserver_response_fakesite.xml | 11 ------- ...domain_update_restore_request_response.xml | 11 ------- .../flows/testdata/login_response.xml | 11 ------- .../google/registry/xjc/XmlTestdataTest.java | 7 +--- .../xjc/testdata/contact_update_response.xml | 11 ------- .../xjc/testdata/domain_delete_response.xml | 11 ------- .../xjc/testdata/domain_update_response.xml | 11 ------- ...domain_update_restore_request_response.xml | 11 ------- .../testdata/generic_success_response.xml} | 0 .../xjc/testdata/host_update_response.xml | 11 ------- .../registry/xjc/testdata/login_response.xml | 11 ------- 25 files changed, 76 insertions(+), 182 deletions(-) rename javatests/google/registry/flows/contact/testdata/{contact_update_response.xml => generic_success_response.xml} (100%) rename javatests/google/registry/flows/domain/testdata/{domain_delete_response.xml => generic_success_response.xml} (100%) rename javatests/google/registry/flows/{domain/testdata/domain_update_response.xml => host/testdata/generic_success_response.xml} (100%) rename javatests/google/registry/flows/{host/testdata/host_update_response.xml => session/testdata/generic_success_response.xml} (100%) delete mode 100644 javatests/google/registry/flows/testdata/domain_update_add_nameserver_response_fakesite.xml delete mode 100644 javatests/google/registry/flows/testdata/domain_update_restore_request_response.xml delete mode 100644 javatests/google/registry/flows/testdata/login_response.xml delete mode 100644 javatests/google/registry/xjc/testdata/contact_update_response.xml delete mode 100644 javatests/google/registry/xjc/testdata/domain_delete_response.xml delete mode 100644 javatests/google/registry/xjc/testdata/domain_update_response.xml delete mode 100644 javatests/google/registry/xjc/testdata/domain_update_restore_request_response.xml rename javatests/google/registry/{flows/session/testdata/login_response.xml => xjc/testdata/generic_success_response.xml} (100%) delete mode 100644 javatests/google/registry/xjc/testdata/host_update_response.xml delete mode 100644 javatests/google/registry/xjc/testdata/login_response.xml diff --git a/javatests/google/registry/flows/EppLifecycleDomainTest.java b/javatests/google/registry/flows/EppLifecycleDomainTest.java index dbeb4c40f..44e4dbcaf 100644 --- a/javatests/google/registry/flows/EppLifecycleDomainTest.java +++ b/javatests/google/registry/flows/EppLifecycleDomainTest.java @@ -125,7 +125,7 @@ public class EppLifecycleDomainTest extends EppTestCase { // Add new nameserver to domain. assertThatCommand("domain_update_add_nameserver_fakesite.xml") .atTime("2000-06-08T00:00:00Z") - .hasResponse("domain_update_add_nameserver_response_fakesite.xml"); + .hasResponse("generic_success_response.xml"); // Verify new nameserver was added. assertThatCommand("domain_info_fakesite.xml") .atTime("2000-06-08T00:01:00Z") @@ -159,7 +159,7 @@ public class EppLifecycleDomainTest extends EppTestCase { // Restore the domain. assertThatCommand("domain_update_restore_request.xml") .atTime("2000-07-01T00:03:00Z") - .hasResponse("domain_update_restore_request_response.xml"); + .hasResponse("generic_success_response.xml"); assertThatLogoutSucceeds(); } @@ -268,7 +268,7 @@ public class EppLifecycleDomainTest extends EppTestCase { @Test public void testEapDomainDeletion_withinAddGracePeriod_eapFeeIsNotRefunded() throws Exception { - assertThatCommand("login_valid_fee_extension.xml").hasResponse("login_response.xml"); + assertThatCommand("login_valid_fee_extension.xml").hasResponse("generic_success_response.xml"); createContacts(DateTime.parse("2000-06-01T00:00:00Z")); // Set the EAP schedule. @@ -561,7 +561,7 @@ public class EppLifecycleDomainTest extends EppTestCase { START_OF_TIME, TldState.PREDELEGATION, gaDate, TldState.GENERAL_AVAILABILITY)); - assertThatCommand("login_valid_fee_extension.xml").hasResponse("login_response.xml"); + assertThatCommand("login_valid_fee_extension.xml").hasResponse("generic_success_response.xml"); assertThatCommand("domain_check_fee_premium.xml") .atTime(gaDate.plusDays(1)) @@ -796,7 +796,7 @@ public class EppLifecycleDomainTest extends EppTestCase { .hasResponse("domain_info_response_fakesite_pending_delete.xml"); assertThatCommand("domain_update_restore_fakesite.xml") .atTime("2002-05-30T01:03:00Z") - .hasResponse("domain_update_restore_request_response.xml"); + .hasResponse("generic_success_response.xml"); // Expect domain is ok now, not pending delete or transfer, and has been extended by a year from // the date of the restore. (Not from the original expiration date.) @@ -1031,7 +1031,7 @@ public class EppLifecycleDomainTest extends EppTestCase { assertThatLogin("NewRegistrar", "foo-BAR2") .atTime(sunriseDate.minusDays(3)) - .hasResponse("login_response.xml"); + .hasResponse("generic_success_response.xml"); createContactsAndHosts(); @@ -1118,7 +1118,7 @@ public class EppLifecycleDomainTest extends EppTestCase { assertThatLogin("NewRegistrar", "foo-BAR2") .atTime(sunriseDate.minusDays(3)) - .hasResponse("login_response.xml"); + .hasResponse("generic_success_response.xml"); createContactsAndHosts(); diff --git a/javatests/google/registry/flows/EppTestCase.java b/javatests/google/registry/flows/EppTestCase.java index e3860292c..5970ecba9 100644 --- a/javatests/google/registry/flows/EppTestCase.java +++ b/javatests/google/registry/flows/EppTestCase.java @@ -120,7 +120,7 @@ public class EppTestCase extends ShardableTestCase { } void assertThatLoginSucceeds(String clientId, String password) throws Exception { - assertThatLogin(clientId, password).hasResponse("login_response.xml"); + assertThatLogin(clientId, password).hasResponse("generic_success_response.xml"); } void assertThatLogoutSucceeds() throws Exception { diff --git a/javatests/google/registry/flows/contact/ContactUpdateFlowTest.java b/javatests/google/registry/flows/contact/ContactUpdateFlowTest.java index 26f5a3921..581900ec4 100644 --- a/javatests/google/registry/flows/contact/ContactUpdateFlowTest.java +++ b/javatests/google/registry/flows/contact/ContactUpdateFlowTest.java @@ -55,7 +55,7 @@ public class ContactUpdateFlowTest persistActiveContact(getUniqueIdFromCommand()); clock.advanceOneMilli(); assertTransactionalFlow(true); - runFlowAssertResponse(loadFile("contact_update_response.xml")); + runFlowAssertResponse(loadFile("generic_success_response.xml")); // Check that the contact was updated. This value came from the xml. assertAboutContacts().that(reloadResourceByForeignKey()) .hasAuthInfoPwd("2fooBAR").and() @@ -67,7 +67,7 @@ public class ContactUpdateFlowTest @Test public void testDryRun() throws Exception { persistActiveContact(getUniqueIdFromCommand()); - dryRunFlowAssertResponse(loadFile("contact_update_response.xml")); + dryRunFlowAssertResponse(loadFile("generic_success_response.xml")); } @Test @@ -98,7 +98,7 @@ public class ContactUpdateFlowTest .hasNonNullLocalizedPostalInfo().and() .hasNullInternationalizedPostalInfo(); - runFlowAssertResponse(loadFile("contact_update_response.xml")); + runFlowAssertResponse(loadFile("generic_success_response.xml")); assertAboutContacts().that(reloadResourceByForeignKey()) .hasNullLocalizedPostalInfo().and() .hasInternationalizedPostalInfo(new PostalInfo.Builder() @@ -137,7 +137,7 @@ public class ContactUpdateFlowTest .hasNonNullInternationalizedPostalInfo().and() .hasNullLocalizedPostalInfo(); - runFlowAssertResponse(loadFile("contact_update_response.xml")); + runFlowAssertResponse(loadFile("generic_success_response.xml")); assertAboutContacts().that(reloadResourceByForeignKey()) .hasNullInternationalizedPostalInfo().and() .hasLocalizedPostalInfo(new PostalInfo.Builder() @@ -172,7 +172,7 @@ public class ContactUpdateFlowTest .build()); clock.advanceOneMilli(); // The test xml updates the address of the postal info and should leave the name untouched. - runFlowAssertResponse(loadFile("contact_update_response.xml")); + runFlowAssertResponse(loadFile("generic_success_response.xml")); assertAboutContacts().that(reloadResourceByForeignKey()).hasLocalizedPostalInfo( new PostalInfo.Builder() .setType(Type.LOCALIZED) @@ -224,7 +224,7 @@ public class ContactUpdateFlowTest // internationalized postal info to the same value it previously had, which causes it to be // preserved. If the xml had not mentioned the internationalized one at all it would have been // deleted. - runFlowAssertResponse(loadFile("contact_update_response.xml")); + runFlowAssertResponse(loadFile("generic_success_response.xml")); assertAboutContacts().that(reloadResourceByForeignKey()) .hasLocalizedPostalInfo( new PostalInfo.Builder() @@ -286,7 +286,7 @@ public class ContactUpdateFlowTest persistActiveContact(getUniqueIdFromCommand()); clock.advanceOneMilli(); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("contact_update_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); } @Test @@ -303,7 +303,7 @@ public class ContactUpdateFlowTest persistActiveContact(getUniqueIdFromCommand()); clock.advanceOneMilli(); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("contact_update_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); } @Test @@ -330,7 +330,7 @@ public class ContactUpdateFlowTest .build()); clock.advanceOneMilli(); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("contact_update_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); assertAboutContacts() .that(reloadResourceByForeignKey()) .hasStatusValue(StatusValue.CLIENT_UPDATE_PROHIBITED) diff --git a/javatests/google/registry/flows/contact/testdata/contact_update_response.xml b/javatests/google/registry/flows/contact/testdata/generic_success_response.xml similarity index 100% rename from javatests/google/registry/flows/contact/testdata/contact_update_response.xml rename to javatests/google/registry/flows/contact/testdata/generic_success_response.xml diff --git a/javatests/google/registry/flows/domain/DomainApplicationDeleteFlowTest.java b/javatests/google/registry/flows/domain/DomainApplicationDeleteFlowTest.java index 7fbab88d0..1059a69c3 100644 --- a/javatests/google/registry/flows/domain/DomainApplicationDeleteFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainApplicationDeleteFlowTest.java @@ -70,7 +70,7 @@ public class DomainApplicationDeleteFlowTest public void doSuccessfulTest() throws Exception { assertTransactionalFlow(true); clock.advanceOneMilli(); - runFlowAssertResponse(loadFile("domain_delete_response.xml")); + runFlowAssertResponse(loadFile("generic_success_response.xml")); // Check that the domain is fully deleted. assertThat(reloadDomainApplication()).isNull(); assertNoBillingEvents(); @@ -79,7 +79,7 @@ public class DomainApplicationDeleteFlowTest @Test public void testDryRun() throws Exception { persistResource(newDomainApplication("example.tld").asBuilder().setRepoId("1-TLD").build()); - dryRunFlowAssertResponse(loadFile("domain_delete_response.xml")); + dryRunFlowAssertResponse(loadFile("generic_success_response.xml")); } @Test @@ -164,7 +164,7 @@ public class DomainApplicationDeleteFlowTest persistResource(newDomainApplication("example.tld").asBuilder().setRepoId("1-TLD").build()); clock.advanceOneMilli(); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("domain_delete_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); } @Test @@ -183,7 +183,7 @@ public class DomainApplicationDeleteFlowTest loadRegistrar("TheRegistrar").asBuilder().setAllowedTlds(ImmutableSet.of()).build()); clock.advanceOneMilli(); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("domain_delete_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); } @Test @@ -213,7 +213,7 @@ public class DomainApplicationDeleteFlowTest .build()); clock.advanceOneMilli(); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("domain_delete_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); } @Test @@ -296,7 +296,7 @@ public class DomainApplicationDeleteFlowTest persistResource(newDomainApplication("example.tld").asBuilder().setRepoId("1-TLD").build()); clock.advanceOneMilli(); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("domain_delete_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); } @Test @@ -305,7 +305,7 @@ public class DomainApplicationDeleteFlowTest persistResource(newDomainApplication("example.tld").asBuilder().setRepoId("1-TLD").build()); clock.advanceOneMilli(); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("domain_delete_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); } @Test @@ -314,7 +314,7 @@ public class DomainApplicationDeleteFlowTest persistResource(newDomainApplication("example.tld").asBuilder().setRepoId("1-TLD").build()); clock.advanceOneMilli(); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("domain_delete_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); } @Test @@ -323,7 +323,7 @@ public class DomainApplicationDeleteFlowTest persistResource(newDomainApplication("example.tld").asBuilder().setRepoId("1-TLD").build()); clock.advanceOneMilli(); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("domain_delete_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); } @Test diff --git a/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java b/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java index a456b2da0..f671e568a 100644 --- a/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java @@ -136,7 +136,7 @@ public class DomainApplicationUpdateFlowTest private void doSuccessfulTest() throws Exception { assertTransactionalFlow(true); clock.advanceOneMilli(); - runFlowAssertResponse(loadFile("domain_update_response.xml")); + runFlowAssertResponse(loadFile("generic_success_response.xml")); // Check that the application was updated. These values came from the xml. DomainApplication application = reloadDomainApplication(); assertAboutApplications() @@ -154,7 +154,7 @@ public class DomainApplicationUpdateFlowTest public void testDryRun() throws Exception { persistReferencedEntities(); persistApplication(); - dryRunFlowAssertResponse(loadFile("domain_update_response.xml")); + dryRunFlowAssertResponse(loadFile("generic_success_response.xml")); } @Test @@ -187,7 +187,7 @@ public class DomainApplicationUpdateFlowTest ContactResource sh8013 = loadByForeignKey(ContactResource.class, "sh8013", clock.nowUtc()); persistResource(newApplicationBuilder().setRegistrant(Key.create(sh8013)).build()); clock.advanceOneMilli(); - runFlowAssertResponse(loadFile("domain_update_response.xml")); + runFlowAssertResponse(loadFile("generic_success_response.xml")); } @Test @@ -206,7 +206,7 @@ public class DomainApplicationUpdateFlowTest DesignatedContact.create(Type.TECH, sh8013Key))) .build()); clock.advanceOneMilli(); - runFlowAssertResponse(loadFile("domain_update_response.xml")); + runFlowAssertResponse(loadFile("generic_success_response.xml")); } @Test @@ -233,7 +233,7 @@ public class DomainApplicationUpdateFlowTest persistResource(newApplicationBuilder().setDsData(originalDsData).build()); assertTransactionalFlow(true); clock.advanceOneMilli(); - runFlowAssertResponse(loadFile("domain_update_response.xml")); + runFlowAssertResponse(loadFile("generic_success_response.xml")); assertAboutApplications() .that(reloadDomainApplication()) .hasExactlyDsData(expectedDsData) @@ -568,7 +568,7 @@ public class DomainApplicationUpdateFlowTest persistNewApplication(); clock.advanceOneMilli(); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("domain_update_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); } @Test @@ -606,7 +606,7 @@ public class DomainApplicationUpdateFlowTest persistApplication(); clock.advanceOneMilli(); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("domain_update_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); } @Test @@ -627,7 +627,7 @@ public class DomainApplicationUpdateFlowTest persistApplication(); clock.advanceOneMilli(); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("domain_update_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); } @Test diff --git a/javatests/google/registry/flows/domain/DomainDeleteFlowTest.java b/javatests/google/registry/flows/domain/DomainDeleteFlowTest.java index 938c84020..1e2171a30 100644 --- a/javatests/google/registry/flows/domain/DomainDeleteFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainDeleteFlowTest.java @@ -292,7 +292,7 @@ public class DomainDeleteFlowTest extends ResourceFlowTestCase FEE_12_MAP = ImmutableMap.of("FEE_VERSION", "0.12", "FEE_NS", "fee12"); - public DomainRestoreRequestFlowTest() { - setEppInput("domain_update_restore_request.xml"); - } - @Before public void initDomainTest() { createTld("tld"); + setEppInput("domain_update_restore_request.xml"); } void persistPendingDeleteDomain() throws Exception { @@ -125,7 +122,7 @@ public class DomainRestoreRequestFlowTest public void testDryRun() throws Exception { setEppInput("domain_update_restore_request.xml"); persistPendingDeleteDomain(); - dryRunFlowAssertResponse(loadFile("domain_update_response.xml")); + dryRunFlowAssertResponse(loadFile("generic_success_response.xml")); } @Test @@ -135,7 +132,7 @@ public class DomainRestoreRequestFlowTest assertTransactionalFlow(true); // Double check that we see a poll message in the future for when the delete happens. assertThat(getPollMessages("TheRegistrar", clock.nowUtc().plusMonths(1))).hasSize(1); - runFlowAssertResponse(loadFile("domain_update_response.xml")); + runFlowAssertResponse(loadFile("generic_success_response.xml")); DomainResource domain = reloadResourceByForeignKey(); HistoryEntry historyEntryDomainRestore = getOnlyHistoryEntryOfType(domain, HistoryEntry.Type.DOMAIN_RESTORE); @@ -332,7 +329,7 @@ public class DomainRestoreRequestFlowTest .build()); persistPendingDeleteDomain(); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("domain_update_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); } @Test @@ -344,7 +341,7 @@ public class DomainRestoreRequestFlowTest // Modify the Registrar to block premium names. persistResource(loadRegistrar("TheRegistrar").asBuilder().setBlockPremiumNames(true).build()); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("domain_update_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); } @Test @@ -513,7 +510,7 @@ public class DomainRestoreRequestFlowTest EppException thrown = assertThrows( ResourceNotOwnedException.class, - () -> runFlowAssertResponse(loadFile("domain_update_response.xml"))); + () -> runFlowAssertResponse(loadFile("generic_success_response.xml"))); assertAboutEppExceptions().that(thrown).marshalsToXml(); } @@ -532,7 +529,7 @@ public class DomainRestoreRequestFlowTest loadRegistrar("TheRegistrar").asBuilder().setAllowedTlds(ImmutableSet.of()).build()); persistPendingDeleteDomain(); runFlowAssertResponse( - CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("domain_update_response.xml")); + CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml")); } @Test diff --git a/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java b/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java index c1cdee0a4..0bc98f65d 100644 --- a/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java +++ b/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java @@ -146,7 +146,7 @@ public class DomainUpdateFlowTest extends ResourceFlowTestCase exception) @@ -1304,7 +1304,7 @@ public class HostUpdateFlowTest extends ResourceFlowTestCase { void doSuccessfulTest(String xmlFilename) throws Exception { setEppInput(xmlFilename); assertTransactionalFlow(false); - runFlowAssertResponse(loadFile("login_response.xml")); + runFlowAssertResponse(loadFile("generic_success_response.xml")); } // Also called in subclasses. diff --git a/javatests/google/registry/flows/host/testdata/host_update_response.xml b/javatests/google/registry/flows/session/testdata/generic_success_response.xml similarity index 100% rename from javatests/google/registry/flows/host/testdata/host_update_response.xml rename to javatests/google/registry/flows/session/testdata/generic_success_response.xml diff --git a/javatests/google/registry/flows/testdata/domain_update_add_nameserver_response_fakesite.xml b/javatests/google/registry/flows/testdata/domain_update_add_nameserver_response_fakesite.xml deleted file mode 100644 index 7c0fcd652..000000000 --- a/javatests/google/registry/flows/testdata/domain_update_add_nameserver_response_fakesite.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Command completed successfully - - - ABC-12345 - server-trid - - - diff --git a/javatests/google/registry/flows/testdata/domain_update_restore_request_response.xml b/javatests/google/registry/flows/testdata/domain_update_restore_request_response.xml deleted file mode 100644 index ab613d34f..000000000 --- a/javatests/google/registry/flows/testdata/domain_update_restore_request_response.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Command completed successfully - - - ABC-12345 - server-trid - - - diff --git a/javatests/google/registry/flows/testdata/login_response.xml b/javatests/google/registry/flows/testdata/login_response.xml deleted file mode 100644 index ab613d34f..000000000 --- a/javatests/google/registry/flows/testdata/login_response.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Command completed successfully - - - ABC-12345 - server-trid - - - diff --git a/javatests/google/registry/xjc/XmlTestdataTest.java b/javatests/google/registry/xjc/XmlTestdataTest.java index 901c905a4..46cee8fd1 100644 --- a/javatests/google/registry/xjc/XmlTestdataTest.java +++ b/javatests/google/registry/xjc/XmlTestdataTest.java @@ -77,7 +77,6 @@ public class XmlTestdataTest { new Good("contact_transfer_query.xml", XjcEpp.class), new Good("contact_transfer_request_response.xml", XjcEpp.class), new Good("contact_transfer_request.xml", XjcEpp.class), - new Good("contact_update_response.xml", XjcEpp.class), new Good("contact_update.xml", XjcEpp.class), new Good("domain_check_response.xml", XjcEpp.class), new Good("domain_check.xml", XjcEpp.class), @@ -85,7 +84,6 @@ public class XmlTestdataTest { new Good("domain_create_response_offline_review.xml", XjcEpp.class), new Good("domain_create_response.xml", XjcEpp.class), new Good("domain_create.xml", XjcEpp.class), - new Good("domain_delete_response.xml", XjcEpp.class), new Good("domain_delete.xml", XjcEpp.class), new Good("domain_info_response_addperiod.xml", XjcEpp.class), new Good("domain_info_response_pendingdelete.xml", XjcEpp.class), @@ -101,11 +99,10 @@ public class XmlTestdataTest { new Good("domain_transfer_query.xml", XjcEpp.class), new Good("domain_transfer_request_response.xml", XjcEpp.class), new Good("domain_transfer_request.xml", XjcEpp.class), - new Good("domain_update_response.xml", XjcEpp.class), new Good("domain_update_restore_report.xml", XjcEpp.class), - new Good("domain_update_restore_request_response.xml", XjcEpp.class), new Good("domain_update_restore_request.xml", XjcEpp.class), new Good("domain_update.xml", XjcEpp.class), + new Good("generic_success_response.xml", XjcEpp.class), new Good("greeting.xml", XjcEpp.class), new Good("host_check_response.xml", XjcEpp.class), new Good("host_check.xml", XjcEpp.class), @@ -117,9 +114,7 @@ public class XmlTestdataTest { new Good("host_delete.xml", XjcEpp.class), new Good("host_info_response.xml", XjcEpp.class), new Good("host_info.xml", XjcEpp.class), - new Good("host_update_response.xml", XjcEpp.class), new Good("host_update.xml", XjcEpp.class), - new Good("login_response.xml", XjcEpp.class), new Good("login.xml", XjcEpp.class), new Good("logout_response.xml", XjcEpp.class), new Good("logout.xml", XjcEpp.class), diff --git a/javatests/google/registry/xjc/testdata/contact_update_response.xml b/javatests/google/registry/xjc/testdata/contact_update_response.xml deleted file mode 100644 index ab613d34f..000000000 --- a/javatests/google/registry/xjc/testdata/contact_update_response.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Command completed successfully - - - ABC-12345 - server-trid - - - diff --git a/javatests/google/registry/xjc/testdata/domain_delete_response.xml b/javatests/google/registry/xjc/testdata/domain_delete_response.xml deleted file mode 100644 index ab613d34f..000000000 --- a/javatests/google/registry/xjc/testdata/domain_delete_response.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Command completed successfully - - - ABC-12345 - server-trid - - - diff --git a/javatests/google/registry/xjc/testdata/domain_update_response.xml b/javatests/google/registry/xjc/testdata/domain_update_response.xml deleted file mode 100644 index ab613d34f..000000000 --- a/javatests/google/registry/xjc/testdata/domain_update_response.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Command completed successfully - - - ABC-12345 - server-trid - - - diff --git a/javatests/google/registry/xjc/testdata/domain_update_restore_request_response.xml b/javatests/google/registry/xjc/testdata/domain_update_restore_request_response.xml deleted file mode 100644 index ab613d34f..000000000 --- a/javatests/google/registry/xjc/testdata/domain_update_restore_request_response.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Command completed successfully - - - ABC-12345 - server-trid - - - diff --git a/javatests/google/registry/flows/session/testdata/login_response.xml b/javatests/google/registry/xjc/testdata/generic_success_response.xml similarity index 100% rename from javatests/google/registry/flows/session/testdata/login_response.xml rename to javatests/google/registry/xjc/testdata/generic_success_response.xml diff --git a/javatests/google/registry/xjc/testdata/host_update_response.xml b/javatests/google/registry/xjc/testdata/host_update_response.xml deleted file mode 100644 index ab613d34f..000000000 --- a/javatests/google/registry/xjc/testdata/host_update_response.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Command completed successfully - - - ABC-12345 - server-trid - - - diff --git a/javatests/google/registry/xjc/testdata/login_response.xml b/javatests/google/registry/xjc/testdata/login_response.xml deleted file mode 100644 index ab613d34f..000000000 --- a/javatests/google/registry/xjc/testdata/login_response.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Command completed successfully - - - ABC-12345 - server-trid - - -