From 5d9d89e0e551ee175f2a7d539457b4ebb3705ccb Mon Sep 17 00:00:00 2001 From: Gus Brodman Date: Mon, 8 Dec 2025 15:39:03 -0500 Subject: [PATCH] Always act as if contacts are prohibited This PR finds instances where we previously checked if the feature flag for contacts-prohibited was set and removes those checks, making the contacts-prohibited behavior the only behavior. Because the tests didn't have that feature flag set, this means we need to change a ton of tests to remove contact references. --- .../batch/RemoveAllDomainContactsAction.java | 7 - .../flows/domain/DomainCreateFlow.java | 3 - .../flows/domain/DomainFlowUtils.java | 91 +---- .../flows/domain/DomainUpdateFlow.java | 18 +- .../registry/tools/CreateDomainCommand.java | 14 - .../flows/EppLifecycleDomainTest.java | 52 +-- .../registry/flows/EppLifecycleHostTest.java | 18 - .../registry/flows/EppPointInTimeTest.java | 12 - .../google/registry/flows/EppTestCase.java | 17 +- .../flows/domain/DomainCreateFlowTest.java | 176 +-------- .../flows/domain/DomainInfoFlowTest.java | 191 +--------- .../flows/domain/DomainUpdateFlowTest.java | 339 +----------------- .../tools/CreateDomainCommandTest.java | 69 +--- .../registry/tools/EppLifecycleToolsTest.java | 17 +- .../domains/ConsoleBulkDomainActionTest.java | 30 +- ...tact_delete_response_no_cltrid_pending.xml | 10 - .../contact_delete_response_pending.xml | 11 - ...contact_delete_response_sh8013_pending.xml | 11 - .../domain_check_reserved_allocationtoken.xml | 22 -- .../registry/flows/domain/domain_create.xml | 3 - .../flows/domain/domain_create_11_years.xml | 3 - .../domain/domain_create_13_nameservers.xml | 3 - .../domain/domain_create_14_nameservers.xml | 3 - .../domain/domain_create_allocationtoken.xml | 3 - .../domain_create_allocationtoken_claims.xml | 3 - .../domain_create_anchor_allocationtoken.xml | 3 - ...ain_create_anchor_tenant_invalid_years.xml | 3 - ...reate_anchor_tenant_metadata_extension.xml | 3 - ...omain_create_anchor_tenant_signed_mark.xml | 3 - ...chor_tenant_sunrise_metadata_extension.xml | 3 - ...sunrise_metadata_extension_signed_mark.xml | 3 - ...omain_create_bad_checksum_claim_notice.xml | 3 - .../domain/domain_create_bad_idn_minna.xml | 3 - .../domain/domain_create_bad_validator_id.xml | 3 - .../domain/domain_create_claim_notice.xml | 3 - .../domain/domain_create_code_with_mark.xml | 3 - .../flows/domain/domain_create_dsdata.xml | 3 - .../domain/domain_create_dsdata_8_records.xml | 3 - .../domain/domain_create_dsdata_9_records.xml | 3 - .../domain_create_dsdata_bad_algorithms.xml | 3 - .../domain_create_dsdata_bad_digest_types.xml | 3 - .../domain_create_dsdata_no_maxsiglife.xml | 3 - .../domain_create_duplicate_contact.xml | 23 -- .../domain/domain_create_eap_combined_fee.xml | 3 - .../flows/domain/domain_create_eap_fee.xml | 3 - .../flows/domain/domain_create_extra_fees.xml | 3 - .../flows/domain/domain_create_fee.xml | 3 - .../domain/domain_create_fee_applied.xml | 3 - .../domain/domain_create_fee_bad_scale.xml | 3 - .../domain/domain_create_fee_defaults.xml | 3 - .../domain/domain_create_fee_grace_period.xml | 3 - .../domain/domain_create_fee_refundable.xml | 3 - ... domain_create_has_registrant_contact.xml} | 0 .../flows/domain/domain_create_idn_minna.xml | 3 - .../domain_create_malformed_claim_notice1.xml | 3 - .../domain_create_malformed_claim_notice2.xml | 3 - .../flows/domain/domain_create_metadata.xml | 3 - .../domain/domain_create_missing_admin.xml | 21 -- .../domain_create_missing_contact_type.xml | 2 - .../domain/domain_create_missing_period.xml | 3 - .../domain/domain_create_missing_tech.xml | 21 -- .../flows/domain/domain_create_months.xml | 3 - .../flows/domain/domain_create_no_cltrid.xml | 3 - .../domain/domain_create_no_contacts.xml | 19 - .../domain_create_no_hosts_or_dsdata.xml | 3 - ... => domain_create_other_contact_types.xml} | 0 .../flows/domain/domain_create_premium.xml | 3 - .../domain_create_premium_allocationtoken.xml | 3 - .../domain/domain_create_premium_eap.xml | 3 - ...reate_registration_encoded_signed_mark.xml | 3 - ...on_encoded_signed_mark_allocationtoken.xml | 3 - ...ation_start_date_sunrise_claims_notice.xml | 3 - .../domain_create_registration_sunrise.xml | 3 - .../flows/domain/domain_create_reserved.xml | 3 - .../domain/domain_create_response_noasync.xml | 19 - ...te_sunrise_encoded_signed_mark_no_type.xml | 3 - .../flows/domain/domain_create_uppercase.xml | 3 - .../flows/domain/domain_create_with_tld.xml | 3 - .../domain/domain_create_wrong_extension.xml | 3 - .../flows/domain/domain_delete_flags.xml | 11 - .../domain_info_fee_premium_response.xml | 3 - .../flows/domain/domain_info_fee_response.xml | 3 - ...main_info_fee_restore_premium_response.xml | 3 - .../domain_info_fee_restore_response.xml | 3 - ...n_info_fee_restore_response_no_renewal.xml | 3 - ...info_fee_restore_response_with_renewal.xml | 3 - .../flows/domain/domain_info_flags_none.xml | 11 - .../flows/domain/domain_info_flags_two.xml | 11 - .../flows/domain/domain_info_response.xml | 3 - .../domain/domain_info_response_addperiod.xml | 3 - .../domain_info_response_autorenewperiod.xml | 3 - .../domain/domain_info_response_bulk.xml | 3 - .../domain_info_response_delegated_hosts.xml | 3 - .../domain/domain_info_response_dsdata.xml | 3 - .../domain_info_response_dsdata_addperiod.xml | 3 - ...omain_info_response_empty_bulk_package.xml | 3 - .../domain/domain_info_response_no_cltrid.xml | 3 - .../domain_info_response_no_registrant.xml | 2 - .../domain_info_response_none_hosts.xml | 3 - .../domain_info_response_pendingdelete.xml | 3 - .../domain_info_response_redemptionperiod.xml | 3 - .../domain_info_response_renewperiod.xml | 3 - ...in_info_response_stackedaddrenewperiod.xml | 3 - ...domain_info_response_subordinate_hosts.xml | 3 - .../domain_info_response_superuser_bulk.xml | 1 - .../domain_info_response_transferperiod.xml | 3 - .../domain_info_response_unauthorized.xml | 1 - .../domain/domain_info_with_contact_auth.xml | 14 - .../flows/domain/domain_renew_flags.xml | 19 - .../domain/domain_transfer_cancel_extra.xml | 11 - .../domain/domain_transfer_reject_extra.xml | 11 - .../registry/flows/domain/domain_update.xml | 3 - .../domain_update_add_registry_lock.xml | 1 - .../domain_update_add_remove_same_contact.xml | 25 -- .../domain_update_add_remove_same_host.xml | 1 - .../domain_update_contacts_and_registrant.xml | 24 -- .../domain_update_duplicate_contact.xml | 34 -- .../flows/domain/domain_update_fee.xml | 1 - .../domain/domain_update_max_everything.xml | 9 - .../domain_update_missing_contact_type.xml | 32 -- ...ain_update_multiple_duplicate_contacts.xml | 34 -- .../domain/domain_update_no_auth_change.xml | 2 - .../flows/domain/domain_update_no_cltrid.xml | 3 - .../domain_update_prohibited_status.xml | 1 - .../domain_update_registrant_to_tech.xml | 3 - .../domain/domain_update_remove_admin.xml | 14 - .../domain_update_remove_all_contacts.xml | 20 -- .../domain_update_remove_client_hold.xml | 14 - .../domain/domain_update_remove_contact.xml | 2 - ...domain_update_remove_multiple_contacts.xml | 24 -- .../domain_update_remove_server_hold.xml | 14 - .../domain/domain_update_remove_tech.xml | 14 - .../domain_update_restore_request_flags.xml | 21 -- ...ain_update_restore_request_with_change.xml | 4 +- .../flows/domain/domain_update_wildcard.xml | 3 - .../google/registry/flows/domain_create.xml | 3 - .../registry/flows/domain_create_eap_fee.xml | 3 - .../registry/flows/domain_create_fakesite.xml | 3 - .../domain_create_fakesite_no_nameservers.xml | 3 - .../domain_create_no_hosts_or_dsdata.xml | 3 - .../flows/domain_create_prettyprinted.xml | 3 - .../flows/domain_create_secondsite.xml | 3 - ...tart_date_sunrise_encoded_mark_no_type.xml | 3 - ..._date_sunrise_encoded_mark_wrong_phase.xml | 3 - .../domain_create_sunrise_encoded_mark.xml | 3 - ...omain_info_response_addperiod_wildcard.xml | 3 - ...nfo_response_after_transfer_after_argp.xml | 3 - ...fo_response_after_transfer_during_argp.xml | 3 - ...info_response_before_transfer_and_argp.xml | 3 - ...o_response_before_transfer_during_argp.xml | 3 - ...o_response_during_transfer_during_argp.xml | 3 - ...n_info_response_fakesite_3_nameservers.xml | 3 - ...akesite_3_nameservers_pending_transfer.xml | 3 - ...site_3_nameservers_transfer_successful.xml | 3 - ...domain_info_response_fakesite_inactive.xml | 3 - .../domain_info_response_fakesite_ok.xml | 3 - ..._response_fakesite_ok_post_host_update.xml | 3 - ..._info_response_fakesite_pending_delete.xml | 3 - ...nfo_response_fakesite_pending_transfer.xml | 3 - ...se_fakesite_pending_transfer_autorenew.xml | 3 - ...ain_info_response_fakesite_restored_ok.xml | 3 - ...fo_response_fakesite_transfer_complete.xml | 3 - ...info_response_fakesite_transfer_period.xml | 3 - .../domain_info_response_graceperiod.xml | 3 - ...nfo_response_graceperiod_add_and_renew.xml | 3 - .../flows/domain_info_response_inactive.xml | 3 - ...in_info_response_inactive_grace_period.xml | 3 - .../domain_info_response_ok_wildcard.xml | 3 - ...nfo_response_redemptionperiod_wildcard.xml | 3 - .../domain_info_response_testvalidate_ok.xml | 37 -- .../flows/domain_info_response_wildcard.xml | 3 - ...nfo_response_wildcard_after_redemption.xml | 3 - ...host_delete_response_no_cltrid_pending.xml | 10 - .../host/host_delete_response_pending.xml | 11 - .../registry/flows/host_info_response_ns1.xml | 22 -- .../registry/flows/host_info_response_ns2.xml | 22 -- .../registry/flows/host_update_ns1_to_ns2.xml | 16 - .../flows/poll_response_server_hold.xml | 2 +- .../registry/flows/poll_response_unrenew.xml | 2 +- ...contact_delete_response_sh8013_pending.xml | 11 - 180 files changed, 76 insertions(+), 1995 deletions(-) delete mode 100644 core/src/test/resources/google/registry/flows/contact/contact_delete_response_no_cltrid_pending.xml delete mode 100644 core/src/test/resources/google/registry/flows/contact/contact_delete_response_pending.xml delete mode 100644 core/src/test/resources/google/registry/flows/contact_delete_response_sh8013_pending.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_check_reserved_allocationtoken.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_create_duplicate_contact.xml rename core/src/test/resources/google/registry/flows/domain/{domain_create_missing_non_registrant_contacts.xml => domain_create_has_registrant_contact.xml} (100%) delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_create_missing_admin.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_create_missing_tech.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_create_no_contacts.xml rename core/src/test/resources/google/registry/flows/domain/{domain_create_missing_registrant.xml => domain_create_other_contact_types.xml} (100%) delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_create_response_noasync.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_delete_flags.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_info_flags_none.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_info_flags_two.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_info_with_contact_auth.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_renew_flags.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_transfer_cancel_extra.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_transfer_reject_extra.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_update_add_remove_same_contact.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_update_contacts_and_registrant.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_update_duplicate_contact.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_update_missing_contact_type.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_update_multiple_duplicate_contacts.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_update_remove_admin.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_update_remove_all_contacts.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_update_remove_client_hold.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_update_remove_multiple_contacts.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_update_remove_server_hold.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_update_remove_tech.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_flags.xml delete mode 100644 core/src/test/resources/google/registry/flows/domain_info_response_testvalidate_ok.xml delete mode 100644 core/src/test/resources/google/registry/flows/host/host_delete_response_no_cltrid_pending.xml delete mode 100644 core/src/test/resources/google/registry/flows/host/host_delete_response_pending.xml delete mode 100644 core/src/test/resources/google/registry/flows/host_info_response_ns1.xml delete mode 100644 core/src/test/resources/google/registry/flows/host_info_response_ns2.xml delete mode 100644 core/src/test/resources/google/registry/flows/host_update_ns1_to_ns2.xml delete mode 100644 core/src/test/resources/google/registry/flows/session/contact_delete_response_sh8013_pending.xml diff --git a/core/src/main/java/google/registry/batch/RemoveAllDomainContactsAction.java b/core/src/main/java/google/registry/batch/RemoveAllDomainContactsAction.java index 9deef62ceb0..df418592bdf 100644 --- a/core/src/main/java/google/registry/batch/RemoveAllDomainContactsAction.java +++ b/core/src/main/java/google/registry/batch/RemoveAllDomainContactsAction.java @@ -14,10 +14,8 @@ package google.registry.batch; -import static com.google.common.base.Preconditions.checkState; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; import static google.registry.flows.FlowUtils.marshalWithLenientRetry; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_PROHIBITED; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.util.DateTimeUtils.END_OF_TIME; import static google.registry.util.ResourceUtils.readResourceUtf8; @@ -36,7 +34,6 @@ import google.registry.flows.EppRequestSource; import google.registry.flows.PasswordOnlyTransportCredentials; import google.registry.flows.StatelessRequestSessionMetadata; -import google.registry.model.common.FeatureFlag; import google.registry.model.contact.Contact; import google.registry.model.domain.DesignatedContact; import google.registry.model.domain.Domain; @@ -106,11 +103,7 @@ public class RemoveAllDomainContactsAction implements Runnable { @Override public void run() { - checkState( - tm().transact(() -> FeatureFlag.isActiveNow(MINIMUM_DATASET_CONTACTS_PROHIBITED)), - "Minimum dataset migration must be completed prior to running this action"); response.setContentType(PLAIN_TEXT_UTF_8); - Callable runner = () -> { try { diff --git a/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java b/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java index d2902464563..18184347bcf 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java @@ -186,12 +186,9 @@ * @error {@link DomainFlowUtils.LinkedResourceInPendingDeleteProhibitsOperationException} * @error {@link DomainFlowUtils.MalformedTcnIdException} * @error {@link DomainFlowUtils.MaxSigLifeNotSupportedException} - * @error {@link DomainFlowUtils.MissingAdminContactException} * @error {@link DomainFlowUtils.MissingBillingAccountMapException} * @error {@link DomainFlowUtils.MissingClaimsNoticeException} * @error {@link DomainFlowUtils.MissingContactTypeException} - * @error {@link DomainFlowUtils.MissingRegistrantException} - * @error {@link DomainFlowUtils.MissingTechnicalContactException} * @error {@link DomainFlowUtils.NameserversNotAllowedForTldException} * @error {@link DomainFlowUtils.NameserversNotSpecifiedForTldWithNameserverAllowListException} * @error {@link DomainFlowUtils.PremiumNameBlockedException} diff --git a/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java b/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java index 0228126ed74..8b199d26141 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java +++ b/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java @@ -24,8 +24,6 @@ import static com.google.common.collect.Sets.intersection; import static com.google.common.collect.Sets.union; import static google.registry.bsa.persistence.BsaLabelUtils.isLabelBlocked; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_OPTIONAL; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_PROHIBITED; import static google.registry.model.domain.Domain.MAX_REGISTRATION_YEARS; import static google.registry.model.domain.token.AllocationToken.TokenType.REGISTER_BSA; import static google.registry.model.tld.Tld.TldState.GENERAL_AVAILABILITY; @@ -81,7 +79,6 @@ import google.registry.model.billing.BillingBase.Flag; import google.registry.model.billing.BillingBase.Reason; import google.registry.model.billing.BillingRecurrence; -import google.registry.model.common.FeatureFlag; import google.registry.model.contact.Contact; import google.registry.model.domain.DesignatedContact; import google.registry.model.domain.DesignatedContact.Type; @@ -138,7 +135,6 @@ import java.math.BigDecimal; import java.util.Collection; import java.util.Comparator; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -486,31 +482,12 @@ static void validateNoDuplicateContacts(Set contacts) */ static void validateCreateContactData( Optional> registrant, Set contacts) - throws RequiredParameterMissingException, ParameterValuePolicyErrorException { - // TODO(b/353347632): Change these flag checks to a registry config check once minimum data set - // migration is completed. - if (FeatureFlag.isActiveNow(MINIMUM_DATASET_CONTACTS_PROHIBITED)) { - if (registrant.isPresent()) { - throw new RegistrantProhibitedException(); - } - if (!contacts.isEmpty()) { - throw new ContactsProhibitedException(); - } - } else if (!FeatureFlag.isActiveNow(MINIMUM_DATASET_CONTACTS_OPTIONAL)) { - if (registrant.isEmpty()) { - throw new MissingRegistrantException(); - } - - Set roles = new HashSet<>(); - for (DesignatedContact contact : contacts) { - roles.add(contact.getType()); - } - if (!roles.contains(Type.ADMIN)) { - throw new MissingAdminContactException(); - } - if (!roles.contains(Type.TECH)) { - throw new MissingTechnicalContactException(); - } + throws ParameterValuePolicyErrorException { + if (registrant.isPresent()) { + throw new RegistrantProhibitedException(); + } + if (!contacts.isEmpty()) { + throw new ContactsProhibitedException(); } } @@ -523,33 +500,14 @@ static void validateUpdateContactData( Optional> newRegistrant, Set existingContacts, Set newContacts) - throws RequiredParameterMissingException, ParameterValuePolicyErrorException { - // TODO(b/353347632): Change these flag checks to a registry config check once minimum data set - // migration is completed. - if (FeatureFlag.isActiveNow(MINIMUM_DATASET_CONTACTS_PROHIBITED)) { - // Throw if the update specifies a new registrant that is different from the existing one. - if (newRegistrant.isPresent() && !newRegistrant.equals(existingRegistrant)) { - throw new RegistrantProhibitedException(); - } - // Throw if the update specifies any new contacts that weren't already present on the domain. - if (!Sets.difference(newContacts, existingContacts).isEmpty()) { - throw new ContactsProhibitedException(); - } - } else if (!FeatureFlag.isActiveNow(MINIMUM_DATASET_CONTACTS_OPTIONAL)) { - // Throw if the update empties out a registrant that had been present. - if (newRegistrant.isEmpty() && existingRegistrant.isPresent()) { - throw new MissingRegistrantException(); - } - // Throw if the update contains no admin contact when one had been present. - if (existingContacts.stream().anyMatch(c -> c.getType().equals(Type.ADMIN)) - && newContacts.stream().noneMatch(c -> c.getType().equals(Type.ADMIN))) { - throw new MissingAdminContactException(); - } - // Throw if the update contains no tech contact when one had been present. - if (existingContacts.stream().anyMatch(c -> c.getType().equals(Type.TECH)) - && newContacts.stream().noneMatch(c -> c.getType().equals(Type.TECH))) { - throw new MissingTechnicalContactException(); - } + throws ParameterValuePolicyErrorException { + // Throw if the update specifies a new registrant that is different from the existing one. + if (newRegistrant.isPresent() && !newRegistrant.equals(existingRegistrant)) { + throw new RegistrantProhibitedException(); + } + // Throw if the update specifies any new contacts that weren't already present on the domain. + if (!Sets.difference(newContacts, existingContacts).isEmpty()) { + throw new ContactsProhibitedException(); } } @@ -1398,13 +1356,6 @@ public InvalidIdnDomainLabelException() { } } - /** Registrant is required. */ - static class MissingRegistrantException extends RequiredParameterMissingException { - public MissingRegistrantException() { - super("Registrant is required"); - } - } - /** Having a registrant is prohibited by registry policy. */ static class RegistrantProhibitedException extends ParameterValuePolicyErrorException { public RegistrantProhibitedException() { @@ -1412,20 +1363,6 @@ public RegistrantProhibitedException() { } } - /** Admin contact is required. */ - static class MissingAdminContactException extends RequiredParameterMissingException { - public MissingAdminContactException() { - super("Admin contact is required"); - } - } - - /** Technical contact is required. */ - static class MissingTechnicalContactException extends RequiredParameterMissingException { - public MissingTechnicalContactException() { - super("Technical contact is required"); - } - } - /** Too many nameservers set on this domain. */ static class TooManyNameserversException extends ParameterValuePolicyErrorException { public TooManyNameserversException(String message) { diff --git a/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java b/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java index 5a4981f83f4..d4b541c7052 100644 --- a/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java +++ b/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java @@ -39,8 +39,6 @@ import static google.registry.flows.domain.DomainFlowUtils.validateUpdateContactData; import static google.registry.flows.domain.DomainFlowUtils.verifyClientUpdateNotProhibited; import static google.registry.flows.domain.DomainFlowUtils.verifyNotInPendingDelete; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_OPTIONAL; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_PROHIBITED; import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_UPDATE; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; @@ -61,13 +59,11 @@ import google.registry.flows.custom.DomainUpdateFlowCustomLogic.AfterValidationParameters; import google.registry.flows.custom.DomainUpdateFlowCustomLogic.BeforeSaveParameters; import google.registry.flows.custom.EntityChanges; -import google.registry.flows.domain.DomainFlowUtils.MissingRegistrantException; import google.registry.flows.domain.DomainFlowUtils.NameserversNotSpecifiedForTldWithNameserverAllowListException; import google.registry.flows.domain.DomainFlowUtils.RegistrantProhibitedException; import google.registry.model.ImmutableObject; import google.registry.model.billing.BillingBase.Reason; import google.registry.model.billing.BillingEvent; -import google.registry.model.common.FeatureFlag; import google.registry.model.contact.Contact; import google.registry.model.domain.DesignatedContact; import google.registry.model.domain.Domain; @@ -123,10 +119,7 @@ * @error {@link DomainFlowUtils.LinkedResourcesDoNotExistException} * @error {@link DomainFlowUtils.LinkedResourceInPendingDeleteProhibitsOperationException} * @error {@link DomainFlowUtils.MaxSigLifeChangeNotSupportedException} - * @error {@link DomainFlowUtils.MissingAdminContactException} * @error {@link DomainFlowUtils.MissingContactTypeException} - * @error {@link DomainFlowUtils.MissingTechnicalContactException} - * @error {@link DomainFlowUtils.MissingRegistrantException} * @error {@link DomainFlowUtils.NameserversNotAllowedForTldException} * @error {@link NameserversNotSpecifiedForTldWithNameserverAllowListException} * @error {@link DomainFlowUtils.NotAuthorizedForTldException} @@ -307,18 +300,11 @@ private Domain performUpdate(Update command, Domain domain, DateTime now) throws return domainBuilder.build(); } - private Optional> determineUpdatedRegistrant(Change change, Domain domain) - throws EppException { + private Optional> determineUpdatedRegistrant(Change change, Domain domain) { // During or after the minimum dataset transition, allow registrant to be removed. if (change.getRegistrantContactId().isPresent() && change.getRegistrantContactId().get().isEmpty()) { - // TODO(b/353347632): Change this flag check to a registry config check. - if (FeatureFlag.isActiveNow(MINIMUM_DATASET_CONTACTS_OPTIONAL) - || FeatureFlag.isActiveNow(MINIMUM_DATASET_CONTACTS_PROHIBITED)) { - return Optional.empty(); - } else { - throw new MissingRegistrantException(); - } + return Optional.empty(); } return change.getRegistrant().or(domain::getRegistrant); } diff --git a/core/src/main/java/google/registry/tools/CreateDomainCommand.java b/core/src/main/java/google/registry/tools/CreateDomainCommand.java index c3085f0341b..66664bd8f09 100644 --- a/core/src/main/java/google/registry/tools/CreateDomainCommand.java +++ b/core/src/main/java/google/registry/tools/CreateDomainCommand.java @@ -16,17 +16,12 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Strings.isNullOrEmpty; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_OPTIONAL; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_PROHIBITED; -import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.pricing.PricingEngineProxy.getPricesForDomainName; -import static google.registry.util.PreconditionsUtils.checkArgumentNotNull; import static org.joda.time.DateTimeZone.UTC; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.google.template.soy.data.SoyMapData; -import google.registry.model.common.FeatureFlag; import google.registry.model.pricing.PremiumPricingEngine.DomainPrices; import google.registry.tools.soy.DomainCreateSoyInfo; import google.registry.util.StringGenerator; @@ -62,15 +57,6 @@ final class CreateDomainCommand extends CreateOrUpdateDomainCommand { @Override protected void initMutatingEppToolCommand() { - tm().transact( - () -> { - if (!FeatureFlag.isActiveNow(MINIMUM_DATASET_CONTACTS_OPTIONAL) - && !FeatureFlag.isActiveNow(MINIMUM_DATASET_CONTACTS_PROHIBITED)) { - checkArgumentNotNull(registrant, "Registrant must be specified"); - checkArgument(!admins.isEmpty(), "At least one admin must be specified"); - checkArgument(!techs.isEmpty(), "At least one tech must be specified"); - } - }); if (isNullOrEmpty(password)) { password = passwordGenerator.createString(PASSWORD_LENGTH); } diff --git a/core/src/test/java/google/registry/flows/EppLifecycleDomainTest.java b/core/src/test/java/google/registry/flows/EppLifecycleDomainTest.java index 394102d131f..fb45f347354 100644 --- a/core/src/test/java/google/registry/flows/EppLifecycleDomainTest.java +++ b/core/src/test/java/google/registry/flows/EppLifecycleDomainTest.java @@ -16,8 +16,6 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.model.ForeignKeyUtils.loadResource; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_OPTIONAL; -import static google.registry.model.common.FeatureFlag.FeatureStatus.INACTIVE; import static google.registry.model.eppoutput.Result.Code.SUCCESS; import static google.registry.model.eppoutput.Result.Code.SUCCESS_AND_CLOSE; import static google.registry.model.eppoutput.Result.Code.SUCCESS_WITH_ACTION_PENDING; @@ -42,7 +40,6 @@ import com.google.re2j.Pattern; import google.registry.model.billing.BillingBase.Reason; import google.registry.model.billing.BillingEvent; -import google.registry.model.common.FeatureFlag; import google.registry.model.domain.Domain; import google.registry.model.domain.DomainHistory; import google.registry.model.reporting.HistoryEntry.Type; @@ -76,19 +73,12 @@ class EppLifecycleDomainTest extends EppTestCase { @BeforeEach void beforeEach() { - persistResource( - new FeatureFlag() - .asBuilder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_OPTIONAL) - .setStatusMap(ImmutableSortedMap.of(START_OF_TIME, INACTIVE)) - .build()); createTlds("example", "tld"); } @Test void testDomainDeleteRestore() throws Exception { assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); - createContacts(DateTime.parse("2000-06-01T00:00:00Z")); // Create domain example.tld assertThatCommand( @@ -148,7 +138,6 @@ void testDomainDeleteRestore() throws Exception { @Test void testDomainDeleteRestore_duringAutorenewGracePeriod() throws Exception { assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); - createContacts(DateTime.parse("2000-06-01T00:00:00Z")); // Create domain example.tld assertThatCommand( @@ -222,7 +211,6 @@ void testDomainDeleteRestore_duringAutorenewGracePeriod() throws Exception { @Test void testDomainDeleteRestore_duringRenewalGracePeriod() throws Exception { assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); - createContacts(DateTime.parse("2000-06-01T00:00:00Z")); // Create domain example.tld assertThatCommand( @@ -304,7 +292,6 @@ void testDomainDeleteRestore_duringRenewalGracePeriod() throws Exception { @Test void testDomainDelete_duringAddAndRenewalGracePeriod_deletesImmediately() throws Exception { assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); - createContacts(DateTime.parse("2000-06-01T00:00:00Z")); DateTime createTime = DateTime.parse("2000-06-01T00:02:00Z"); // Create domain example.tld @@ -396,7 +383,6 @@ void testDomainDelete_duringAddAndRenewalGracePeriod_deletesImmediately() throws @Test void testDomainDeletion_withinAddGracePeriod_deletesImmediately() throws Exception { assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); - createContacts(DateTime.parse("2000-06-01T00:00:00Z")); // Create domain example.tld DateTime createTime = DateTime.parse("2000-06-01T00:02:00Z"); @@ -450,7 +436,6 @@ void testDomainDeletion_withinAddGracePeriod_deletesImmediately() throws Excepti @Test void testDomainDeletion_outsideAddGracePeriod_showsRedemptionPeriod() throws Exception { assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); - createContacts(DateTime.parse("2000-06-01T00:00:00Z")); DateTime createTime = DateTime.parse("2000-06-01T00:02:00Z"); // Create domain example.tld @@ -509,7 +494,6 @@ void testDomainDeletion_outsideAddGracePeriod_showsRedemptionPeriod() throws Exc @Test void testEapDomainDeletion_withinAddGracePeriod_eapFeeIsNotRefunded() throws Exception { assertThatCommand("login_valid_fee_extension.xml").hasSuccessfulLogin(); - createContacts(DateTime.parse("2000-06-01T00:00:00Z")); // Set the EAP schedule. persistResource( @@ -697,7 +681,7 @@ void testDomainCreation_failsBeforeSunrise() throws Exception { assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); - createContactsAndHosts(); + createHosts(); assertThatCommand("domain_create_sunrise_encoded_mark.xml") .atTime(sunriseDate.minusDays(1)) @@ -760,11 +744,11 @@ void testDomainCreate_annualAutoRenewPollMessages_haveUniqueIds() throws Excepti .hasResponse( "poll_response_autorenew.xml", ImmutableMap.of( - "ID", "15-2002", + "ID", "11-2002", "QDATE", "2002-06-01T00:04:00Z", "DOMAIN", "fakesite.example", "EXDATE", "2003-06-01T00:04:00Z")); - assertThatCommand("poll_ack.xml", ImmutableMap.of("ID", "15-2002")) + assertThatCommand("poll_ack.xml", ImmutableMap.of("ID", "11-2002")) .atTime("2002-07-01T00:02:00Z") .hasResponse("poll_ack_response_empty.xml"); @@ -778,13 +762,13 @@ void testDomainCreate_annualAutoRenewPollMessages_haveUniqueIds() throws Excepti .hasResponse( "poll_response_autorenew.xml", ImmutableMap.of( - "ID", "15-2003", // Note -- Year is different from previous ID. + "ID", "11-2003", // Note -- Year is different from previous ID. "QDATE", "2003-06-01T00:04:00Z", "DOMAIN", "fakesite.example", "EXDATE", "2004-06-01T00:04:00Z")); // Ack the second poll message and verify that none remain. - assertThatCommand("poll_ack.xml", ImmutableMap.of("ID", "15-2003")) + assertThatCommand("poll_ack.xml", ImmutableMap.of("ID", "11-2003")) .atTime("2003-07-01T00:05:05Z") .hasResponse("poll_ack_response_empty.xml"); assertThatCommand("poll.xml") @@ -814,7 +798,7 @@ void testDomainTransferPollMessage_serverApproved() throws Exception { // As the losing registrar, read the request poll message, and then ack it. assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); - String messageId = "24-2001"; + String messageId = "20-2001"; assertThatCommand("poll.xml") .atTime("2001-01-01T00:01:00Z") .hasResponse("poll_response_domain_transfer_request.xml", ImmutableMap.of("ID", messageId)); @@ -823,7 +807,7 @@ void testDomainTransferPollMessage_serverApproved() throws Exception { .hasResponse("poll_ack_response_empty.xml"); // Five days in the future, expect a server approval poll message to the loser, and ack it. - messageId = "23-2001"; + messageId = "19-2001"; assertThatCommand("poll.xml") .atTime("2001-01-06T00:01:00Z") .hasResponse( @@ -835,7 +819,7 @@ void testDomainTransferPollMessage_serverApproved() throws Exception { assertThatLogoutSucceeds(); // Also expect a server approval poll message to the winner, with the transfer request trid. - messageId = "22-2001"; + messageId = "18-2001"; assertThatLoginSucceeds("TheRegistrar", "password2"); assertThatCommand("poll.xml") .atTime("2001-01-06T00:02:00Z") @@ -1113,7 +1097,6 @@ void testSuccess_multipartTldsWithSharedSuffixes() throws Exception { createTlds("bar.foo.tld", "foo.tld"); assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); - createContacts(DateTime.parse("2000-06-01T00:00:00.000Z")); // Create domain example.bar.foo.tld assertThatCommand( @@ -1157,7 +1140,6 @@ void testSuccess_multipartTldsWithSharedPrefixes() throws Exception { createTld("tld.foo"); assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); - createContacts(DateTime.parse("2000-06-01T00:00:00.000Z")); // Create domain example.tld.foo assertThatCommand( @@ -1207,7 +1189,7 @@ void testDomainCreation_startDateSunriseFull() throws Exception { .atTime(sunriseDate.minusDays(3)) .hasSuccessfulLogin(); - createContactsAndHosts(); + createHosts(); // During pre-delegation, any create should fail both with and without mark assertThatCommand("domain_create_sunrise_encoded_mark.xml", ImmutableMap.of("SMD", ENCODED_SMD)) @@ -1235,9 +1217,10 @@ void testDomainCreation_startDateSunriseFull() throws Exception { .hasResponse( "response_error.xml", ImmutableMap.of( - "CODE", "2306", + "CODE", + "2306", "MSG", - "Declared launch extension phase does not match the current registry phase")); + "Declared launch extension phase does not match the current registry phase")); // During sunrise, create with mark will succeed but without will fail. // We also test we can delete without a mark. @@ -1255,8 +1238,7 @@ void testDomainCreation_startDateSunriseFull() throws Exception { .hasResponse("generic_success_response.xml"); assertThatCommand( - "domain_create_no_hosts_or_dsdata.xml", - ImmutableMap.of("DOMAIN", "general.example")) + "domain_create_no_hosts_or_dsdata.xml", ImmutableMap.of("DOMAIN", "general.example")) .atTime(sunriseDate.plusDays(2)) .hasResponse( "response_error.xml", @@ -1270,9 +1252,10 @@ void testDomainCreation_startDateSunriseFull() throws Exception { .hasResponse( "response_error.xml", ImmutableMap.of( - "CODE", "2306", + "CODE", + "2306", "MSG", - "Declared launch extension phase does not match the current registry phase")); + "Declared launch extension phase does not match the current registry phase")); assertThatCommand( "domain_create_no_hosts_or_dsdata.xml", ImmutableMap.of("DOMAIN", "general.example")) @@ -1304,7 +1287,7 @@ void testDomainCreation_startDateSunrise_noType() throws Exception { .atTime(sunriseDate.minusDays(3)) .hasSuccessfulLogin(); - createContactsAndHosts(); + createHosts(); // During start-date sunrise, create with mark will succeed but without will fail. // We also test we can delete without a mark. @@ -1459,7 +1442,6 @@ void testDomainTransfer_queryForServerApproved() throws Exception { void testDomainUpdateBySuperuser_sendsPollMessage() throws Exception { setIsSuperuser(false); assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); - createContacts(DateTime.parse("2000-06-01T00:00:00Z")); // Create domain example.tld assertThatCommand( diff --git a/core/src/test/java/google/registry/flows/EppLifecycleHostTest.java b/core/src/test/java/google/registry/flows/EppLifecycleHostTest.java index 345eba7c150..f97396af5cc 100644 --- a/core/src/test/java/google/registry/flows/EppLifecycleHostTest.java +++ b/core/src/test/java/google/registry/flows/EppLifecycleHostTest.java @@ -16,19 +16,13 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.model.ForeignKeyUtils.loadResource; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_OPTIONAL; -import static google.registry.model.common.FeatureFlag.FeatureStatus.INACTIVE; import static google.registry.model.eppoutput.Result.Code.SUCCESS; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.createTlds; -import static google.registry.testing.DatabaseHelper.persistResource; import static google.registry.testing.EppMetricSubject.assertThat; import static google.registry.testing.HostSubject.assertAboutHosts; -import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSortedMap; -import google.registry.model.common.FeatureFlag; import google.registry.model.domain.Domain; import google.registry.model.host.Host; import google.registry.persistence.transaction.JpaTestExtensions; @@ -94,12 +88,6 @@ void testLifecycle() throws Exception { @Test void testRenamingHostToExistingHost_fails() throws Exception { - persistResource( - new FeatureFlag() - .asBuilder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_OPTIONAL) - .setStatusMap(ImmutableSortedMap.of(START_OF_TIME, INACTIVE)) - .build()); createTld("example"); assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); // Create the fakesite domain. @@ -150,12 +138,6 @@ void testRenamingHostToExistingHost_fails() throws Exception { @Test void testSuccess_multipartTldsWithSharedSuffixes() throws Exception { - persistResource( - new FeatureFlag() - .asBuilder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_OPTIONAL) - .setStatusMap(ImmutableSortedMap.of(START_OF_TIME, INACTIVE)) - .build()); createTlds("bar.foo.tld", "foo.tld", "tld"); assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); diff --git a/core/src/test/java/google/registry/flows/EppPointInTimeTest.java b/core/src/test/java/google/registry/flows/EppPointInTimeTest.java index b9cae7f09c3..2bb1108e16a 100644 --- a/core/src/test/java/google/registry/flows/EppPointInTimeTest.java +++ b/core/src/test/java/google/registry/flows/EppPointInTimeTest.java @@ -17,24 +17,18 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.model.EppResourceUtils.loadAtPointInTime; import static google.registry.model.ImmutableObjectSubject.assertAboutImmutableObjects; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_OPTIONAL; -import static google.registry.model.common.FeatureFlag.FeatureStatus.INACTIVE; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.loadAllOf; import static google.registry.testing.DatabaseHelper.loadByEntity; import static google.registry.testing.DatabaseHelper.persistActiveContact; import static google.registry.testing.DatabaseHelper.persistActiveHost; -import static google.registry.testing.DatabaseHelper.persistResource; -import static google.registry.util.DateTimeUtils.START_OF_TIME; import static java.nio.charset.StandardCharsets.UTF_8; import static org.joda.time.DateTimeZone.UTC; import static org.joda.time.Duration.standardDays; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.Iterables; import google.registry.flows.EppTestComponent.FakesAndMocksModule; -import google.registry.model.common.FeatureFlag; import google.registry.model.domain.Domain; import google.registry.monitoring.whitebox.EppMetric; import google.registry.persistence.transaction.JpaTestExtensions; @@ -60,12 +54,6 @@ class EppPointInTimeTest { @BeforeEach void beforeEach() { - persistResource( - new FeatureFlag() - .asBuilder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_OPTIONAL) - .setStatusMap(ImmutableSortedMap.of(START_OF_TIME, INACTIVE)) - .build()); createTld("tld"); } diff --git a/core/src/test/java/google/registry/flows/EppTestCase.java b/core/src/test/java/google/registry/flows/EppTestCase.java index 3088f311881..d86f8413460 100644 --- a/core/src/test/java/google/registry/flows/EppTestCase.java +++ b/core/src/test/java/google/registry/flows/EppTestCase.java @@ -224,9 +224,8 @@ EppMetric getRecordedEppMetric() { } /** Create the two administrative contacts and two hosts. */ - void createContactsAndHosts() throws Exception { + void createHosts() throws Exception { DateTime createTime = DateTime.parse("2000-06-01T00:00:00Z"); - createContacts(createTime); assertThatCommand("host_create.xml", ImmutableMap.of("HOSTNAME", "ns1.example.external")) .atTime(createTime.plusMinutes(2)) .hasResponse( @@ -243,21 +242,9 @@ void createContactsAndHosts() throws Exception { "CRDATE", createTime.plusMinutes(3).toString())); } - protected void createContacts(DateTime createTime) throws Exception { - assertThatCommand("contact_create_sh8013.xml") - .atTime(createTime) - .hasResponse( - "contact_create_response_sh8013.xml", ImmutableMap.of("CRDATE", createTime.toString())); - assertThatCommand("contact_create_jd1234.xml") - .atTime(createTime.plusMinutes(1)) - .hasResponse( - "contact_create_response_jd1234.xml", - ImmutableMap.of("CRDATE", createTime.plusMinutes(1).toString())); - } - /** Creates the domain fakesite.example with two nameservers on it. */ void createFakesite() throws Exception { - createContactsAndHosts(); + createHosts(); assertThatCommand("domain_create_fakesite.xml") .atTime("2000-06-01T00:04:00Z") .hasResponse( diff --git a/core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java index daddc745b95..8c96f30f796 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java @@ -24,10 +24,6 @@ import static google.registry.model.billing.BillingBase.Flag.SUNRISE; import static google.registry.model.billing.BillingBase.RenewalPriceBehavior.NONPREMIUM; import static google.registry.model.billing.BillingBase.RenewalPriceBehavior.SPECIFIED; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_OPTIONAL; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_PROHIBITED; -import static google.registry.model.common.FeatureFlag.FeatureStatus.ACTIVE; -import static google.registry.model.common.FeatureFlag.FeatureStatus.INACTIVE; import static google.registry.model.domain.fee.Fee.FEE_EXTENSION_URIS; import static google.registry.model.domain.token.AllocationToken.TokenType.BULK_PRICING; import static google.registry.model.domain.token.AllocationToken.TokenType.DEFAULT_PROMO; @@ -53,7 +49,6 @@ import static google.registry.testing.DatabaseHelper.getHistoryEntries; import static google.registry.testing.DatabaseHelper.loadAllOf; import static google.registry.testing.DatabaseHelper.loadRegistrar; -import static google.registry.testing.DatabaseHelper.newContact; import static google.registry.testing.DatabaseHelper.newHost; import static google.registry.testing.DatabaseHelper.persistActiveContact; import static google.registry.testing.DatabaseHelper.persistActiveDomain; @@ -104,7 +99,6 @@ import google.registry.flows.domain.DomainFlowUtils.DomainLabelTooLongException; import google.registry.flows.domain.DomainFlowUtils.DomainNameExistsAsTldException; import google.registry.flows.domain.DomainFlowUtils.DomainReservedException; -import google.registry.flows.domain.DomainFlowUtils.DuplicateContactForRoleException; import google.registry.flows.domain.DomainFlowUtils.EmptyDomainNamePartException; import google.registry.flows.domain.DomainFlowUtils.ExceedsMaxRegistrationYearsException; import google.registry.flows.domain.DomainFlowUtils.ExpiredClaimException; @@ -123,12 +117,9 @@ import google.registry.flows.domain.DomainFlowUtils.LinkedResourcesDoNotExistException; import google.registry.flows.domain.DomainFlowUtils.MalformedTcnIdException; import google.registry.flows.domain.DomainFlowUtils.MaxSigLifeNotSupportedException; -import google.registry.flows.domain.DomainFlowUtils.MissingAdminContactException; import google.registry.flows.domain.DomainFlowUtils.MissingBillingAccountMapException; import google.registry.flows.domain.DomainFlowUtils.MissingClaimsNoticeException; import google.registry.flows.domain.DomainFlowUtils.MissingContactTypeException; -import google.registry.flows.domain.DomainFlowUtils.MissingRegistrantException; -import google.registry.flows.domain.DomainFlowUtils.MissingTechnicalContactException; import google.registry.flows.domain.DomainFlowUtils.NameserversNotAllowedForTldException; import google.registry.flows.domain.DomainFlowUtils.NameserversNotSpecifiedForTldWithNameserverAllowListException; import google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException; @@ -155,7 +146,6 @@ import google.registry.model.billing.BillingBase.RenewalPriceBehavior; import google.registry.model.billing.BillingEvent; import google.registry.model.billing.BillingRecurrence; -import google.registry.model.common.FeatureFlag; import google.registry.model.domain.Domain; import google.registry.model.domain.DomainHistory; import google.registry.model.domain.GracePeriod; @@ -1945,28 +1935,6 @@ void testFailure_pendingDeleteHost() { assertThat(thrown).hasMessageThat().contains("ns2.example.net"); } - @Test - void testFailure_missingContact() { - persistActiveHost("ns1.example.net"); - persistActiveHost("ns2.example.net"); - persistActiveContact("jd1234"); - LinkedResourcesDoNotExistException thrown = - assertThrows(LinkedResourcesDoNotExistException.class, this::runFlow); - assertThat(thrown).hasMessageThat().contains("(sh8013)"); - } - - @Test - void testFailure_pendingDeleteContact() { - persistActiveHost("ns1.example.net"); - persistActiveHost("ns2.example.net"); - persistActiveContact("sh8013"); - persistResource(newContact("jd1234").asBuilder().addStatusValue(PENDING_DELETE).build()); - clock.advanceOneMilli(); - LinkedResourceInPendingDeleteProhibitsOperationException thrown = - assertThrows(LinkedResourceInPendingDeleteProhibitsOperationException.class, this::runFlow); - assertThat(thrown).hasMessageThat().contains("jd1234"); - } - @Test void testFailure_wrongTld() { persistContactsAndHosts("net"); @@ -2072,14 +2040,6 @@ void testSuccess_customLogicIsCalled_andSavesExtraEntity() throws Exception { .build()); } - @Test - void testFailure_duplicateContact() { - setEppInput("domain_create_duplicate_contact.xml"); - persistContactsAndHosts(); - EppException thrown = assertThrows(DuplicateContactForRoleException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - @Test void testFailure_missingContactType() { // We need to test for missing type, but not for invalid - the schema enforces that for us. @@ -2090,149 +2050,21 @@ void testFailure_missingContactType() { } @Test - void testFailure_missingRegistrant() { - setEppInput("domain_create_missing_registrant.xml"); - persistContactsAndHosts(); - EppException thrown = assertThrows(MissingRegistrantException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testSuccess_minimumDatasetPhase1_missingRegistrant() throws Exception { - persistResource( - new FeatureFlag.Builder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_OPTIONAL) - .setStatusMap( - ImmutableSortedMap.of(START_OF_TIME, INACTIVE, clock.nowUtc().minusDays(5), ACTIVE)) - .build()); - setEppInput("domain_create_missing_registrant.xml"); - persistContactsAndHosts(); - runFlowAssertResponse( - loadFile("domain_create_response.xml", ImmutableMap.of("DOMAIN", "example.tld"))); - } - - @Test - void testFailure_minimumDatasetPhase2_noRegistrantButSomeOtherContactTypes() throws Exception { - persistResource( - new FeatureFlag.Builder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_PROHIBITED) - .setStatusMap( - ImmutableSortedMap.of(START_OF_TIME, INACTIVE, clock.nowUtc().minusDays(5), ACTIVE)) - .build()); - setEppInput("domain_create_missing_registrant.xml"); + void testFailure_minimumDataset_noRegistrantButSomeOtherContactTypes() throws Exception { + setEppInput("domain_create_other_contact_types.xml"); persistContactsAndHosts(); EppException thrown = assertThrows(ContactsProhibitedException.class, this::runFlow); assertAboutEppExceptions().that(thrown).marshalsToXml(); } @Test - void testFailure_missingAdmin() { - setEppInput("domain_create_missing_admin.xml"); - persistContactsAndHosts(); - EppException thrown = assertThrows(MissingAdminContactException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testSuccess_minimumDatasetPhase1_missingAdmin() throws Exception { - persistResource( - new FeatureFlag.Builder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_OPTIONAL) - .setStatusMap( - ImmutableSortedMap.of(START_OF_TIME, INACTIVE, clock.nowUtc().minusDays(5), ACTIVE)) - .build()); - setEppInput("domain_create_missing_admin.xml"); - persistContactsAndHosts(); - runFlowAssertResponse( - loadFile("domain_create_response.xml", ImmutableMap.of("DOMAIN", "example.tld"))); - } - - @Test - void testFailure_minimumDatasetPhase2_registrantAndOtherContactsSent() throws Exception { - persistResource( - new FeatureFlag.Builder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_PROHIBITED) - .setStatusMap( - ImmutableSortedMap.of(START_OF_TIME, INACTIVE, clock.nowUtc().minusDays(5), ACTIVE)) - .build()); - setEppInput("domain_create_missing_admin.xml"); - persistContactsAndHosts(); - EppException thrown = assertThrows(RegistrantProhibitedException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testFailure_missingTech() { - setEppInput("domain_create_missing_tech.xml"); - persistContactsAndHosts(); - EppException thrown = assertThrows(MissingTechnicalContactException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testSuccess_minimumDatasetPhase1_missingTech() throws Exception { - persistResource( - new FeatureFlag.Builder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_OPTIONAL) - .setStatusMap( - ImmutableSortedMap.of(START_OF_TIME, INACTIVE, clock.nowUtc().minusDays(5), ACTIVE)) - .build()); - setEppInput("domain_create_missing_tech.xml"); - persistContactsAndHosts(); - runFlowAssertResponse( - loadFile("domain_create_response.xml", ImmutableMap.of("DOMAIN", "example.tld"))); - } - - @Test - void testFailure_missingNonRegistrantContacts() { - setEppInput("domain_create_missing_non_registrant_contacts.xml"); - persistContactsAndHosts(); - EppException thrown = assertThrows(MissingAdminContactException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testSuccess_minimumDatasetPhase1_missingNonRegistrantContacts() throws Exception { - persistResource( - new FeatureFlag.Builder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_OPTIONAL) - .setStatusMap( - ImmutableSortedMap.of(START_OF_TIME, INACTIVE, clock.nowUtc().minusDays(5), ACTIVE)) - .build()); - setEppInput("domain_create_missing_non_registrant_contacts.xml"); - persistContactsAndHosts(); - runFlowAssertResponse( - loadFile("domain_create_response.xml", ImmutableMap.of("DOMAIN", "example.tld"))); - } - - @Test - void testFailure_minimumDatasetPhase2_registrantNotPermitted() throws Exception { - persistResource( - new FeatureFlag.Builder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_PROHIBITED) - .setStatusMap( - ImmutableSortedMap.of(START_OF_TIME, INACTIVE, clock.nowUtc().minusDays(5), ACTIVE)) - .build()); - setEppInput("domain_create_missing_non_registrant_contacts.xml"); + void testFailure_minimumDataset_registrantNotPermitted() throws Exception { + setEppInput("domain_create_has_registrant_contact.xml"); persistContactsAndHosts(); EppException thrown = assertThrows(RegistrantProhibitedException.class, this::runFlow); assertAboutEppExceptions().that(thrown).marshalsToXml(); } - @Test - void testSuccess_minimumDatasetPhase2_noContactsWhatsoever() throws Exception { - persistResource( - new FeatureFlag.Builder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_PROHIBITED) - .setStatusMap( - ImmutableSortedMap.of(START_OF_TIME, INACTIVE, clock.nowUtc().minusDays(5), ACTIVE)) - .build()); - setEppInput("domain_create_no_contacts.xml"); - persistContactsAndHosts(); - runFlowAssertResponse( - loadFile("domain_create_response.xml", ImmutableMap.of("DOMAIN", "example.tld"))); - } - @Test void testFailure_badIdn() { createTld("xn--q9jyb4c"); diff --git a/core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java index 5584faf3d70..5a4ac81e635 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java @@ -23,7 +23,6 @@ import static google.registry.model.tld.Tld.TldState.QUIET_PERIOD; import static google.registry.testing.DatabaseHelper.assertNoBillingEvents; import static google.registry.testing.DatabaseHelper.createTld; -import static google.registry.testing.DatabaseHelper.persistActiveContact; import static google.registry.testing.DatabaseHelper.persistActiveHost; import static google.registry.testing.DatabaseHelper.persistBillingRecurrenceForDomain; import static google.registry.testing.DatabaseHelper.persistPremiumList; @@ -55,10 +54,6 @@ import google.registry.model.billing.BillingBase.Reason; import google.registry.model.billing.BillingBase.RenewalPriceBehavior; import google.registry.model.billing.BillingRecurrence; -import google.registry.model.contact.Contact; -import google.registry.model.contact.ContactAuthInfo; -import google.registry.model.domain.DesignatedContact; -import google.registry.model.domain.DesignatedContact.Type; import google.registry.model.domain.Domain; import google.registry.model.domain.DomainAuthInfo; import google.registry.model.domain.DomainHistory; @@ -103,8 +98,6 @@ class DomainInfoFlowTest extends ResourceFlowTestCase { private static final Pattern OK_PATTERN = Pattern.compile("\"ok\""); - private Contact registrant; - private Contact contact; private Host host1; private Host host2; private Host host3; @@ -124,8 +117,6 @@ void setup() { } private void persistTestEntities(String domainName, boolean inactive) { - registrant = persistActiveContact("jd1234"); - contact = persistActiveContact("sh8013"); host1 = persistActiveHost("ns1.example.tld"); host2 = persistActiveHost("ns1.example.net"); domain = @@ -140,11 +131,6 @@ private void persistTestEntities(String domainName, boolean inactive) { .setLastEppUpdateTime(DateTime.parse("1999-12-03T09:00:00.0Z")) .setLastTransferTime(DateTime.parse("2000-04-08T09:00:00.0Z")) .setRegistrationExpirationTime(DateTime.parse("2005-04-03T22:00:00.0Z")) - .setRegistrant(Optional.of(registrant.createVKey())) - .setContacts( - ImmutableSet.of( - DesignatedContact.create(Type.ADMIN, contact.createVKey()), - DesignatedContact.create(Type.TECH, contact.createVKey()))) .setNameservers( inactive ? null : ImmutableSet.of(host1.createVKey(), host2.createVKey())) .setAuthInfo(DomainAuthInfo.create(PasswordAuth.create("2fooBAR"))) @@ -323,24 +309,6 @@ void testSuccess_differentRegistrarWithAuthInfo() throws Exception { doSuccessfulTest("domain_info_response.xml"); } - @Test - void testSuccess_differentRegistrarWithRegistrantAuthInfo() throws Exception { - persistTestEntities(false); - setEppInput("domain_info_with_contact_auth.xml"); - eppLoader.replaceAll("JD1234-REP", registrant.getRepoId()); - sessionMetadata.setRegistrarId("ClientZ"); - doSuccessfulTest("domain_info_response.xml", false); - } - - @Test - void testSuccess_differentRegistrarWithContactAuthInfo() throws Exception { - persistTestEntities(false); - setEppInput("domain_info_with_contact_auth.xml"); - eppLoader.replaceAll("JD1234-REP", registrant.getRepoId()); - sessionMetadata.setRegistrarId("ClientZ"); - doSuccessfulTest("domain_info_response.xml", false); - } - @Test void testSuccess_inQuietPeriod() throws Exception { persistResource( @@ -618,99 +586,6 @@ void testFailure_wrongAuthInfo() { assertAboutEppExceptions().that(thrown).marshalsToXml(); } - @Test - void testFailure_differentRegistrarWrongRegistrantAuthInfo() { - persistTestEntities(false); - // Change the password of the registrant so that it does not match the file. - registrant = - persistResource( - registrant - .asBuilder() - .setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("diffpw"))) - .build()); - sessionMetadata.setRegistrarId("ClientZ"); - setEppInput("domain_info_with_contact_auth.xml"); - // Replace the ROID in the xml file with the one for our registrant. - eppLoader.replaceAll("JD1234-REP", registrant.getRepoId()); - EppException thrown = assertThrows(BadAuthInfoForResourceException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testFailure_wrongRegistrantAuthInfo() { - persistTestEntities(false); - // Change the password of the registrant so that it does not match the file. - registrant = - persistResource( - registrant - .asBuilder() - .setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("diffpw"))) - .build()); - setEppInput("domain_info_with_contact_auth.xml"); - // Replace the ROID in the xml file with the one for our registrant. - eppLoader.replaceAll("JD1234-REP", registrant.getRepoId()); - EppException thrown = assertThrows(BadAuthInfoForResourceException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testFailure_differentRegistrarWrongContactAuthInfo() { - persistTestEntities(false); - // Change the password of the contact so that it does not match the file. - contact = - persistResource( - contact - .asBuilder() - .setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("diffpw"))) - .build()); - sessionMetadata.setRegistrarId("ClientZ"); - setEppInput("domain_info_with_contact_auth.xml"); - // Replace the ROID in the xml file with the one for our contact. - eppLoader.replaceAll("JD1234-REP", contact.getRepoId()); - EppException thrown = assertThrows(BadAuthInfoForResourceException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testFailure_wrongContactAuthInfo() { - persistTestEntities(false); - // Change the password of the contact so that it does not match the file. - contact = - persistResource( - contact - .asBuilder() - .setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("diffpw"))) - .build()); - setEppInput("domain_info_with_contact_auth.xml"); - // Replace the ROID in the xml file with the one for our contact. - eppLoader.replaceAll("JD1234-REP", contact.getRepoId()); - EppException thrown = assertThrows(BadAuthInfoForResourceException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testFailure_differentRegistrarUnrelatedContactAuthInfo() { - persistTestEntities(false); - Contact unrelatedContact = persistActiveContact("foo1234"); - sessionMetadata.setRegistrarId("ClientZ"); - setEppInput("domain_info_with_contact_auth.xml"); - // Replace the ROID in the xml file with the one for our unrelated contact. - eppLoader.replaceAll("JD1234-REP", unrelatedContact.getRepoId()); - EppException thrown = assertThrows(BadAuthInfoForResourceException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testFailure_unrelatedContactAuthInfo() { - persistTestEntities(false); - Contact unrelatedContact = persistActiveContact("foo1234"); - setEppInput("domain_info_with_contact_auth.xml"); - // Replace the ROID in the xml file with the one for our unrelated contact. - eppLoader.replaceAll("JD1234-REP", unrelatedContact.getRepoId()); - EppException thrown = assertThrows(BadAuthInfoForResourceException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - /** * Test create command. Fee extension version 6 is the only one which supports fee extensions on * info commands and responses, so we don't need to test the other versions. @@ -719,10 +594,7 @@ void testFailure_unrelatedContactAuthInfo() { void testFeeExtension_createCommand() throws Exception { setEppInput( "domain_info_fee.xml", - updateSubstitutions( - SUBSTITUTION_BASE, - "COMMAND", "create", - "PERIOD", "2")); + updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "create", "PERIOD", "2")); persistTestEntities(false); setUpBillingEventForExistingDomain(); doSuccessfulTest( @@ -741,10 +613,7 @@ void testFeeExtension_createCommand() throws Exception { void testFeeExtension_renewCommand() throws Exception { setEppInput( "domain_info_fee.xml", - updateSubstitutions( - SUBSTITUTION_BASE, - "COMMAND", "renew", - "PERIOD", "2")); + updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "renew", "PERIOD", "2")); persistTestEntities(false); setUpBillingEventForExistingDomain(); doSuccessfulTest( @@ -763,10 +632,7 @@ void testFeeExtension_renewCommand() throws Exception { void testFeeExtension_transferCommand() throws Exception { setEppInput( "domain_info_fee.xml", - updateSubstitutions( - SUBSTITUTION_BASE, - "COMMAND", "transfer", - "PERIOD", "1")); + updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "transfer", "PERIOD", "1")); persistTestEntities(false); setUpBillingEventForExistingDomain(); doSuccessfulTest( @@ -785,10 +651,7 @@ void testFeeExtension_transferCommand() throws Exception { void testFeeExtension_restoreCommand() throws Exception { setEppInput( "domain_info_fee.xml", - updateSubstitutions( - SUBSTITUTION_BASE, - "COMMAND", "restore", - "PERIOD", "1")); + updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "restore", "PERIOD", "1")); persistTestEntities(false); setUpBillingEventForExistingDomain(); doSuccessfulTest("domain_info_fee_restore_response.xml", false, ImmutableMap.of(), true); @@ -838,10 +701,7 @@ void testFeeExtension_createCommandPremium() throws Exception { setEppInput( "domain_info_fee.xml", updateSubstitutions( - SUBSTITUTION_BASE, - "NAME", "rich.example", - "COMMAND", "create", - "PERIOD", "1")); + SUBSTITUTION_BASE, "NAME", "rich.example", "COMMAND", "create", "PERIOD", "1")); persistTestEntities("rich.example", false); setUpBillingEventForExistingDomain(); doSuccessfulTest( @@ -858,10 +718,7 @@ void testFeeExtension_renewCommandPremium() throws Exception { setEppInput( "domain_info_fee.xml", updateSubstitutions( - SUBSTITUTION_BASE, - "NAME", "rich.example", - "COMMAND", "renew", - "PERIOD", "1")); + SUBSTITUTION_BASE, "NAME", "rich.example", "COMMAND", "renew", "PERIOD", "1")); persistTestEntities("rich.example", false); setUpBillingEventForExistingDomain(); doSuccessfulTest( @@ -973,10 +830,7 @@ void testFeeExtension_transferCommandPremium() throws Exception { setEppInput( "domain_info_fee.xml", updateSubstitutions( - SUBSTITUTION_BASE, - "NAME", "rich.example", - "COMMAND", "transfer", - "PERIOD", "1")); + SUBSTITUTION_BASE, "NAME", "rich.example", "COMMAND", "transfer", "PERIOD", "1")); persistTestEntities("rich.example", false); setUpBillingEventForExistingDomain(); doSuccessfulTest( @@ -993,10 +847,7 @@ void testFeeExtension_restoreCommandPremium() throws Exception { setEppInput( "domain_info_fee.xml", updateSubstitutions( - SUBSTITUTION_BASE, - "NAME", "rich.example", - "COMMAND", "restore", - "PERIOD", "1")); + SUBSTITUTION_BASE, "NAME", "rich.example", "COMMAND", "restore", "PERIOD", "1")); persistTestEntities("rich.example", false); setUpBillingEventForExistingDomain(); doSuccessfulTest( @@ -1009,10 +860,7 @@ void testFeeExtension_wrongCurrency() { setEppInput( "domain_info_fee.xml", updateSubstitutions( - SUBSTITUTION_BASE, - "COMMAND", "create", - "CURRENCY", "EUR", - "PERIOD", "1")); + SUBSTITUTION_BASE, "COMMAND", "create", "CURRENCY", "EUR", "PERIOD", "1")); persistTestEntities(false); setUpBillingEventForExistingDomain(); EppException thrown = assertThrows(CurrencyUnitMismatchException.class, this::runFlow); @@ -1024,10 +872,7 @@ void testFeeExtension_unknownCurrency() { setEppInput( "domain_info_fee.xml", updateSubstitutions( - SUBSTITUTION_BASE, - "COMMAND", "create", - "CURRENCY", "BAD", - "PERIOD", "1")); + SUBSTITUTION_BASE, "COMMAND", "create", "CURRENCY", "BAD", "PERIOD", "1")); EppException thrown = assertThrows(UnknownCurrencyEppException.class, this::runFlow); assertAboutEppExceptions().that(thrown).marshalsToXml(); } @@ -1037,11 +882,7 @@ void testFeeExtension_unknownCurrency() { void testFeeExtension_periodNotInYears() { setEppInput( "domain_info_fee.xml", - updateSubstitutions( - SUBSTITUTION_BASE, - "COMMAND", "create", - "PERIOD", "2", - "UNIT", "m")); + updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "create", "PERIOD", "2", "UNIT", "m")); persistTestEntities(false); setUpBillingEventForExistingDomain(); EppException thrown = assertThrows(BadPeriodUnitException.class, this::runFlow); @@ -1073,10 +914,7 @@ void testFeeExtension_commandSubphase() { void testFeeExtension_multiyearRestore() { setEppInput( "domain_info_fee.xml", - updateSubstitutions( - SUBSTITUTION_BASE, - "COMMAND", "restore", - "PERIOD", "2")); + updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "restore", "PERIOD", "2")); persistTestEntities(false); setUpBillingEventForExistingDomain(); EppException thrown = assertThrows(RestoresAreAlwaysForOneYearException.class, this::runFlow); @@ -1088,10 +926,7 @@ void testFeeExtension_multiyearRestore() { void testFeeExtension_multiyearTransfer() { setEppInput( "domain_info_fee.xml", - updateSubstitutions( - SUBSTITUTION_BASE, - "COMMAND", "transfer", - "PERIOD", "2")); + updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "transfer", "PERIOD", "2")); persistTestEntities(false); setUpBillingEventForExistingDomain(); EppException thrown = assertThrows(TransfersAreAlwaysForOneYearException.class, this::runFlow); diff --git a/core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java index 6c42ad70162..fb073a0c6aa 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java @@ -19,10 +19,6 @@ import static com.google.common.io.BaseEncoding.base16; import static com.google.common.truth.Truth.assertThat; import static google.registry.model.ForeignKeyUtils.loadResource; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_OPTIONAL; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_PROHIBITED; -import static google.registry.model.common.FeatureFlag.FeatureStatus.ACTIVE; -import static google.registry.model.common.FeatureFlag.FeatureStatus.INACTIVE; import static google.registry.model.eppcommon.StatusValue.CLIENT_DELETE_PROHIBITED; import static google.registry.model.eppcommon.StatusValue.CLIENT_HOLD; import static google.registry.model.eppcommon.StatusValue.CLIENT_RENEW_PROHIBITED; @@ -45,7 +41,6 @@ import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.getOnlyHistoryEntryOfType; import static google.registry.testing.DatabaseHelper.getPollMessages; -import static google.registry.testing.DatabaseHelper.loadByKey; import static google.registry.testing.DatabaseHelper.loadRegistrar; import static google.registry.testing.DatabaseHelper.persistActiveContact; import static google.registry.testing.DatabaseHelper.persistActiveDomain; @@ -68,13 +63,14 @@ import google.registry.flows.EppException; import google.registry.flows.EppException.UnimplementedExtensionException; import google.registry.flows.EppRequestSource; +import google.registry.flows.FlowTestCase.CommitMode; +import google.registry.flows.FlowTestCase.UserPrivileges; import google.registry.flows.FlowUtils.NotLoggedInException; import google.registry.flows.ResourceFlowTestCase; import google.registry.flows.ResourceFlowUtils.AddRemoveSameValueException; import google.registry.flows.ResourceFlowUtils.ResourceDoesNotExistException; import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException; import google.registry.flows.ResourceFlowUtils.StatusNotClientSettableException; -import google.registry.flows.domain.DomainFlowUtils.DuplicateContactForRoleException; import google.registry.flows.domain.DomainFlowUtils.EmptySecDnsUpdateException; import google.registry.flows.domain.DomainFlowUtils.FeesMismatchException; import google.registry.flows.domain.DomainFlowUtils.FeesRequiredForNonFreeOperationException; @@ -82,10 +78,6 @@ import google.registry.flows.domain.DomainFlowUtils.LinkedResourceInPendingDeleteProhibitsOperationException; import google.registry.flows.domain.DomainFlowUtils.LinkedResourcesDoNotExistException; import google.registry.flows.domain.DomainFlowUtils.MaxSigLifeChangeNotSupportedException; -import google.registry.flows.domain.DomainFlowUtils.MissingAdminContactException; -import google.registry.flows.domain.DomainFlowUtils.MissingContactTypeException; -import google.registry.flows.domain.DomainFlowUtils.MissingRegistrantException; -import google.registry.flows.domain.DomainFlowUtils.MissingTechnicalContactException; import google.registry.flows.domain.DomainFlowUtils.NameserversNotAllowedForTldException; import google.registry.flows.domain.DomainFlowUtils.NameserversNotSpecifiedForTldWithNameserverAllowListException; import google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException; @@ -101,7 +93,6 @@ import google.registry.model.ImmutableObject; import google.registry.model.billing.BillingBase.Reason; import google.registry.model.billing.BillingEvent; -import google.registry.model.common.FeatureFlag; import google.registry.model.contact.Contact; import google.registry.model.domain.DesignatedContact; import google.registry.model.domain.DesignatedContact.Type; @@ -320,38 +311,7 @@ void testSuccess_inQuietPeriod() throws Exception { } @Test - void testFailure_emptyRegistrant() throws Exception { - setEppInput("domain_update_empty_registrant.xml"); - persistReferencedEntities(); - persistDomain(); - MissingRegistrantException thrown = - assertThrows(MissingRegistrantException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testSuccess_minimumDatasetPhase1_emptyRegistrant() throws Exception { - persistResource( - new FeatureFlag.Builder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_OPTIONAL) - .setStatusMap( - ImmutableSortedMap.of(START_OF_TIME, INACTIVE, clock.nowUtc().minusDays(5), ACTIVE)) - .build()); - setEppInput("domain_update_empty_registrant.xml"); - persistReferencedEntities(); - persistDomain(); - runFlowAssertResponse(loadFile("generic_success_response.xml")); - assertThat(reloadResourceByForeignKey().getRegistrant()).isEmpty(); - } - - @Test - void testFailure_minimumDatasetPhase2_whenAddingNewContacts() throws Exception { - persistResource( - new FeatureFlag.Builder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_PROHIBITED) - .setStatusMap( - ImmutableSortedMap.of(START_OF_TIME, INACTIVE, clock.nowUtc().minusDays(5), ACTIVE)) - .build()); + void testFailure_minimumDataset_whenAddingNewContacts() throws Exception { // This EPP adds a new technical contact mak21 that wasn't already present. setEppInput("domain_update_empty_registrant.xml"); persistReferencedEntities(); @@ -386,7 +346,7 @@ void testSuccess_maxNumberOfNameservers() throws Exception { } @Test - void testSuccess_addAndRemoveLargeNumberOfNameserversAndContacts() throws Exception { + void testSuccess_addAndRemoveLargeNumberOfNameservers() throws Exception { persistReferencedEntities(); persistDomain(); setEppInput("domain_update_max_everything.xml"); @@ -398,20 +358,10 @@ void testSuccess_addAndRemoveLargeNumberOfNameserversAndContacts() throws Except nameservers.add(host.createVKey()); } } - ImmutableList.Builder contactsBuilder = new ImmutableList.Builder<>(); - for (int i = 0; i < 8; i++) { - contactsBuilder.add( - DesignatedContact.create( - DesignatedContact.Type.values()[i % 4], - persistActiveContact(String.format("max_test_%d", i)).createVKey())); - } - ImmutableList contacts = contactsBuilder.build(); persistResource( reloadResourceByForeignKey() .asBuilder() .setNameservers(nameservers.build()) - .setContacts(ImmutableSet.copyOf(contacts.subList(0, 3))) - .setRegistrant(Optional.of(contacts.get(3).getContactKey())) .build()); clock.advanceOneMilli(); assertMutatingFlow(true); @@ -419,9 +369,6 @@ void testSuccess_addAndRemoveLargeNumberOfNameserversAndContacts() throws Except Domain domain = reloadResourceByForeignKey(); assertAboutDomains().that(domain).hasOneHistoryEntryEachOfTypes(DOMAIN_CREATE, DOMAIN_UPDATE); assertThat(domain.getNameservers()).hasSize(13); - // getContacts does not return contacts of type REGISTRANT, so check these separately. - assertThat(domain.getContacts()).hasSize(3); - assertThat(loadByKey(domain.getRegistrant().get()).getContactId()).isEqualTo("max_test_7"); assertNoBillingEvents(); assertDomainDnsRequests("example.tld"); } @@ -503,26 +450,6 @@ void testSuccess_registrantMovedToTechContact() throws Exception { runFlowAssertResponse(loadFile("generic_success_response.xml")); } - @Test - void testSuccess_multipleReferencesToSameContactRemoved() throws Exception { - setEppInput("domain_update_remove_multiple_contacts.xml"); - persistReferencedEntities(); - Contact sh8013 = loadResource(Contact.class, "sh8013", clock.nowUtc()).get(); - VKey sh8013Key = sh8013.createVKey(); - persistResource( - DatabaseHelper.newDomain(getUniqueIdFromCommand()) - .asBuilder() - .setRegistrant(Optional.of(sh8013Key)) - .setContacts( - ImmutableSet.of( - DesignatedContact.create(Type.ADMIN, sh8013Key), - DesignatedContact.create(Type.BILLING, sh8013Key), - DesignatedContact.create(Type.TECH, sh8013Key))) - .build()); - clock.advanceOneMilli(); - runFlowAssertResponse(loadFile("generic_success_response.xml")); - } - @Test void testSuccess_removeClientUpdateProhibited() throws Exception { persistReferencedEntities(); @@ -1180,40 +1107,6 @@ void testFailure_missingHost() throws Exception { assertThat(thrown).hasMessageThat().contains("(ns2.example.foo)"); } - @Test - void testFailure_missingContact() throws Exception { - persistActiveHost("ns1.example.foo"); - persistActiveHost("ns2.example.foo"); - persistActiveContact("mak21"); - persistActiveDomain(getUniqueIdFromCommand()); - LinkedResourcesDoNotExistException thrown = - assertThrows(LinkedResourcesDoNotExistException.class, this::runFlow); - assertThat(thrown).hasMessageThat().contains("(sh8013)"); - } - - @Test - void testFailure_addingDuplicateContact() throws Exception { - persistReferencedEntities(); - persistActiveContact("foo"); - persistDomain(); - // Add a tech contact to the persisted entity, which should cause the flow to fail when it tries - // to add "mak21" as a second tech contact. - persistResource( - reloadResourceByForeignKey() - .asBuilder() - .setContacts( - DesignatedContact.create( - Type.TECH, - loadResource(Contact.class, "foo", clock.nowUtc()).get().createVKey())) - .build()); - EppException thrown = assertThrows(DuplicateContactForRoleException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - assertThat(thrown.getResult().getMsg()) - .isEqualTo( - "More than one contact for a given role is not allowed: " - + "role [tech] has contacts [foo, mak21]"); - } - @Test void testFailure_statusValueNotClientSettable() throws Exception { setEppInput("domain_update_prohibited_status.xml"); @@ -1425,40 +1318,6 @@ void testFailure_pendingDelete() throws Exception { assertThat(thrown).hasMessageThat().contains("pendingDelete"); } - @Test - void testFailure_duplicateContactInCommand() throws Exception { - setEppInput("domain_update_duplicate_contact.xml"); - persistReferencedEntities(); - persistDomain(); - EppException thrown = assertThrows(DuplicateContactForRoleException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testFailure_multipleDuplicateContactInCommand() throws Exception { - setEppInput("domain_update_multiple_duplicate_contacts.xml"); - persistReferencedEntities(); - persistDomain(); - EppException thrown = assertThrows(DuplicateContactForRoleException.class, this::runFlow); - assertThat(thrown) - .hasMessageThat() - .isEqualTo( - "More than one contact for a given role is not allowed: " - + "role [billing] has contacts [mak21, sh8013], " - + "role [tech] has contacts [mak21, sh8013]"); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testFailure_missingContactType() throws Exception { - // We need to test for missing type, but not for invalid - the schema enforces that for us. - setEppInput("domain_update_missing_contact_type.xml"); - persistReferencedEntities(); - persistDomain(); - EppException thrown = assertThrows(MissingContactTypeException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - @Test void testFailure_unauthorizedClient() throws Exception { sessionMetadata.setRegistrarId("NewRegistrar"); @@ -1514,68 +1373,8 @@ void testFailure_sameNameserverAddedAndRemoved() throws Exception { assertAboutEppExceptions().that(thrown).marshalsToXml(); } - // Contacts mismatch. @Test - void testFailure_sameContactAddedAndRemoved() throws Exception { - setEppInput("domain_update_add_remove_same_contact.xml"); - persistReferencedEntities(); - persistResource( - DatabaseHelper.newDomain(getUniqueIdFromCommand()) - .asBuilder() - .setContacts( - DesignatedContact.create( - Type.TECH, - loadResource(Contact.class, "sh8013", clock.nowUtc()).get().createVKey())) - .build()); - EppException thrown = assertThrows(AddRemoveSameValueException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testFailure_removeAdmin() throws Exception { - setEppInput("domain_update_remove_admin.xml"); - persistReferencedEntities(); - persistResource( - DatabaseHelper.newDomain(getUniqueIdFromCommand()) - .asBuilder() - .setContacts( - ImmutableSet.of( - DesignatedContact.create(Type.ADMIN, sh8013Contact.createVKey()), - DesignatedContact.create(Type.TECH, sh8013Contact.createVKey()))) - .build()); - EppException thrown = assertThrows(MissingAdminContactException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testSuccess_minimumDatasetPhase1_removeAdmin() throws Exception { - persistResource( - new FeatureFlag.Builder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_OPTIONAL) - .setStatusMap( - ImmutableSortedMap.of(START_OF_TIME, INACTIVE, clock.nowUtc().minusDays(5), ACTIVE)) - .build()); - setEppInput("domain_update_remove_admin.xml"); - persistReferencedEntities(); - persistResource( - DatabaseHelper.newDomain(getUniqueIdFromCommand()) - .asBuilder() - .setContacts( - ImmutableSet.of( - DesignatedContact.create(Type.ADMIN, sh8013Contact.createVKey()), - DesignatedContact.create(Type.TECH, sh8013Contact.createVKey()))) - .build()); - runFlowAssertResponse(loadFile("generic_success_response.xml")); - } - - @Test - void testFailure_minimumDatasetPhase2_addingNewRegistrantFails() throws Exception { - persistResource( - new FeatureFlag.Builder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_PROHIBITED) - .setStatusMap( - ImmutableSortedMap.of(START_OF_TIME, INACTIVE, clock.nowUtc().minusDays(5), ACTIVE)) - .build()); + void testFailure_minimumDataset_addingNewRegistrantFails() throws Exception { persistReferencedEntities(); persistResource( DatabaseHelper.newDomain(getUniqueIdFromCommand()) @@ -1593,109 +1392,6 @@ void testFailure_minimumDatasetPhase2_addingNewRegistrantFails() throws Exceptio assertAboutEppExceptions().that(thrown).marshalsToXml(); } - @Test - void testFailure_removeTech() throws Exception { - setEppInput("domain_update_remove_tech.xml"); - persistReferencedEntities(); - persistResource( - DatabaseHelper.newDomain(getUniqueIdFromCommand()) - .asBuilder() - .setContacts( - ImmutableSet.of( - DesignatedContact.create(Type.ADMIN, sh8013Contact.createVKey()), - DesignatedContact.create(Type.TECH, sh8013Contact.createVKey()))) - .build()); - EppException thrown = assertThrows(MissingTechnicalContactException.class, this::runFlow); - assertAboutEppExceptions().that(thrown).marshalsToXml(); - } - - @Test - void testSuccess_minimumDatasetPhase1_removeTech() throws Exception { - persistResource( - new FeatureFlag.Builder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_OPTIONAL) - .setStatusMap( - ImmutableSortedMap.of(START_OF_TIME, INACTIVE, clock.nowUtc().minusDays(5), ACTIVE)) - .build()); - setEppInput("domain_update_remove_tech.xml"); - persistReferencedEntities(); - persistResource( - DatabaseHelper.newDomain(getUniqueIdFromCommand()) - .asBuilder() - .setContacts( - ImmutableSet.of( - DesignatedContact.create(Type.ADMIN, sh8013Contact.createVKey()), - DesignatedContact.create(Type.TECH, sh8013Contact.createVKey()))) - .build()); - runFlowAssertResponse(loadFile("generic_success_response.xml")); - } - - @Test - void testSuccess_minimumDatasetPhase2_removeAllContacts() throws Exception { - persistResource( - new FeatureFlag.Builder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_PROHIBITED) - .setStatusMap( - ImmutableSortedMap.of(START_OF_TIME, INACTIVE, clock.nowUtc().minusDays(5), ACTIVE)) - .build()); - setEppInput("domain_update_remove_all_contacts.xml"); - persistReferencedEntities(); - persistResource( - DatabaseHelper.newDomain(getUniqueIdFromCommand()) - .asBuilder() - .setContacts( - ImmutableSet.of( - DesignatedContact.create(Type.ADMIN, sh8013Contact.createVKey()), - DesignatedContact.create(Type.TECH, sh8013Contact.createVKey()))) - .build()); - runFlowAssertResponse(loadFile("generic_success_response.xml")); - Domain updatedDomain = reloadResourceByForeignKey(); - assertThat(updatedDomain.getRegistrant()).isEmpty(); - assertThat(updatedDomain.getContacts()).isEmpty(); - } - - @Test - void testSuccess_minimumDatasetPhase2_removeOneContact() throws Exception { - persistResource( - new FeatureFlag.Builder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_PROHIBITED) - .setStatusMap( - ImmutableSortedMap.of(START_OF_TIME, INACTIVE, clock.nowUtc().minusDays(5), ACTIVE)) - .build()); - setEppInput("domain_update_remove_admin.xml"); - persistReferencedEntities(); - persistResource( - DatabaseHelper.newDomain(getUniqueIdFromCommand()) - .asBuilder() - .setContacts( - ImmutableSet.of( - DesignatedContact.create(Type.ADMIN, sh8013Contact.createVKey()), - DesignatedContact.create(Type.TECH, sh8013Contact.createVKey()))) - .build()); - assertThat(reloadResourceByForeignKey().getRegistrant()).isPresent(); - assertThat(reloadResourceByForeignKey().getContacts()).hasSize(2); - runFlowAssertResponse(loadFile("generic_success_response.xml")); - Domain updatedDomain = reloadResourceByForeignKey(); - assertThat(updatedDomain.getRegistrant()).isPresent(); - assertThat(updatedDomain.getContacts()).hasSize(1); - } - - @Test - void testFailure_addPendingDeleteContact() throws Exception { - persistReferencedEntities(); - persistDomain(); - persistResource( - loadResource(Contact.class, "mak21", clock.nowUtc()) - .get() - .asBuilder() - .addStatusValue(PENDING_DELETE) - .build()); - clock.advanceOneMilli(); - LinkedResourceInPendingDeleteProhibitsOperationException thrown = - assertThrows(LinkedResourceInPendingDeleteProhibitsOperationException.class, this::runFlow); - assertThat(thrown).hasMessageThat().contains("mak21"); - } - @Test void testFailure_addPendingDeleteHost() throws Exception { persistReferencedEntities(); @@ -1727,31 +1423,6 @@ void testFailure_addedNameserverDisallowedInTld() throws Exception { assertAboutEppExceptions().that(thrown).marshalsToXml(); } - @Test - void testSuccess_changeContactsAndRegistrant() throws Exception { - setEppInput("domain_update_contacts_and_registrant.xml"); - persistReferencedEntities(); - persistDomainWithRegistrant(); - - reloadResourceByForeignKey() - .getContacts() - .forEach( - contact -> - assertThat(loadByKey(contact.getContactKey()).getContactId()).isEqualTo("mak21")); - assertThat(loadByKey(reloadResourceByForeignKey().getRegistrant().get()).getContactId()) - .isEqualTo("mak21"); - - runFlow(); - - reloadResourceByForeignKey() - .getContacts() - .forEach( - contact -> - assertThat(loadByKey(contact.getContactKey()).getContactId()).isEqualTo("sh8013")); - assertThat(loadByKey(reloadResourceByForeignKey().getRegistrant().get()).getContactId()) - .isEqualTo("sh8013"); - } - @Test void testSuccess_tldWithNameserverAllowList_removeNameserver() throws Exception { setEppInput("domain_update_remove_nameserver.xml"); diff --git a/core/src/test/java/google/registry/tools/CreateDomainCommandTest.java b/core/src/test/java/google/registry/tools/CreateDomainCommandTest.java index 9da1db3986e..d58646a9979 100644 --- a/core/src/test/java/google/registry/tools/CreateDomainCommandTest.java +++ b/core/src/test/java/google/registry/tools/CreateDomainCommandTest.java @@ -15,22 +15,16 @@ package google.registry.tools; import static com.google.common.truth.Truth.assertThat; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_OPTIONAL; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_PROHIBITED; -import static google.registry.model.common.FeatureFlag.FeatureStatus.ACTIVE; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.persistPremiumList; import static google.registry.testing.DatabaseHelper.persistResource; -import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.money.CurrencyUnit.JPY; import static org.junit.jupiter.api.Assertions.assertThrows; import com.beust.jcommander.ParameterException; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableSortedMap; import google.registry.dns.writer.VoidDnsWriter; -import google.registry.model.common.FeatureFlag; import google.registry.model.pricing.StaticPremiumListPricingEngine; import google.registry.model.tld.Tld; import google.registry.model.tld.label.PremiumListDao; @@ -116,26 +110,7 @@ void testSuccess_completeWithSquareBracketsAndCanonicalization() throws Exceptio } @Test - void testSuccess_minimumDatasetPhase1_noContacts() throws Exception { - persistResource( - new FeatureFlag() - .asBuilder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_OPTIONAL) - .setStatusMap(ImmutableSortedMap.of(START_OF_TIME, ACTIVE)) - .build()); - // Test that each optional field can be omitted. Also tests the auto-gen password. - runCommandForced("--client=NewRegistrar", "example.tld"); - eppVerifier.verifySent("domain_create_minimal.xml"); - } - - @Test - void testSuccess_minimumDatasetPhase2_noContacts() throws Exception { - persistResource( - new FeatureFlag() - .asBuilder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_PROHIBITED) - .setStatusMap(ImmutableSortedMap.of(START_OF_TIME, ACTIVE)) - .build()); + void testSuccess_minimumDataset_noContacts() throws Exception { // Test that each optional field can be omitted. Also tests the auto-gen password. runCommandForced( "--client=NewRegistrar", @@ -308,48 +283,6 @@ void testFailure_missingClientId() { assertThat(thrown).hasMessageThat().contains("--client"); } - @Test - void testFailure_missingRegistrant() { - IllegalArgumentException thrown = - assertThrows( - IllegalArgumentException.class, - () -> - runCommandForced( - "--client=NewRegistrar", - "--admins=crr-admin", - "--techs=crr-tech", - "example.tld")); - assertThat(thrown).hasMessageThat().contains("Registrant must be specified"); - } - - @Test - void testFailure_missingAdmins() { - IllegalArgumentException thrown = - assertThrows( - IllegalArgumentException.class, - () -> - runCommandForced( - "--client=NewRegistrar", - "--registrant=crr-admin", - "--techs=crr-tech", - "example.tld")); - assertThat(thrown).hasMessageThat().contains("At least one admin must be specified"); - } - - @Test - void testFailure_missingTechs() { - IllegalArgumentException thrown = - assertThrows( - IllegalArgumentException.class, - () -> - runCommandForced( - "--client=NewRegistrar", - "--registrant=crr-admin", - "--admins=crr-admin", - "example.tld")); - assertThat(thrown).hasMessageThat().contains("At least one tech must be specified"); - } - @Test void testFailure_tooManyNameServers() { IllegalArgumentException thrown = diff --git a/core/src/test/java/google/registry/tools/EppLifecycleToolsTest.java b/core/src/test/java/google/registry/tools/EppLifecycleToolsTest.java index be704a565b6..f7974b92e87 100644 --- a/core/src/test/java/google/registry/tools/EppLifecycleToolsTest.java +++ b/core/src/test/java/google/registry/tools/EppLifecycleToolsTest.java @@ -14,23 +14,17 @@ package google.registry.tools; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_OPTIONAL; -import static google.registry.model.common.FeatureFlag.FeatureStatus.INACTIVE; import static google.registry.testing.DatabaseHelper.assertBillingEventsForResource; import static google.registry.testing.DatabaseHelper.createTlds; import static google.registry.testing.DatabaseHelper.getOnlyHistoryEntryOfType; -import static google.registry.testing.DatabaseHelper.persistResource; import static google.registry.util.DateTimeUtils.END_OF_TIME; -import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSortedMap; import google.registry.flows.EppTestCase; import google.registry.model.ForeignKeyUtils; import google.registry.model.billing.BillingBase.Reason; import google.registry.model.billing.BillingEvent; -import google.registry.model.common.FeatureFlag; import google.registry.model.domain.Domain; import google.registry.model.domain.DomainHistory; import google.registry.model.reporting.HistoryEntry.Type; @@ -59,19 +53,12 @@ class EppLifecycleToolsTest extends EppTestCase { @BeforeEach void beforeEach() { - persistResource( - new FeatureFlag() - .asBuilder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_OPTIONAL) - .setStatusMap(ImmutableSortedMap.of(START_OF_TIME, INACTIVE)) - .build()); createTlds("example", "tld"); } @Test void test_renewDomainThenUnrenew() throws Exception { assertThatLoginSucceeds("NewRegistrar", "foo-BAR2"); - createContacts(DateTime.parse("2000-06-01T00:00:00Z")); // Create the domain for 2 years. assertThatCommand( @@ -128,7 +115,7 @@ void test_renewDomainThenUnrenew() throws Exception { .atTime("2001-06-08T00:00:00Z") .hasResponse("poll_response_unrenew.xml"); - assertThatCommand("poll_ack.xml", ImmutableMap.of("ID", "21-2001")) + assertThatCommand("poll_ack.xml", ImmutableMap.of("ID", "17-2001")) .atTime("2001-06-08T00:00:01Z") .hasResponse("poll_ack_response_empty.xml"); @@ -149,7 +136,7 @@ void test_renewDomainThenUnrenew() throws Exception { .hasResponse( "poll_response_autorenew.xml", ImmutableMap.of( - "ID", "23-2003", + "ID", "19-2003", "QDATE", "2003-06-01T00:02:00Z", "DOMAIN", "example.tld", "EXDATE", "2004-06-01T00:02:00Z")); diff --git a/core/src/test/java/google/registry/ui/server/console/domains/ConsoleBulkDomainActionTest.java b/core/src/test/java/google/registry/ui/server/console/domains/ConsoleBulkDomainActionTest.java index d2b5bbac84e..a0fc5990383 100644 --- a/core/src/test/java/google/registry/ui/server/console/domains/ConsoleBulkDomainActionTest.java +++ b/core/src/test/java/google/registry/ui/server/console/domains/ConsoleBulkDomainActionTest.java @@ -15,14 +15,10 @@ package google.registry.ui.server.console.domains; import static com.google.common.truth.Truth.assertThat; -import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_OPTIONAL; -import static google.registry.model.common.FeatureFlag.FeatureStatus.INACTIVE; import static google.registry.testing.DatabaseHelper.loadByEntity; import static google.registry.testing.DatabaseHelper.loadSingleton; -import static google.registry.testing.DatabaseHelper.persistActiveContact; import static google.registry.testing.DatabaseHelper.persistDomainWithDependentResources; import static google.registry.testing.DatabaseHelper.persistResource; -import static google.registry.util.DateTimeUtils.START_OF_TIME; import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; import static jakarta.servlet.http.HttpServletResponse.SC_OK; @@ -31,12 +27,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableSortedMap; import com.google.gson.JsonElement; import google.registry.flows.DaggerEppTestComponent; import google.registry.flows.EppController; import google.registry.flows.EppTestComponent; -import google.registry.model.common.FeatureFlag; import google.registry.model.console.ConsoleUpdateHistory; import google.registry.model.console.RegistrarRole; import google.registry.model.console.User; @@ -68,12 +62,6 @@ public class ConsoleBulkDomainActionTest extends ConsoleActionBaseTestCase { @BeforeEach void beforeEach() { - persistResource( - new FeatureFlag() - .asBuilder() - .setFeatureName(MINIMUM_DATASET_CONTACTS_OPTIONAL) - .setStatusMap(ImmutableSortedMap.of(START_OF_TIME, INACTIVE)) - .build()); eppController = DaggerEppTestComponent.builder() .fakesAndMocksModule(EppTestComponent.FakesAndMocksModule.create(clock)) @@ -84,7 +72,7 @@ void beforeEach() { persistDomainWithDependentResources( "example", "tld", - persistActiveContact("contact1234"), + null, clock.nowUtc(), clock.nowUtc().minusMonths(1), clock.nowUtc().plusMonths(11)); @@ -101,9 +89,10 @@ void testSuccess_delete() { assertThat(response.getStatus()).isEqualTo(SC_OK); assertThat(response.getPayload()) .isEqualTo( - """ +""" {"example.tld":{"message":"Command completed successfully; action pending",\ -"responseCode":1001}}"""); +"responseCode":1001}}\ +"""); assertThat(loadByEntity(domain).getDeletionTime()).isEqualTo(clock.nowUtc().plusDays(35)); ConsoleUpdateHistory history = loadSingleton(ConsoleUpdateHistory.class).get(); assertThat(history.getType()).isEqualTo(ConsoleUpdateHistory.Type.DOMAIN_DELETE); @@ -122,7 +111,8 @@ void testSuccess_suspend() throws Exception { assertThat(response.getPayload()) .isEqualTo( """ - {"example.tld":{"message":"Command completed successfully","responseCode":1000}}"""); + {"example.tld":{"message":"Command completed successfully","responseCode":1000}}\ + """); assertThat(loadByEntity(domain).getStatusValues()) .containsAtLeastElementsIn(serverSuspensionStatuses); ConsoleUpdateHistory history = loadSingleton(ConsoleUpdateHistory.class).get(); @@ -145,7 +135,8 @@ void testSuccess_unsuspend() throws Exception { assertThat(response.getPayload()) .isEqualTo( """ - {"example.tld":{"message":"Command completed successfully","responseCode":1000}}"""); + {"example.tld":{"message":"Command completed successfully","responseCode":1000}}\ + """); assertThat(loadByEntity(domain).getStatusValues()).containsNoneIn(serverSuspensionStatuses); ConsoleUpdateHistory history = loadSingleton(ConsoleUpdateHistory.class).get(); assertThat(history.getType()).isEqualTo(ConsoleUpdateHistory.Type.DOMAIN_UNSUSPEND); @@ -167,10 +158,11 @@ void testHalfSuccess_halfNonexistent() throws Exception { assertThat(response.getStatus()).isEqualTo(SC_OK); assertThat(response.getPayload()) .isEqualTo( - """ +""" {"example.tld":{"message":"Command completed successfully; action pending","responseCode":1001},\ "nonexistent.tld":{"message":"The domain with given ID (nonexistent.tld) doesn\\u0027t exist.",\ -"responseCode":2303}}"""); +"responseCode":2303}}\ +"""); assertThat(loadByEntity(domain).getDeletionTime()).isEqualTo(clock.nowUtc().plusDays(35)); ConsoleUpdateHistory history = loadSingleton(ConsoleUpdateHistory.class).get(); assertThat(history.getType()).isEqualTo(ConsoleUpdateHistory.Type.DOMAIN_DELETE); diff --git a/core/src/test/resources/google/registry/flows/contact/contact_delete_response_no_cltrid_pending.xml b/core/src/test/resources/google/registry/flows/contact/contact_delete_response_no_cltrid_pending.xml deleted file mode 100644 index 7d1721ff9de..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_delete_response_no_cltrid_pending.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - Command completed successfully; action pending - - - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact/contact_delete_response_pending.xml b/core/src/test/resources/google/registry/flows/contact/contact_delete_response_pending.xml deleted file mode 100644 index 91fe71a836d..00000000000 --- a/core/src/test/resources/google/registry/flows/contact/contact_delete_response_pending.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Command completed successfully; action pending - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/contact_delete_response_sh8013_pending.xml b/core/src/test/resources/google/registry/flows/contact_delete_response_sh8013_pending.xml deleted file mode 100644 index 91fe71a836d..00000000000 --- a/core/src/test/resources/google/registry/flows/contact_delete_response_sh8013_pending.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Command completed successfully; action pending - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_reserved_allocationtoken.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_reserved_allocationtoken.xml deleted file mode 100644 index f06bfa98950..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_reserved_allocationtoken.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - collision.tld - reserved.tld - anchor.tld - allowedinsunrise.tld - premiumcollision.tld - - - - - abc123 - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create.xml b/core/src/test/resources/google/registry/flows/domain/domain_create.xml index f5bc7c25ac5..097cc87c5be 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_11_years.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_11_years.xml index c0ac5f7cb7d..9f9281bb9c5 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_11_years.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_11_years.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_13_nameservers.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_13_nameservers.xml index 0914cac15f3..6b33c65ddd5 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_13_nameservers.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_13_nameservers.xml @@ -20,9 +20,6 @@ ns12.example.net ns13.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_14_nameservers.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_14_nameservers.xml index 5d7da284545..71139c308c9 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_14_nameservers.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_14_nameservers.xml @@ -21,9 +21,6 @@ ns13.example.net ns14.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_allocationtoken.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_allocationtoken.xml index eb68b9062a3..7fd000fce90 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_allocationtoken.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_allocationtoken.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_allocationtoken_claims.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_allocationtoken_claims.xml index e9d44c0742e..26f70dbd363 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_allocationtoken_claims.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_allocationtoken_claims.xml @@ -10,9 +10,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_allocationtoken.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_allocationtoken.xml index 9c59eaffb3b..20db5dcc849 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_allocationtoken.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_allocationtoken.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_invalid_years.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_invalid_years.xml index 5667a2c6d5e..bc5ee1ab4be 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_invalid_years.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_invalid_years.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_metadata_extension.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_metadata_extension.xml index 4c6e3136669..cd4837e7fc7 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_metadata_extension.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_metadata_extension.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_signed_mark.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_signed_mark.xml index 0043bb18f2d..50021c1c4f9 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_signed_mark.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_signed_mark.xml @@ -10,9 +10,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_sunrise_metadata_extension.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_sunrise_metadata_extension.xml index 0da72e6c3a7..413016f22f2 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_sunrise_metadata_extension.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_sunrise_metadata_extension.xml @@ -10,9 +10,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_sunrise_metadata_extension_signed_mark.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_sunrise_metadata_extension_signed_mark.xml index e3d3410b9c6..02ff42c3dba 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_sunrise_metadata_extension_signed_mark.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_anchor_tenant_sunrise_metadata_extension_signed_mark.xml @@ -10,9 +10,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_bad_checksum_claim_notice.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_bad_checksum_claim_notice.xml index e023122a40f..86d35345af9 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_bad_checksum_claim_notice.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_bad_checksum_claim_notice.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_bad_idn_minna.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_bad_idn_minna.xml index e3fc7e85108..e826547784a 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_bad_idn_minna.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_bad_idn_minna.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_bad_validator_id.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_bad_validator_id.xml index 87b517fbe09..2c614dce776 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_bad_validator_id.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_bad_validator_id.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_claim_notice.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_claim_notice.xml index 25309e6bafc..8a6c159a34e 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_claim_notice.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_claim_notice.xml @@ -10,9 +10,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_code_with_mark.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_code_with_mark.xml index 4e2586b6117..69f2c707a29 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_code_with_mark.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_code_with_mark.xml @@ -5,9 +5,6 @@ exampleone.tld - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata.xml index 99f77c5d19d..11ea18d03a9 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata.xml @@ -11,9 +11,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_8_records.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_8_records.xml index 82048ba80c6..ce291ff9745 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_8_records.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_8_records.xml @@ -11,9 +11,6 @@ ns1.example.tld ns2.example.tld - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_9_records.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_9_records.xml index c6ce60c06ae..23c14f839ef 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_9_records.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_9_records.xml @@ -11,9 +11,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_bad_algorithms.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_bad_algorithms.xml index 4938f6f5a65..bce11d615f9 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_bad_algorithms.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_bad_algorithms.xml @@ -11,9 +11,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_bad_digest_types.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_bad_digest_types.xml index 3f235257fd8..267202bcd02 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_bad_digest_types.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_bad_digest_types.xml @@ -11,9 +11,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_no_maxsiglife.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_no_maxsiglife.xml index 1028636f7f9..f074622a1a1 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_no_maxsiglife.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_dsdata_no_maxsiglife.xml @@ -11,9 +11,6 @@ ns1.example.tld ns2.example.tld - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_duplicate_contact.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_duplicate_contact.xml deleted file mode 100644 index 33b67e11d84..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_duplicate_contact.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - example.tld - 2 - - ns1.example.net - ns2.example.net - - jd1234 - sh8013 - jd1234 - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_eap_combined_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_eap_combined_fee.xml index e1d91dc5908..cc26d577ec4 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_eap_combined_fee.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_eap_combined_fee.xml @@ -4,9 +4,6 @@ example.tld 2 - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_eap_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_eap_fee.xml index 35c649c1d18..5743b50aeac 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_eap_fee.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_eap_fee.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_extra_fees.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_extra_fees.xml index d66de57d469..aa09f34e100 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_extra_fees.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_extra_fees.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_fee.xml index e8fc1ae5305..96437ed5616 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_fee.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_fee.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_fee_applied.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_fee_applied.xml index e3e4c0f68c7..d40fd7c30bd 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_fee_applied.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_fee_applied.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_fee_bad_scale.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_fee_bad_scale.xml index 2a28683e4ae..cfa201059ce 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_fee_bad_scale.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_fee_bad_scale.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_fee_defaults.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_fee_defaults.xml index 035b5925460..0dd8dea3161 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_fee_defaults.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_fee_defaults.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_fee_grace_period.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_fee_grace_period.xml index 67106e59989..833ce271788 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_fee_grace_period.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_fee_grace_period.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_fee_refundable.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_fee_refundable.xml index 9f5b3d629cc..4534c489223 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_fee_refundable.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_fee_refundable.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_missing_non_registrant_contacts.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_has_registrant_contact.xml similarity index 100% rename from core/src/test/resources/google/registry/flows/domain/domain_create_missing_non_registrant_contacts.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_has_registrant_contact.xml diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_idn_minna.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_idn_minna.xml index a5c34e0db4e..06d0a459052 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_idn_minna.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_idn_minna.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_malformed_claim_notice1.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_malformed_claim_notice1.xml index 297486794ec..626ef87d5de 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_malformed_claim_notice1.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_malformed_claim_notice1.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_malformed_claim_notice2.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_malformed_claim_notice2.xml index 95522f3bb51..91204e99fec 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_malformed_claim_notice2.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_malformed_claim_notice2.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_metadata.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_metadata.xml index ba7023020f2..f58697850b8 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_metadata.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_metadata.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_missing_admin.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_missing_admin.xml deleted file mode 100644 index 3c83f389a7d..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_missing_admin.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - example.tld - 2 - - ns1.example.net - ns2.example.net - - jd1234 - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_missing_contact_type.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_missing_contact_type.xml index 3f0db2b1db3..d78add11645 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_missing_contact_type.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_missing_contact_type.xml @@ -9,9 +9,7 @@ ns1.example.net ns2.example.net - jd1234 sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_missing_period.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_missing_period.xml index 47bae1346dc..c6d3fcc7348 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_missing_period.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_missing_period.xml @@ -8,9 +8,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_missing_tech.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_missing_tech.xml deleted file mode 100644 index 4402e95f5a7..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_missing_tech.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - example.tld - 2 - - ns1.example.net - ns2.example.net - - jd1234 - sh8013 - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_months.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_months.xml index 1755d531ae4..32f3a00c742 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_months.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_months.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_no_cltrid.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_no_cltrid.xml index 3c3e0516d16..8f289e42f69 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_no_cltrid.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_no_cltrid.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_no_contacts.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_no_contacts.xml deleted file mode 100644 index 06e19e3750c..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_no_contacts.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - example.tld - 2 - - ns1.example.net - ns2.example.net - - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_no_hosts_or_dsdata.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_no_hosts_or_dsdata.xml index 7728301c33d..58a2ef5f277 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_no_hosts_or_dsdata.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_no_hosts_or_dsdata.xml @@ -5,9 +5,6 @@ xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"> %DOMAIN% 2 - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_missing_registrant.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_other_contact_types.xml similarity index 100% rename from core/src/test/resources/google/registry/flows/domain/domain_create_missing_registrant.xml rename to core/src/test/resources/google/registry/flows/domain/domain_create_other_contact_types.xml diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_premium.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_premium.xml index f620515cc44..8385ac6db05 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_premium.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_premium.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_premium_allocationtoken.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_premium_allocationtoken.xml index abd13d5c1ad..80cb8ac5924 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_premium_allocationtoken.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_premium_allocationtoken.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_premium_eap.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_premium_eap.xml index f35320b3e71..cfc54f7a03c 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_premium_eap.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_premium_eap.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark.xml index b812b4401fa..520fe31ede1 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark.xml @@ -10,9 +10,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark_allocationtoken.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark_allocationtoken.xml index caf22775857..59dcfc84252 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark_allocationtoken.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_registration_encoded_signed_mark_allocationtoken.xml @@ -10,9 +10,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_registration_start_date_sunrise_claims_notice.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_registration_start_date_sunrise_claims_notice.xml index 67bebc142a7..4f77dd0d644 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_registration_start_date_sunrise_claims_notice.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_registration_start_date_sunrise_claims_notice.xml @@ -10,9 +10,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_registration_sunrise.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_registration_sunrise.xml index 0089de37146..f1e202ead02 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_registration_sunrise.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_registration_sunrise.xml @@ -10,9 +10,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_reserved.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_reserved.xml index 3698802671a..0d9437e3bb3 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_reserved.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_reserved.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_response_noasync.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_response_noasync.xml deleted file mode 100644 index 1317779fad8..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_response_noasync.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - Command completed successfully - - - - %DOMAIN% - 1999-04-03T22:00:01.0Z - 2001-04-03T22:00:01.0Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_sunrise_encoded_signed_mark_no_type.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_sunrise_encoded_signed_mark_no_type.xml index 4075e2631b7..e3dbadd667a 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_sunrise_encoded_signed_mark_no_type.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_sunrise_encoded_signed_mark_no_type.xml @@ -10,9 +10,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_uppercase.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_uppercase.xml index f8ba236322a..44dfd188571 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_uppercase.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_uppercase.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_with_tld.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_with_tld.xml index c2cdc1deff2..dd7eb330a3c 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_with_tld.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_with_tld.xml @@ -9,9 +9,6 @@ ns1.example.%TLD% ns2.example.%TLD% - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_create_wrong_extension.xml b/core/src/test/resources/google/registry/flows/domain/domain_create_wrong_extension.xml index 5916cccbb5c..07ca9374466 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_create_wrong_extension.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_create_wrong_extension.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain/domain_delete_flags.xml b/core/src/test/resources/google/registry/flows/domain/domain_delete_flags.xml deleted file mode 100644 index fc32d3224a4..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_delete_flags.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - example.flags - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_fee_premium_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_premium_response.xml index 5ed534d3670..914b7d26b02 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_fee_premium_response.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_premium_response.xml @@ -9,9 +9,6 @@ rich.example %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_fee_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_response.xml index f6091f2da36..47a666a5780 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_fee_response.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_response.xml @@ -9,9 +9,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_premium_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_premium_response.xml index c1c9b49a018..1525916e3a8 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_premium_response.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_premium_response.xml @@ -9,9 +9,6 @@ rich.example %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_response.xml index 4095bef0a26..a01e32b094e 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_response.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_response.xml @@ -9,9 +9,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_response_no_renewal.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_response_no_renewal.xml index 816caf4cc15..53b06027832 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_response_no_renewal.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_response_no_renewal.xml @@ -9,9 +9,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_response_with_renewal.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_response_with_renewal.xml index 4b1fa4142ad..23ff87e9bb5 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_response_with_renewal.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_fee_restore_response_with_renewal.xml @@ -9,9 +9,6 @@ rich.example %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_flags_none.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_flags_none.xml deleted file mode 100644 index df22e757e12..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_flags_none.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - domain.flags - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_flags_two.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_flags_two.xml deleted file mode 100644 index 885a5fb71f5..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_flags_two.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - domain-flag1-flag2.flags - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response.xml index 976ee58a629..5b64419b8e6 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response.xml @@ -9,9 +9,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_addperiod.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_addperiod.xml index 412b0fe03eb..23a1fcb95a5 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_addperiod.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_addperiod.xml @@ -10,9 +10,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_autorenewperiod.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_autorenewperiod.xml index 3037572c61e..c790899462f 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_autorenewperiod.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_autorenewperiod.xml @@ -10,9 +10,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_bulk.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_bulk.xml index 13b5dffc9bb..453947ec953 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_bulk.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_bulk.xml @@ -10,9 +10,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_delegated_hosts.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_delegated_hosts.xml index 8dd40bf9ed7..03df11d989d 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_delegated_hosts.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_delegated_hosts.xml @@ -9,9 +9,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_dsdata.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_dsdata.xml index 93b9083d86b..c1d8283988c 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_dsdata.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_dsdata.xml @@ -11,9 +11,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns2.example.tld diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_dsdata_addperiod.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_dsdata_addperiod.xml index 96c82b62e35..06d335008ce 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_dsdata_addperiod.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_dsdata_addperiod.xml @@ -10,9 +10,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_empty_bulk_package.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_empty_bulk_package.xml index cc0e03081b6..51d245b033e 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_empty_bulk_package.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_empty_bulk_package.xml @@ -10,9 +10,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_no_cltrid.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_no_cltrid.xml index 79e4b4497dd..811737002d6 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_no_cltrid.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_no_cltrid.xml @@ -9,9 +9,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_no_registrant.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_no_registrant.xml index a596e58f7fb..5b64419b8e6 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_no_registrant.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_no_registrant.xml @@ -9,8 +9,6 @@ example.tld %ROID% - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_none_hosts.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_none_hosts.xml index d2ea0ec0023..4497fe6cfbc 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_none_hosts.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_none_hosts.xml @@ -9,9 +9,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 NewRegistrar TheRegistrar 1999-04-03T22:00:00.0Z diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_pendingdelete.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_pendingdelete.xml index f1b4b4b96e2..fe50ddd7ac4 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_pendingdelete.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_pendingdelete.xml @@ -10,9 +10,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_redemptionperiod.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_redemptionperiod.xml index 1b774c1ae4c..7680579e17d 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_redemptionperiod.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_redemptionperiod.xml @@ -10,9 +10,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_renewperiod.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_renewperiod.xml index b3dc98653ba..2a6391aaec3 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_renewperiod.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_renewperiod.xml @@ -10,9 +10,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_stackedaddrenewperiod.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_stackedaddrenewperiod.xml index 758c0224fa5..3fbdec7ca90 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_stackedaddrenewperiod.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_stackedaddrenewperiod.xml @@ -10,9 +10,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_subordinate_hosts.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_subordinate_hosts.xml index f902ec1df81..06a5e45a34e 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_subordinate_hosts.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_subordinate_hosts.xml @@ -9,9 +9,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns2.example.tld NewRegistrar diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_superuser_bulk.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_superuser_bulk.xml index 0f27c48685e..a108f640364 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_superuser_bulk.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_superuser_bulk.xml @@ -9,7 +9,6 @@ example.tld %ROID% - jd1234 ns1.example.net ns1.example.tld diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_transferperiod.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_transferperiod.xml index 550d6cc1947..ea34d23446d 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_transferperiod.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_transferperiod.xml @@ -10,9 +10,6 @@ example.tld %ROID% - jd1234 - sh8013 - sh8013 ns1.example.tld ns1.example.net diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_response_unauthorized.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_response_unauthorized.xml index 39259352afd..cf2d78132ff 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_response_unauthorized.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_info_response_unauthorized.xml @@ -9,7 +9,6 @@ example.tld %ROID% - jd1234 ns1.example.net ns1.example.tld diff --git a/core/src/test/resources/google/registry/flows/domain/domain_info_with_contact_auth.xml b/core/src/test/resources/google/registry/flows/domain/domain_info_with_contact_auth.xml deleted file mode 100644 index 3b045487772..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_info_with_contact_auth.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - example.tld - - 2fooBAR - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_renew_flags.xml b/core/src/test/resources/google/registry/flows/domain/domain_renew_flags.xml deleted file mode 100644 index c761e03c912..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_renew_flags.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - %DOMAIN% - 2000-04-03 - 1 - - - - - USD - %FEE% - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_transfer_cancel_extra.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_cancel_extra.xml deleted file mode 100644 index 1e97f1797d3..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_transfer_cancel_extra.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - example.extra - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_transfer_reject_extra.xml b/core/src/test/resources/google/registry/flows/domain/domain_transfer_reject_extra.xml deleted file mode 100644 index 7e0835f9510..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_transfer_reject_extra.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - example.extra - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update.xml b/core/src/test/resources/google/registry/flows/domain/domain_update.xml index 234b1a2880c..9b012cf2242 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_update.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_update.xml @@ -8,7 +8,6 @@ ns2.example.foo - mak21 Payment overdue. @@ -16,11 +15,9 @@ ns1.example.foo - sh8013 - sh8013 2BARfoo diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_add_registry_lock.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_add_registry_lock.xml index 4884d3ead1a..fe2477fba77 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_add_registry_lock.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_update_add_registry_lock.xml @@ -17,7 +17,6 @@ - sh8013 2BARfoo diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_add_remove_same_contact.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_add_remove_same_contact.xml deleted file mode 100644 index a97a1b8768a..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_add_remove_same_contact.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - example.tld - - sh8013 - Payment overdue. - - - sh8013 - - - sh8013 - - 2BARfoo - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_add_remove_same_host.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_add_remove_same_host.xml index b900cbcb612..7cd3a97cd4f 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_add_remove_same_host.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_update_add_remove_same_host.xml @@ -17,7 +17,6 @@ - sh8013 2BARfoo diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_contacts_and_registrant.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_contacts_and_registrant.xml deleted file mode 100644 index b45b24a81e9..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_contacts_and_registrant.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - example.tld - - sh8013 - sh8013 - sh8013 - - - mak21 - mak21 - mak21 - - - sh8013 - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_duplicate_contact.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_duplicate_contact.xml deleted file mode 100644 index 196f1ad6512..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_duplicate_contact.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - example.tld - - - ns2.example.foo - - mak21 - mak21 - sh8013 - Payment overdue. - - - - ns1.example.foo - - sh8013 - - - - sh8013 - - 2BARfoo - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_fee.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_fee.xml index 2a056b79f24..0da21397910 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_fee.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_update_fee.xml @@ -7,7 +7,6 @@ - sh8013 2BARfoo diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_max_everything.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_max_everything.xml index 1048d1236c9..92844d1d561 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_max_everything.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_update_max_everything.xml @@ -20,9 +20,6 @@ max_test_24.example.tld max_test_25.example.tld - max_test_4 - max_test_5 - max_test_6 @@ -40,13 +37,7 @@ max_test_11.example.tld max_test_12.example.tld - max_test_0 - max_test_1 - max_test_2 - - max_test_7 - ABC-12345 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_missing_contact_type.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_missing_contact_type.xml deleted file mode 100644 index 7e3af38dcc0..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_missing_contact_type.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - example.tld - - - ns2.example.foo - - mak21 - Payment overdue. - - - - ns1.example.foo - - sh8013 - - - - sh8013 - - 2BARfoo - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_multiple_duplicate_contacts.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_multiple_duplicate_contacts.xml deleted file mode 100644 index e0e2c9e84a5..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_multiple_duplicate_contacts.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - example.tld - - - ns2.example.foo - - mak21 - sh8013 - mak21 - sh8013 - Payment overdue. - - - - ns1.example.foo - - - - - sh8013 - - 2BARfoo - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_no_auth_change.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_no_auth_change.xml index 7e2b44f3a1a..8d3d7a62467 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_no_auth_change.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_update_no_auth_change.xml @@ -8,7 +8,6 @@ ns2.example.foo - mak21 Payment overdue. @@ -16,7 +15,6 @@ ns1.example.foo - sh8013 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_no_cltrid.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_no_cltrid.xml index f66cc8e5b63..721fcfe43ef 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_no_cltrid.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_update_no_cltrid.xml @@ -8,7 +8,6 @@ ns2.example.foo - mak21 Payment overdue. @@ -16,11 +15,9 @@ ns1.example.foo - sh8013 - sh8013 2BARfoo diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_prohibited_status.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_prohibited_status.xml index b757ad198fd..d8100d1ac0f 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_prohibited_status.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_update_prohibited_status.xml @@ -18,7 +18,6 @@ - sh8013 2BARfoo diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_registrant_to_tech.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_registrant_to_tech.xml index 3fb249b439a..06e195c2900 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_registrant_to_tech.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_update_registrant_to_tech.xml @@ -5,13 +5,10 @@ xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"> example.tld - sh8013 - contact1234 - mak21 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_remove_admin.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_admin.xml deleted file mode 100644 index fe2323a21ac..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_remove_admin.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - example.tld - - sh8013 - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_remove_all_contacts.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_all_contacts.xml deleted file mode 100644 index 93c25ccf121..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_remove_all_contacts.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - example.tld - - - sh8013 - sh8013 - sh8013 - - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_remove_client_hold.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_client_hold.xml deleted file mode 100644 index fa96c1491e5..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_remove_client_hold.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - example.tld - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_remove_contact.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_contact.xml index 82d565df751..9b012cf2242 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_remove_contact.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_contact.xml @@ -8,7 +8,6 @@ ns2.example.foo - mak21 Payment overdue. @@ -16,7 +15,6 @@ ns1.example.foo - sh8013 diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_remove_multiple_contacts.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_multiple_contacts.xml deleted file mode 100644 index 1c52212d120..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_remove_multiple_contacts.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - example.tld - - mak21 - mak21 - mak21 - - - sh8013 - sh8013 - sh8013 - - - mak21 - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_remove_server_hold.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_server_hold.xml deleted file mode 100644 index 15492a0bdda..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_remove_server_hold.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - example.tld - - - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_remove_tech.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_remove_tech.xml deleted file mode 100644 index 021d9906f36..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_remove_tech.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - example.tld - - sh8013 - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_flags.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_flags.xml deleted file mode 100644 index 5f1de21bb0b..00000000000 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_flags.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - %DOMAIN% - - - - - - - - - USD - %FEE% - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_with_change.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_with_change.xml index b6e9c79e555..7fa3705e7b1 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_with_change.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_update_restore_request_with_change.xml @@ -5,7 +5,9 @@ xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"> example.tld - sh8013 + + 2fooBAR + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_update_wildcard.xml b/core/src/test/resources/google/registry/flows/domain/domain_update_wildcard.xml index dc0bc2f8c92..cb62a9191b0 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_update_wildcard.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_update_wildcard.xml @@ -8,7 +8,6 @@ ns2.example.foo - mak21 Payment overdue. @@ -16,11 +15,9 @@ ns1.example.foo - sh8013 - sh8013 2BARfoo diff --git a/core/src/test/resources/google/registry/flows/domain_create.xml b/core/src/test/resources/google/registry/flows/domain_create.xml index f5bc7c25ac5..097cc87c5be 100644 --- a/core/src/test/resources/google/registry/flows/domain_create.xml +++ b/core/src/test/resources/google/registry/flows/domain_create.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain_create_eap_fee.xml b/core/src/test/resources/google/registry/flows/domain_create_eap_fee.xml index 38aa38854d7..eebb13ac2c3 100644 --- a/core/src/test/resources/google/registry/flows/domain_create_eap_fee.xml +++ b/core/src/test/resources/google/registry/flows/domain_create_eap_fee.xml @@ -4,9 +4,6 @@ example.tld 2 - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain_create_fakesite.xml b/core/src/test/resources/google/registry/flows/domain_create_fakesite.xml index 08d900366f7..b08b8e58e3c 100644 --- a/core/src/test/resources/google/registry/flows/domain_create_fakesite.xml +++ b/core/src/test/resources/google/registry/flows/domain_create_fakesite.xml @@ -9,9 +9,6 @@ ns1.example.external ns2.example.external - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain_create_fakesite_no_nameservers.xml b/core/src/test/resources/google/registry/flows/domain_create_fakesite_no_nameservers.xml index 56c3a664933..bbc014af336 100644 --- a/core/src/test/resources/google/registry/flows/domain_create_fakesite_no_nameservers.xml +++ b/core/src/test/resources/google/registry/flows/domain_create_fakesite_no_nameservers.xml @@ -5,9 +5,6 @@ xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"> fakesite.example 2 - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain_create_no_hosts_or_dsdata.xml b/core/src/test/resources/google/registry/flows/domain_create_no_hosts_or_dsdata.xml index 7728301c33d..58a2ef5f277 100644 --- a/core/src/test/resources/google/registry/flows/domain_create_no_hosts_or_dsdata.xml +++ b/core/src/test/resources/google/registry/flows/domain_create_no_hosts_or_dsdata.xml @@ -5,9 +5,6 @@ xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"> %DOMAIN% 2 - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain_create_prettyprinted.xml b/core/src/test/resources/google/registry/flows/domain_create_prettyprinted.xml index eebc36788ec..6cbc1a07b99 100644 --- a/core/src/test/resources/google/registry/flows/domain_create_prettyprinted.xml +++ b/core/src/test/resources/google/registry/flows/domain_create_prettyprinted.xml @@ -9,9 +9,6 @@ ns1.example.net ns2.example.net - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain_create_secondsite.xml b/core/src/test/resources/google/registry/flows/domain_create_secondsite.xml index 9862af3c047..fcd561cae2a 100644 --- a/core/src/test/resources/google/registry/flows/domain_create_secondsite.xml +++ b/core/src/test/resources/google/registry/flows/domain_create_secondsite.xml @@ -9,9 +9,6 @@ ns1.example.external ns2.example.external - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_no_type.xml b/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_no_type.xml index a2c996f2fd4..b2c11453f12 100644 --- a/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_no_type.xml +++ b/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_no_type.xml @@ -10,9 +10,6 @@ ns1.example.external ns2.example.external - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_wrong_phase.xml b/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_wrong_phase.xml index 151a1c8ba84..2f1492f7ffc 100644 --- a/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_wrong_phase.xml +++ b/core/src/test/resources/google/registry/flows/domain_create_start_date_sunrise_encoded_mark_wrong_phase.xml @@ -10,9 +10,6 @@ ns1.example.external ns2.example.external - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain_create_sunrise_encoded_mark.xml b/core/src/test/resources/google/registry/flows/domain_create_sunrise_encoded_mark.xml index 43161f5bed3..1611c457da3 100644 --- a/core/src/test/resources/google/registry/flows/domain_create_sunrise_encoded_mark.xml +++ b/core/src/test/resources/google/registry/flows/domain_create_sunrise_encoded_mark.xml @@ -10,9 +10,6 @@ ns1.example.external ns2.example.external - jd1234 - sh8013 - sh8013 2fooBAR diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_addperiod_wildcard.xml b/core/src/test/resources/google/registry/flows/domain_info_response_addperiod_wildcard.xml index 2e186056f8a..f9985e5768f 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_addperiod_wildcard.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_addperiod_wildcard.xml @@ -10,9 +10,6 @@ %DOMAIN% 8-TLD - jd1234 - sh8013 - sh8013 NewRegistrar NewRegistrar %CRDATE% diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_after_transfer_after_argp.xml b/core/src/test/resources/google/registry/flows/domain_info_response_after_transfer_after_argp.xml index cfeaca84bdc..83ef3258e90 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_after_transfer_after_argp.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_after_transfer_after_argp.xml @@ -9,9 +9,6 @@ fakesite.example IGNORED - jd1234 - sh8013 - sh8013 ns1.example.external ns2.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_after_transfer_during_argp.xml b/core/src/test/resources/google/registry/flows/domain_info_response_after_transfer_during_argp.xml index af57c2d8dc7..e5c4e0ee9a0 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_after_transfer_during_argp.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_after_transfer_during_argp.xml @@ -9,9 +9,6 @@ fakesite.example IGNORED - jd1234 - sh8013 - sh8013 ns1.example.external ns2.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_before_transfer_and_argp.xml b/core/src/test/resources/google/registry/flows/domain_info_response_before_transfer_and_argp.xml index 20b0b2b1bcb..69f1e7d8c32 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_before_transfer_and_argp.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_before_transfer_and_argp.xml @@ -9,9 +9,6 @@ fakesite.example IGNORED - jd1234 - sh8013 - sh8013 ns1.example.external ns2.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_before_transfer_during_argp.xml b/core/src/test/resources/google/registry/flows/domain_info_response_before_transfer_during_argp.xml index 0784a91b8ee..d3d6b55d99c 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_before_transfer_during_argp.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_before_transfer_during_argp.xml @@ -9,9 +9,6 @@ fakesite.example IGNORED - jd1234 - sh8013 - sh8013 ns1.example.external ns2.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_during_transfer_during_argp.xml b/core/src/test/resources/google/registry/flows/domain_info_response_during_transfer_during_argp.xml index d238eef1527..2fc68057470 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_during_transfer_during_argp.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_during_transfer_during_argp.xml @@ -9,9 +9,6 @@ fakesite.example IGNORED - jd1234 - sh8013 - sh8013 ns1.example.external ns2.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers.xml index e6aa9a15a74..80b02107b6f 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers.xml @@ -9,9 +9,6 @@ fakesite.example %ROID% - jd1234 - sh8013 - sh8013 ns1.example.external ns2.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers_pending_transfer.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers_pending_transfer.xml index e0617986b60..84294b43f75 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers_pending_transfer.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers_pending_transfer.xml @@ -9,9 +9,6 @@ fakesite.example %ROID% - jd1234 - sh8013 - sh8013 ns3.fakesite.example ns1.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers_transfer_successful.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers_transfer_successful.xml index 8ce1d7f97b4..187417110f5 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers_transfer_successful.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_3_nameservers_transfer_successful.xml @@ -9,9 +9,6 @@ fakesite.example %ROID% - jd1234 - sh8013 - sh8013 ns3.fakesite.example ns1.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_inactive.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_inactive.xml index 35532369a27..eca55ca798b 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_inactive.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_inactive.xml @@ -9,9 +9,6 @@ fakesite.example %ROID% - jd1234 - sh8013 - sh8013 NewRegistrar NewRegistrar 2000-06-01T00:04:00Z diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_ok.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_ok.xml index 6d1a1971466..64884d5ae31 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_ok.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_ok.xml @@ -9,9 +9,6 @@ fakesite.example %ROID% - jd1234 - sh8013 - sh8013 ns1.example.external ns2.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_ok_post_host_update.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_ok_post_host_update.xml index afe667d215c..6a844d07db5 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_ok_post_host_update.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_ok_post_host_update.xml @@ -9,9 +9,6 @@ fakesite.example %ROID% - jd1234 - sh8013 - sh8013 ns1.example.external ns2.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_delete.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_delete.xml index f1f2105bf30..7281d99b2f5 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_delete.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_delete.xml @@ -9,9 +9,6 @@ fakesite.example %ROID% - jd1234 - sh8013 - sh8013 ns1.example.external ns2.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_transfer.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_transfer.xml index fc921b478ef..240920b029a 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_transfer.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_transfer.xml @@ -9,9 +9,6 @@ fakesite.example %ROID% - jd1234 - sh8013 - sh8013 ns1.example.external ns2.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_transfer_autorenew.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_transfer_autorenew.xml index b55aef2f5e7..5e149a4a991 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_transfer_autorenew.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_pending_transfer_autorenew.xml @@ -9,9 +9,6 @@ fakesite.example %ROID% - jd1234 - sh8013 - sh8013 ns1.example.external ns2.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_restored_ok.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_restored_ok.xml index 8c749cb1271..ab49266e142 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_restored_ok.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_restored_ok.xml @@ -9,9 +9,6 @@ fakesite.example %ROID% - jd1234 - sh8013 - sh8013 ns1.example.external ns2.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_transfer_complete.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_transfer_complete.xml index 7138956dd4a..2a854b95335 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_transfer_complete.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_transfer_complete.xml @@ -9,9 +9,6 @@ fakesite.example %ROID% - jd1234 - sh8013 - sh8013 ns1.example.external ns2.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_transfer_period.xml b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_transfer_period.xml index 2f5263aade3..f0bb8f6190b 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_transfer_period.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_fakesite_transfer_period.xml @@ -9,9 +9,6 @@ fakesite.example %ROID% - jd1234 - sh8013 - sh8013 ns1.example.external ns2.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_graceperiod.xml b/core/src/test/resources/google/registry/flows/domain_info_response_graceperiod.xml index 012e5712558..0bc63c17f3a 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_graceperiod.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_graceperiod.xml @@ -10,9 +10,6 @@ %DOMAIN% 8-TLD - jd1234 - sh8013 - sh8013 NewRegistrar NewRegistrar 2000-06-01T00:02:00Z diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_graceperiod_add_and_renew.xml b/core/src/test/resources/google/registry/flows/domain_info_response_graceperiod_add_and_renew.xml index 20951b6baa2..d288377fb2f 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_graceperiod_add_and_renew.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_graceperiod_add_and_renew.xml @@ -10,9 +10,6 @@ %DOMAIN% 8-TLD - jd1234 - sh8013 - sh8013 NewRegistrar NewRegistrar 2000-06-01T00:02:00Z diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_inactive.xml b/core/src/test/resources/google/registry/flows/domain_info_response_inactive.xml index 1500fb96c9d..077869bb857 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_inactive.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_inactive.xml @@ -9,9 +9,6 @@ %DOMAIN% 8-TLD - jd1234 - sh8013 - sh8013 NewRegistrar NewRegistrar 2000-06-01T00:02:00Z diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_inactive_grace_period.xml b/core/src/test/resources/google/registry/flows/domain_info_response_inactive_grace_period.xml index 91862685028..84f30d2b76f 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_inactive_grace_period.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_inactive_grace_period.xml @@ -9,9 +9,6 @@ %DOMAIN% 8-TLD - jd1234 - sh8013 - sh8013 NewRegistrar NewRegistrar 2000-06-01T00:02:00Z diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_ok_wildcard.xml b/core/src/test/resources/google/registry/flows/domain_info_response_ok_wildcard.xml index ca54ad245df..9a246ea11aa 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_ok_wildcard.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_ok_wildcard.xml @@ -9,9 +9,6 @@ %DOMAIN% %ROID% - jd1234 - sh8013 - sh8013 ns1.example.external ns2.example.external diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_redemptionperiod_wildcard.xml b/core/src/test/resources/google/registry/flows/domain_info_response_redemptionperiod_wildcard.xml index 70daae37fdc..5d8aa44d6c1 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_redemptionperiod_wildcard.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_redemptionperiod_wildcard.xml @@ -11,9 +11,6 @@ 8-TLD - jd1234 - sh8013 - sh8013 NewRegistrar NewRegistrar %CRDATE% diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_testvalidate_ok.xml b/core/src/test/resources/google/registry/flows/domain_info_response_testvalidate_ok.xml deleted file mode 100644 index d195316a04d..00000000000 --- a/core/src/test/resources/google/registry/flows/domain_info_response_testvalidate_ok.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - Command completed successfully - - - - test-validate.example - %ROID% - - jd1234 - sh8013 - sh8013 - - ns1.example.external - ns2.example.external - - NewRegistrar - NewRegistrar - 2014-03-02T00:01:00.000Z - 2015-03-02T00:01:00.000Z - - 2fooBAR - - - - - - - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_wildcard.xml b/core/src/test/resources/google/registry/flows/domain_info_response_wildcard.xml index 3e15f24f164..c2778a22596 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_wildcard.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_wildcard.xml @@ -11,9 +11,6 @@ %ROID% - jd1234 - sh8013 - sh8013 NewRegistrar NewRegistrar 2000-06-01T00:02:00.0Z diff --git a/core/src/test/resources/google/registry/flows/domain_info_response_wildcard_after_redemption.xml b/core/src/test/resources/google/registry/flows/domain_info_response_wildcard_after_redemption.xml index 05e30eeb7ae..8a923929a28 100644 --- a/core/src/test/resources/google/registry/flows/domain_info_response_wildcard_after_redemption.xml +++ b/core/src/test/resources/google/registry/flows/domain_info_response_wildcard_after_redemption.xml @@ -11,9 +11,6 @@ %ROID% - jd1234 - sh8013 - sh8013 NewRegistrar NewRegistrar 2000-06-01T00:02:00.0Z diff --git a/core/src/test/resources/google/registry/flows/host/host_delete_response_no_cltrid_pending.xml b/core/src/test/resources/google/registry/flows/host/host_delete_response_no_cltrid_pending.xml deleted file mode 100644 index 7d1721ff9de..00000000000 --- a/core/src/test/resources/google/registry/flows/host/host_delete_response_no_cltrid_pending.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - Command completed successfully; action pending - - - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/host/host_delete_response_pending.xml b/core/src/test/resources/google/registry/flows/host/host_delete_response_pending.xml deleted file mode 100644 index 91fe71a836d..00000000000 --- a/core/src/test/resources/google/registry/flows/host/host_delete_response_pending.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Command completed successfully; action pending - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/host_info_response_ns1.xml b/core/src/test/resources/google/registry/flows/host_info_response_ns1.xml deleted file mode 100644 index 014dae3f2c6..00000000000 --- a/core/src/test/resources/google/registry/flows/host_info_response_ns1.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - Command completed successfully - - - - ns1.example.external - NS1_EXAMPLE1-REP - - NewRegistrar - NewRegistrar - 2000-06-01T00:02:00.000Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/host_info_response_ns2.xml b/core/src/test/resources/google/registry/flows/host_info_response_ns2.xml deleted file mode 100644 index ffef92c09bb..00000000000 --- a/core/src/test/resources/google/registry/flows/host_info_response_ns2.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - Command completed successfully - - - - ns2.example.external - NS1_EXAMPLE1-REP - - NewRegistrar - NewRegistrar - 2000-06-01T00:03:00.000Z - - - - ABC-12345 - server-trid - - - diff --git a/core/src/test/resources/google/registry/flows/host_update_ns1_to_ns2.xml b/core/src/test/resources/google/registry/flows/host_update_ns1_to_ns2.xml deleted file mode 100644 index 43a0e6a3c19..00000000000 --- a/core/src/test/resources/google/registry/flows/host_update_ns1_to_ns2.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - ns1.example.external - - - - - ns2.example.external - - - - ABC-12345 - - diff --git a/core/src/test/resources/google/registry/flows/poll_response_server_hold.xml b/core/src/test/resources/google/registry/flows/poll_response_server_hold.xml index 93f0d71693f..5c60bdb621e 100644 --- a/core/src/test/resources/google/registry/flows/poll_response_server_hold.xml +++ b/core/src/test/resources/google/registry/flows/poll_response_server_hold.xml @@ -3,7 +3,7 @@ Command completed successfully; ack to dequeue - + 2000-06-02T13:00:00Z The registry administrator has added the status(es) [serverHold]. diff --git a/core/src/test/resources/google/registry/flows/poll_response_unrenew.xml b/core/src/test/resources/google/registry/flows/poll_response_unrenew.xml index a14bc1071d1..0be1ad23415 100644 --- a/core/src/test/resources/google/registry/flows/poll_response_unrenew.xml +++ b/core/src/test/resources/google/registry/flows/poll_response_unrenew.xml @@ -3,7 +3,7 @@ Command completed successfully; ack to dequeue - + 2001-06-07T00:00:00Z Domain example.tld was unrenewed by 3 years; now expires at 2003-06-01T00:02:00.000Z. diff --git a/core/src/test/resources/google/registry/flows/session/contact_delete_response_sh8013_pending.xml b/core/src/test/resources/google/registry/flows/session/contact_delete_response_sh8013_pending.xml deleted file mode 100644 index 91fe71a836d..00000000000 --- a/core/src/test/resources/google/registry/flows/session/contact_delete_response_sh8013_pending.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - Command completed successfully; action pending - - - ABC-12345 - server-trid - - -