diff --git a/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckCommandExtensionItemStdV1.java b/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckCommandExtensionItemStdV1.java index fb74aa5a7..0152b056e 100644 --- a/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckCommandExtensionItemStdV1.java +++ b/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckCommandExtensionItemStdV1.java @@ -18,7 +18,6 @@ import com.google.common.base.Ascii; import google.registry.model.domain.Period; import google.registry.model.domain.fee.FeeCheckCommandExtensionItem; import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; import java.util.Locale; import java.util.Optional; @@ -32,12 +31,13 @@ import org.joda.time.DateTime; * 
{@code
  * 
  *   1
- *   premium
- *   2017-05-17T13:22:21.0Z
  * 
  * }
+ * + *

The `feeClass` and `feeDate` attributes that are present in version 0.12 are removed from this + * version. */ -@XmlType(propOrder = {"period", "feeClass", "feeDate"}) +@XmlType(propOrder = {"period"}) public class FeeCheckCommandExtensionItemStdV1 extends FeeCheckCommandExtensionItem { /** The default validity period (if not specified) is 1 year for all operations. */ @@ -50,12 +50,6 @@ public class FeeCheckCommandExtensionItemStdV1 extends FeeCheckCommandExtensionI @XmlAttribute String subphase; - @XmlElement(name = "class") - String feeClass; - - @XmlElement(name = "date") - DateTime feeDate; - /** Version 1.0 does not support domain name or currency in fee extension items. */ @Override public boolean isDomainNameSupported() { @@ -107,6 +101,6 @@ public class FeeCheckCommandExtensionItemStdV1 extends FeeCheckCommandExtensionI @Override public Optional getEffectiveDate() { - return Optional.ofNullable(feeDate); + return Optional.empty(); } } diff --git a/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckCommandExtensionStdV1.java b/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckCommandExtensionStdV1.java index 144ccf26d..795b92d84 100644 --- a/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckCommandExtensionStdV1.java +++ b/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckCommandExtensionStdV1.java @@ -76,7 +76,7 @@ public class FeeCheckCommandExtensionStdV1 extends ImmutableObject } /** Domains across multiple currencies cannot be checked simultaneously. */ - static class MultipleCurrenciesCannotBeCheckedException + public static class MultipleCurrenciesCannotBeCheckedException extends ParameterValuePolicyErrorException { public MultipleCurrenciesCannotBeCheckedException() { // The fee extension 1.0 only supports one currency shared across all results diff --git a/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemCommandStdV1.java b/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemCommandStdV1.java index d2299b9d0..6cc8589c1 100644 --- a/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemCommandStdV1.java +++ b/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemCommandStdV1.java @@ -24,13 +24,11 @@ import google.registry.model.domain.Period; import google.registry.model.domain.fee.Fee; import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName; import jakarta.xml.bind.annotation.XmlAttribute; -import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; import java.util.List; -import org.joda.time.DateTime; /** The version 1.0 response command entity for a domain check on a single resource. */ -@XmlType(propOrder = {"period", "fee", "effectiveDate", "notAfterDate"}) +@XmlType(propOrder = {"period", "fee"}) public class FeeCheckResponseExtensionItemCommandStdV1 extends ImmutableObject { /** The command that was checked. */ @@ -53,14 +51,6 @@ public class FeeCheckResponseExtensionItemCommandStdV1 extends ImmutableObject { */ List fee; - /** The effective date that the check is to be performed on (if specified in the query). */ - @XmlElement(name = "date") - DateTime effectiveDate; - - /** The date after which the quoted fee is no longer valid (if applicable). */ - @XmlElement(name = "notAfter") - DateTime notAfterDate; - /** Builder for {@link FeeCheckResponseExtensionItemCommandStdV1}. */ public static class Builder extends Buildable.Builder { @@ -84,16 +74,6 @@ public class FeeCheckResponseExtensionItemCommandStdV1 extends ImmutableObject { return this; } - public Builder setEffectiveDate(DateTime effectiveDate) { - getInstance().effectiveDate = effectiveDate; - return this; - } - - public Builder setNotAfterDate(DateTime notAfterDate) { - getInstance().notAfterDate = notAfterDate; - return this; - } - public Builder setFee(List fees) { getInstance().fee = forceEmptyToNull(ImmutableList.copyOf(fees)); return this; diff --git a/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemStdV1.java b/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemStdV1.java index b994d5ee8..46929eec1 100644 --- a/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemStdV1.java +++ b/core/src/main/java/google/registry/model/domain/feestdv1/FeeCheckResponseExtensionItemStdV1.java @@ -17,20 +17,18 @@ package google.registry.model.domain.feestdv1; import static google.registry.util.CollectionUtils.forceEmptyToNull; import com.google.common.collect.ImmutableList; -import google.registry.model.domain.DomainObjectSpec; import google.registry.model.domain.Period; import google.registry.model.domain.fee.Fee; import google.registry.model.domain.fee.FeeCheckResponseExtensionItem; import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName; import jakarta.xml.bind.annotation.XmlType; -import org.joda.time.DateTime; /** The version 1.0 response for a domain check on a single resource. */ -@XmlType(propOrder = {"object", "feeClass", "command"}) +@XmlType(propOrder = {"objID", "feeClass", "command"}) public class FeeCheckResponseExtensionItemStdV1 extends FeeCheckResponseExtensionItem { /** The domain that was checked. */ - DomainObjectSpec object; + String objID; /** The command that was checked. */ FeeCheckResponseExtensionItemCommandStdV1 command; @@ -88,7 +86,7 @@ public class FeeCheckResponseExtensionItemStdV1 extends FeeCheckResponseExtensio @Override public Builder setDomainNameIfSupported(String name) { - getInstance().object = new DomainObjectSpec(name); + getInstance().objID = name; return this; } @@ -97,17 +95,5 @@ public class FeeCheckResponseExtensionItemStdV1 extends FeeCheckResponseExtensio getInstance().command = commandBuilder.build(); return super.build(); } - - @Override - public Builder setEffectiveDateIfSupported(DateTime effectiveDate) { - commandBuilder.setEffectiveDate(effectiveDate); - return this; - } - - @Override - public Builder setNotAfterDateIfSupported(DateTime notAfterDate) { - commandBuilder.setNotAfterDate(notAfterDate); - return this; - } } } diff --git a/core/src/main/java/google/registry/xml/xsd/fee-std-v1.xsd b/core/src/main/java/google/registry/xml/xsd/fee-std-v1.xsd index 85206af40..33e1d41e0 100644 --- a/core/src/main/java/google/registry/xml/xsd/fee-std-v1.xsd +++ b/core/src/main/java/google/registry/xml/xsd/fee-std-v1.xsd @@ -23,7 +23,7 @@ - + @@ -33,32 +33,24 @@ - + - - - - - - - - - + + + + + + - + @@ -66,45 +58,13 @@ - - - - - - - + - - - - - - - - - - - - + - - - @@ -119,32 +79,15 @@ - + - - - - - - - - - - - - - - - + minOccurs="0" maxOccurs="unbounded" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + @@ -184,9 +167,10 @@ + - + @@ -202,6 +186,7 @@ + diff --git a/core/src/test/java/google/registry/flows/FlowTestCase.java b/core/src/test/java/google/registry/flows/FlowTestCase.java index bb485939c..4a26ff908 100644 --- a/core/src/test/java/google/registry/flows/FlowTestCase.java +++ b/core/src/test/java/google/registry/flows/FlowTestCase.java @@ -36,6 +36,7 @@ import google.registry.flows.EppTestComponent.FakesAndMocksModule; import google.registry.flows.picker.FlowPicker; import google.registry.model.billing.BillingBase; import google.registry.model.domain.GracePeriod; +import google.registry.model.eppcommon.EppXmlTransformer; import google.registry.model.eppcommon.ProtocolDefinition; import google.registry.model.eppinput.EppInput; import google.registry.model.eppoutput.EppOutput; @@ -289,6 +290,8 @@ public abstract class FlowTestCase { if (output.isResponse()) { assertThat(output.isSuccess()).isTrue(); } + // Verify that expected xml is syntatically correct. + EppXmlTransformer.validateOutput(xml); try { assertXmlEquals( xml, new String(marshal(output, ValidationMode.STRICT), UTF_8), ignoredPathsPlusTrid); diff --git a/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java index d302932fc..5ef629653 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java @@ -77,6 +77,7 @@ import google.registry.model.billing.BillingRecurrence; import google.registry.model.domain.Domain; import google.registry.model.domain.DomainHistory; import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName; +import google.registry.model.domain.feestdv1.FeeCheckCommandExtensionStdV1.MultipleCurrenciesCannotBeCheckedException; import google.registry.model.domain.token.AllocationToken; import google.registry.model.domain.token.AllocationToken.TokenStatus; import google.registry.model.eppcommon.StatusValue; @@ -977,23 +978,34 @@ class DomainCheckFlowTest extends ResourceCheckFlowTestCase provideFeeTestParams() { return Stream.of( - // Arguments.of("fee_std_v1", new FeeFileLoader(true)), + Arguments.of("fee_std_v1", new FeeFileLoader(true)), Arguments.of("fee_12", new FeeFileLoader(false))); } } diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_stdv1.xml new file mode 100644 index 000000000..a105fd413 --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_eap_fee_response_stdv1.xml @@ -0,0 +1,54 @@ + + + + Command completed successfully + + + + + example1.tld + In use + + + example2.tld + + + example3.tld + + + + + + USD + + example1.tld + + 1 + 13.00 + 100.00 + + + + example2.tld + + 1 + 13.00 + 100.00 + + + + example3.tld + + 1 + 13.00 + 100.00 + + + + + + ABC-12345 + server-trid + + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_invalid_command_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_invalid_command_stdv1.xml new file mode 100644 index 000000000..5f6ecab10 --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_invalid_command_stdv1.xml @@ -0,0 +1,17 @@ + + + + + example1.tld + + + + + + 1 + + + + ABC-12345 + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_allocationtoken_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_allocationtoken_response_stdv1.xml new file mode 100644 index 000000000..38fb1f0a7 --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_allocationtoken_response_stdv1.xml @@ -0,0 +1,58 @@ + + + + Command completed successfully + + + + + example1.tld + + + + + + USD + + example1.tld + + 1 + 11.70 + + + + example1.tld + + 1 + 11.00 + + + + example1.tld + + 1 + 11.00 + + + + example1.tld + + 1 + 17.00 + + + + example1.tld + + 1 + 0.00 + + + + + + ABC-12345 + server-trid + + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_allocationtoken_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_allocationtoken_stdv1.xml new file mode 100644 index 000000000..a9d0649e2 --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_allocationtoken_stdv1.xml @@ -0,0 +1,24 @@ + + + + + example1.tld + + + + + abc123 + + + + + + + + + + ABC-12345 + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_default_token_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_default_token_response_stdv1.xml new file mode 100644 index 000000000..590b1cabe --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_default_token_response_stdv1.xml @@ -0,0 +1,58 @@ + + + + Command completed successfully + + + + + example1.tld + + + + + + USD + + example1.tld + + 1 + 6.50 + + + + example1.tld + + 1 + 11.00 + + + + example1.tld + + 1 + 11.00 + + + + example1.tld + + 1 + 17.00 + + + + example1.tld + + 1 + 0.00 + + + + + + ABC-12345 + server-trid + + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_response_stdv1.xml new file mode 100644 index 000000000..9d94d941e --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_response_stdv1.xml @@ -0,0 +1,58 @@ + + + + Command completed successfully + + + + + example1.tld + + + + + + USD + + example1.tld + + 1 + 13.00 + + + + example1.tld + + 1 + 11.00 + + + + example1.tld + + 1 + 11.00 + + + + example1.tld + + 1 + 17.00 + + + + example1.tld + + 1 + 0.00 + + + + + + ABC-12345 + server-trid + + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_stdv1.xml new file mode 100644 index 000000000..441606e3f --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_commands_stdv1.xml @@ -0,0 +1,19 @@ + + + + + example1.tld + + + + + + + + + + + + ABC-12345 + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_currencies_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_currencies_stdv1.xml new file mode 100644 index 000000000..4d8d32e18 --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_multiple_currencies_stdv1.xml @@ -0,0 +1,18 @@ + + + + + example.tld + example.example + + + + + + 1 + + + + ABC-12345 + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1.xml new file mode 100644 index 000000000..4a02a3e34 --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1.xml @@ -0,0 +1,61 @@ + + + + Command completed successfully + + + + + rich.example + + + + + + USD + + rich.example + premium + + 1 + 100.00 + + + + rich.example + premium + + 1 + 100.00 + + + + rich.example + premium + + 1 + 100.00 + + + + rich.example + + 1 + 17.00 + + + + rich.example + + 1 + 0.00 + + + + + + ABC-12345 + server-trid + + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_renew_only.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_renew_only.xml new file mode 100644 index 000000000..78aa5054b --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_renew_only.xml @@ -0,0 +1,31 @@ + + + + Command completed successfully + + + + + rich.example + In use + + + + + + USD + + rich.example + + 1 + %RENEWPRICE% + + + + + + ABC-12345 + server-trid + + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_with_renewal.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_with_renewal.xml new file mode 100644 index 000000000..128199fdd --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_stdv1_with_renewal.xml @@ -0,0 +1,64 @@ + + + + Command completed successfully + + + + + rich.example + In use + + + + + + USD + + rich.example + premium + + 1 + 100.00 + + + + rich.example + premium + + 1 + 100.00 + + + + rich.example + premium + + 1 + 100.00 + + + + rich.example + premium + + 1 + 100.00 + 17.00 + + + + rich.example + + 1 + 0.00 + + + + + + ABC-12345 + server-trid + + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v12.xml index 6692e2e5d..e57462d4a 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v12.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v12.xml @@ -1,4 +1,4 @@ -domain_check_fee_premium_response_v12.xml + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v12_renew_only.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v12_renew_only.xml index f11b2f27d..bb67698ed 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v12_renew_only.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v12_renew_only.xml @@ -1,4 +1,4 @@ -domain_check_fee_premium_response_v12.xml + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v12_with_renewal.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v12_with_renewal.xml index 5f2ef4b86..525b1ec5f 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v12_with_renewal.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_response_v12_with_renewal.xml @@ -1,4 +1,4 @@ -domain_check_fee_premium_response_v12.xml + Command completed successfully diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_stdv1.xml new file mode 100644 index 000000000..6f4790f5d --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_stdv1.xml @@ -0,0 +1,19 @@ + + + + + rich.example + + + + + + + + + + + + ABC-12345 + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_stdv1_renew_only.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_stdv1_renew_only.xml new file mode 100644 index 000000000..a0d98b22b --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_premium_stdv1_renew_only.xml @@ -0,0 +1,15 @@ + + + + + rich.example + + + + + + + + ABC-12345 + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_dupes_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_dupes_response_stdv1.xml new file mode 100644 index 000000000..2e2fdc3c4 --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_dupes_response_stdv1.xml @@ -0,0 +1,122 @@ + + + + Command completed successfully + + + + + reserved.tld + Reserved + + + allowedinsunrise.tld + In use + + + allowedinsunrise.tld + In use + + + premiumcollision.tld + Cannot be delegated + + + + + + USD + + reserved.tld + reserved + + 1 + + + + reserved.tld + + 1 + 11.00 + + + + reserved.tld + + 1 + 11.00 + + + + reserved.tld + + 1 + 17.00 + + + + allowedinsunrise.tld + reserved + + 1 + + + + allowedinsunrise.tld + + 1 + 11.00 + + + + allowedinsunrise.tld + + 1 + 11.00 + + + + allowedinsunrise.tld + + 1 + 17.00 + + + + premiumcollision.tld + reserved + + 1 + + + + premiumcollision.tld + premium + + 1 + 70.00 + + + + premiumcollision.tld + premium + + 1 + 70.00 + + + + premiumcollision.tld + + 1 + 17.00 + + + + + + ABC-12345 + server-trid + + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_dupes_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_dupes_stdv1.xml new file mode 100644 index 000000000..2e774d57e --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_dupes_stdv1.xml @@ -0,0 +1,33 @@ + + + + + reserved.tld + allowedinsunrise.tld + allowedinsunrise.tld + premiumcollision.tld + + + + + custom + + + USD + + 1 + + + 1 + + + 1 + + + 1 + + + + ABC-12345 + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_stdv1.xml new file mode 100644 index 000000000..ea53d3534 --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_stdv1.xml @@ -0,0 +1,150 @@ + + + + Command completed successfully + + + + + reserved.tld + Reserved + + + allowedinsunrise.tld + Reserved + + + collision.tld + Cannot be delegated + + + premiumcollision.tld + Cannot be delegated + + + + + + USD + + reserved.tld + reserved + + 1 + + + + reserved.tld + + 1 + 11.00 + + + + reserved.tld + + 1 + 11.00 + + + + reserved.tld + + 1 + 17.00 + + + + allowedinsunrise.tld + reserved + + 1 + + + + allowedinsunrise.tld + + 1 + 11.00 + + + + allowedinsunrise.tld + + 1 + 11.00 + + + + allowedinsunrise.tld + + 1 + 17.00 + + + + collision.tld + reserved + + 1 + + + + collision.tld + + 1 + 11.00 + + + + collision.tld + + 1 + 11.00 + + + + collision.tld + + 1 + 17.00 + + + + premiumcollision.tld + reserved + + 1 + + + + premiumcollision.tld + premium + + 1 + 70.00 + + + + premiumcollision.tld + premium + + 1 + 70.00 + + + + premiumcollision.tld + + 1 + 17.00 + + + + + + ABC-12345 + server-trid + + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v11_restore_with_renewals.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v11_restore_with_renewals.xml index 5ef08cf27..223ab74ff 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v11_restore_with_renewals.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_response_v11_restore_with_renewals.xml @@ -64,8 +64,8 @@ USD 1 70.00 - premium 17.00 + premium diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_stdv1.xml new file mode 100644 index 000000000..f925f56ab --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_stdv1.xml @@ -0,0 +1,33 @@ + + + + + reserved.tld + allowedinsunrise.tld + collision.tld + premiumcollision.tld + + + + + custom + + + USD + + 1 + + + 1 + + + 1 + + + 1 + + + + ABC-12345 + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_stdv1.xml new file mode 100644 index 000000000..29c0c6bcd --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_reserved_sunrise_response_stdv1.xml @@ -0,0 +1,153 @@ + + + + Command completed successfully + + + + + reserved.tld + Reserved + + + allowedinsunrise.tld + + + collision.tld + + + premiumcollision.tld + + + + + + USD + + reserved.tld + reserved + + 1 + + + + reserved.tld + + 1 + 11.00 + + + + reserved.tld + + 1 + 11.00 + + + + reserved.tld + + 1 + 17.00 + + + + allowedinsunrise.tld + + 1 + 11.05 + + + + allowedinsunrise.tld + + 1 + 11.00 + + + + allowedinsunrise.tld + + 1 + 11.00 + + + + allowedinsunrise.tld + + 1 + 17.00 + + + + collision.tld + collision + + 1 + 11.05 + + + + collision.tld + collision + + 1 + 11.00 + + + + collision.tld + collision + + 1 + 11.00 + + + + collision.tld + collision + + 1 + 17.00 + + + + premiumcollision.tld + premium-collision + + 1 + 59.50 + + + + premiumcollision.tld + premium-collision + + 1 + 70.00 + + + + premiumcollision.tld + premium-collision + + 1 + 70.00 + + + + premiumcollision.tld + collision + + 1 + 17.00 + + + + + + ABC-12345 + server-trid + + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_default_token_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_default_token_stdv1.xml new file mode 100644 index 000000000..ef7e8e6c6 --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_default_token_stdv1.xml @@ -0,0 +1,51 @@ + + + + Command completed successfully + + + + + example1.tld + In use + + + example2.tld + + + example3.tld + + + + + + USD + + example1.tld + + 1 + 6.50 + + + + example2.tld + + 1 + 6.50 + + + + example3.tld + + 1 + 6.50 + + + + + + ABC-12345 + server-trid + + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_stdv1.xml new file mode 100644 index 000000000..c592a8a8a --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_response_stdv1.xml @@ -0,0 +1,51 @@ + + + + Command completed successfully + + + + + example1.tld + In use + + + example2.tld + + + example3.tld + + + + + + USD + + example1.tld + + 1 + 13.00 + + + + example2.tld + + 1 + 13.00 + + + + example3.tld + + 1 + 13.00 + + + + + + ABC-12345 + server-trid + + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_fee_stdv1.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_stdv1.xml new file mode 100644 index 000000000..0dee4c17e --- /dev/null +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_fee_stdv1.xml @@ -0,0 +1,24 @@ + + + + + + example1.tld + example2.tld + example3.tld + + + + + custom + + + USD + + 1 + + + + ABC-12345 + + diff --git a/core/src/test/resources/google/registry/flows/domain/domain_check_tiered_promotion_fee_response_v12.xml b/core/src/test/resources/google/registry/flows/domain/domain_check_tiered_promotion_fee_response_v12.xml index a5df0a6a7..56602f872 100644 --- a/core/src/test/resources/google/registry/flows/domain/domain_check_tiered_promotion_fee_response_v12.xml +++ b/core/src/test/resources/google/registry/flows/domain/domain_check_tiered_promotion_fee_response_v12.xml @@ -1,4 +1,4 @@ - + Command completed successfully