From 39c3706321b010367f47d1ba63e57f410b2af481 Mon Sep 17 00:00:00 2001 From: bbilbo Date: Tue, 11 Jul 2017 14:32:54 -0700 Subject: [PATCH] Move EPP XML testdata to server/testdata This will allow tests in server to reference the xml files. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=161582503 --- .../tools/AllocateDomainCommandTest.java | 12 +++-- javatests/google/registry/tools/BUILD | 2 + .../registry/tools/EppToolCommandTest.java | 11 +++-- .../registry/tools/EppToolVerifier.java | 4 +- .../registry/tools/ExecuteEppCommandTest.java | 6 +-- .../registry/tools/server/ToolsTestData.java | 44 +++++++++++++++++++ .../{ => server}/testdata/allocate_domain.xml | 0 .../testdata/allocate_domain2.xml | 0 .../{ => server}/testdata/contact_create.xml | 0 .../testdata/contact_create_complete.xml | 0 .../testdata/contact_create_minimal.xml | 0 .../{ => server}/testdata/domain_check.xml | 0 .../testdata/domain_check_claims.xml | 0 .../testdata/domain_check_claims_multiple.xml | 0 .../domain_check_claims_second_tld.xml | 0 .../testdata/domain_check_fee.xml | 0 .../testdata/domain_check_fee_multiple.xml | 0 .../testdata/domain_check_fee_second_tld.xml | 0 .../testdata/domain_check_multiple.xml | 0 .../testdata/domain_check_second_tld.xml | 0 .../testdata/domain_create_anchor_tenant.xml | 0 ...omain_create_anchor_tenant_fee_premium.xml | 0 ...main_create_anchor_tenant_fee_standard.xml | 0 ...ate_anchor_tenant_multiple_word_reason.xml | 0 .../domain_create_anchor_tenant_no_reason.xml | 0 .../domain_create_anchor_tenant_password.xml | 0 .../testdata/domain_create_complete.xml | 0 .../testdata/domain_create_minimal.xml | 0 .../testdata/domain_create_minimal_abc.xml | 0 .../testdata/domain_create_sunrush.xml | 0 .../testdata/domain_create_sunrush2.xml | 0 .../{ => server}/testdata/domain_delete.xml | 0 .../testdata/domain_delete_by_registrar.xml | 0 .../domain_delete_multiple_word_reason.xml | 0 .../testdata/domain_info_landrush.xml | 0 .../testdata/domain_info_sunrush.xml | 0 .../testdata/domain_update_add.xml | 0 .../testdata/domain_update_change.xml | 0 .../testdata/domain_update_complete.xml | 0 .../testdata/domain_update_complete_abc.xml | 0 .../testdata/domain_update_remove.xml | 0 .../testdata/domain_update_set_contacts.xml | 0 .../domain_update_set_nameservers.xml | 0 .../testdata/domain_update_set_statuses.xml | 0 .../testdata/host_create_complete.xml | 0 .../testdata/host_create_minimal.xml | 0 .../{ => server}/testdata/host_delete.xml | 0 .../testdata/host_delete_by_registrar.xml | 0 .../host_delete_multiple_word_reason.xml | 0 .../testdata/uniform_rapid_suspension.xml | 0 ...uniform_rapid_suspension_existing_host.xml | 0 .../uniform_rapid_suspension_undo.xml | 0 ...uniform_rapid_suspension_undo_preserve.xml | 0 .../update_server_locks_apply_all.xml | 0 .../update_server_locks_apply_one.xml | 0 ...date_server_locks_multiple_word_reason.xml | 0 .../update_server_locks_remove_all.xml | 0 .../update_server_locks_remove_one.xml | 0 .../xn--q9jyb4c_2010-10-17_full_S1_R0.xml | 0 59 files changed, 61 insertions(+), 18 deletions(-) create mode 100644 javatests/google/registry/tools/server/ToolsTestData.java rename javatests/google/registry/tools/{ => server}/testdata/allocate_domain.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/allocate_domain2.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/contact_create.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/contact_create_complete.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/contact_create_minimal.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_check.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_check_claims.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_check_claims_multiple.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_check_claims_second_tld.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_check_fee.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_check_fee_multiple.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_check_fee_second_tld.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_check_multiple.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_check_second_tld.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_create_anchor_tenant.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_create_anchor_tenant_fee_premium.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_create_anchor_tenant_fee_standard.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_create_anchor_tenant_multiple_word_reason.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_create_anchor_tenant_no_reason.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_create_anchor_tenant_password.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_create_complete.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_create_minimal.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_create_minimal_abc.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_create_sunrush.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_create_sunrush2.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_delete.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_delete_by_registrar.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_delete_multiple_word_reason.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_info_landrush.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_info_sunrush.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_update_add.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_update_change.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_update_complete.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_update_complete_abc.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_update_remove.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_update_set_contacts.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_update_set_nameservers.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/domain_update_set_statuses.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/host_create_complete.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/host_create_minimal.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/host_delete.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/host_delete_by_registrar.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/host_delete_multiple_word_reason.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/uniform_rapid_suspension.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/uniform_rapid_suspension_existing_host.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/uniform_rapid_suspension_undo.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/uniform_rapid_suspension_undo_preserve.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/update_server_locks_apply_all.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/update_server_locks_apply_one.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/update_server_locks_multiple_word_reason.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/update_server_locks_remove_all.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/update_server_locks_remove_one.xml (100%) rename javatests/google/registry/tools/{ => server}/testdata/xn--q9jyb4c_2010-10-17_full_S1_R0.xml (100%) diff --git a/javatests/google/registry/tools/AllocateDomainCommandTest.java b/javatests/google/registry/tools/AllocateDomainCommandTest.java index 41a73ac87..5b06af429 100644 --- a/javatests/google/registry/tools/AllocateDomainCommandTest.java +++ b/javatests/google/registry/tools/AllocateDomainCommandTest.java @@ -15,8 +15,6 @@ package google.registry.tools; import static com.google.common.io.BaseEncoding.base16; -import static com.google.common.io.Resources.getResource; -import static com.google.common.io.Resources.toByteArray; import static com.google.common.truth.Truth.assertThat; import static google.registry.flows.EppXmlTransformer.unmarshal; import static google.registry.flows.picker.FlowPicker.getFlowClass; @@ -31,7 +29,6 @@ import static google.registry.testing.DatastoreHelper.persistActiveContact; import static google.registry.testing.DatastoreHelper.persistActiveHost; import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.util.DateTimeUtils.START_OF_TIME; -import static google.registry.util.ResourceUtils.readResourceBytes; import com.beust.jcommander.ParameterException; import com.google.common.collect.ImmutableSet; @@ -45,6 +42,7 @@ import google.registry.model.eppcommon.Trid; import google.registry.model.eppinput.EppInput; import google.registry.model.reporting.HistoryEntry; import google.registry.tools.ServerSideCommand.Connection; +import google.registry.tools.server.ToolsTestData; import java.io.IOException; import org.joda.time.DateTime; import org.junit.Before; @@ -61,8 +59,8 @@ public class AllocateDomainCommandTest extends CommandTestCase { // The choice of xml file is arbitrary. runCommandForced( "--client=NewRegistrar", - readResourceUtf8(getClass(), "testdata/contact_create.xml")); + ToolsTestData.loadUtf8("contact_create.xml")); eppVerifier().verifySent("contact_create.xml"); } @@ -61,9 +60,9 @@ public class EppToolCommandTest extends EppToolCommandTestCase { // The choice of xml files is arbitrary. runCommandForced( "--client=NewRegistrar", - readResourceUtf8(getClass(), "testdata/contact_create.xml"), - readResourceUtf8(getClass(), "testdata/domain_check.xml"), - readResourceUtf8(getClass(), "testdata/domain_check_fee.xml")); + ToolsTestData.loadUtf8("contact_create.xml"), + ToolsTestData.loadUtf8("domain_check.xml"), + ToolsTestData.loadUtf8("domain_check_fee.xml")); eppVerifier().verifySent("contact_create.xml", "domain_check.xml", "domain_check_fee.xml"); } diff --git a/javatests/google/registry/tools/EppToolVerifier.java b/javatests/google/registry/tools/EppToolVerifier.java index 63c76746b..bd17335ed 100644 --- a/javatests/google/registry/tools/EppToolVerifier.java +++ b/javatests/google/registry/tools/EppToolVerifier.java @@ -15,7 +15,6 @@ package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static google.registry.util.ResourceUtils.readResourceUtf8; import static google.registry.xml.XmlTestUtils.assertXmlEquals; import static java.nio.charset.StandardCharsets.UTF_8; import static org.mockito.Matchers.eq; @@ -26,6 +25,7 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableMap; import com.google.common.net.MediaType; import google.registry.tools.ServerSideCommand.Connection; +import google.registry.tools.server.ToolsTestData; import java.net.URLDecoder; import java.util.List; import java.util.Map; @@ -85,7 +85,7 @@ public class EppToolVerifier { .split(new String(capturedParam, UTF_8)); assertThat(map).hasSize(4); assertXmlEquals( - readResourceUtf8(getClass(), "testdata/" + xml), + ToolsTestData.loadUtf8(xml), URLDecoder.decode(map.get("xml"), UTF_8.toString())); assertThat(map).containsEntry("dryRun", Boolean.toString(dryRun)); assertThat(map).containsEntry("clientId", clientId); diff --git a/javatests/google/registry/tools/ExecuteEppCommandTest.java b/javatests/google/registry/tools/ExecuteEppCommandTest.java index 5b515d9ca..e573b226e 100644 --- a/javatests/google/registry/tools/ExecuteEppCommandTest.java +++ b/javatests/google/registry/tools/ExecuteEppCommandTest.java @@ -14,11 +14,11 @@ package google.registry.tools; -import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.nio.charset.StandardCharsets.UTF_8; import com.beust.jcommander.ParameterException; import google.registry.testing.InjectRule; +import google.registry.tools.server.ToolsTestData; import java.io.ByteArrayInputStream; import org.junit.Before; import org.junit.Rule; @@ -35,7 +35,7 @@ public class ExecuteEppCommandTest extends EppToolCommandTestCase