mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-09 01:26:24 +00:00
Code Issues Releases Wiki Activity

Rename client ID to registrar ID in most places (#1317)

Browse Source 
* Rename client ID to registrar ID in most places

This is a code-only change, that shouldn't require any sort of data
migration. Correspondingly, there are some existing uses of clientId that are
not migrated (e.g. Datastore fields, task queue payloads, URL parameters for
actions that might be hit from task queues, etc.). And it of course doesn't
modify any fields in EPP XML. Note that the Cloud SQL schema fields are
already named using the registar_id pattern.

This also doesn't yet touch on the -c parameters in nomulus tools; that will be
coming later (since that is an external manual touch-point, it will require a
lot more in the way of changes to various meta scripts and documentation).

* Change more client IDs

* Merge branch 'master' into clientid-to-registrarid
This commit is contained in:
Ben McIlwain
2021-09-16 12:57:43 -04:00
committed by GitHub
parent adc10131a0
commit 8d421e995e
268 changed files with 1897 additions and 1786 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/google/registry/batch/DeleteContactsAndHostsActionTest.java
+2 -2
View File
@@ -890,14 +890,14 @@ public class DeleteContactsAndHostsActionTest
*/
private static void assertPollMessageFor(
HistoryEntry historyEntry,
String clientId,
String registrarId,
String msg,
boolean expectedActionResult,
EppResource resource,
Optional<String> clientTrid) {
PollMessage.OneTime pollMessage = (OneTime) getOnlyPollMessageForHistoryEntry(historyEntry);
assertThat(pollMessage.getMsg()).isEqualTo(msg);
assertThat(pollMessage.getClientId()).isEqualTo(clientId);
assertThat(pollMessage.getRegistrarId()).isEqualTo(registrarId);
ImmutableList<ResponseData> pollResponses = pollMessage.getResponseData();
assertThat(pollResponses).hasSize(1);
core/src/test/java/google/registry/batch/DeleteExpiredDomainsActionTest.java
+3 -3
View File
@@ -181,7 +181,7 @@ class DeleteExpiredDomainsActionTest {
.setType(DOMAIN_CREATE)
.setDomain(pendingExpirationDomain)
.setModificationTime(clock.nowUtc().minusMonths(9))
.setClientId(pendingExpirationDomain.getCreationClientId())
.setRegistrarId(pendingExpirationDomain.getCreationRegistrarId())
.build());
BillingEvent.Recurring autorenewBillingEvent =
persistResource(createAutorenewBillingEvent(createHistoryEntry).build());
@@ -205,7 +205,7 @@ class DeleteExpiredDomainsActionTest {
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId("fizz.tld")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(clock.nowUtc().plusYears(1))
.setRecurrenceEndTime(END_OF_TIME)
.setParent(createHistoryEntry);
@@ -215,7 +215,7 @@ class DeleteExpiredDomainsActionTest {
HistoryEntry createHistoryEntry) {
return new PollMessage.Autorenew.Builder()
.setTargetId("fizz.tld")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(clock.nowUtc().plusYears(1))
.setAutorenewEndTime(END_OF_TIME)
.setParent(createHistoryEntry);
core/src/test/java/google/registry/batch/DeleteProberDataActionTest.java
+14 -13
View File
@@ -293,26 +293,27 @@ class DeleteProberDataActionTest extends MapreduceTestCase<DeleteProberDataActio
new DomainHistory.Builder()
.setDomain(domain)
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setModificationTime(DELETION_TIME.minusYears(3))
.build());
BillingEvent.OneTime billingEvent = persistSimpleResource(
new BillingEvent.OneTime.Builder()
.setParent(historyEntry)
.setBillingTime(DELETION_TIME.plusYears(1))
.setCost(Money.parse("USD 10"))
.setPeriodYears(1)
.setReason(Reason.CREATE)
.setClientId("TheRegistrar")
.setEventTime(DELETION_TIME)
.setTargetId(fqdn)
.build());
BillingEvent.OneTime billingEvent =
persistSimpleResource(
new BillingEvent.OneTime.Builder()
.setParent(historyEntry)
.setBillingTime(DELETION_TIME.plusYears(1))
.setCost(Money.parse("USD 10"))
.setPeriodYears(1)
.setReason(Reason.CREATE)
.setRegistrarId("TheRegistrar")
.setEventTime(DELETION_TIME)
.setTargetId(fqdn)
.build());
PollMessage.OneTime pollMessage =
persistSimpleResource(
new PollMessage.OneTime.Builder()
.setParent(historyEntry)
.setEventTime(DELETION_TIME)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setMsg("Domain registered")
.build());
ImmutableSet.Builder<ImmutableObject> builder =
core/src/test/java/google/registry/batch/ExpandRecurringBillingEventsActionTest.java
+7 -7
View File
@@ -107,7 +107,7 @@ public class ExpandRecurringBillingEventsActionTest
historyEntry =
persistResource(
new DomainHistory.Builder()
.setClientId(domain.getCreationClientId())
.setRegistrarId(domain.getCreationRegistrarId())
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setModificationTime(DateTime.parse("1999-01-05T00:00:00Z"))
.setDomain(domain)
@@ -115,7 +115,7 @@ public class ExpandRecurringBillingEventsActionTest
recurring =
new BillingEvent.Recurring.Builder()
.setParent(historyEntry)
.setClientId(domain.getCreationClientId())
.setRegistrarId(domain.getCreationRegistrarId())
.setEventTime(DateTime.parse("2000-01-05T00:00:00Z"))
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setId(2L)
@@ -152,11 +152,11 @@ public class ExpandRecurringBillingEventsActionTest
private void assertHistoryEntryMatches(
DomainBase domain,
HistoryEntry actual,
String clientId,
String registrarId,
DateTime billingTime,
boolean shouldHaveTxRecord) {
assertThat(actual.getBySuperuser()).isFalse();
assertThat(actual.getClientId()).isEqualTo(clientId);
assertThat(actual.getRegistrarId()).isEqualTo(registrarId);
assertThat(actual.getParent()).isEqualTo(Key.create(domain));
assertThat(actual.getPeriod()).isEqualTo(Period.create(1, YEARS));
assertThat(actual.getReason())
@@ -176,7 +176,7 @@ public class ExpandRecurringBillingEventsActionTest
private OneTime.Builder defaultOneTimeBuilder() {
return new BillingEvent.OneTime.Builder()
.setBillingTime(DateTime.parse("2000-02-19T00:00:00Z"))
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setCost(Money.of(USD, 11))
.setEventTime(DateTime.parse("2000-01-05T00:00:00Z"))
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW, Flag.SYNTHETIC))
@@ -209,7 +209,7 @@ public class ExpandRecurringBillingEventsActionTest
persistResource(
new DomainHistory.Builder()
.setDomain(deletedDomain)
.setClientId(deletedDomain.getCreationClientId())
.setRegistrarId(deletedDomain.getCreationRegistrarId())
.setModificationTime(deletedDomain.getCreationTime())
.setType(DOMAIN_CREATE)
.build());
@@ -217,7 +217,7 @@ public class ExpandRecurringBillingEventsActionTest
persistResource(
new BillingEvent.Recurring.Builder()
.setParent(historyEntry)
.setClientId(deletedDomain.getCreationClientId())
.setRegistrarId(deletedDomain.getCreationRegistrarId())
.setEventTime(DateTime.parse("2000-01-05T00:00:00Z"))
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setId(2L)
core/src/test/java/google/registry/batch/RelockDomainActionTest.java
+2 -1
View File
@@ -197,7 +197,8 @@ public class RelockDomainActionTest {
@TestOfyAndSql
void testFailure_domainTransferred() throws Exception {
persistResource(domain.asBuilder().setPersistedCurrentSponsorClientId("NewRegistrar").build());
persistResource(
domain.asBuilder().setPersistedCurrentSponsorRegistrarId("NewRegistrar").build());
action.run();
String expectedFailureMessage =
"Domain example.tld has been transferred from registrar TheRegistrar to registrar "
core/src/test/java/google/registry/batch/ResaveEntityActionTest.java
+2 -2
View File
@@ -109,10 +109,10 @@ public class ResaveEntityActionTest {
DateTime.parse("2016-02-11T10:00:00Z"),
DateTime.parse("2017-01-02T10:11:00Z"));
clock.advanceOneMilli();
assertThat(domain.getCurrentSponsorClientId()).isEqualTo("TheRegistrar");
assertThat(domain.getCurrentSponsorRegistrarId()).isEqualTo("TheRegistrar");
runAction(Key.create(domain), DateTime.parse("2016-02-06T10:00:01Z"), ImmutableSortedSet.of());
DomainBase resavedDomain = loadByEntity(domain);
assertThat(resavedDomain.getCurrentSponsorClientId()).isEqualTo("NewRegistrar");
assertThat(resavedDomain.getCurrentSponsorRegistrarId()).isEqualTo("NewRegistrar");
verify(response).setPayload("Entity re-saved.");
}
core/src/test/java/google/registry/batch/SendExpiringCertificateNotificationEmailActionTest.java
+2 -2
View File
@@ -140,7 +140,7 @@ class SendExpiringCertificateNotificationEmailActionTest {
/** Returns a sample registrar with a customized registrar name, client id and certificate* */
private Registrar.Builder createRegistrar(
String clientId,
String registrarId,
String registrarName,
@Nullable X509Certificate certificate,
@Nullable X509Certificate failOverCertificate)
@@ -148,7 +148,7 @@ class SendExpiringCertificateNotificationEmailActionTest {
// set up only required fields sample test data
Registrar.Builder builder =
new Registrar.Builder()
.setClientId(clientId)
.setRegistrarId(registrarId)
.setRegistrarName(registrarName)
.setType(Registrar.Type.REAL)
.setIanaIdentifier(8L)
core/src/test/java/google/registry/beam/common/RegistryJpaReadTest.java
+7 -7
View File
@@ -165,23 +165,23 @@ public class RegistryJpaReadTest {
Registrar registrar =
makeRegistrar1()
.asBuilder()
.setClientId("registrar1")
.setRegistrarId("registrar1")
.setEmailAddress("me@google.com")
.build();
ContactResource contact =
new ContactResource.Builder()
.setRepoId("contactid_1")
.setCreationClientId(registrar.getClientId())
.setCreationRegistrarId(registrar.getRegistrarId())
.setTransferData(new ContactTransferData.Builder().build())
.setPersistedCurrentSponsorClientId(registrar.getClientId())
.setPersistedCurrentSponsorRegistrarId(registrar.getRegistrarId())
.build();
DomainBase domain =
new DomainBase.Builder()
.setDomainName("example.com")
.setRepoId("4-COM")
.setCreationClientId(registrar.getClientId())
.setCreationRegistrarId(registrar.getRegistrarId())
.setLastEppUpdateTime(fakeClock.nowUtc())
.setLastEppUpdateClientId(registrar.getClientId())
.setLastEppUpdateRegistrarId(registrar.getRegistrarId())
.setLastTransferTime(fakeClock.nowUtc())
.setStatusValues(
ImmutableSet.of(
@@ -194,7 +194,7 @@ public class RegistryJpaReadTest {
.setRegistrant(contact.createVKey())
.setContacts(ImmutableSet.of())
.setSubordinateHosts(ImmutableSet.of("ns1.example.com"))
.setPersistedCurrentSponsorClientId(registrar.getClientId())
.setPersistedCurrentSponsorRegistrarId(registrar.getRegistrarId())
.setRegistrationExpirationTime(fakeClock.nowUtc().plusYears(1))
.setAuthInfo(DomainAuthInfo.create(PasswordAuth.create("password")))
.setDsData(ImmutableSet.of(DelegationSignerData.create(1, 2, 3, new byte[] {0, 1, 2})))
@@ -206,7 +206,7 @@ public class RegistryJpaReadTest {
GracePeriodStatus.ADD,
"4-COM",
END_OF_TIME,
registrar.getClientId(),
registrar.getRegistrarId(),
null,
100L))
.build();
core/src/test/java/google/registry/beam/initsql/DomainBaseUtilTest.java
+6 -6
View File
@@ -106,7 +106,7 @@ public class DomainBaseUtilTest {
new DomainHistory.Builder()
.setDomainRepoId(domainKey.getName())
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setModificationTime(fakeClock.nowUtc().minusYears(1))
.build()));
oneTimeBillKey = Key.create(historyEntryKey, BillingEvent.OneTime.class, 1);
@@ -122,9 +122,9 @@ public class DomainBaseUtilTest {
new DomainBase.Builder()
.setDomainName("example.com")
.setRepoId("4-COM")
.setCreationClientId("a registrar")
.setCreationRegistrarId("a registrar")
.setLastEppUpdateTime(fakeClock.nowUtc())
.setLastEppUpdateClientId("AnotherRegistrar")
.setLastEppUpdateRegistrarId("AnotherRegistrar")
.setLastTransferTime(fakeClock.nowUtc())
.setStatusValues(
ImmutableSet.of(
@@ -140,7 +140,7 @@ public class DomainBaseUtilTest {
DesignatedContact.create(DesignatedContact.Type.ADMIN, contact2Key)))
.setNameservers(ImmutableSet.of(hostKey))
.setSubordinateHosts(ImmutableSet.of("ns1.example.com"))
.setPersistedCurrentSponsorClientId("losing")
.setPersistedCurrentSponsorRegistrarId("losing")
.setRegistrationExpirationTime(fakeClock.nowUtc().plusYears(1))
.setAuthInfo(DomainAuthInfo.create(PasswordAuth.create("password")))
.setDsData(
@@ -149,8 +149,8 @@ public class DomainBaseUtilTest {
LaunchNotice.create("tcnid", "validatorId", START_OF_TIME, START_OF_TIME))
.setTransferData(
new DomainTransferData.Builder()
.setGainingClientId("gaining")
.setLosingClientId("losing")
.setGainingRegistrarId("gaining")
.setLosingRegistrarId("losing")
.setPendingTransferExpirationTime(fakeClock.nowUtc())
.setServerApproveEntities(
ImmutableSet.of(
core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java
+17 -17
View File
@@ -147,24 +147,24 @@ class InitSqlPipelineTest {
.setHostName("ns1.example.com")
.setSuperordinateDomain(VKey.from(domainKey))
.setRepoId("1-COM")
.setCreationClientId(registrar1.getClientId())
.setPersistedCurrentSponsorClientId(registrar2.getClientId())
.setCreationRegistrarId(registrar1.getRegistrarId())
.setPersistedCurrentSponsorRegistrarId(registrar2.getRegistrarId())
.build());
contact1 =
persistResource(
new ContactResource.Builder()
.setContactId("contact_id1")
.setRepoId("2-COM")
.setCreationClientId(registrar1.getClientId())
.setPersistedCurrentSponsorClientId(registrar2.getClientId())
.setCreationRegistrarId(registrar1.getRegistrarId())
.setPersistedCurrentSponsorRegistrarId(registrar2.getRegistrarId())
.build());
contact2 =
persistResource(
new ContactResource.Builder()
.setContactId("contact_id2")
.setRepoId("3-COM")
.setCreationClientId(registrar1.getClientId())
.setPersistedCurrentSponsorClientId(registrar1.getClientId())
.setCreationRegistrarId(registrar1.getRegistrarId())
.setPersistedCurrentSponsorRegistrarId(registrar1.getRegistrarId())
.build());
persistSimpleResource(
new RegistrarContact.Builder()
@@ -182,7 +182,7 @@ class InitSqlPipelineTest {
new DomainHistory.Builder()
.setDomainRepoId(domainKey.getName())
.setModificationTime(fakeClock.nowUtc())
.setClientId(registrar1.getClientId())
.setRegistrarId(registrar1.getRegistrarId())
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.build());
persistResource(
@@ -193,7 +193,7 @@ class InitSqlPipelineTest {
.setId(1)
.setReason(Reason.RENEW)
.setTargetId("example.com")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setCost(Money.parse("USD 44.00"))
.setPeriodYears(4)
.setEventTime(fakeClock.nowUtc())
@@ -208,7 +208,7 @@ class InitSqlPipelineTest {
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId("example.com")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(fakeClock.nowUtc())
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntryKey)
@@ -219,7 +219,7 @@ class InitSqlPipelineTest {
new PollMessage.Autorenew.Builder()
.setId(3L)
.setTargetId("example.com")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(fakeClock.nowUtc())
.setMsg("Domain was auto-renewed.")
.setParent(historyEntry)
@@ -231,7 +231,7 @@ class InitSqlPipelineTest {
.setId(1L)
.setParent(historyEntry)
.setEventTime(fakeClock.nowUtc())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setMsg(DomainFlowUtils.COLLISION_MESSAGE)
.build();
persistResource(oneTimePollMessage);
@@ -241,9 +241,9 @@ class InitSqlPipelineTest {
new DomainBase.Builder()
.setDomainName("example.com")
.setRepoId("4-COM")
.setCreationClientId(registrar1.getClientId())
.setCreationRegistrarId(registrar1.getRegistrarId())
.setLastEppUpdateTime(fakeClock.nowUtc())
.setLastEppUpdateClientId(registrar2.getClientId())
.setLastEppUpdateRegistrarId(registrar2.getRegistrarId())
.setLastTransferTime(fakeClock.nowUtc())
.setStatusValues(
ImmutableSet.of(
@@ -260,7 +260,7 @@ class InitSqlPipelineTest {
DesignatedContact.Type.ADMIN, contact2.createVKey())))
.setNameservers(ImmutableSet.of(hostResource.createVKey()))
.setSubordinateHosts(ImmutableSet.of("ns1.example.com"))
.setPersistedCurrentSponsorClientId(registrar2.getClientId())
.setPersistedCurrentSponsorRegistrarId(registrar2.getRegistrarId())
.setRegistrationExpirationTime(fakeClock.nowUtc().plusYears(1))
.setAuthInfo(DomainAuthInfo.create(PasswordAuth.create("password")))
.setDsData(
@@ -269,8 +269,8 @@ class InitSqlPipelineTest {
LaunchNotice.create("tcnid", "validatorId", START_OF_TIME, START_OF_TIME))
.setTransferData(
new DomainTransferData.Builder()
.setGainingClientId(registrar1.getClientId())
.setLosingClientId(registrar2.getClientId())
.setGainingRegistrarId(registrar1.getRegistrarId())
.setLosingRegistrarId(registrar2.getRegistrarId())
.setPendingTransferExpirationTime(fakeClock.nowUtc())
.setServerApproveEntities(
ImmutableSet.of(
@@ -298,7 +298,7 @@ class InitSqlPipelineTest {
new BillingEvent.Cancellation.Builder()
.setReason(Reason.RENEW)
.setTargetId(domain.getDomainName())
.setClientId(domain.getCurrentSponsorClientId())
.setRegistrarId(domain.getCurrentSponsorRegistrarId())
.setEventTime(fakeClock.nowUtc())
.setBillingTime(fakeClock.nowUtc())
.setRecurringEventKey(recurringBillEvent.createVKey())
core/src/test/java/google/registry/beam/invoicing/InvoicingPipelineTest.java
+5 -5
View File
@@ -480,7 +480,7 @@ class InvoicingPipelineTest {
new Cancellation()
.asBuilder()
.setId(1)
.setClientId(registrar1.getClientId())
.setRegistrarId(registrar1.getRegistrarId())
.setDomainHistoryRevisionId(domainHistory.getId())
.setEventTime(DateTime.parse("2017-10-05T00:00:00.0Z"))
.setBillingTime(DateTime.parse("2017-10-04T00:00:00.0Z"))
@@ -498,7 +498,7 @@ class InvoicingPipelineTest {
Recurring recurring =
new Recurring()
.asBuilder()
.setClientId(registrar1.getClientId())
.setRegistrarId(registrar1.getRegistrarId())
.setRecurrenceEndTime(END_OF_TIME)
.setId(1)
.setParent(domainHistoryRecurring)
@@ -523,7 +523,7 @@ class InvoicingPipelineTest {
new Cancellation()
.asBuilder()
.setId(2)
.setClientId(registrar1.getClientId())
.setRegistrarId(registrar1.getRegistrarId())
.setDomainHistoryRevisionId(domainHistoryRecurring.getId())
.setEventTime(DateTime.parse("2017-10-05T00:00:00.0Z"))
.setBillingTime(DateTime.parse("2017-10-04T00:00:00.0Z"))
@@ -541,7 +541,7 @@ class InvoicingPipelineTest {
.setType(HistoryEntry.Type.DOMAIN_RENEW)
.setModificationTime(DateTime.parse("2017-10-04T00:00:00.0Z"))
.setDomain(domainBase)
.setClientId(registrar.getClientId())
.setRegistrarId(registrar.getRegistrarId())
.build();
return persistResource(domainHistory);
}
@@ -575,7 +575,7 @@ class InvoicingPipelineTest {
.setId(id)
.setBillingTime(billingTime)
.setEventTime(eventTime)
.setClientId(registrar.getClientId())
.setRegistrarId(registrar.getRegistrarId())
.setReason(reason)
.setTargetId(domainBase.getDomainName())
.setDomainRepoId("REPO-ID")
core/src/test/java/google/registry/beam/spec11/Spec11PipelineTest.java
+9 -9
View File
@@ -239,21 +239,21 @@ class Spec11PipelineTest {
persistResource(
makeRegistrar1()
.asBuilder()
.setClientId("hello-registrar")
.setRegistrarId("hello-registrar")
.setEmailAddress("email@hello.net")
.build());
Registrar registrar2 =
persistResource(
makeRegistrar1()
.asBuilder()
.setClientId("kitty-registrar")
.setRegistrarId("kitty-registrar")
.setEmailAddress("contact@kit.ty")
.build());
Registrar registrar3 =
persistResource(
makeRegistrar1()
.asBuilder()
.setClientId("cool-registrar")
.setRegistrarId("cool-registrar")
.setEmailAddress("cool@aid.net")
.build());
@@ -262,9 +262,9 @@ class Spec11PipelineTest {
createTld("bank");
createTld("dev");
ContactResource contact1 = persistActiveContact(registrar1.getClientId());
ContactResource contact2 = persistActiveContact(registrar2.getClientId());
ContactResource contact3 = persistActiveContact(registrar3.getClientId());
ContactResource contact1 = persistActiveContact(registrar1.getRegistrarId());
ContactResource contact2 = persistActiveContact(registrar2.getRegistrarId());
ContactResource contact3 = persistActiveContact(registrar3.getRegistrarId());
persistResource(createDomain("111.com", "123456789-COM", registrar1, contact1));
persistResource(createDomain("party-night.net", "2244AABBC-NET", registrar2, contact2));
@@ -306,12 +306,12 @@ class Spec11PipelineTest {
return new DomainBase.Builder()
.setDomainName(domainName)
.setRepoId(repoId)
.setCreationClientId(registrar.getClientId())
.setCreationRegistrarId(registrar.getRegistrarId())
.setLastEppUpdateTime(fakeClock.nowUtc())
.setLastEppUpdateClientId(registrar.getClientId())
.setLastEppUpdateRegistrarId(registrar.getRegistrarId())
.setLastTransferTime(fakeClock.nowUtc())
.setRegistrant(contact.createVKey())
.setPersistedCurrentSponsorClientId(registrar.getClientId())
.setPersistedCurrentSponsorRegistrarId(registrar.getRegistrarId())
.setRegistrationExpirationTime(fakeClock.nowUtc().plusYears(1))
.setAuthInfo(DomainAuthInfo.create(PasswordAuth.create("password")))
.build();
core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java
+31 -30
View File
@@ -107,39 +107,40 @@ public class SyncRegistrarsSheetTest {
@TestOfyAndSql
void testRun() throws Exception {
persistResource(new Registrar.Builder()
.setClientId("anotherregistrar")
.setRegistrarName("Another Registrar LLC")
.setType(Registrar.Type.REAL)
.setIanaIdentifier(1L)
.setState(Registrar.State.ACTIVE)
.setInternationalizedAddress(new RegistrarAddress.Builder()
.setStreet(ImmutableList.of("I will get ignored :'("))
.setCity("Williamsburg")
.setState("NY")
.setZip("11211")
.setCountryCode("US")
.build())
.setLocalizedAddress(new RegistrarAddress.Builder()
.setStreet(ImmutableList.of(
"123 Main St",
"Suite 100"))
.setCity("Smalltown")
.setState("NY")
.setZip("11211")
.setCountryCode("US")
.build())
.setPhoneNumber("+1.2125551212")
.setFaxNumber("+1.2125551213")
.setEmailAddress("contact-us@example.com")
.setWhoisServer("whois.example.com")
.setUrl("http://www.example.org/another_registrar")
.setIcannReferralEmail("jim@example.net")
.build());
persistResource(
new Registrar.Builder()
.setRegistrarId("anotherregistrar")
.setRegistrarName("Another Registrar LLC")
.setType(Registrar.Type.REAL)
.setIanaIdentifier(1L)
.setState(Registrar.State.ACTIVE)
.setInternationalizedAddress(
new RegistrarAddress.Builder()
.setStreet(ImmutableList.of("I will get ignored :'("))
.setCity("Williamsburg")
.setState("NY")
.setZip("11211")
.setCountryCode("US")
.build())
.setLocalizedAddress(
new RegistrarAddress.Builder()
.setStreet(ImmutableList.of("123 Main St", "Suite 100"))
.setCity("Smalltown")
.setState("NY")
.setZip("11211")
.setCountryCode("US")
.build())
.setPhoneNumber("+1.2125551212")
.setFaxNumber("+1.2125551213")
.setEmailAddress("contact-us@example.com")
.setWhoisServer("whois.example.com")
.setUrl("http://www.example.org/another_registrar")
.setIcannReferralEmail("jim@example.net")
.build());
Registrar registrar =
new Registrar.Builder()
.setClientId("aaaregistrar")
.setRegistrarId("aaaregistrar")
.setRegistrarName("AAA Registrar Inc.")
.setType(Registrar.Type.REAL)
.setIanaIdentifier(8L)
core/src/test/java/google/registry/flows/EppControllerTest.java
+2 -2
View File
@@ -99,7 +99,7 @@ class EppControllerTest {
void beforeEach() throws Exception {
loggerToIntercept.addHandler(logHandler);
when(sessionMetadata.getClientId()).thenReturn("some-client");
when(sessionMetadata.getRegistrarId()).thenReturn("some-client");
when(flowComponentBuilder.flowModule(ArgumentMatchers.any())).thenReturn(flowComponentBuilder);
when(flowComponentBuilder.build()).thenReturn(flowComponent);
when(flowComponent.flowRunner()).thenReturn(flowRunner);
@@ -137,7 +137,7 @@ class EppControllerTest {
// actually get values.
EppMetric.Builder metricBuilder =
EppMetric.builderForRequest(clock)
.setClientId("some-client")
.setRegistrarId("some-client")
.setStatus(Code.SUCCESS_WITH_NO_MESSAGES)
.setTld("tld");
eppController.handleEppCommand(
core/src/test/java/google/registry/flows/EppLifecycleDomainTest.java
+1 -1
View File
@@ -545,7 +545,7 @@ class EppLifecycleDomainTest extends EppTestCase {
new BillingEvent.OneTime.Builder()
.setReason(Reason.FEE_EARLY_ACCESS)
.setTargetId("example.tld")
.setClientId("NewRegistrar")
.setRegistrarId("NewRegistrar")
.setPeriodYears(1)
.setCost(Money.parse("USD 100.00"))
.setEventTime(createTime)
core/src/test/java/google/registry/flows/EppPointInTimeTest.java
+1 -1
View File
@@ -70,7 +70,7 @@ class EppPointInTimeTest {
private void runFlow() throws Exception {
SessionMetadata sessionMetadata = new HttpSessionMetadata(new FakeHttpSession());
sessionMetadata.setClientId("TheRegistrar");
sessionMetadata.setRegistrarId("TheRegistrar");
DaggerEppTestComponent.builder()
.fakesAndMocksModule(FakesAndMocksModule.create(clock, EppMetric.builderForRequest(clock)))
.build()
core/src/test/java/google/registry/flows/EppTestCase.java
+9 -9
View File
@@ -136,13 +136,13 @@ public class EppTestCase {
return new CommandAsserter(inputFilename, inputSubstitutions);
}
CommandAsserter assertThatLogin(String clientId, String password) {
return assertThatCommand("login.xml", ImmutableMap.of("CLID", clientId, "PW", password))
CommandAsserter assertThatLogin(String registrarId, String password) {
return assertThatCommand("login.xml", ImmutableMap.of("CLID", registrarId, "PW", password))
.atTime(clock.nowUtc());
}
protected void assertThatLoginSucceeds(String clientId, String password) throws Exception {
assertThatLogin(clientId, password).atTime(clock.nowUtc()).hasSuccessfulLogin();
protected void assertThatLoginSucceeds(String registrarId, String password) throws Exception {
assertThatLogin(registrarId, password).atTime(clock.nowUtc()).hasSuccessfulLogin();
}
protected void assertThatLogoutSucceeds() throws Exception {
@@ -320,7 +320,7 @@ public class EppTestCase {
return new BillingEvent.OneTime.Builder()
.setReason(Reason.CREATE)
.setTargetId(domain.getDomainName())
.setClientId(domain.getCurrentSponsorClientId())
.setRegistrarId(domain.getCurrentSponsorRegistrarId())
.setCost(Money.parse("USD 26.00"))
.setPeriodYears(2)
.setEventTime(createTime)
@@ -334,7 +334,7 @@ public class EppTestCase {
return new BillingEvent.OneTime.Builder()
.setReason(Reason.RENEW)
.setTargetId(domain.getDomainName())
.setClientId(domain.getCurrentSponsorClientId())
.setRegistrarId(domain.getCurrentSponsorRegistrarId())
.setCost(Money.parse("USD 33.00"))
.setPeriodYears(3)
.setEventTime(renewTime)
@@ -370,7 +370,7 @@ public class EppTestCase {
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId(domain.getDomainName())
.setClientId(domain.getCurrentSponsorClientId())
.setRegistrarId(domain.getCurrentSponsorRegistrarId())
.setEventTime(eventTime)
.setRecurrenceEndTime(endTime)
.setParent(historyEntry)
@@ -382,7 +382,7 @@ public class EppTestCase {
DomainBase domain, OneTime billingEventToCancel, DateTime createTime, DateTime deleteTime) {
return new BillingEvent.Cancellation.Builder()
.setTargetId(domain.getDomainName())
.setClientId(domain.getCurrentSponsorClientId())
.setRegistrarId(domain.getCurrentSponsorRegistrarId())
.setEventTime(deleteTime)
.setOneTimeEventKey(VKey.from(findKeyToActualOneTimeBillingEvent(billingEventToCancel)))
.setBillingTime(createTime.plus(Registry.get(domain.getTld()).getAddGracePeriodLength()))
@@ -396,7 +396,7 @@ public class EppTestCase {
DomainBase domain, OneTime billingEventToCancel, DateTime renewTime, DateTime deleteTime) {
return new BillingEvent.Cancellation.Builder()
.setTargetId(domain.getDomainName())
.setClientId(domain.getCurrentSponsorClientId())
.setRegistrarId(domain.getCurrentSponsorRegistrarId())
.setEventTime(deleteTime)
.setOneTimeEventKey(VKey.from(findKeyToActualOneTimeBillingEvent(billingEventToCancel)))
.setBillingTime(renewTime.plus(Registry.get(domain.getTld()).getRenewGracePeriodLength()))
core/src/test/java/google/registry/flows/EppTlsActionTest.java
+2 -2
View File
@@ -37,7 +37,7 @@ class EppTlsActionTest {
action.inputXmlBytes = INPUT_XML_BYTES;
action.tlsCredentials = mock(TlsCredentials.class);
action.session = new FakeHttpSession();
action.session.setAttribute("CLIENT_ID", "ClientIdentifier");
action.session.setAttribute("REGISTRAR_ID", "ClientIdentifier");
action.eppRequestHandler = mock(EppRequestHandler.class);
action.run();
ArgumentCaptor<SessionMetadata> captor = ArgumentCaptor.forClass(SessionMetadata.class);
@@ -48,6 +48,6 @@ class EppTlsActionTest {
eq(false),
eq(false),
eq(INPUT_XML_BYTES));
assertThat(captor.getValue().getClientId()).isEqualTo("ClientIdentifier");
assertThat(captor.getValue().getRegistrarId()).isEqualTo("ClientIdentifier");
}
}
core/src/test/java/google/registry/flows/EppToolActionTest.java
+2 -2
View File
@@ -29,7 +29,7 @@ class EppToolActionTest {
private void doTest(boolean isDryRun, boolean isSuperuser) {
EppToolAction action = new EppToolAction();
action.clientId = "ClientIdentifier";
action.registrarId = "ClientIdentifier";
action.isDryRun = isDryRun;
action.isSuperuser = isSuperuser;
action.eppRequestHandler = mock(EppRequestHandler.class);
@@ -43,7 +43,7 @@ class EppToolActionTest {
eq(isDryRun),
eq(isSuperuser),
eq(action.xml.getBytes(UTF_8)));
assertThat(captor.getValue().getClientId()).isEqualTo("ClientIdentifier");
assertThat(captor.getValue().getRegistrarId()).isEqualTo("ClientIdentifier");
}
@Test
core/src/test/java/google/registry/flows/ExtensionManagerTest.java
+1 -1
View File
@@ -221,7 +221,7 @@ class ExtensionManagerTest {
ExtensionManager build() {
manager.flowClass = HelloFlow.class;
manager.clientId = manager.sessionMetadata.getClientId();
manager.registrarId = manager.sessionMetadata.getRegistrarId();
return manager;
}
}
core/src/test/java/google/registry/flows/FlowReporterTest.java
+2 -2
View File
@@ -60,7 +60,7 @@ class FlowReporterTest {
void beforeEach() {
LoggerConfig.getConfig(FlowReporter.class).addHandler(handler);
flowReporter.trid = Trid.create("client-123", "server-456");
flowReporter.clientId = "TheRegistrar";
flowReporter.registrarId = "TheRegistrar";
flowReporter.inputXmlBytes = "<xml/>".getBytes(UTF_8);
flowReporter.flowClass = TestCommandFlow.class;
flowReporter.eppInput = mock(EppInput.class);
@@ -101,7 +101,7 @@ class FlowReporterTest {
@Test
void testRecordToLogs_metadata_noClientId() throws Exception {
flowReporter.clientId = "";
flowReporter.registrarId = "";
flowReporter.recordToLogs();
Map<String, Object> json =
parseJsonMap(findFirstLogMessageByPrefix(handler, "FLOW-LOG-SIGNATURE-METADATA: "));
core/src/test/java/google/registry/flows/FlowRunnerTest.java
+2 -2
View File
@@ -80,7 +80,7 @@ class FlowRunnerTest {
@BeforeEach
void beforeEach() {
LoggerConfig.getConfig(FlowRunner.class).addHandler(handler);
flowRunner.clientId = "TheRegistrar";
flowRunner.registrarId = "TheRegistrar";
flowRunner.credentials = new PasswordOnlyTransportCredentials();
flowRunner.eppRequestSource = EppRequestSource.UNIT_TEST;
flowRunner.flowProvider = TestCommandFlow::new;
@@ -143,7 +143,7 @@ class FlowRunnerTest {
@Test
void testRun_loggingStatement_httpSessionMetadata() throws Exception {
flowRunner.sessionMetadata = new HttpSessionMetadata(new FakeHttpSession());
flowRunner.sessionMetadata.setClientId("TheRegistrar");
flowRunner.sessionMetadata.setRegistrarId("TheRegistrar");
flowRunner.run(eppMetricBuilder);
assertThat(Splitter.on("\n\t").split(findFirstLogMessageByPrefix(handler, "EPP Command\n\t")))
.contains(
core/src/test/java/google/registry/flows/FlowTestCase.java
+8 -8
View File
@@ -111,7 +111,7 @@ public abstract class FlowTestCase<F extends Flow> {
@BeforeEach
public void beforeEachFlowTestCase() {
sessionMetadata = new HttpSessionMetadata(new FakeHttpSession());
sessionMetadata.setClientId("TheRegistrar");
sessionMetadata.setRegistrarId("TheRegistrar");
sessionMetadata.setServiceExtensionUris(ProtocolDefinition.getVisibleServiceExtensionUris());
}
@@ -151,14 +151,14 @@ public abstract class FlowTestCase<F extends Flow> {
return eppLoader.getEpp().getCommandWrapper().getClTrid().orElse(null);
}
/** Gets the client ID that the flow will run as. */
protected String getClientIdForFlow() {
return sessionMetadata.getClientId();
/** Gets the ID of the registrar that the flow will run as. */
protected String getRegistrarIdForFlow() {
return sessionMetadata.getRegistrarId();
}
/** Sets the client ID that the flow will run as. */
protected void setClientIdForFlow(String clientId) {
sessionMetadata.setClientId(clientId);
/** Sets the ID of the registrar that the flow will run as. */
protected void setRegistrarIdForFlow(String registrarId) {
sessionMetadata.setRegistrarId(registrarId);
}
public void assertTransactionalFlow(boolean isTransactional) throws Exception {
@@ -192,7 +192,7 @@ public abstract class FlowTestCase<F extends Flow> {
entry.getKey().getType(),
entry.getKey().getDomainRepoId(),
entry.getKey().getExpirationTime(),
entry.getKey().getClientId(),
entry.getKey().getRegistrarId(),
null,
1L),
stripBillingEventId(entry.getValue()));
core/src/test/java/google/registry/flows/ResourceFlowTestCase.java
+5 -5
View File
@@ -122,7 +122,7 @@ public abstract class ResourceFlowTestCase<F extends Flow, R extends EppResource
@Test
void testRequiresLogin() {
sessionMetadata.setClientId(null);
sessionMetadata.setRegistrarId(null);
EppException thrown = assertThrows(NotLoggedInException.class, this::runFlow);
assertAboutEppExceptions().that(thrown).marshalsToXml();
}
@@ -166,12 +166,12 @@ public abstract class ResourceFlowTestCase<F extends Flow, R extends EppResource
assertTasksEnqueued("async-delete-pull", expected);
}
protected void assertClientIdFieldLogged(String clientId) {
assertAboutLogs().that(logHandler)
protected void assertClientIdFieldLogged(String registrarId) {
assertAboutLogs()
.that(logHandler)
.hasLogAtLevelWithMessage(Level.INFO, "FLOW-LOG-SIGNATURE-METADATA")
.which()
.contains("\"clientId\":" + JSONValue.toJSONString(clientId));
.contains("\"clientId\":" + JSONValue.toJSONString(registrarId));
}
protected void assertTldsFieldLogged(String... tlds) {
core/src/test/java/google/registry/flows/TlsCredentialsTest.java
+4 -4
View File
@@ -76,7 +76,7 @@ final class TlsCredentialsTest {
.build());
assertThrows(
MissingRegistrarCertificateException.class,
() -> tls.validateCertificateHash(Registrar.loadByClientId("TheRegistrar").get()));
() -> tls.validateCertificateHash(Registrar.loadByRegistrarId("TheRegistrar").get()));
}
@Test
@@ -91,7 +91,7 @@ final class TlsCredentialsTest {
.build());
assertThrows(
BadRegistrarIpAddressException.class,
() -> tls.validate(Registrar.loadByClientId("TheRegistrar").get(), "password"));
() -> tls.validate(Registrar.loadByRegistrarId("TheRegistrar").get(), "password"));
}
@Test
@@ -102,7 +102,7 @@ final class TlsCredentialsTest {
persistResource(loadRegistrar("TheRegistrar").asBuilder().build());
assertThrows(
RegistrarCertificateNotConfiguredException.class,
() -> tls.validateCertificateHash(Registrar.loadByClientId("TheRegistrar").get()));
() -> tls.validateCertificateHash(Registrar.loadByRegistrarId("TheRegistrar").get()));
}
@Test
@@ -117,6 +117,6 @@ final class TlsCredentialsTest {
.setFailoverClientCertificate(null, clock.nowUtc())
.build());
// This would throw a RegistrarCertificateNotConfiguredException if cert hashes wren't bypassed.
tls.validateCertificateHash(Registrar.loadByClientId("TheRegistrar").get());
tls.validateCertificateHash(Registrar.loadByRegistrarId("TheRegistrar").get());
}
}
core/src/test/java/google/registry/flows/contact/ContactCreateFlowTest.java
+1 -1
View File
@@ -100,7 +100,7 @@ class ContactCreateFlowTest extends ResourceFlowTestCase<ContactCreateFlow, Cont
persistResource(
newContactResource(targetId)
.asBuilder()
.setPersistedCurrentSponsorClientId("NewRegistrar")
.setPersistedCurrentSponsorRegistrarId("NewRegistrar")
.build());
ResourceCreateContentionException thrown =
assertThrows(ResourceCreateContentionException.class, this::runFlow);
core/src/test/java/google/registry/flows/contact/ContactDeleteFlowTest.java
+4 -4
View File
@@ -203,7 +203,7 @@ class ContactDeleteFlowTest extends ResourceFlowTestCase<ContactDeleteFlow, Cont
@TestOfyAndSql
void testFailure_unauthorizedClient() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
persistActiveContact(getUniqueIdFromCommand());
EppException thrown = assertThrows(ResourceNotOwnedException.class, this::runFlow);
assertAboutEppExceptions().that(thrown).marshalsToXml();
@@ -211,7 +211,7 @@ class ContactDeleteFlowTest extends ResourceFlowTestCase<ContactDeleteFlow, Cont
@TestOfyAndSql
void testSuccess_superuserUnauthorizedClient() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
persistActiveContact(getUniqueIdFromCommand());
clock.advanceOneMilli();
if (tm().isOfy()) {
@@ -243,11 +243,11 @@ class ContactDeleteFlowTest extends ResourceFlowTestCase<ContactDeleteFlow, Cont
assertIcannReportingActivityFieldLogged("srs-cont-delete");
}
private void assertOfyDeleteSuccess(String clientId, String clientTrid, boolean isSuperuser)
private void assertOfyDeleteSuccess(String registrarId, String clientTrid, boolean isSuperuser)
throws Exception {
ContactResource deletedContact = reloadResourceByForeignKey();
assertAsyncDeletionTaskEnqueued(
deletedContact, clientId, Trid.create(clientTrid, "server-trid"), isSuperuser);
deletedContact, registrarId, Trid.create(clientTrid, "server-trid"), isSuperuser);
assertAboutContacts()
.that(deletedContact)
.hasStatusValue(StatusValue.PENDING_DELETE)
core/src/test/java/google/registry/flows/contact/ContactInfoFlowTest.java
+46 -44
View File
@@ -58,47 +58,49 @@ class ContactInfoFlowTest extends ResourceFlowTestCase<ContactInfoFlow, ContactR
}
private ContactResource persistContactResource(boolean active) {
ContactResource contact = persistResource(
new ContactResource.Builder()
.setContactId("sh8013")
.setRepoId("2FF-ROID")
.setDeletionTime(active ? null : clock.nowUtc().minusDays(1))
.setStatusValues(ImmutableSet.of(StatusValue.CLIENT_DELETE_PROHIBITED))
.setInternationalizedPostalInfo(new PostalInfo.Builder()
.setType(Type.INTERNATIONALIZED)
.setName("John Doe")
.setOrg("Example Inc.")
.setAddress(new ContactAddress.Builder()
.setStreet(ImmutableList.of("123 Example Dr.", "Suite 100"))
.setCity("Dulles")
.setState("VA")
.setZip("20166-6503")
.setCountryCode("US")
.build())
.build())
.setVoiceNumber(
new ContactPhoneNumber.Builder()
.setPhoneNumber("+1.7035555555")
.setExtension("1234")
.build())
.setFaxNumber(
new ContactPhoneNumber.Builder()
.setPhoneNumber("+1.7035555556")
.build())
.setEmailAddress("jdoe@example.com")
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setCreationClientId("NewRegistrar")
.setLastEppUpdateClientId("NewRegistrar")
.setCreationTimeForTest(DateTime.parse("1999-04-03T22:00:00.0Z"))
.setLastEppUpdateTime(DateTime.parse("1999-12-03T09:00:00.0Z"))
.setLastTransferTime(DateTime.parse("2000-04-08T09:00:00.0Z"))
.setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("2fooBAR")))
.setDisclose(new Disclose.Builder()
.setFlag(true)
.setVoice(new PresenceMarker())
.setEmail(new PresenceMarker())
.build())
.build());
ContactResource contact =
persistResource(
new ContactResource.Builder()
.setContactId("sh8013")
.setRepoId("2FF-ROID")
.setDeletionTime(active ? null : clock.nowUtc().minusDays(1))
.setStatusValues(ImmutableSet.of(StatusValue.CLIENT_DELETE_PROHIBITED))
.setInternationalizedPostalInfo(
new PostalInfo.Builder()
.setType(Type.INTERNATIONALIZED)
.setName("John Doe")
.setOrg("Example Inc.")
.setAddress(
new ContactAddress.Builder()
.setStreet(ImmutableList.of("123 Example Dr.", "Suite 100"))
.setCity("Dulles")
.setState("VA")
.setZip("20166-6503")
.setCountryCode("US")
.build())
.build())
.setVoiceNumber(
new ContactPhoneNumber.Builder()
.setPhoneNumber("+1.7035555555")
.setExtension("1234")
.build())
.setFaxNumber(
new ContactPhoneNumber.Builder().setPhoneNumber("+1.7035555556").build())
.setEmailAddress("jdoe@example.com")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.setCreationRegistrarId("NewRegistrar")
.setLastEppUpdateRegistrarId("NewRegistrar")
.setCreationTimeForTest(DateTime.parse("1999-04-03T22:00:00.0Z"))
.setLastEppUpdateTime(DateTime.parse("1999-12-03T09:00:00.0Z"))
.setLastTransferTime(DateTime.parse("2000-04-08T09:00:00.0Z"))
.setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("2fooBAR")))
.setDisclose(
new Disclose.Builder()
.setFlag(true)
.setVoice(new PresenceMarker())
.setEmail(new PresenceMarker())
.build())
.build());
assertThat(isDeleted(contact, clock.nowUtc())).isNotEqualTo(active);
return contact;
}
@@ -146,7 +148,7 @@ class ContactInfoFlowTest extends ResourceFlowTestCase<ContactInfoFlow, ContactR
@TestOfyAndSql
void testFailure_otherRegistrar_notAuthorized() throws Exception {
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
persistContactResource(true);
// Check that the persisted contact info was returned.
assertTransactionalFlow(false);
@@ -156,7 +158,7 @@ class ContactInfoFlowTest extends ResourceFlowTestCase<ContactInfoFlow, ContactR
@TestOfyAndSql
void testSuccess_otherRegistrarWithoutAuthInfoAsSuperuser_doesNotSeeAuthInfo() throws Exception {
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
setEppInput("contact_info_no_authinfo.xml");
persistContactResource(true);
// Check that the persisted contact info was returned.
@@ -173,7 +175,7 @@ class ContactInfoFlowTest extends ResourceFlowTestCase<ContactInfoFlow, ContactR
@TestOfyAndSql
void testSuccess_otherRegistrarWithAuthInfoAsSuperuser_seesAuthInfo() throws Exception {
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
persistContactResource(true);
// Check that the persisted contact info was returned.
assertTransactionalFlow(false);
core/src/test/java/google/registry/flows/contact/ContactTransferApproveFlowTest.java
+10 -8
View File
@@ -59,7 +59,7 @@ class ContactTransferApproveFlowTest
@BeforeEach
void setUp() {
setEppInput("contact_transfer_approve.xml");
setClientIdForFlow("TheRegistrar");
setRegistrarIdForFlow("TheRegistrar");
setupContactWithPendingTransfer();
clock.advanceOneMilli();
createTld("foobar");
@@ -82,12 +82,14 @@ class ContactTransferApproveFlowTest
// Transfer should have succeeded. Verify correct fields were set.
contact = reloadResourceByForeignKey();
assertAboutContacts().that(contact)
.hasCurrentSponsorClientId("NewRegistrar").and()
.hasLastTransferTime(clock.nowUtc()).and()
assertAboutContacts()
.that(contact)
.hasCurrentSponsorRegistrarId("NewRegistrar")
.and()
.hasLastTransferTime(clock.nowUtc())
.and()
.hasOneHistoryEntryEachOfTypes(
HistoryEntry.Type.CONTACT_TRANSFER_REQUEST,
HistoryEntry.Type.CONTACT_TRANSFER_APPROVE);
HistoryEntry.Type.CONTACT_TRANSFER_REQUEST, HistoryEntry.Type.CONTACT_TRANSFER_APPROVE);
assertThat(contact.getTransferData())
.isEqualTo(
originalTransferData.copyConstantFieldsToBuilder()
@@ -217,7 +219,7 @@ class ContactTransferApproveFlowTest
@TestOfyAndSql
void testFailure_gainingClient() {
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
EppException thrown =
assertThrows(
ResourceNotOwnedException.class, () -> doFailingTest("contact_transfer_approve.xml"));
@@ -226,7 +228,7 @@ class ContactTransferApproveFlowTest
@TestOfyAndSql
void testFailure_unrelatedClient() {
setClientIdForFlow("ClientZ");
setRegistrarIdForFlow("ClientZ");
EppException thrown =
assertThrows(
ResourceNotOwnedException.class, () -> doFailingTest("contact_transfer_approve.xml"));
core/src/test/java/google/registry/flows/contact/ContactTransferCancelFlowTest.java
+10 -8
View File
@@ -56,7 +56,7 @@ class ContactTransferCancelFlowTest
@BeforeEach
void setUp() {
this.setEppInput("contact_transfer_cancel.xml");
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
setupContactWithPendingTransfer();
clock.advanceOneMilli();
}
@@ -76,12 +76,14 @@ class ContactTransferCancelFlowTest
// Transfer should have been cancelled. Verify correct fields were set.
contact = reloadResourceByForeignKey();
assertAboutContacts().that(contact)
.hasCurrentSponsorClientId("TheRegistrar").and()
.hasLastTransferTimeNotEqualTo(clock.nowUtc()).and()
assertAboutContacts()
.that(contact)
.hasCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTimeNotEqualTo(clock.nowUtc())
.and()
.hasOneHistoryEntryEachOfTypes(
HistoryEntry.Type.CONTACT_TRANSFER_REQUEST,
HistoryEntry.Type.CONTACT_TRANSFER_CANCEL);
HistoryEntry.Type.CONTACT_TRANSFER_REQUEST, HistoryEntry.Type.CONTACT_TRANSFER_CANCEL);
assertThat(contact.getTransferData())
.isEqualTo(
originalTransferData.copyConstantFieldsToBuilder()
@@ -203,7 +205,7 @@ class ContactTransferCancelFlowTest
@TestOfyAndSql
void testFailure_sponsoringClient() {
setClientIdForFlow("TheRegistrar");
setRegistrarIdForFlow("TheRegistrar");
EppException thrown =
assertThrows(
NotTransferInitiatorException.class,
@@ -213,7 +215,7 @@ class ContactTransferCancelFlowTest
@TestOfyAndSql
void testFailure_unrelatedClient() {
setClientIdForFlow("ClientZ");
setRegistrarIdForFlow("ClientZ");
EppException thrown =
assertThrows(
NotTransferInitiatorException.class,
core/src/test/java/google/registry/flows/contact/ContactTransferFlowTestCase.java
+4 -3
View File
@@ -58,7 +58,8 @@ abstract class ContactTransferFlowTestCase<F extends Flow, R extends EppResource
void beforeEachContactTransferFlowTestCase() {
// Registrar ClientZ is used in tests that need another registrar that definitely doesn't own
// the resources in question.
persistResource(AppEngineExtension.makeRegistrar1().asBuilder().setClientId("ClientZ").build());
persistResource(
AppEngineExtension.makeRegistrar1().asBuilder().setRegistrarId("ClientZ").build());
}
/** Adds a contact that has a pending transfer on it from TheRegistrar to NewRegistrar. */
@@ -82,7 +83,7 @@ abstract class ContactTransferFlowTestCase<F extends Flow, R extends EppResource
/** Changes the client ID that the flow will run as. */
@Override
protected void setClientIdForFlow(String clientId) {
sessionMetadata.setClientId(clientId);
protected void setRegistrarIdForFlow(String registrarId) {
sessionMetadata.setRegistrarId(registrarId);
}
}
core/src/test/java/google/registry/flows/contact/ContactTransferQueryFlowTest.java
+4 -4
View File
@@ -52,7 +52,7 @@ class ContactTransferQueryFlowTest
void setUp() {
setEppInput("contact_transfer_query.xml");
clock.setTo(DateTime.parse("2000-06-10T22:00:00.0Z"));
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
setupContactWithPendingTransfer();
}
@@ -88,13 +88,13 @@ class ContactTransferQueryFlowTest
@TestOfyAndSql
void testSuccess_sponsoringClient() throws Exception {
setClientIdForFlow("TheRegistrar");
setRegistrarIdForFlow("TheRegistrar");
doSuccessfulTest("contact_transfer_query.xml", "contact_transfer_query_response.xml");
}
@TestOfyAndSql
void testSuccess_withAuthinfo() throws Exception {
setClientIdForFlow("ClientZ");
setRegistrarIdForFlow("ClientZ");
doSuccessfulTest("contact_transfer_query_with_authinfo.xml",
"contact_transfer_query_response.xml");
}
@@ -183,7 +183,7 @@ class ContactTransferQueryFlowTest
@TestOfyAndSql
void testFailure_unrelatedClient() {
setClientIdForFlow("ClientZ");
setRegistrarIdForFlow("ClientZ");
EppException thrown =
assertThrows(
NotAuthorizedToViewTransferException.class,
core/src/test/java/google/registry/flows/contact/ContactTransferRejectFlowTest.java
+10 -8
View File
@@ -58,7 +58,7 @@ class ContactTransferRejectFlowTest
@BeforeEach
void setUp() {
setEppInput("contact_transfer_reject.xml");
setClientIdForFlow("TheRegistrar");
setRegistrarIdForFlow("TheRegistrar");
setupContactWithPendingTransfer();
clock.advanceOneMilli();
}
@@ -80,12 +80,14 @@ class ContactTransferRejectFlowTest
// Transfer should have failed. Verify correct fields were set.
contact = reloadResourceByForeignKey();
assertAboutContacts().that(contact)
.hasCurrentSponsorClientId("TheRegistrar").and()
.hasLastTransferTimeNotEqualTo(clock.nowUtc()).and()
assertAboutContacts()
.that(contact)
.hasCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTimeNotEqualTo(clock.nowUtc())
.and()
.hasOneHistoryEntryEachOfTypes(
HistoryEntry.Type.CONTACT_TRANSFER_REQUEST,
HistoryEntry.Type.CONTACT_TRANSFER_REJECT);
HistoryEntry.Type.CONTACT_TRANSFER_REQUEST, HistoryEntry.Type.CONTACT_TRANSFER_REJECT);
assertThat(contact.getTransferData())
.isEqualTo(
originalTransferData.copyConstantFieldsToBuilder()
@@ -218,7 +220,7 @@ class ContactTransferRejectFlowTest
@TestOfyAndSql
void testFailure_gainingClient() {
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
EppException thrown =
assertThrows(
ResourceNotOwnedException.class, () -> doFailingTest("contact_transfer_reject.xml"));
@@ -227,7 +229,7 @@ class ContactTransferRejectFlowTest
@TestOfyAndSql
void testFailure_unrelatedClient() {
setClientIdForFlow("ClientZ");
setRegistrarIdForFlow("ClientZ");
EppException thrown =
assertThrows(
ResourceNotOwnedException.class, () -> doFailingTest("contact_transfer_reject.xml"));
core/src/test/java/google/registry/flows/contact/ContactTransferRequestFlowTest.java
+11 -8
View File
@@ -75,7 +75,7 @@ class ContactTransferRequestFlowTest
@BeforeEach
void beforeEach() {
setEppInput("contact_transfer_request.xml");
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
contact = persistActiveContact("sh8013");
clock.advanceOneMilli();
}
@@ -91,8 +91,10 @@ class ContactTransferRequestFlowTest
// Transfer should have been requested. Verify correct fields were set.
contact = reloadResourceByForeignKey();
assertAboutContacts().that(contact)
.hasCurrentSponsorClientId("TheRegistrar").and()
assertAboutContacts()
.that(contact)
.hasCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasOnlyOneHistoryEntryWhich()
.hasType(HistoryEntry.Type.CONTACT_TRANSFER_REQUEST);
Trid expectedTrid =
@@ -104,8 +106,8 @@ class ContactTransferRequestFlowTest
new ContactTransferData.Builder()
.setTransferRequestTrid(expectedTrid)
.setTransferRequestTime(clock.nowUtc())
.setGainingClientId("NewRegistrar")
.setLosingClientId("TheRegistrar")
.setGainingRegistrarId("NewRegistrar")
.setLosingRegistrarId("TheRegistrar")
.setTransferStatus(TransferStatus.PENDING)
.setPendingTransferExpirationTime(afterTransfer)
// Make the server-approve entities field a no-op comparison; it's easier to
@@ -119,8 +121,9 @@ class ContactTransferRequestFlowTest
getOnlyElement(getPollMessages("TheRegistrar", clock.nowUtc()));
// If we fast forward AUTOMATIC_TRANSFER_DAYS the transfer should have happened.
assertAboutContacts().that(contact.cloneProjectedAtTime(afterTransfer))
.hasCurrentSponsorClientId("NewRegistrar");
assertAboutContacts()
.that(contact.cloneProjectedAtTime(afterTransfer))
.hasCurrentSponsorRegistrarId("NewRegistrar");
assertThat(getPollMessages("NewRegistrar", afterTransfer)).hasSize(1);
assertThat(getPollMessages("TheRegistrar", afterTransfer)).hasSize(2);
PollMessage gainingApproveMessage =
@@ -236,7 +239,7 @@ class ContactTransferRequestFlowTest
@TestOfyAndSql
void testFailure_sponsoringClient() {
setClientIdForFlow("TheRegistrar");
setRegistrarIdForFlow("TheRegistrar");
EppException thrown =
assertThrows(
ObjectAlreadySponsoredException.class,
core/src/test/java/google/registry/flows/contact/ContactUpdateFlowTest.java
+2 -2
View File
@@ -302,7 +302,7 @@ class ContactUpdateFlowTest extends ResourceFlowTestCase<ContactUpdateFlow, Cont
@TestOfyAndSql
void testFailure_unauthorizedClient() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
persistActiveContact(getUniqueIdFromCommand());
EppException thrown = assertThrows(ResourceNotOwnedException.class, this::runFlow);
assertAboutEppExceptions().that(thrown).marshalsToXml();
@@ -310,7 +310,7 @@ class ContactUpdateFlowTest extends ResourceFlowTestCase<ContactUpdateFlow, Cont
@TestOfyAndSql
void testSuccess_superuserUnauthorizedClient() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
persistActiveContact(getUniqueIdFromCommand());
clock.advanceOneMilli();
runFlowAssertResponse(
core/src/test/java/google/registry/flows/custom/TestDomainCreateFlowCustomLogic.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class TestDomainCreateFlowCustomLogic extends DomainCreateFlowCustomLogic
new PollMessage.OneTime.Builder()
.setParent(parameters.historyEntry())
.setEventTime(tm().getTransactionTime())
.setClientId(getSessionMetadata().getClientId())
.setRegistrarId(getSessionMetadata().getRegistrarId())
.setMsg("Custom logic was triggered")
.build();
return EntityChanges.newBuilder()
core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java
+10 -10
View File
@@ -282,7 +282,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
new BillingEvent.OneTime.Builder()
.setReason(Reason.CREATE)
.setTargetId(getUniqueIdFromCommand())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setCost(creationCost)
.setPeriodYears(2)
.setEventTime(clock.nowUtc())
@@ -297,7 +297,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId(getUniqueIdFromCommand())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(domain.getRegistrationExpirationTime())
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntry)
@@ -313,7 +313,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
new BillingEvent.OneTime.Builder()
.setReason(Reason.FEE_EARLY_ACCESS)
.setTargetId(getUniqueIdFromCommand())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setPeriodYears(1)
.setCost(eapFee)
.setEventTime(clock.nowUtc())
@@ -328,7 +328,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
domain,
new PollMessage.Autorenew.Builder()
.setTargetId(domain.getDomainName())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(domain.getRegistrationExpirationTime())
.setMsg("Domain was auto-renewed.")
.setParent(historyEntry)
@@ -1082,7 +1082,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
persistResource(
newDomainBase(targetId)
.asBuilder()
.setPersistedCurrentSponsorClientId("NewRegistrar")
.setPersistedCurrentSponsorRegistrarId("NewRegistrar")
.build());
ResourceCreateContentionException thrown =
assertThrows(ResourceCreateContentionException.class, this::runFlow);
@@ -1591,7 +1591,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
domain,
new PollMessage.Autorenew.Builder()
.setTargetId(domain.getDomainName())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(domain.getRegistrationExpirationTime())
.setMsg("Domain was auto-renewed.")
.setParent(historyEntry)
@@ -1599,7 +1599,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
new PollMessage.OneTime.Builder()
.setParent(historyEntry)
.setEventTime(domain.getCreationTime())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setMsg(DomainFlowUtils.COLLISION_MESSAGE)
.setResponseData(
ImmutableList.of(
@@ -1746,7 +1746,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
domain,
new PollMessage.Autorenew.Builder()
.setTargetId(domain.getDomainName())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(domain.getRegistrationExpirationTime())
.setMsg("Domain was auto-renewed.")
.setParent(historyEntry)
@@ -1754,7 +1754,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
new PollMessage.OneTime.Builder()
.setParent(historyEntry)
.setEventTime(domain.getCreationTime())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setMsg("Custom logic was triggered")
.setId(1L)
.build());
@@ -1978,7 +1978,7 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
private void doFailingTest_invalidRegistrarState(State registrarState) {
persistContactsAndHosts();
persistResource(
Registrar.loadByClientId("TheRegistrar")
Registrar.loadByRegistrarId("TheRegistrar")
.get()
.asBuilder()
.setState(registrarState)
core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java
+18 -18
View File
@@ -180,7 +180,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
.setType(DOMAIN_CREATE)
.setDomain(domain)
.setModificationTime(clock.nowUtc())
.setClientId(domain.getCreationClientId())
.setRegistrarId(domain.getCreationRegistrarId())
.build());
}
@@ -244,7 +244,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
new BillingEvent.Cancellation.Builder()
.setReason(graceBillingEvent.getReason())
.setTargetId("example.tld")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(eventTime)
.setBillingTime(TIME_BEFORE_FLOW.plusDays(1))
.setOneTimeEventKey(graceBillingEvent.createVKey())
@@ -252,18 +252,18 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
.build());
}
private void assertOnlyBillingEventIsClosedAutorenew(String clientId) {
private void assertOnlyBillingEventIsClosedAutorenew(String registrarId) {
// There should be no billing events (even timed to when the transfer would have expired) except
// for the now closed autorenew one.
assertBillingEvents(
createAutorenewBillingEvent(clientId).setRecurrenceEndTime(clock.nowUtc()).build());
createAutorenewBillingEvent(registrarId).setRecurrenceEndTime(clock.nowUtc()).build());
}
private BillingEvent.OneTime createBillingEvent(Reason reason, Money cost) {
return new BillingEvent.OneTime.Builder()
.setReason(reason)
.setTargetId("example.tld")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setCost(cost)
.setPeriodYears(2)
.setEventTime(TIME_BEFORE_FLOW.minusDays(4))
@@ -272,21 +272,21 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
.build();
}
private BillingEvent.Recurring.Builder createAutorenewBillingEvent(String clientId) {
private BillingEvent.Recurring.Builder createAutorenewBillingEvent(String registrarId) {
return new BillingEvent.Recurring.Builder()
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId("example.tld")
.setClientId(clientId)
.setRegistrarId(registrarId)
.setEventTime(A_MONTH_FROM_NOW)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(earlierHistoryEntry);
}
private PollMessage.Autorenew.Builder createAutorenewPollMessage(String clientId) {
private PollMessage.Autorenew.Builder createAutorenewPollMessage(String registrarId) {
return new PollMessage.Autorenew.Builder()
.setTargetId("example.tld")
.setClientId(clientId)
.setRegistrarId(registrarId)
.setEventTime(A_MONTH_FROM_NOW)
.setAutorenewEndTime(END_OF_TIME)
.setParent(earlierHistoryEntry);
@@ -374,7 +374,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
.setRedemptionGracePeriodLength(standardDays(3))
.setPendingDeleteLength(standardDays(2))
.build());
setClientIdForFlow("TheRegistrar");
setRegistrarIdForFlow("TheRegistrar");
setUpSuccessfulTest();
clock.advanceOneMilli();
@@ -633,7 +633,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
@TestOfyAndSql
void testSuccess_noPendingTransfer_deletedAndHasNoTransferData() throws Exception {
setClientIdForFlow("TheRegistrar");
setRegistrarIdForFlow("TheRegistrar");
setUpSuccessfulTest();
clock.advanceOneMilli();
runFlowAssertResponse(loadFile("domain_delete_response_pending.xml"));
@@ -643,7 +643,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
@TestOfyAndSql
void testSuccess_pendingTransfer() throws Exception {
setClientIdForFlow("TheRegistrar");
setRegistrarIdForFlow("TheRegistrar");
setUpSuccessfulTest();
// Modify the domain we are testing to include a pending transfer.
DomainTransferData oldTransferData =
@@ -823,7 +823,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
@TestOfyAndSql
void testFailure_unauthorizedClient() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
persistActiveDomain(getUniqueIdFromCommand());
EppException thrown = assertThrows(ResourceNotOwnedException.class, this::runFlow);
assertAboutEppExceptions().that(thrown).marshalsToXml();
@@ -831,7 +831,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
@TestOfyAndSql
void testSuccess_superuserUnauthorizedClient() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
setUpSuccessfulTest();
clock.advanceOneMilli();
runFlowAssertResponse(
@@ -840,7 +840,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
HistoryEntry deleteHistoryEntry = getOnlyHistoryEntryOfType(domain, DOMAIN_DELETE);
assertPollMessages(
new PollMessage.OneTime.Builder()
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setParent(deleteHistoryEntry)
.setEventTime(clock.nowUtc())
.setMsg(
@@ -848,7 +848,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
+ " effective: 2000-07-11T22:00:00.013Z")
.build(),
new PollMessage.OneTime.Builder()
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setParent(deleteHistoryEntry)
.setEventTime(DateTime.parse("2000-07-11T22:00:00.013Z"))
.setMsg("Deleted by registry administrator.")
@@ -1118,7 +1118,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
.setType(DOMAIN_CREATE)
.setDomain(domain)
.setModificationTime(TIME_BEFORE_FLOW.minusDays(1))
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setDomainTransactionRecords(ImmutableSet.of(existingRecord))
.build());
runFlow();
@@ -1224,7 +1224,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
@TestOfyAndSql
void testSuccess_immediateDelete_withSuperuserAndMetadataExtension() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
eppRequestSource = EppRequestSource.TOOL;
setEppInput(
"domain_delete_superuser_and_metadata_extension.xml",
core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java
+18 -17
View File
@@ -111,9 +111,10 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
@BeforeEach
void setup() {
setEppInput("domain_info.xml");
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
createTld("tld");
persistResource(AppEngineExtension.makeRegistrar1().asBuilder().setClientId("ClientZ").build());
persistResource(
AppEngineExtension.makeRegistrar1().asBuilder().setRegistrarId("ClientZ").build());
}
private void persistTestEntities(String domainName, boolean inactive) {
@@ -126,9 +127,9 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
new DomainBase.Builder()
.setDomainName(domainName)
.setRepoId("2FF-TLD")
.setPersistedCurrentSponsorClientId("NewRegistrar")
.setCreationClientId("TheRegistrar")
.setLastEppUpdateClientId("NewRegistrar")
.setPersistedCurrentSponsorRegistrarId("NewRegistrar")
.setCreationRegistrarId("TheRegistrar")
.setLastEppUpdateRegistrarId("NewRegistrar")
.setCreationTimeForTest(DateTime.parse("1999-04-03T22:00:00.0Z"))
.setLastEppUpdateTime(DateTime.parse("1999-12-03T09:00:00.0Z"))
.setLastTransferTime(DateTime.parse("2000-04-08T09:00:00.0Z"))
@@ -274,14 +275,14 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
@TestOfyAndSql
void testSuccess_unauthorized() throws Exception {
sessionMetadata.setClientId("ClientZ");
sessionMetadata.setRegistrarId("ClientZ");
doSuccessfulTest("domain_info_response_unauthorized.xml");
}
@TestOfyAndSql
void testSuccess_differentRegistrarWithAuthInfo() throws Exception {
setEppInput("domain_info_with_auth.xml");
sessionMetadata.setClientId("ClientZ");
sessionMetadata.setRegistrarId("ClientZ");
doSuccessfulTest("domain_info_response.xml");
}
@@ -290,7 +291,7 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
persistTestEntities(false);
setEppInput("domain_info_with_contact_auth.xml");
eppLoader.replaceAll("JD1234-REP", registrant.getRepoId());
sessionMetadata.setClientId("ClientZ");
sessionMetadata.setRegistrarId("ClientZ");
doSuccessfulTest("domain_info_response.xml", false);
}
@@ -299,7 +300,7 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
persistTestEntities(false);
setEppInput("domain_info_with_contact_auth.xml");
eppLoader.replaceAll("JD1234-REP", registrant.getRepoId());
sessionMetadata.setClientId("ClientZ");
sessionMetadata.setRegistrarId("ClientZ");
doSuccessfulTest("domain_info_response.xml", false);
}
@@ -343,12 +344,12 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
clock.nowUtc().plusDays(1),
"TheRegistrar",
null))
.setCreationClientId("NewRegistrar")
.setCreationRegistrarId("NewRegistrar")
.setCreationTimeForTest(DateTime.parse("2003-11-26T22:00:00.0Z"))
.setRegistrationExpirationTime(DateTime.parse("2005-11-26T22:00:00.0Z"))
.setLastTransferTime(null)
.setLastEppUpdateTime(null)
.setLastEppUpdateClientId(null)
.setLastEppUpdateRegistrarId(null)
.build());
doSuccessfulTest("domain_info_response_addperiod.xml", false);
}
@@ -367,7 +368,7 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
.setDomain(domain)
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setModificationTime(clock.nowUtc())
.setClientId(domain.getCreationClientId())
.setRegistrarId(domain.getCreationRegistrarId())
.build());
BillingEvent.Recurring renewEvent =
persistResource(
@@ -375,7 +376,7 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId(getUniqueIdFromCommand())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(clock.nowUtc())
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntry)
@@ -562,7 +563,7 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
.asBuilder()
.setAuthInfo(DomainAuthInfo.create(PasswordAuth.create("diffpw")))
.build());
sessionMetadata.setClientId("ClientZ");
sessionMetadata.setRegistrarId("ClientZ");
setEppInput("domain_info_with_auth.xml");
EppException thrown = assertThrows(BadAuthInfoForResourceException.class, this::runFlow);
assertAboutEppExceptions().that(thrown).marshalsToXml();
@@ -592,7 +593,7 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
.asBuilder()
.setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("diffpw")))
.build());
sessionMetadata.setClientId("ClientZ");
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());
@@ -627,7 +628,7 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
.asBuilder()
.setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("diffpw")))
.build());
sessionMetadata.setClientId("ClientZ");
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());
@@ -656,7 +657,7 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
void testFailure_differentRegistrarUnrelatedContactAuthInfo() {
persistTestEntities(false);
ContactResource unrelatedContact = persistActiveContact("foo1234");
sessionMetadata.setClientId("ClientZ");
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());
core/src/test/java/google/registry/flows/domain/DomainRenewFlowTest.java
+13 -13
View File
@@ -130,14 +130,14 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
.setDomain(domain)
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setModificationTime(clock.nowUtc())
.setClientId(domain.getCreationClientId())
.setRegistrarId(domain.getCreationRegistrarId())
.build();
BillingEvent.Recurring autorenewEvent =
new BillingEvent.Recurring.Builder()
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId(getUniqueIdFromCommand())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(expirationTime)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntryDomainCreate)
@@ -145,7 +145,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
PollMessage.Autorenew autorenewPollMessage =
new PollMessage.Autorenew.Builder()
.setTargetId(getUniqueIdFromCommand())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(expirationTime)
.setAutorenewEndTime(END_OF_TIME)
.setMsg("Domain was auto-renewed.")
@@ -222,7 +222,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
new BillingEvent.OneTime.Builder()
.setReason(Reason.RENEW)
.setTargetId(getUniqueIdFromCommand())
.setClientId(renewalClientId)
.setRegistrarId(renewalClientId)
.setCost(totalRenewCost)
.setPeriodYears(renewalYears)
.setEventTime(clock.nowUtc())
@@ -235,7 +235,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId(getUniqueIdFromCommand())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(expirationTime)
.setRecurrenceEndTime(clock.nowUtc())
.setParent(
@@ -246,7 +246,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId(getUniqueIdFromCommand())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(domain.getRegistrationExpirationTime())
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntryDomainRenew)
@@ -256,7 +256,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
assertPollMessages(
new PollMessage.Autorenew.Builder()
.setTargetId(getUniqueIdFromCommand())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(domain.getRegistrationExpirationTime())
.setAutorenewEndTime(END_OF_TIME)
.setMsg("Domain was auto-renewed.")
@@ -296,7 +296,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
@TestOfyAndSql
void testSuccess_recurringClientIdIsSame_whenSuperuserOverridesRenewal() throws Exception {
persistDomain();
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
doSuccessfulTest(
"domain_renew_response.xml",
5,
@@ -466,7 +466,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
private void doFailingTest_invalidRegistrarState(State registrarState) {
persistResource(
Registrar.loadByClientId("TheRegistrar")
Registrar.loadByRegistrarId("TheRegistrar")
.get()
.asBuilder()
.setState(registrarState)
@@ -515,7 +515,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
assertPollMessages(
new PollMessage.Autorenew.Builder()
.setTargetId(getUniqueIdFromCommand())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(expirationTime.minusYears(1))
.setAutorenewEndTime(clock.nowUtc())
.setMsg("Domain was auto-renewed.")
@@ -525,7 +525,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
.build(),
new PollMessage.Autorenew.Builder()
.setTargetId(getUniqueIdFromCommand())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(reloadResourceByForeignKey().getRegistrationExpirationTime())
.setAutorenewEndTime(END_OF_TIME)
.setMsg("Domain was auto-renewed.")
@@ -743,7 +743,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
@TestOfyAndSql
void testFailure_unauthorizedClient() throws Exception {
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
persistActiveDomain(getUniqueIdFromCommand());
EppException thrown = assertThrows(ResourceNotOwnedException.class, this::runFlow);
assertAboutEppExceptions().that(thrown).marshalsToXml();
@@ -751,7 +751,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
@TestOfyAndSql
void testSuccess_superuserUnauthorizedClient() throws Exception {
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
persistDomain();
runFlowAssertResponse(
CommitMode.LIVE,
core/src/test/java/google/registry/flows/domain/DomainRestoreRequestFlowTest.java
+13 -13
View File
@@ -117,7 +117,7 @@ class DomainRestoreRequestFlowTest
new DomainHistory.Builder()
.setType(HistoryEntry.Type.DOMAIN_DELETE)
.setModificationTime(clock.nowUtc())
.setClientId(domain.getCurrentSponsorClientId())
.setRegistrarId(domain.getCurrentSponsorRegistrarId())
.setDomain(domain)
.build());
persistResource(
@@ -136,7 +136,7 @@ class DomainRestoreRequestFlowTest
.setDeletePollMessage(
persistResource(
new PollMessage.OneTime.Builder()
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(clock.nowUtc().plusDays(5))
.setParent(historyEntry)
.build())
@@ -190,7 +190,7 @@ class DomainRestoreRequestFlowTest
"TheRegistrar",
new PollMessage.Autorenew.Builder()
.setTargetId("example.tld")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(domain.getRegistrationExpirationTime())
.setAutorenewEndTime(END_OF_TIME)
.setMsg("Domain was auto-renewed.")
@@ -203,7 +203,7 @@ class DomainRestoreRequestFlowTest
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId("example.tld")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(expirationTime)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntryDomainRestore)
@@ -211,7 +211,7 @@ class DomainRestoreRequestFlowTest
new BillingEvent.OneTime.Builder()
.setReason(Reason.RESTORE)
.setTargetId("example.tld")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setCost(Money.of(USD, 17))
.setPeriodYears(1)
.setEventTime(clock.nowUtc())
@@ -259,7 +259,7 @@ class DomainRestoreRequestFlowTest
"TheRegistrar",
new PollMessage.Autorenew.Builder()
.setTargetId("example.tld")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(domain.getRegistrationExpirationTime())
.setAutorenewEndTime(END_OF_TIME)
.setMsg("Domain was auto-renewed.")
@@ -272,7 +272,7 @@ class DomainRestoreRequestFlowTest
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId("example.tld")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(newExpirationTime)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntryDomainRestore)
@@ -280,7 +280,7 @@ class DomainRestoreRequestFlowTest
new BillingEvent.OneTime.Builder()
.setReason(Reason.RESTORE)
.setTargetId("example.tld")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setCost(Money.of(USD, 17))
.setPeriodYears(1)
.setEventTime(clock.nowUtc())
@@ -290,7 +290,7 @@ class DomainRestoreRequestFlowTest
new BillingEvent.OneTime.Builder()
.setReason(Reason.RENEW)
.setTargetId("example.tld")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setCost(Money.of(USD, 11))
.setPeriodYears(1)
.setEventTime(clock.nowUtc())
@@ -498,7 +498,7 @@ class DomainRestoreRequestFlowTest
@TestOfyAndSql
void testFailure_suspendedRegistrarCantRestoreDomain() {
persistResource(
Registrar.loadByClientId("TheRegistrar")
Registrar.loadByRegistrarId("TheRegistrar")
.get()
.asBuilder()
.setState(State.SUSPENDED)
@@ -511,7 +511,7 @@ class DomainRestoreRequestFlowTest
@TestOfyAndSql
void testFailure_pendingRegistrarCantRestoreDomain() {
persistResource(
Registrar.loadByClientId("TheRegistrar")
Registrar.loadByRegistrarId("TheRegistrar")
.get()
.asBuilder()
.setState(State.PENDING)
@@ -668,7 +668,7 @@ class DomainRestoreRequestFlowTest
@TestOfyAndSql
void testFailure_unauthorizedClient() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
persistPendingDeleteDomain();
EppException thrown = assertThrows(ResourceNotOwnedException.class, this::runFlow);
assertAboutEppExceptions().that(thrown).marshalsToXml();
@@ -676,7 +676,7 @@ class DomainRestoreRequestFlowTest
@TestOfyAndSql
void testSuccess_superuserUnauthorizedClient() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
persistPendingDeleteDomain();
EppException thrown =
assertThrows(
core/src/test/java/google/registry/flows/domain/DomainTransferApproveFlowTest.java
+7 -7
View File
@@ -112,7 +112,7 @@ class DomainTransferApproveFlowTest
.put(TRANSFER_REQUEST_TIME.plusMillis(1), Money.of(USD, 333))
.build())
.build());
setClientIdForFlow("TheRegistrar");
setRegistrarIdForFlow("TheRegistrar");
createTld("extra");
setupDomainWithPendingTransfer("example", "tld");
clock.advanceOneMilli();
@@ -121,7 +121,7 @@ class DomainTransferApproveFlowTest
private void assertTransferApproved(DomainBase domain, DomainTransferData oldTransferData) {
assertAboutDomains()
.that(domain)
.hasCurrentSponsorClientId("NewRegistrar")
.hasCurrentSponsorRegistrarId("NewRegistrar")
.and()
.hasLastTransferTime(clock.nowUtc())
.and()
@@ -270,7 +270,7 @@ class DomainTransferApproveFlowTest
.setTargetId(domain.getDomainName())
.setEventTime(clock.nowUtc())
.setBillingTime(clock.nowUtc().plus(registry.getTransferGracePeriodLength()))
.setClientId("NewRegistrar")
.setRegistrarId("NewRegistrar")
.setCost(Money.of(USD, 11).multipliedBy(expectedYearsToCharge))
.setPeriodYears(expectedYearsToCharge)
.setParent(historyEntryTransferApproved)
@@ -409,7 +409,7 @@ class DomainTransferApproveFlowTest
new BillingEvent.Cancellation.Builder()
.setReason(Reason.RENEW)
.setTargetId("example.tld")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(clock.nowUtc()) // The cancellation happens at the moment of transfer.
.setBillingTime(
oldExpirationTime.plus(Registry.get("tld").getAutoRenewGracePeriodLength()))
@@ -503,7 +503,7 @@ class DomainTransferApproveFlowTest
@TestOfyAndSql
void testFailure_gainingClient() {
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
EppException thrown =
assertThrows(
ResourceNotOwnedException.class, () -> doFailingTest("domain_transfer_approve.xml"));
@@ -512,7 +512,7 @@ class DomainTransferApproveFlowTest
@TestOfyAndSql
void testFailure_unrelatedClient() {
setClientIdForFlow("ClientZ");
setRegistrarIdForFlow("ClientZ");
EppException thrown =
assertThrows(
ResourceNotOwnedException.class, () -> doFailingTest("domain_transfer_approve.xml"));
@@ -608,7 +608,7 @@ class DomainTransferApproveFlowTest
.setType(DOMAIN_TRANSFER_REQUEST)
.setDomain(domain)
.setModificationTime(clock.nowUtc().minusDays(4))
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setDomainTransactionRecords(
ImmutableSet.of(previousSuccessRecord, notCancellableRecord))
.build());
core/src/test/java/google/registry/flows/domain/DomainTransferCancelFlowTest.java
+10 -10
View File
@@ -76,7 +76,7 @@ class DomainTransferCancelFlowTest
@BeforeEach
void setUp() {
setEppInput("domain_transfer_cancel.xml");
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
setupDomainWithPendingTransfer("example", "tld");
}
@@ -99,7 +99,7 @@ class DomainTransferCancelFlowTest
"NewRegistrar",
new PollMessage.Autorenew.Builder()
.setTargetId(getUniqueIdFromCommand())
.setClientId("NewRegistrar")
.setRegistrarId("NewRegistrar")
.setEventTime(EXTENDED_REGISTRATION_EXPIRATION_TIME)
.setAutorenewEndTime(END_OF_TIME)
.setMsg("Domain was auto-renewed.")
@@ -151,7 +151,7 @@ class DomainTransferCancelFlowTest
getOnlyHistoryEntryOfType(domain, DOMAIN_TRANSFER_CANCEL);
assertAboutHistoryEntries()
.that(historyEntryTransferCancel)
.hasClientId("NewRegistrar")
.hasRegistrarId("NewRegistrar")
.and()
.hasOtherClientId("TheRegistrar");
// The only billing event left should be the original autorenew event, now reopened.
@@ -166,14 +166,14 @@ class DomainTransferCancelFlowTest
"TheRegistrar",
new PollMessage.Autorenew.Builder()
.setTargetId(getUniqueIdFromCommand())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(originalExpirationTime)
.setAutorenewEndTime(END_OF_TIME)
.setMsg("Domain was auto-renewed.")
.setParent(getOnlyHistoryEntryOfType(domain, DOMAIN_CREATE))
.build(),
new PollMessage.OneTime.Builder()
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(clock.nowUtc())
.setResponseData(
ImmutableList.of(
@@ -181,8 +181,8 @@ class DomainTransferCancelFlowTest
.setFullyQualifiedDomainName(getUniqueIdFromCommand())
.setTransferStatus(TransferStatus.CLIENT_CANCELLED)
.setTransferRequestTime(TRANSFER_REQUEST_TIME)
.setGainingClientId("NewRegistrar")
.setLosingClientId("TheRegistrar")
.setGainingRegistrarId("NewRegistrar")
.setLosingRegistrarId("TheRegistrar")
.setPendingTransferExpirationTime(clock.nowUtc())
.build()))
.setMsg("Transfer cancelled.")
@@ -312,7 +312,7 @@ class DomainTransferCancelFlowTest
@TestOfyAndSql
void testFailure_sponsoringClient() {
setClientIdForFlow("TheRegistrar");
setRegistrarIdForFlow("TheRegistrar");
EppException thrown =
assertThrows(
NotTransferInitiatorException.class, () -> doFailingTest("domain_transfer_cancel.xml"));
@@ -321,7 +321,7 @@ class DomainTransferCancelFlowTest
@TestOfyAndSql
void testFailure_unrelatedClient() {
setClientIdForFlow("ClientZ");
setRegistrarIdForFlow("ClientZ");
EppException thrown =
assertThrows(
NotTransferInitiatorException.class, () -> doFailingTest("domain_transfer_cancel.xml"));
@@ -406,7 +406,7 @@ class DomainTransferCancelFlowTest
.setType(DOMAIN_TRANSFER_REQUEST)
.setDomain(domain)
.setModificationTime(clock.nowUtc().minusDays(4))
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setDomainTransactionRecords(
ImmutableSet.of(previousSuccessRecord, notCancellableRecord))
.build());
core/src/test/java/google/registry/flows/domain/DomainTransferFlowTestCase.java
+11 -8
View File
@@ -85,7 +85,8 @@ abstract class DomainTransferFlowTestCase<F extends Flow, R extends EppResource>
void beforeEachDomainTransferFlowTestCase() {
// Registrar ClientZ is used in tests that need another registrar that definitely doesn't own
// the resources in question.
persistResource(AppEngineExtension.makeRegistrar1().asBuilder().setClientId("ClientZ").build());
persistResource(
AppEngineExtension.makeRegistrar1().asBuilder().setRegistrarId("ClientZ").build());
}
static DomainBase persistWithPendingTransfer(DomainBase domain) {
@@ -113,8 +114,8 @@ abstract class DomainTransferFlowTestCase<F extends Flow, R extends EppResource>
new HostResource.Builder()
.setRepoId("2-".concat(Ascii.toUpperCase(tld)))
.setHostName("ns1." + label + "." + tld)
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setCreationClientId("TheRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.setCreationTimeForTest(DateTime.parse("1999-04-03T22:00:00.0Z"))
.setSuperordinateDomain(domain.createVKey())
.build());
@@ -139,7 +140,7 @@ abstract class DomainTransferFlowTestCase<F extends Flow, R extends EppResource>
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId(domain.getDomainName())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(REGISTRATION_EXPIRATION_TIME)
.setRecurrenceEndTime(TRANSFER_EXPIRATION_TIME)
.setParent(historyEntryDomainCreate)
@@ -152,7 +153,7 @@ abstract class DomainTransferFlowTestCase<F extends Flow, R extends EppResource>
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId(domain.getDomainName())
.setClientId("NewRegistrar")
.setRegistrarId("NewRegistrar")
.setEventTime(EXTENDED_REGISTRATION_EXPIRATION_TIME)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(
@@ -163,9 +164,11 @@ abstract class DomainTransferFlowTestCase<F extends Flow, R extends EppResource>
void assertTransferFailed(
DomainBase domain, TransferStatus status, TransferData oldTransferData) {
assertAboutDomains().that(domain)
.doesNotHaveStatusValue(StatusValue.PENDING_TRANSFER).and()
.hasCurrentSponsorClientId("TheRegistrar");
assertAboutDomains()
.that(domain)
.doesNotHaveStatusValue(StatusValue.PENDING_TRANSFER)
.and()
.hasCurrentSponsorRegistrarId("TheRegistrar");
// The domain TransferData should reflect the failed transfer as we expect, with
// all the speculative server-approve fields nulled out.
assertThat(domain.getTransferData())
core/src/test/java/google/registry/flows/domain/DomainTransferQueryFlowTest.java
+5 -5
View File
@@ -53,7 +53,7 @@ class DomainTransferQueryFlowTest
@BeforeEach
void beforeEach() {
setEppInput("domain_transfer_query.xml");
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
setupDomainWithPendingTransfer("example", "tld");
}
@@ -95,20 +95,20 @@ class DomainTransferQueryFlowTest
@TestOfyAndSql
void testSuccess_sponsoringClient() throws Exception {
setClientIdForFlow("TheRegistrar");
setRegistrarIdForFlow("TheRegistrar");
doSuccessfulTest("domain_transfer_query.xml", "domain_transfer_query_response.xml", 1);
}
@TestOfyAndSql
void testSuccess_domainAuthInfo() throws Exception {
setClientIdForFlow("ClientZ");
setRegistrarIdForFlow("ClientZ");
doSuccessfulTest(
"domain_transfer_query_domain_authinfo.xml", "domain_transfer_query_response.xml", 1);
}
@TestOfyAndSql
void testSuccess_contactAuthInfo() throws Exception {
setClientIdForFlow("ClientZ");
setRegistrarIdForFlow("ClientZ");
doSuccessfulTest(
"domain_transfer_query_contact_authinfo.xml", "domain_transfer_query_response.xml", 1);
}
@@ -214,7 +214,7 @@ class DomainTransferQueryFlowTest
@TestOfyAndSql
void testFailure_unrelatedClient() {
setClientIdForFlow("ClientZ");
setRegistrarIdForFlow("ClientZ");
EppException thrown =
assertThrows(
NotAuthorizedToViewTransferException.class,
core/src/test/java/google/registry/flows/domain/DomainTransferRejectFlowTest.java
+4 -4
View File
@@ -78,7 +78,7 @@ class DomainTransferRejectFlowTest
@BeforeEach
void setUp() {
setEppInput("domain_transfer_reject.xml");
setClientIdForFlow("TheRegistrar");
setRegistrarIdForFlow("TheRegistrar");
setupDomainWithPendingTransfer("example", "tld");
clock.advanceOneMilli();
}
@@ -295,7 +295,7 @@ class DomainTransferRejectFlowTest
@TestOfyAndSql
void testFailure_gainingClient() {
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
EppException thrown =
assertThrows(
ResourceNotOwnedException.class, () -> doFailingTest("domain_transfer_reject.xml"));
@@ -304,7 +304,7 @@ class DomainTransferRejectFlowTest
@TestOfyAndSql
void testFailure_unrelatedClient() {
setClientIdForFlow("ClientZ");
setRegistrarIdForFlow("ClientZ");
EppException thrown =
assertThrows(
ResourceNotOwnedException.class, () -> doFailingTest("domain_transfer_reject.xml"));
@@ -372,7 +372,7 @@ class DomainTransferRejectFlowTest
.setType(DOMAIN_TRANSFER_REQUEST)
.setDomain(domain)
.setModificationTime(clock.nowUtc().minusDays(4))
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setDomainTransactionRecords(
ImmutableSet.of(previousSuccessRecord, notCancellableRecord))
.build());
core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java
+15 -15
View File
@@ -166,7 +166,7 @@ class DomainTransferRequestFlowTest
@BeforeEach
void setUp() {
setEppInput("domain_transfer_request.xml");
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
}
private void assertTransferRequested(
@@ -177,7 +177,7 @@ class DomainTransferRequestFlowTest
throws Exception {
assertAboutDomains()
.that(domain)
.hasCurrentSponsorClientId("TheRegistrar")
.hasCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasStatusValue(StatusValue.PENDING_TRANSFER)
.and()
@@ -196,8 +196,8 @@ class DomainTransferRequestFlowTest
domain
.getTransferData()
.asBuilder()
.setGainingClientId("NewRegistrar")
.setLosingClientId("TheRegistrar")
.setGainingRegistrarId("NewRegistrar")
.setLosingRegistrarId("TheRegistrar")
.setTransferRequestTrid(expectedTrid)
.setTransferRequestTime(clock.nowUtc())
.setTransferPeriod(expectedPeriod)
@@ -214,7 +214,7 @@ class DomainTransferRequestFlowTest
throws Exception {
assertAboutDomains()
.that(domain)
.hasCurrentSponsorClientId("NewRegistrar")
.hasCurrentSponsorRegistrarId("NewRegistrar")
.and()
.hasLastTransferTime(automaticTransferTime)
.and()
@@ -226,8 +226,8 @@ class DomainTransferRequestFlowTest
assertThat(domain.getTransferData())
.isEqualTo(
new DomainTransferData.Builder()
.setGainingClientId("NewRegistrar")
.setLosingClientId("TheRegistrar")
.setGainingRegistrarId("NewRegistrar")
.setLosingRegistrarId("TheRegistrar")
.setTransferRequestTrid(expectedTrid)
.setTransferRequestTime(clock.nowUtc())
.setTransferPeriod(expectedPeriod)
@@ -268,7 +268,7 @@ class DomainTransferRequestFlowTest
.setEventTime(implicitTransferTime)
.setBillingTime(
implicitTransferTime.plus(registry.getTransferGracePeriodLength()))
.setClientId("NewRegistrar")
.setRegistrarId("NewRegistrar")
.setCost(transferCost.orElse(Money.of(USD, 11)))
.setPeriodYears(1)
.setParent(historyEntryTransferRequest)
@@ -323,7 +323,7 @@ class DomainTransferRequestFlowTest
Sets.union(expectedServeApproveBillingEvents, extraBillingEvents));
// The domain's autorenew billing event should still point to the losing client's event.
BillingEvent.Recurring domainAutorenewEvent = loadByKey(domain.getAutorenewBillingEvent());
assertThat(domainAutorenewEvent.getClientId()).isEqualTo("TheRegistrar");
assertThat(domainAutorenewEvent.getRegistrarId()).isEqualTo("TheRegistrar");
assertThat(domainAutorenewEvent.getRecurrenceEndTime()).isEqualTo(implicitTransferTime);
// The original grace periods should remain untouched.
assertThat(domain.getGracePeriods()).containsExactlyElementsIn(originalGracePeriods);
@@ -804,7 +804,7 @@ class DomainTransferRequestFlowTest
setupDomain("example", "tld");
clock.advanceOneMilli();
persistResource(
Registrar.loadByClientId("NewRegistrar")
Registrar.loadByRegistrarId("NewRegistrar")
.get()
.asBuilder()
.setState(State.SUSPENDED)
@@ -821,7 +821,7 @@ class DomainTransferRequestFlowTest
setupDomain("example", "tld");
clock.advanceOneMilli();
persistResource(
Registrar.loadByClientId("NewRegistrar")
Registrar.loadByRegistrarId("NewRegistrar")
.get()
.asBuilder()
.setState(State.PENDING)
@@ -868,7 +868,7 @@ class DomainTransferRequestFlowTest
setupDomain("example", "tld");
clock.advanceOneMilli();
persistResource(
Registrar.loadByClientId("TheRegistrar")
Registrar.loadByRegistrarId("TheRegistrar")
.get()
.asBuilder()
.setState(State.SUSPENDED)
@@ -1129,7 +1129,7 @@ class DomainTransferRequestFlowTest
new BillingEvent.Cancellation.Builder()
.setReason(Reason.RENEW)
.setTargetId("example.tld")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
// The cancellation happens at the moment of transfer.
.setEventTime(clock.nowUtc().plus(Registry.get("tld").getAutomaticTransferLength()))
.setBillingTime(autorenewTime.plus(Registry.get("tld").getAutoRenewGracePeriodLength()))
@@ -1156,7 +1156,7 @@ class DomainTransferRequestFlowTest
new BillingEvent.Cancellation.Builder()
.setReason(Reason.RENEW)
.setTargetId("example.tld")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
// The cancellation happens at the moment of transfer.
.setEventTime(clock.nowUtc().plus(Registry.get("tld").getAutomaticTransferLength()))
.setBillingTime(
@@ -1421,7 +1421,7 @@ class DomainTransferRequestFlowTest
@TestOfyAndSql
void testFailure_sponsoringClient() {
setupDomain("example", "tld");
setClientIdForFlow("TheRegistrar");
setRegistrarIdForFlow("TheRegistrar");
EppException thrown =
assertThrows(
ObjectAlreadySponsoredException.class,
core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java
+5 -5
View File
@@ -157,7 +157,7 @@ class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow, Domain
new DomainHistory.Builder()
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setModificationTime(clock.nowUtc())
.setClientId(domain.getCreationClientId())
.setRegistrarId(domain.getCreationRegistrarId())
.setDomain(domain)
.build());
clock.advanceOneMilli();
@@ -181,7 +181,7 @@ class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow, Domain
new DomainHistory.Builder()
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setModificationTime(clock.nowUtc())
.setClientId(domain.getCreationClientId())
.setRegistrarId(domain.getCreationRegistrarId())
.setDomain(domain)
.build());
clock.advanceOneMilli();
@@ -681,7 +681,7 @@ class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow, Domain
new BillingEvent.OneTime.Builder()
.setReason(Reason.SERVER_STATUS)
.setTargetId("example.tld")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setCost(Money.of(USD, 19))
.setEventTime(clock.nowUtc())
.setBillingTime(clock.nowUtc())
@@ -1035,7 +1035,7 @@ class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow, Domain
@TestOfyAndSql
void testFailure_unauthorizedClient() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
persistReferencedEntities();
persistDomain();
EppException thrown = assertThrows(ResourceNotOwnedException.class, this::runFlow);
@@ -1044,7 +1044,7 @@ class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow, Domain
@TestOfyAndSql
void testSuccess_superuserUnauthorizedClient() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
persistReferencedEntities();
persistDomain();
clock.advanceOneMilli();
core/src/test/java/google/registry/flows/domain/token/AllocationTokenFlowUtilsTest.java
+3 -3
View File
@@ -303,7 +303,7 @@ class AllocationTokenFlowUtilsTest {
DomainCommand.Create command,
AllocationToken token,
Registry registry,
String clientId,
String registrarId,
DateTime now) {
throw new IllegalStateException("failed for tests");
}
@@ -312,7 +312,7 @@ class AllocationTokenFlowUtilsTest {
public ImmutableMap<InternetDomainName, String> checkDomainsWithToken(
ImmutableList<InternetDomainName> domainNames,
AllocationToken tokenEntity,
String clientId,
String registrarId,
DateTime now) {
throw new IllegalStateException("failed for tests");
}
@@ -325,7 +325,7 @@ class AllocationTokenFlowUtilsTest {
public ImmutableMap<InternetDomainName, String> checkDomainsWithToken(
ImmutableList<InternetDomainName> domainNames,
AllocationToken tokenEntity,
String clientId,
String registrarId,
DateTime now) {
return Maps.toMap(domainNames, domain -> domain.toString().contains("bunny") ? "fufu" : "");
}
core/src/test/java/google/registry/flows/host/HostCreateFlowTest.java
+1 -1
View File
@@ -230,7 +230,7 @@ class HostCreateFlowTest extends ResourceFlowTestCase<HostCreateFlow, HostResour
persistResource(
newHostResource(targetId)
.asBuilder()
.setPersistedCurrentSponsorClientId("NewRegistrar")
.setPersistedCurrentSponsorRegistrarId("NewRegistrar")
.build());
ResourceCreateContentionException thrown =
assertThrows(ResourceCreateContentionException.class, this::runFlow);
core/src/test/java/google/registry/flows/host/HostDeleteFlowTest.java
+20 -20
View File
@@ -156,7 +156,7 @@ class HostDeleteFlowTest extends ResourceFlowTestCase<HostDeleteFlow, HostResour
@TestOfyAndSql
void testFailure_unauthorizedClient() {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
persistActiveHost("ns1.example.tld");
EppException thrown = assertThrows(ResourceNotOwnedException.class, this::runFlow);
assertAboutEppExceptions().that(thrown).marshalsToXml();
@@ -164,7 +164,7 @@ class HostDeleteFlowTest extends ResourceFlowTestCase<HostDeleteFlow, HostResour
@TestOfyAndSql
void testSuccess_superuserUnauthorizedClient() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
persistActiveHost("ns1.example.tld");
clock.advanceOneMilli();
if (tm().isOfy()) {
@@ -180,18 +180,18 @@ class HostDeleteFlowTest extends ResourceFlowTestCase<HostDeleteFlow, HostResour
@TestOfyAndSql
void testSuccess_authorizedClientReadFromSuperordinate() throws Exception {
sessionMetadata.setClientId("TheRegistrar");
sessionMetadata.setRegistrarId("TheRegistrar");
createTld("tld");
DomainBase domain =
persistResource(
newDomainBase("example.tld")
.asBuilder()
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.build());
persistResource(
newHostResource("ns1.example.tld")
.asBuilder()
.setPersistedCurrentSponsorClientId("NewRegistrar") // Shouldn't hurt.
.setPersistedCurrentSponsorRegistrarId("NewRegistrar") // Shouldn't hurt.
.setSuperordinateDomain(domain.createVKey())
.build());
clock.advanceOneMilli();
@@ -206,18 +206,18 @@ class HostDeleteFlowTest extends ResourceFlowTestCase<HostDeleteFlow, HostResour
@TestOfyAndSql
void testFailure_unauthorizedClientReadFromSuperordinate() {
sessionMetadata.setClientId("TheRegistrar");
sessionMetadata.setRegistrarId("TheRegistrar");
createTld("tld");
DomainBase domain =
persistResource(
newDomainBase("example.tld")
.asBuilder()
.setPersistedCurrentSponsorClientId("NewRegistrar")
.setPersistedCurrentSponsorRegistrarId("NewRegistrar")
.build());
persistResource(
newHostResource("ns1.example.tld")
.asBuilder()
.setPersistedCurrentSponsorClientId("TheRegistrar") // Shouldn't help.
.setPersistedCurrentSponsorRegistrarId("TheRegistrar") // Shouldn't help.
.setSuperordinateDomain(domain.createVKey())
.build());
EppException thrown = assertThrows(ResourceNotOwnedException.class, this::runFlow);
@@ -226,7 +226,7 @@ class HostDeleteFlowTest extends ResourceFlowTestCase<HostDeleteFlow, HostResour
@TestOfyAndSql
void testSuccess_authorizedClientReadFromTransferredSuperordinate() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
createTld("tld");
// Setup a transfer that should have been server approved a day ago.
DateTime now = clock.nowUtc();
@@ -236,21 +236,21 @@ class HostDeleteFlowTest extends ResourceFlowTestCase<HostDeleteFlow, HostResour
persistResource(
newDomainBase("example.tld")
.asBuilder()
.setPersistedCurrentSponsorClientId("NewRegistrar") // Shouldn't hurt.
.setPersistedCurrentSponsorRegistrarId("NewRegistrar") // Shouldn't hurt.
.addStatusValue(StatusValue.PENDING_TRANSFER)
.setTransferData(
new DomainTransferData.Builder()
.setTransferStatus(TransferStatus.PENDING)
.setGainingClientId("NewRegistrar")
.setGainingRegistrarId("NewRegistrar")
.setTransferRequestTime(requestTime)
.setLosingClientId("TheRegistrar")
.setLosingRegistrarId("TheRegistrar")
.setPendingTransferExpirationTime(transferExpirationTime)
.build())
.build());
persistResource(
newHostResource("ns1.example.tld")
.asBuilder()
.setPersistedCurrentSponsorClientId("TheRegistrar") // Shouldn't hurt.
.setPersistedCurrentSponsorRegistrarId("TheRegistrar") // Shouldn't hurt.
.setSuperordinateDomain(domain.createVKey())
.build());
clock.advanceOneMilli();
@@ -265,7 +265,7 @@ class HostDeleteFlowTest extends ResourceFlowTestCase<HostDeleteFlow, HostResour
@TestOfyAndSql
void testFailure_unauthorizedClientReadFromTransferredSuperordinate() {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
createTld("tld");
// Setup a transfer that should have been server approved a day ago.
DateTime now = clock.nowUtc();
@@ -275,21 +275,21 @@ class HostDeleteFlowTest extends ResourceFlowTestCase<HostDeleteFlow, HostResour
persistResource(
newDomainBase("example.tld")
.asBuilder()
.setPersistedCurrentSponsorClientId("NewRegistrar") // Shouldn't help.
.setPersistedCurrentSponsorRegistrarId("NewRegistrar") // Shouldn't help.
.addStatusValue(StatusValue.PENDING_TRANSFER)
.setTransferData(
new DomainTransferData.Builder()
.setTransferStatus(TransferStatus.PENDING)
.setGainingClientId("TheRegistrar")
.setGainingRegistrarId("TheRegistrar")
.setTransferRequestTime(requestTime)
.setLosingClientId("NewRegistrar")
.setLosingRegistrarId("NewRegistrar")
.setPendingTransferExpirationTime(transferExpirationTime)
.build())
.build());
persistResource(
newHostResource("ns1.example.tld")
.asBuilder()
.setPersistedCurrentSponsorClientId("NewRegistrar") // Shouldn't help.
.setPersistedCurrentSponsorRegistrarId("NewRegistrar") // Shouldn't help.
.setSuperordinateDomain(domain.createVKey())
.build());
EppException thrown = assertThrows(ResourceNotOwnedException.class, this::runFlow);
@@ -338,11 +338,11 @@ class HostDeleteFlowTest extends ResourceFlowTestCase<HostDeleteFlow, HostResour
assertIcannReportingActivityFieldLogged("srs-host-delete");
}
private void assertOfyDeleteSuccess(String clientId, String clientTrid, boolean isSuperuser)
private void assertOfyDeleteSuccess(String registrarId, String clientTrid, boolean isSuperuser)
throws Exception {
HostResource deletedHost = reloadResourceByForeignKey();
assertAsyncDeletionTaskEnqueued(
deletedHost, clientId, Trid.create(clientTrid, "server-trid"), isSuperuser);
deletedHost, registrarId, Trid.create(clientTrid, "server-trid"), isSuperuser);
assertAboutHosts()
.that(deletedHost)
.hasStatusValue(StatusValue.PENDING_DELETE)
core/src/test/java/google/registry/flows/host/HostInfoFlowTest.java
+5 -5
View File
@@ -67,16 +67,16 @@ class HostInfoFlowTest extends ResourceFlowTestCase<HostInfoFlow, HostResource>
new HostResource.Builder()
.setHostName(getUniqueIdFromCommand())
.setRepoId("1FF-FOOBAR")
.setPersistedCurrentSponsorClientId("my sponsor")
.setPersistedCurrentSponsorRegistrarId("my sponsor")
.setStatusValues(ImmutableSet.of(StatusValue.CLIENT_UPDATE_PROHIBITED))
.setInetAddresses(
ImmutableSet.of(
InetAddresses.forString("192.0.2.2"),
InetAddresses.forString("1080:0:0:0:8:800:200C:417A"),
InetAddresses.forString("192.0.2.29")))
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setCreationClientId("NewRegistrar")
.setLastEppUpdateClientId("NewRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.setCreationRegistrarId("NewRegistrar")
.setLastEppUpdateRegistrarId("NewRegistrar")
.setCreationTimeForTest(DateTime.parse("1999-04-03T22:00:00.0Z"))
.setLastEppUpdateTime(DateTime.parse("1999-12-03T09:00:00.0Z"))
.setLastTransferTime(DateTime.parse("2000-04-08T09:00:00.0Z"))
@@ -123,7 +123,7 @@ class HostInfoFlowTest extends ResourceFlowTestCase<HostInfoFlow, HostResource>
.asBuilder()
.setRepoId("BEEF-FOOBAR")
.setLastTransferTime(domainTransferTime)
.setPersistedCurrentSponsorClientId("superclientid")
.setPersistedCurrentSponsorRegistrarId("superclientid")
.build());
HostResource firstHost = persistHostResource();
persistResource(
core/src/test/java/google/registry/flows/host/HostUpdateFlowTest.java
+46 -46
View File
@@ -125,14 +125,14 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
DateTime transferExpirationTime = now.minusDays(1);
return newDomainBase(domainName)
.asBuilder()
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.addStatusValue(StatusValue.PENDING_TRANSFER)
.setTransferData(
new DomainTransferData.Builder()
.setTransferStatus(TransferStatus.PENDING)
.setGainingClientId("NewRegistrar")
.setGainingRegistrarId("NewRegistrar")
.setTransferRequestTime(requestTime)
.setLosingClientId("TheRegistrar")
.setLosingRegistrarId("TheRegistrar")
.setPendingTransferExpirationTime(transferExpirationTime)
.build())
.build();
@@ -239,7 +239,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
.and()
.hasSuperordinateDomain(domain.createVKey())
.and()
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(null)
.and()
@@ -250,7 +250,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
@TestOfyAndSql
void testSuccess_nameUnchanged_superordinateDomainWasTransferred() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
setEppInput("host_update_name_unchanged.xml");
createTld("tld");
// Create a domain that will belong to NewRegistrar after cloneProjectedAtTime is called.
@@ -265,7 +265,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
.and()
.hasSuperordinateDomain(domain.createVKey())
.and()
.hasPersistedCurrentSponsorClientId("NewRegistrar")
.hasPersistedCurrentSponsorRegistrarId("NewRegistrar")
.and()
.hasLastTransferTime(domain.getTransferData().getPendingTransferExpirationTime())
.and()
@@ -300,7 +300,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
.and()
.hasLastSuperordinateChange(oldHost.getLastSuperordinateChange())
.and()
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(oneDayAgo);
DomainBase reloadedDomain = loadByEntity(domain).cloneProjectedAtTime(now);
@@ -334,7 +334,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
.and()
.hasLastSuperordinateChange(now)
.and()
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(null);
assertThat(loadByEntity(foo).cloneProjectedAtTime(now).getSubordinateHosts()).isEmpty();
@@ -370,7 +370,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
.and()
.hasLastSuperordinateChange(now)
.and()
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(null);
DomainBase reloadedFooDomain = loadByEntity(fooDomain).cloneProjectedAtTime(now);
@@ -396,13 +396,13 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
.asBuilder()
.setSubordinateHosts(ImmutableSet.of(oldHostName()))
.build());
assertThat(domain.getCurrentSponsorClientId()).isEqualTo("TheRegistrar");
assertThat(domain.getCurrentSponsorRegistrarId()).isEqualTo("TheRegistrar");
DateTime oneDayAgo = clock.nowUtc().minusDays(1);
HostResource oldHost =
persistResource(
persistActiveSubordinateHost(oldHostName(), domain)
.asBuilder()
.setPersistedCurrentSponsorClientId("Superseded")
.setPersistedCurrentSponsorRegistrarId("Superseded")
.setLastTransferTime(oneDayAgo)
.build());
assertThat(oldHost.isSubordinate()).isTrue();
@@ -412,7 +412,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
.that(renamedHost)
.hasSuperordinateDomain(null)
.and()
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(oneDayAgo)
.and()
@@ -451,7 +451,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
.and()
.hasLastSuperordinateChange(now)
.and()
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(null);
assertThat(loadByEntity(domain).cloneProjectedAtTime(now).getSubordinateHosts())
@@ -478,7 +478,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
.and()
.hasLastSuperordinateChange(null)
.and()
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(null);
assertNoDnsTasksEnqueued();
@@ -497,7 +497,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
CommitMode.LIVE, UserPrivileges.SUPERUSER, loadFile("generic_success_response.xml"));
assertAboutHosts()
.that(reloadResourceByForeignKey())
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(null)
.and()
@@ -538,7 +538,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
HostResource renamedHost = doSuccessfulTest();
assertAboutHosts()
.that(renamedHost)
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(lastTransferTime);
}
@@ -577,7 +577,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
HostResource renamedHost = doSuccessfulTest();
assertAboutHosts()
.that(renamedHost)
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(lastTransferTime);
}
@@ -613,7 +613,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
HostResource renamedHost = doSuccessfulTest();
assertAboutHosts()
.that(renamedHost)
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(lastTransferTime);
}
@@ -645,7 +645,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
HostResource renamedHost = doSuccessfulTest();
assertAboutHosts()
.that(renamedHost)
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(lastTransferTime);
}
@@ -677,7 +677,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
HostResource renamedHost = doSuccessfulTest();
assertAboutHosts()
.that(renamedHost)
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(null);
}
@@ -712,7 +712,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
// update, not what it is later changed to.
assertAboutHosts()
.that(renamedHost)
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(lastTransferTime)
.and()
@@ -751,7 +751,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
// superordinate domain.
assertAboutHosts()
.that(renamedHost)
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(lastTransferTime);
}
@@ -785,7 +785,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
// was transferred more recently than the last time the host's superordinate domain was changed.
assertAboutHosts()
.that(renamedHost)
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(domain.getLastTransferTime());
}
@@ -805,7 +805,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
HostResource renamedHost = doSuccessfulTestAsSuperuser();
assertAboutHosts()
.that(renamedHost)
.hasPersistedCurrentSponsorClientId("TheRegistrar")
.hasPersistedCurrentSponsorRegistrarId("TheRegistrar")
.and()
.hasLastTransferTime(hostTransferTime);
}
@@ -1096,7 +1096,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
@TestOfyAndSql
void testFailure_unauthorizedClient() {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
persistActiveHost("ns1.example.tld");
EppException thrown = assertThrows(ResourceNotOwnedException.class, this::runFlow);
assertAboutEppExceptions().that(thrown).marshalsToXml();
@@ -1104,7 +1104,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
@TestOfyAndSql
void testSuccess_superuserUnauthorizedClient() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
persistActiveHost(oldHostName());
clock.advanceOneMilli();
@@ -1114,18 +1114,18 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
@TestOfyAndSql
void testSuccess_authorizedClientReadFromSuperordinate() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
createTld("tld");
DomainBase domain =
persistResource(
newDomainBase("example.tld")
.asBuilder()
.setPersistedCurrentSponsorClientId("NewRegistrar")
.setPersistedCurrentSponsorRegistrarId("NewRegistrar")
.build());
persistResource(
newHostResource("ns1.example.tld")
.asBuilder()
.setPersistedCurrentSponsorClientId("TheRegistrar") // Shouldn't hurt.
.setPersistedCurrentSponsorRegistrarId("TheRegistrar") // Shouldn't hurt.
.setSuperordinateDomain(domain.createVKey())
.setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
.build());
@@ -1136,18 +1136,18 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
@TestOfyAndSql
void testFailure_unauthorizedClientReadFromSuperordinate() {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
createTld("tld");
DomainBase domain =
persistResource(
newDomainBase("example.tld")
.asBuilder()
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.build());
persistResource(
newHostResource("ns1.example.tld")
.asBuilder()
.setPersistedCurrentSponsorClientId("NewRegistrar") // Shouldn't help.
.setPersistedCurrentSponsorRegistrarId("NewRegistrar") // Shouldn't help.
.setSuperordinateDomain(domain.createVKey())
.setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
.build());
@@ -1158,14 +1158,14 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
@TestOfyAndSql
void testSuccess_authorizedClientReadFromTransferredSuperordinate() throws Exception {
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
createTld("tld");
// Create a domain that will belong to NewRegistrar after cloneProjectedAtTime is called.
DomainBase domain = persistResource(createDomainWithServerApprovedTransfer("example.tld"));
persistResource(
newHostResource("ns1.example.tld")
.asBuilder()
.setPersistedCurrentSponsorClientId("TheRegistrar") // Shouldn't hurt.
.setPersistedCurrentSponsorRegistrarId("TheRegistrar") // Shouldn't hurt.
.setSuperordinateDomain(domain.createVKey())
.setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
.build());
@@ -1176,14 +1176,14 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
@TestOfyAndSql
void testFailure_unauthorizedClientReadFromTransferredSuperordinate() {
sessionMetadata.setClientId("TheRegistrar");
sessionMetadata.setRegistrarId("TheRegistrar");
createTld("tld");
// Create a domain that will belong to NewRegistrar after cloneProjectedAtTime is called.
DomainBase domain = persistResource(createDomainWithServerApprovedTransfer("example.tld"));
persistResource(
newHostResource("ns1.example.tld")
.asBuilder()
.setPersistedCurrentSponsorClientId("TheRegistrar") // Shouldn't help.
.setPersistedCurrentSponsorRegistrarId("TheRegistrar") // Shouldn't help.
.setSuperordinateDomain(domain.createVKey())
.setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
.build());
@@ -1196,17 +1196,17 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
void testFailure_newSuperordinateOwnedByDifferentRegistrar() throws Exception {
setEppHostUpdateInput(
"ns1.example.foo", "ns2.example.tld", "<host:addr ip=\"v4\">192.0.2.22</host:addr>", null);
sessionMetadata.setClientId("TheRegistrar");
sessionMetadata.setRegistrarId("TheRegistrar");
createTld("foo");
createTld("tld");
persistResource(
newDomainBase("example.tld")
.asBuilder()
.setPersistedCurrentSponsorClientId("NewRegistrar")
.setPersistedCurrentSponsorRegistrarId("NewRegistrar")
.build());
HostResource host =
persistActiveSubordinateHost(oldHostName(), persistActiveDomain("example.foo"));
assertAboutHosts().that(host).hasPersistedCurrentSponsorClientId("TheRegistrar");
assertAboutHosts().that(host).hasPersistedCurrentSponsorRegistrarId("TheRegistrar");
EppException thrown = assertThrows(HostDomainNotOwnedException.class, this::runFlow);
assertAboutEppExceptions().that(thrown).marshalsToXml();
@@ -1216,15 +1216,15 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
void testFailure_newSuperordinateWasTransferredToDifferentRegistrar() throws Exception {
setEppHostUpdateInput(
"ns1.example.foo", "ns2.example.tld", "<host:addr ip=\"v4\">192.0.2.22</host:addr>", null);
sessionMetadata.setClientId("TheRegistrar");
sessionMetadata.setRegistrarId("TheRegistrar");
createTld("foo");
createTld("tld");
HostResource host =
persistActiveSubordinateHost(oldHostName(), persistActiveDomain("example.foo"));
// The domain will belong to NewRegistrar after cloneProjectedAtTime is called.
DomainBase domain = persistResource(createDomainWithServerApprovedTransfer("example.tld"));
assertAboutDomains().that(domain).hasPersistedCurrentSponsorClientId("TheRegistrar");
assertAboutHosts().that(host).hasPersistedCurrentSponsorClientId("TheRegistrar");
assertAboutDomains().that(domain).hasPersistedCurrentSponsorRegistrarId("TheRegistrar");
assertAboutHosts().that(host).hasPersistedCurrentSponsorRegistrarId("TheRegistrar");
EppException thrown = assertThrows(HostDomainNotOwnedException.class, this::runFlow);
assertAboutEppExceptions().that(thrown).marshalsToXml();
@@ -1234,7 +1234,7 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
void testSuccess_newSuperordinateWasTransferredToCorrectRegistrar() throws Exception {
setEppHostUpdateInput(
"ns1.example.foo", "ns2.example.tld", "<host:addr ip=\"v4\">192.0.2.22</host:addr>", null);
sessionMetadata.setClientId("NewRegistrar");
sessionMetadata.setRegistrarId("NewRegistrar");
createTld("foo");
createTld("tld");
// The domain will belong to NewRegistrar after cloneProjectedAtTime is called.
@@ -1243,14 +1243,14 @@ class HostUpdateFlowTest extends ResourceFlowTestCase<HostUpdateFlow, HostResour
persistResource(
newDomainBase("example.foo")
.asBuilder()
.setPersistedCurrentSponsorClientId("NewRegistrar")
.setPersistedCurrentSponsorRegistrarId("NewRegistrar")
.build());
assertAboutDomains().that(domain).hasPersistedCurrentSponsorClientId("TheRegistrar");
assertAboutDomains().that(domain).hasPersistedCurrentSponsorRegistrarId("TheRegistrar");
persistResource(
newHostResource("ns1.example.foo")
.asBuilder()
.setSuperordinateDomain(superordinate.createVKey())
.setPersistedCurrentSponsorClientId("NewRegistrar")
.setPersistedCurrentSponsorRegistrarId("NewRegistrar")
.build());
clock.advanceOneMilli();
core/src/test/java/google/registry/flows/poll/PollAckFlowTest.java
+8 -8
View File
@@ -62,7 +62,7 @@ class PollAckFlowTest extends FlowTestCase<PollAckFlow> {
@BeforeEach
void setUp() {
setEppInput("poll_ack.xml", ImmutableMap.of("MSGID", "1-3-EXAMPLE-4-3-2011"));
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
createTld("example");
contact = persistActiveContact("jd1234");
domain = persistResource(newDomainBase("test.example", contact));
@@ -72,7 +72,7 @@ class PollAckFlowTest extends FlowTestCase<PollAckFlow> {
persistResource(
new PollMessage.OneTime.Builder()
.setId(messageId)
.setClientId(getClientIdForFlow())
.setRegistrarId(getRegistrarIdForFlow())
.setEventTime(clock.nowUtc().minusDays(1))
.setMsg("Some poll message.")
.setParent(createHistoryEntryForEppResource(domain))
@@ -83,7 +83,7 @@ class PollAckFlowTest extends FlowTestCase<PollAckFlow> {
persistResource(
new PollMessage.Autorenew.Builder()
.setId(MESSAGE_ID)
.setClientId(getClientIdForFlow())
.setRegistrarId(getRegistrarIdForFlow())
.setEventTime(eventTime)
.setAutorenewEndTime(endTime)
.setMsg("Domain was auto-renewed.")
@@ -104,7 +104,7 @@ class PollAckFlowTest extends FlowTestCase<PollAckFlow> {
persistResource(
new PollMessage.OneTime.Builder()
.setId(MESSAGE_ID)
.setClientId(getClientIdForFlow())
.setRegistrarId(getRegistrarIdForFlow())
.setEventTime(clock.nowUtc().minusDays(1))
.setMsg("Some poll message.")
.setParent(createHistoryEntryForEppResource(contact))
@@ -119,7 +119,7 @@ class PollAckFlowTest extends FlowTestCase<PollAckFlow> {
persistResource(
new PollMessage.OneTime.Builder()
.setId(MESSAGE_ID)
.setClientId(getClientIdForFlow())
.setRegistrarId(getRegistrarIdForFlow())
.setEventTime(clock.nowUtc().minusDays(1))
.setMsg("Some poll message.")
.setParent(createHistoryEntryForEppResource(contact))
@@ -207,7 +207,7 @@ class PollAckFlowTest extends FlowTestCase<PollAckFlow> {
persistResource(
new PollMessage.OneTime.Builder()
.setId(MESSAGE_ID)
.setClientId(getClientIdForFlow())
.setRegistrarId(getRegistrarIdForFlow())
.setEventTime(clock.nowUtc().minusDays(1))
.setMsg("Some poll message.")
.setParent(createHistoryEntryForEppResource(contact))
@@ -242,7 +242,7 @@ class PollAckFlowTest extends FlowTestCase<PollAckFlow> {
persistResource(
new PollMessage.OneTime.Builder()
.setId(MESSAGE_ID)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(clock.nowUtc().minusDays(1))
.setMsg("Some poll message.")
.setParent(createHistoryEntryForEppResource(domain))
@@ -256,7 +256,7 @@ class PollAckFlowTest extends FlowTestCase<PollAckFlow> {
persistResource(
new PollMessage.OneTime.Builder()
.setId(MESSAGE_ID)
.setClientId(getClientIdForFlow())
.setRegistrarId(getRegistrarIdForFlow())
.setEventTime(clock.nowUtc().plusDays(1))
.setMsg("Some poll message.")
.setParent(createHistoryEntryForEppResource(domain))
core/src/test/java/google/registry/flows/poll/PollRequestFlowTest.java
+32 -25
View File
@@ -67,7 +67,7 @@ class PollRequestFlowTest extends FlowTestCase<PollRequestFlow> {
@BeforeEach
void setUp() {
setEppInput("poll.xml");
setClientIdForFlow("NewRegistrar");
setRegistrarIdForFlow("NewRegistrar");
createTld("example");
persistNewRegistrar("BadRegistrar");
contact = persistActiveContact("jd1234");
@@ -78,7 +78,7 @@ class PollRequestFlowTest extends FlowTestCase<PollRequestFlow> {
private void persistPendingTransferPollMessage() {
persistResource(
new PollMessage.OneTime.Builder()
.setClientId(getClientIdForFlow())
.setRegistrarId(getRegistrarIdForFlow())
.setEventTime(clock.nowUtc().minusDays(1))
.setMsg("Transfer approved.")
.setResponseData(
@@ -86,9 +86,9 @@ class PollRequestFlowTest extends FlowTestCase<PollRequestFlow> {
new DomainTransferResponse.Builder()
.setFullyQualifiedDomainName("test.example")
.setTransferStatus(TransferStatus.SERVER_APPROVED)
.setGainingClientId(getClientIdForFlow())
.setGainingRegistrarId(getRegistrarIdForFlow())
.setTransferRequestTime(clock.nowUtc().minusDays(5))
.setLosingClientId("TheRegistrar")
.setLosingRegistrarId("TheRegistrar")
.setPendingTransferExpirationTime(clock.nowUtc().minusDays(1))
.setExtendedRegistrationExpirationTime(clock.nowUtc().plusYears(1))
.build()))
@@ -113,21 +113,23 @@ class PollRequestFlowTest extends FlowTestCase<PollRequestFlow> {
@TestOfyAndSql
void testSuccess_contactTransferPending() throws Exception {
setClientIdForFlow("TheRegistrar");
setRegistrarIdForFlow("TheRegistrar");
persistResource(
new PollMessage.OneTime.Builder()
.setId(3L)
.setClientId(getClientIdForFlow())
.setRegistrarId(getRegistrarIdForFlow())
.setEventTime(clock.nowUtc().minusDays(5))
.setMsg("Transfer requested.")
.setResponseData(ImmutableList.of(new ContactTransferResponse.Builder()
.setContactId("sh8013")
.setTransferStatus(TransferStatus.PENDING)
.setGainingClientId(getClientIdForFlow())
.setTransferRequestTime(clock.nowUtc().minusDays(5))
.setLosingClientId("NewRegistrar")
.setPendingTransferExpirationTime(clock.nowUtc())
.build()))
.setResponseData(
ImmutableList.of(
new ContactTransferResponse.Builder()
.setContactId("sh8013")
.setTransferStatus(TransferStatus.PENDING)
.setGainingRegistrarId(getRegistrarIdForFlow())
.setTransferRequestTime(clock.nowUtc().minusDays(5))
.setLosingRegistrarId("NewRegistrar")
.setPendingTransferExpirationTime(clock.nowUtc())
.build()))
.setParent(createHistoryEntryForEppResource(contact))
.build());
assertTransactionalFlow(false);
@@ -138,11 +140,16 @@ class PollRequestFlowTest extends FlowTestCase<PollRequestFlow> {
void testSuccess_domainPendingActionComplete() throws Exception {
persistResource(
new PollMessage.OneTime.Builder()
.setClientId(getClientIdForFlow())
.setRegistrarId(getRegistrarIdForFlow())
.setEventTime(clock.nowUtc().minusDays(1))
.setMsg("Domain deleted.")
.setResponseData(ImmutableList.of(DomainPendingActionNotificationResponse.create(
"test.example", true, Trid.create("ABC-12345", "other-trid"), clock.nowUtc())))
.setResponseData(
ImmutableList.of(
DomainPendingActionNotificationResponse.create(
"test.example",
true,
Trid.create("ABC-12345", "other-trid"),
clock.nowUtc())))
.setParent(createHistoryEntryForEppResource(domain))
.build());
assertTransactionalFlow(false);
@@ -153,7 +160,7 @@ class PollRequestFlowTest extends FlowTestCase<PollRequestFlow> {
void testSuccess_domainAutorenewMessage() throws Exception {
persistResource(
new PollMessage.Autorenew.Builder()
.setClientId(getClientIdForFlow())
.setRegistrarId(getRegistrarIdForFlow())
.setEventTime(clock.nowUtc().minusDays(1))
.setMsg("Domain was auto-renewed.")
.setTargetId("test.example")
@@ -172,7 +179,7 @@ class PollRequestFlowTest extends FlowTestCase<PollRequestFlow> {
void testSuccess_wrongRegistrar() throws Exception {
persistResource(
new PollMessage.OneTime.Builder()
.setClientId("BadRegistrar")
.setRegistrarId("BadRegistrar")
.setEventTime(clock.nowUtc().minusDays(1))
.setMsg("Poll message")
.setParent(createHistoryEntryForEppResource(domain))
@@ -184,7 +191,7 @@ class PollRequestFlowTest extends FlowTestCase<PollRequestFlow> {
void testSuccess_futurePollMessage() throws Exception {
persistResource(
new PollMessage.OneTime.Builder()
.setClientId(getClientIdForFlow())
.setRegistrarId(getRegistrarIdForFlow())
.setEventTime(clock.nowUtc().plusDays(1))
.setMsg("Poll message")
.setParent(createHistoryEntryForEppResource(domain))
@@ -196,7 +203,7 @@ class PollRequestFlowTest extends FlowTestCase<PollRequestFlow> {
void testSuccess_futureAutorenew() throws Exception {
persistResource(
new PollMessage.Autorenew.Builder()
.setClientId(getClientIdForFlow())
.setRegistrarId(getRegistrarIdForFlow())
.setEventTime(clock.nowUtc().plusDays(1))
.setMsg("Domain was auto-renewed.")
.setTargetId("target.example")
@@ -213,14 +220,14 @@ class PollRequestFlowTest extends FlowTestCase<PollRequestFlow> {
HistoryEntry historyEntry =
persistResource(
new ContactHistory.Builder()
.setClientId("NewRegistrar")
.setRegistrarId("NewRegistrar")
.setModificationTime(clock.nowUtc().minusDays(1))
.setType(HistoryEntry.Type.CONTACT_DELETE)
.setContact(contact)
.build());
persistResource(
new PollMessage.OneTime.Builder()
.setClientId("NewRegistrar")
.setRegistrarId("NewRegistrar")
.setMsg("Deleted contact jd1234")
.setParent(historyEntry)
.setEventTime(clock.nowUtc().minusDays(1))
@@ -236,14 +243,14 @@ class PollRequestFlowTest extends FlowTestCase<PollRequestFlow> {
HistoryEntry historyEntry =
persistResource(
new HostHistory.Builder()
.setClientId("NewRegistrar")
.setRegistrarId("NewRegistrar")
.setModificationTime(clock.nowUtc().minusDays(1))
.setType(HistoryEntry.Type.HOST_DELETE)
.setHost(host)
.build());
persistResource(
new PollMessage.OneTime.Builder()
.setClientId("NewRegistrar")
.setRegistrarId("NewRegistrar")
.setMsg("Deleted host ns1.test.example")
.setParent(historyEntry)
.setEventTime(clock.nowUtc().minusDays(1))
core/src/test/java/google/registry/flows/session/LoginFlowTestCase.java
+4 -4
View File
@@ -28,7 +28,7 @@ import google.registry.flows.EppException.UnimplementedProtocolVersionException;
import google.registry.flows.FlowTestCase;
import google.registry.flows.TransportCredentials.BadRegistrarPasswordException;
import google.registry.flows.session.LoginFlow.AlreadyLoggedInException;
import google.registry.flows.session.LoginFlow.BadRegistrarClientIdException;
import google.registry.flows.session.LoginFlow.BadRegistrarIdException;
import google.registry.flows.session.LoginFlow.PasswordChangesNotSupportedException;
import google.registry.flows.session.LoginFlow.RegistrarAccountNotActiveException;
import google.registry.flows.session.LoginFlow.TooManyFailedLoginsException;
@@ -47,7 +47,7 @@ public abstract class LoginFlowTestCase extends FlowTestCase<LoginFlow> {
@BeforeEach
void beforeEachLoginFlowTestCase() {
sessionMetadata.setClientId(null); // Don't implicitly log in (all other flows need to).
sessionMetadata.setRegistrarId(null); // Don't implicitly log in (all other flows need to).
registrar = loadRegistrar("NewRegistrar");
registrarBuilder = registrar.asBuilder();
}
@@ -124,7 +124,7 @@ public abstract class LoginFlowTestCase extends FlowTestCase<LoginFlow> {
@Test
void testFailure_unknownRegistrar() {
deleteResource(getRegistrarBuilder().build());
doFailingTest("login_valid.xml", BadRegistrarClientIdException.class);
doFailingTest("login_valid.xml", BadRegistrarIdException.class);
}
@Test
@@ -156,7 +156,7 @@ public abstract class LoginFlowTestCase extends FlowTestCase<LoginFlow> {
@Test
void testFailure_alreadyLoggedIn() {
sessionMetadata.setClientId("something");
sessionMetadata.setRegistrarId("something");
doFailingTest("login_valid.xml", AlreadyLoggedInException.class);
}
}
core/src/test/java/google/registry/flows/session/LogoutFlowTest.java
+1 -1
View File
@@ -45,7 +45,7 @@ class LogoutFlowTest extends FlowTestCase<LogoutFlow> {
@Test
void testFailure() {
sessionMetadata.setClientId(null); // Turn off the implicit login
sessionMetadata.setRegistrarId(null); // Turn off the implicit login
EppException thrown = assertThrows(NotLoggedInException.class, this::runFlow);
assertAboutEppExceptions().that(thrown).marshalsToXml();
}
core/src/test/java/google/registry/mapreduce/inputs/ChildEntityInputTest.java
+8 -8
View File
@@ -85,7 +85,7 @@ class ChildEntityInputTest {
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setDomain(domainA)
.setModificationTime(now)
.setClientId(domainA.getCreationClientId())
.setRegistrarId(domainA.getCreationRegistrarId())
.build());
contactHistoryEntry =
persistResource(
@@ -94,7 +94,7 @@ class ChildEntityInputTest {
.setType(HistoryEntry.Type.CONTACT_CREATE)
.setContact(contact)
.setModificationTime(now)
.setClientId(contact.getCreationClientId())
.setRegistrarId(contact.getCreationRegistrarId())
.build());
oneTimeA =
persistResource(
@@ -106,7 +106,7 @@ class ChildEntityInputTest {
.setCost(Money.of(USD, 1))
.setEventTime(now)
.setBillingTime(now.plusDays(5))
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setTargetId("a.tld")
.build());
recurringA =
@@ -116,7 +116,7 @@ class ChildEntityInputTest {
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
.setRecurrenceEndTime(END_OF_TIME)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setTargetId("a.tld")
.build());
}
@@ -130,7 +130,7 @@ class ChildEntityInputTest {
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setDomain(domainB)
.setModificationTime(now)
.setClientId(domainB.getCreationClientId())
.setRegistrarId(domainB.getCreationRegistrarId())
.build());
oneTimeB =
persistResource(
@@ -142,7 +142,7 @@ class ChildEntityInputTest {
.setCost(Money.of(USD, 1))
.setEventTime(now)
.setBillingTime(now.plusDays(5))
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setTargetId("a.tld")
.build());
recurringB =
@@ -152,7 +152,7 @@ class ChildEntityInputTest {
.setReason(Reason.RENEW)
.setEventTime(now.plusYears(1))
.setRecurrenceEndTime(END_OF_TIME)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setTargetId("a.tld")
.build());
}
@@ -315,7 +315,7 @@ class ChildEntityInputTest {
.setDomain(domain)
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setModificationTime(now)
.setClientId(domain.getCreationClientId())
.setRegistrarId(domain.getCreationRegistrarId())
.build())
.asHistoryEntry());
persistResource(EppResourceIndex.create(getBucketKey(i), Key.create(domain)));
core/src/test/java/google/registry/model/EppResourceUtilsTest.java
+34 -29
View File
@@ -86,17 +86,18 @@ class EppResourceUtilsTest {
persistNewRegistrars("OLD", "NEW");
clock.advanceOneMilli();
// Save resource with a commit log that we can read in later as a revisions map value.
HostResource oldHost = persistResourceWithCommitLog(
newHostResource("ns1.cat.tld").asBuilder()
.setCreationTimeForTest(START_OF_TIME)
.setPersistedCurrentSponsorClientId("OLD")
.build());
HostResource oldHost =
persistResourceWithCommitLog(
newHostResource("ns1.cat.tld")
.asBuilder()
.setCreationTimeForTest(START_OF_TIME)
.setPersistedCurrentSponsorRegistrarId("OLD")
.build());
// Advance a day so that the next created revision entry doesn't overwrite the existing one.
clock.advanceBy(Duration.standardDays(1));
// Overwrite the current host with one that has different data.
HostResource currentHost = persistResource(oldHost.asBuilder()
.setPersistedCurrentSponsorClientId("NEW")
.build());
HostResource currentHost =
persistResource(oldHost.asBuilder().setPersistedCurrentSponsorRegistrarId("NEW").build());
// Load at the point in time just before the latest update; the floor entry of the revisions
// map should point to the manifest for the first save, so we should get the old host.
assertThat(loadAtPointInTime(currentHost, clock.nowUtc().minusMillis(1))).isEqualTo(oldHost);
@@ -105,17 +106,18 @@ class EppResourceUtilsTest {
@TestOfyOnly
void testLoadAtPointInTime_brokenRevisionHistory_returnsResourceAsIs() {
// Don't save a commit log since we want to test the handling of a broken revisions key.
HostResource oldHost = persistResource(
newHostResource("ns1.cat.tld").asBuilder()
.setCreationTimeForTest(START_OF_TIME)
.setPersistedCurrentSponsorClientId("OLD")
.build());
HostResource oldHost =
persistResource(
newHostResource("ns1.cat.tld")
.asBuilder()
.setCreationTimeForTest(START_OF_TIME)
.setPersistedCurrentSponsorRegistrarId("OLD")
.build());
// Advance a day so that the next created revision entry doesn't overwrite the existing one.
clock.advanceBy(Duration.standardDays(1));
// Overwrite the existing resource to force revisions map use.
HostResource host = persistResource(oldHost.asBuilder()
.setPersistedCurrentSponsorClientId("NEW")
.build());
HostResource host =
persistResource(oldHost.asBuilder().setPersistedCurrentSponsorRegistrarId("NEW").build());
// Load at the point in time just before the latest update; the old host is not recoverable
// (revisions map link is broken, and guessing using the oldest revision map entry finds the
// same broken link), so just returns the current host.
@@ -126,17 +128,18 @@ class EppResourceUtilsTest {
void testLoadAtPointInTime_fallback_returnsMutationValueForOldestRevision() {
clock.advanceOneMilli();
// Save a commit log that we can fall back to.
HostResource oldHost = persistResourceWithCommitLog(
newHostResource("ns1.cat.tld").asBuilder()
.setCreationTimeForTest(START_OF_TIME)
.setPersistedCurrentSponsorClientId("OLD")
.build());
HostResource oldHost =
persistResourceWithCommitLog(
newHostResource("ns1.cat.tld")
.asBuilder()
.setCreationTimeForTest(START_OF_TIME)
.setPersistedCurrentSponsorRegistrarId("OLD")
.build());
// Advance a day so that the next created revision entry doesn't overwrite the existing one.
clock.advanceBy(Duration.standardDays(1));
// Overwrite the current host with one that has different data.
HostResource currentHost = persistResource(oldHost.asBuilder()
.setPersistedCurrentSponsorClientId("NEW")
.build());
HostResource currentHost =
persistResource(oldHost.asBuilder().setPersistedCurrentSponsorRegistrarId("NEW").build());
// Load at the point in time before the first update; there will be no floor entry for the
// revisions map, so give up and return the oldest revision entry's mutation value (the old host
// data).
@@ -147,11 +150,13 @@ class EppResourceUtilsTest {
void testLoadAtPointInTime_ultimateFallback_onlyOneRevision_returnsCurrentResource() {
clock.advanceOneMilli();
// Don't save a commit log; we want to test that we load from the current resource.
HostResource host = persistResource(
newHostResource("ns1.cat.tld").asBuilder()
.setCreationTimeForTest(START_OF_TIME)
.setPersistedCurrentSponsorClientId("OLD")
.build());
HostResource host =
persistResource(
newHostResource("ns1.cat.tld")
.asBuilder()
.setCreationTimeForTest(START_OF_TIME)
.setPersistedCurrentSponsorRegistrarId("OLD")
.build());
// Load at the point in time before the first save; there will be no floor entry for the
// revisions map. Since the oldest revision entry is the only (i.e. current) revision, return
// the resource.
core/src/test/java/google/registry/model/OteAccountBuilderTest.java
+48 -43
View File
@@ -54,7 +54,7 @@ public final class OteAccountBuilderTest {
@TestOfyAndSql
void testGetRegistrarToTldMap() {
assertThat(OteAccountBuilder.forClientId("myclientid").getClientIdToTldMap())
assertThat(OteAccountBuilder.forRegistrarId("myclientid").getRegistrarIdToTldMap())
.containsExactly(
"myclientid-1", "myclientid-sunrise",
"myclientid-3", "myclientid-ga",
@@ -83,16 +83,16 @@ public final class OteAccountBuilderTest {
.isEqualTo(eapFee.getAmount());
}
private void assertRegistrarExists(String clientId, String tld) {
Registrar registrar = Registrar.loadByClientId(clientId).orElse(null);
private void assertRegistrarExists(String registrarId, String tld) {
Registrar registrar = Registrar.loadByRegistrarId(registrarId).orElse(null);
assertThat(registrar).isNotNull();
assertThat(registrar.getType()).isEqualTo(Registrar.Type.OTE);
assertThat(registrar.getState()).isEqualTo(Registrar.State.ACTIVE);
assertThat(registrar.getAllowedTlds()).containsExactly(tld);
}
private void assertContactExists(String clientId, String email) {
Registrar registrar = Registrar.loadByClientId(clientId).get();
private void assertContactExists(String registrarId, String email) {
Registrar registrar = Registrar.loadByRegistrarId(registrarId).get();
assertThat(registrar.getContacts().stream().map(RegistrarContact::getEmailAddress))
.contains(email);
RegistrarContact contact =
@@ -106,7 +106,9 @@ public final class OteAccountBuilderTest {
@TestOfyAndSql
void testCreateOteEntities_success() {
OteAccountBuilder.forClientId("myclientid").addContact("email@example.com").buildAndPersist();
OteAccountBuilder.forRegistrarId("myclientid")
.addContact("email@example.com")
.buildAndPersist();
assertTldExists("myclientid-sunrise", START_DATE_SUNRISE, Money.zero(USD));
assertTldExists("myclientid-ga", GENERAL_AVAILABILITY, Money.zero(USD));
@@ -123,7 +125,7 @@ public final class OteAccountBuilderTest {
@TestOfyAndSql
void testCreateOteEntities_multipleContacts_success() {
OteAccountBuilder.forClientId("myclientid")
OteAccountBuilder.forRegistrarId("myclientid")
.addContact("email@example.com")
.addContact("other@example.com")
.addContact("someone@example.com")
@@ -152,39 +154,39 @@ public final class OteAccountBuilderTest {
@TestOfyAndSql
void testCreateOteEntities_setPassword() {
OteAccountBuilder.forClientId("myclientid").setPassword("myPassword").buildAndPersist();
OteAccountBuilder.forRegistrarId("myclientid").setPassword("myPassword").buildAndPersist();
assertThat(Registrar.loadByClientId("myclientid-3").get().verifyPassword("myPassword"))
assertThat(Registrar.loadByRegistrarId("myclientid-3").get().verifyPassword("myPassword"))
.isTrue();
}
@TestOfyAndSql
void testCreateOteEntities_setCertificate() {
OteAccountBuilder.forClientId("myclientid")
OteAccountBuilder.forRegistrarId("myclientid")
.setCertificate(SAMPLE_CERT, new SystemClock().nowUtc())
.buildAndPersist();
assertThat(Registrar.loadByClientId("myclientid-3").get().getClientCertificateHash())
assertThat(Registrar.loadByRegistrarId("myclientid-3").get().getClientCertificateHash())
.hasValue(SAMPLE_CERT_HASH);
assertThat(Registrar.loadByClientId("myclientid-3").get().getClientCertificate())
assertThat(Registrar.loadByRegistrarId("myclientid-3").get().getClientCertificate())
.hasValue(SAMPLE_CERT);
}
@TestOfyAndSql
void testCreateOteEntities_setIpAllowList() {
OteAccountBuilder.forClientId("myclientid")
OteAccountBuilder.forRegistrarId("myclientid")
.setIpAllowList(ImmutableList.of("1.1.1.0/24"))
.buildAndPersist();
assertThat(Registrar.loadByClientId("myclientid-3").get().getIpAddressAllowList())
assertThat(Registrar.loadByRegistrarId("myclientid-3").get().getIpAddressAllowList())
.containsExactly(CidrAddressBlock.create("1.1.1.0/24"));
}
@TestOfyAndSql
void testCreateOteEntities_invalidClientId_fails() {
void testCreateOteEntities_invalidRegistrarId_fails() {
assertThat(
assertThrows(
IllegalArgumentException.class, () -> OteAccountBuilder.forClientId("3blo-bio")))
IllegalArgumentException.class, () -> OteAccountBuilder.forRegistrarId("3blo-bio")))
.hasMessageThat()
.isEqualTo("Invalid registrar name: 3blo-bio");
}
@@ -192,7 +194,8 @@ public final class OteAccountBuilderTest {
@TestOfyAndSql
void testCreateOteEntities_clientIdTooShort_fails() {
assertThat(
assertThrows(IllegalArgumentException.class, () -> OteAccountBuilder.forClientId("bl")))
assertThrows(
IllegalArgumentException.class, () -> OteAccountBuilder.forRegistrarId("bl")))
.hasMessageThat()
.isEqualTo("Invalid registrar name: bl");
}
@@ -202,7 +205,7 @@ public final class OteAccountBuilderTest {
assertThat(
assertThrows(
IllegalArgumentException.class,
() -> OteAccountBuilder.forClientId("blobiotoooolong")))
() -> OteAccountBuilder.forRegistrarId("blobiotoooolong")))
.hasMessageThat()
.isEqualTo("Invalid registrar name: blobiotoooolong");
}
@@ -211,16 +214,16 @@ public final class OteAccountBuilderTest {
void testCreateOteEntities_clientIdBadCharacter_fails() {
assertThat(
assertThrows(
IllegalArgumentException.class, () -> OteAccountBuilder.forClientId("blo#bio")))
IllegalArgumentException.class, () -> OteAccountBuilder.forRegistrarId("blo#bio")))
.hasMessageThat()
.isEqualTo("Invalid registrar name: blo#bio");
}
@TestOfyAndSql
void testCreateOteEntities_registrarExists_failsWhenNotReplaceExisting() {
persistSimpleResource(makeRegistrar1().asBuilder().setClientId("myclientid-1").build());
persistSimpleResource(makeRegistrar1().asBuilder().setRegistrarId("myclientid-1").build());
OteAccountBuilder oteSetupHelper = OteAccountBuilder.forClientId("myclientid");
OteAccountBuilder oteSetupHelper = OteAccountBuilder.forRegistrarId("myclientid");
assertThat(assertThrows(IllegalStateException.class, () -> oteSetupHelper.buildAndPersist()))
.hasMessageThat()
@@ -231,7 +234,7 @@ public final class OteAccountBuilderTest {
void testCreateOteEntities_tldExists_failsWhenNotReplaceExisting() {
createTld("myclientid-ga", START_DATE_SUNRISE);
OteAccountBuilder oteSetupHelper = OteAccountBuilder.forClientId("myclientid");
OteAccountBuilder oteSetupHelper = OteAccountBuilder.forRegistrarId("myclientid");
assertThat(assertThrows(IllegalStateException.class, () -> oteSetupHelper.buildAndPersist()))
.hasMessageThat()
@@ -240,11 +243,11 @@ public final class OteAccountBuilderTest {
@TestOfyAndSql
void testCreateOteEntities_entitiesExist_succeedsWhenReplaceExisting() {
persistSimpleResource(makeRegistrar1().asBuilder().setClientId("myclientid-1").build());
persistSimpleResource(makeRegistrar1().asBuilder().setRegistrarId("myclientid-1").build());
// we intentionally create the -ga TLD with the wrong state, to make sure it's overwritten.
createTld("myclientid-ga", START_DATE_SUNRISE);
OteAccountBuilder.forClientId("myclientid").setReplaceExisting(true).buildAndPersist();
OteAccountBuilder.forRegistrarId("myclientid").setReplaceExisting(true).buildAndPersist();
// Just checking a sample of the resulting entities to make sure it indeed succeeded. The full
// entities are checked in other tests
@@ -255,33 +258,35 @@ public final class OteAccountBuilderTest {
@TestOfyAndSql
void testCreateOteEntities_doubleCreation_actuallyReplaces() {
OteAccountBuilder.forClientId("myclientid")
OteAccountBuilder.forRegistrarId("myclientid")
.setPassword("oldPassword")
.addContact("email@example.com")
.buildAndPersist();
assertThat(Registrar.loadByClientId("myclientid-3").get().verifyPassword("oldPassword"))
assertThat(Registrar.loadByRegistrarId("myclientid-3").get().verifyPassword("oldPassword"))
.isTrue();
OteAccountBuilder.forClientId("myclientid")
OteAccountBuilder.forRegistrarId("myclientid")
.setPassword("newPassword")
.addContact("email@example.com")
.setReplaceExisting(true)
.buildAndPersist();
assertThat(Registrar.loadByClientId("myclientid-3").get().verifyPassword("oldPassword"))
assertThat(Registrar.loadByRegistrarId("myclientid-3").get().verifyPassword("oldPassword"))
.isFalse();
assertThat(Registrar.loadByClientId("myclientid-3").get().verifyPassword("newPassword"))
assertThat(Registrar.loadByRegistrarId("myclientid-3").get().verifyPassword("newPassword"))
.isTrue();
}
@TestOfyAndSql
void testCreateOteEntities_doubleCreation_keepsOldContacts() {
OteAccountBuilder.forClientId("myclientid").addContact("email@example.com").buildAndPersist();
OteAccountBuilder.forRegistrarId("myclientid")
.addContact("email@example.com")
.buildAndPersist();
assertContactExists("myclientid-3", "email@example.com");
OteAccountBuilder.forClientId("myclientid")
OteAccountBuilder.forRegistrarId("myclientid")
.addContact("other@example.com")
.setReplaceExisting(true)
.buildAndPersist();
@@ -291,8 +296,8 @@ public final class OteAccountBuilderTest {
}
@TestOfyAndSql
void testCreateClientIdToTldMap_validEntries() {
assertThat(OteAccountBuilder.createClientIdToTldMap("myclientid"))
void testCreateRegistrarIdToTldMap_validEntries() {
assertThat(OteAccountBuilder.createRegistrarIdToTldMap("myclientid"))
.containsExactly(
"myclientid-1", "myclientid-sunrise",
"myclientid-3", "myclientid-ga",
@@ -301,35 +306,35 @@ public final class OteAccountBuilderTest {
}
@TestOfyAndSql
void testCreateClientIdToTldMap_invalidId() {
void testCreateRegistrarIdToTldMap_invalidId() {
IllegalArgumentException exception =
assertThrows(
IllegalArgumentException.class, () -> OteAccountBuilder.createClientIdToTldMap("a"));
IllegalArgumentException.class, () -> OteAccountBuilder.createRegistrarIdToTldMap("a"));
assertThat(exception).hasMessageThat().isEqualTo("Invalid registrar name: a");
}
@TestOfyAndSql
void testGetBaseClientId_validOteId() {
assertThat(OteAccountBuilder.getBaseClientId("myclientid-4")).isEqualTo("myclientid");
void testGetBaseRegistrarId_validOteId() {
assertThat(OteAccountBuilder.getBaseRegistrarId("myclientid-4")).isEqualTo("myclientid");
}
@TestOfyAndSql
void testGetBaseClientId_invalidInput_malformed() {
void testGetBaseRegistrarId_invalidInput_malformed() {
assertThat(
assertThrows(
IllegalArgumentException.class,
() -> OteAccountBuilder.getBaseClientId("myclientid")))
() -> OteAccountBuilder.getBaseRegistrarId("myclientid")))
.hasMessageThat()
.isEqualTo("Invalid OT&E client ID: myclientid");
.isEqualTo("Invalid OT&E registrar ID: myclientid");
}
@TestOfyAndSql
void testGetBaseClientId_invalidInput_wrongForBase() {
void testGetBaseRegistrarId_invalidInput_wrongForBase() {
assertThat(
assertThrows(
IllegalArgumentException.class,
() -> OteAccountBuilder.getBaseClientId("myclientid-7")))
() -> OteAccountBuilder.getBaseRegistrarId("myclientid-7")))
.hasMessageThat()
.isEqualTo("ID myclientid-7 is not one of the OT&E client IDs for base myclientid");
.isEqualTo("ID myclientid-7 is not one of the OT&E registrar IDs for base myclientid");
}
}
core/src/test/java/google/registry/model/OteStatsTestHelper.java
+18 -16
View File
@@ -42,7 +42,7 @@ public final class OteStatsTestHelper {
persistResource(
new DomainHistory.Builder()
.setDomainRepoId(persistActiveDomain("xn--abc-873b2e7eb1k8a4lpjvv.tld").getRepoId())
.setClientId(oteAccount1)
.setRegistrarId(oteAccount1)
.setType(Type.DOMAIN_CREATE)
.setXmlBytes(getBytes("domain_create_idn.xml"))
.setModificationTime(now)
@@ -50,7 +50,7 @@ public final class OteStatsTestHelper {
persistResource(
new DomainHistory.Builder()
.setDomainRepoId(persistActiveDomain("example.tld").getRepoId())
.setClientId(oteAccount1)
.setRegistrarId(oteAccount1)
.setType(Type.DOMAIN_RESTORE)
.setXmlBytes(getBytes("domain_restore.xml"))
.setModificationTime(now)
@@ -58,7 +58,7 @@ public final class OteStatsTestHelper {
persistResource(
new HostHistory.Builder()
.setHostRepoId(persistDeletedHost("ns1.example.tld", now).getRepoId())
.setClientId(oteAccount1)
.setRegistrarId(oteAccount1)
.setType(Type.HOST_DELETE)
.setXmlBytes(getBytes("host_delete.xml"))
.setModificationTime(now)
@@ -79,13 +79,15 @@ public final class OteStatsTestHelper {
public static void setupIncompleteOte(String baseClientId) throws IOException {
createTld("tld");
persistPremiumList("default_sandbox_list", USD, "sandbox,USD 1000");
OteAccountBuilder.forClientId(baseClientId).addContact("email@example.com").buildAndPersist();
OteAccountBuilder.forRegistrarId(baseClientId)
.addContact("email@example.com")
.buildAndPersist();
String oteAccount1 = String.format("%s-1", baseClientId);
DateTime now = DateTime.now(DateTimeZone.UTC);
persistResource(
new DomainHistory.Builder()
.setDomainRepoId(persistActiveDomain("exampleone.tld").getRepoId())
.setClientId(oteAccount1)
.setRegistrarId(oteAccount1)
.setType(Type.DOMAIN_CREATE)
.setXmlBytes(getBytes("domain_create_sunrise.xml"))
.setModificationTime(now)
@@ -93,7 +95,7 @@ public final class OteStatsTestHelper {
persistResource(
new DomainHistory.Builder()
.setDomainRepoId(persistActiveDomain("example-one.tld").getRepoId())
.setClientId(oteAccount1)
.setRegistrarId(oteAccount1)
.setType(Type.DOMAIN_CREATE)
.setXmlBytes(getBytes("domain_create_claim_notice.xml"))
.setModificationTime(now)
@@ -101,7 +103,7 @@ public final class OteStatsTestHelper {
persistResource(
new DomainHistory.Builder()
.setDomainRepoId(persistActiveDomain("example.tld").getRepoId())
.setClientId(oteAccount1)
.setRegistrarId(oteAccount1)
.setType(Type.DOMAIN_CREATE)
.setXmlBytes(getBytes("domain_create_anchor_tenant_fee_standard.xml"))
.setModificationTime(now)
@@ -109,7 +111,7 @@ public final class OteStatsTestHelper {
persistResource(
new DomainHistory.Builder()
.setDomainRepoId(persistActiveDomain("example.tld").getRepoId())
.setClientId(oteAccount1)
.setRegistrarId(oteAccount1)
.setType(Type.DOMAIN_CREATE)
.setXmlBytes(getBytes("domain_create_dsdata.xml"))
.setModificationTime(now)
@@ -117,7 +119,7 @@ public final class OteStatsTestHelper {
persistResource(
new DomainHistory.Builder()
.setDomainRepoId(persistDeletedDomain("example.tld", now).getRepoId())
.setClientId(oteAccount1)
.setRegistrarId(oteAccount1)
.setType(Type.DOMAIN_DELETE)
.setXmlBytes(getBytes("domain_delete.xml"))
.setModificationTime(now)
@@ -125,7 +127,7 @@ public final class OteStatsTestHelper {
persistResource(
new DomainHistory.Builder()
.setDomainRepoId(persistActiveDomain("example.tld").getRepoId())
.setClientId(oteAccount1)
.setRegistrarId(oteAccount1)
.setType(Type.DOMAIN_TRANSFER_APPROVE)
.setXmlBytes(getBytes("domain_transfer_approve.xml"))
.setModificationTime(now)
@@ -133,7 +135,7 @@ public final class OteStatsTestHelper {
persistResource(
new DomainHistory.Builder()
.setDomainRepoId(persistActiveDomain("example.tld").getRepoId())
.setClientId(oteAccount1)
.setRegistrarId(oteAccount1)
.setType(Type.DOMAIN_TRANSFER_CANCEL)
.setXmlBytes(getBytes("domain_transfer_cancel.xml"))
.setModificationTime(now)
@@ -141,7 +143,7 @@ public final class OteStatsTestHelper {
persistResource(
new DomainHistory.Builder()
.setDomainRepoId(persistActiveDomain("example.tld").getRepoId())
.setClientId(oteAccount1)
.setRegistrarId(oteAccount1)
.setType(Type.DOMAIN_TRANSFER_REJECT)
.setXmlBytes(getBytes("domain_transfer_reject.xml"))
.setModificationTime(now)
@@ -149,7 +151,7 @@ public final class OteStatsTestHelper {
persistResource(
new DomainHistory.Builder()
.setDomainRepoId(persistActiveDomain("example.tld").getRepoId())
.setClientId(oteAccount1)
.setRegistrarId(oteAccount1)
.setType(Type.DOMAIN_TRANSFER_REQUEST)
.setXmlBytes(getBytes("domain_transfer_request.xml"))
.setModificationTime(now)
@@ -157,7 +159,7 @@ public final class OteStatsTestHelper {
persistResource(
new DomainHistory.Builder()
.setDomainRepoId(persistActiveDomain("example.tld").getRepoId())
.setClientId(oteAccount1)
.setRegistrarId(oteAccount1)
.setType(Type.DOMAIN_UPDATE)
.setXmlBytes(getBytes("domain_update_with_secdns.xml"))
.setModificationTime(now)
@@ -165,7 +167,7 @@ public final class OteStatsTestHelper {
persistResource(
new HostHistory.Builder()
.setHostRepoId(persistActiveHost("example.tld").getRepoId())
.setClientId(oteAccount1)
.setRegistrarId(oteAccount1)
.setType(Type.HOST_CREATE)
.setXmlBytes(getBytes("host_create_complete.xml"))
.setModificationTime(now)
@@ -177,7 +179,7 @@ public final class OteStatsTestHelper {
persistResource(
new HostHistory.Builder()
.setHostRepoId(persistActiveHost("example.tld").getRepoId())
.setClientId(oteAccount1)
.setRegistrarId(oteAccount1)
.setType(Type.HOST_UPDATE)
.setXmlBytes(getBytes("host_update.xml"))
.setTrid(Trid.create(null, String.format("blahtrid-%d", i)))
core/src/test/java/google/registry/model/billing/BillingEventTest.java
+3 -3
View File
@@ -80,7 +80,7 @@ public class BillingEventTest extends EntityTestCase {
.setDomain(domain)
.setModificationTime(now)
.setRequestedByRegistrar(false)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setXmlBytes(new byte[0])
.build());
@@ -90,7 +90,7 @@ public class BillingEventTest extends EntityTestCase {
.setDomain(domain)
.setModificationTime(now.plusDays(1))
.setRequestedByRegistrar(false)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setXmlBytes(new byte[0])
.build());
@@ -181,7 +181,7 @@ public class BillingEventTest extends EntityTestCase {
}
private <E extends BillingEvent, B extends BillingEvent.Builder<E, B>> E commonInit(B builder) {
return builder.setClientId("TheRegistrar").setTargetId("foo.tld").build();
return builder.setRegistrarId("TheRegistrar").setTargetId("foo.tld").build();
}
@TestOfyAndSql
core/src/test/java/google/registry/model/contact/ContactResourceTest.java
+7 -7
View File
@@ -65,11 +65,11 @@ public class ContactResourceTest extends EntityTestCase {
new ContactResource.Builder()
.setContactId("contact_id")
.setRepoId("1-FOOBAR")
.setCreationClientId("registrar1")
.setCreationRegistrarId("registrar1")
.setLastEppUpdateTime(fakeClock.nowUtc())
.setLastEppUpdateClientId("registrar2")
.setLastEppUpdateRegistrarId("registrar2")
.setLastTransferTime(fakeClock.nowUtc())
.setPersistedCurrentSponsorClientId("registrar3")
.setPersistedCurrentSponsorRegistrarId("registrar3")
.setLocalizedPostalInfo(
new PostalInfo.Builder()
.setType(Type.LOCALIZED)
@@ -115,8 +115,8 @@ public class ContactResourceTest extends EntityTestCase {
.setStatusValues(ImmutableSet.of(StatusValue.OK))
.setTransferData(
new ContactTransferData.Builder()
.setGainingClientId("gaining")
.setLosingClientId("losing")
.setGainingRegistrarId("gaining")
.setLosingRegistrarId("losing")
.setPendingTransferExpirationTime(fakeClock.nowUtc())
.setTransferRequestTime(fakeClock.nowUtc())
.setTransferStatus(TransferStatus.SERVER_APPROVED)
@@ -258,13 +258,13 @@ public class ContactResourceTest extends EntityTestCase {
.asBuilder()
.setTransferStatus(TransferStatus.PENDING)
.setPendingTransferExpirationTime(fakeClock.nowUtc().plusDays(1))
.setGainingClientId("winner")
.setGainingRegistrarId("winner")
.build())
.build()
.cloneProjectedAtTime(fakeClock.nowUtc().plusDays(1));
assertThat(afterTransfer.getTransferData().getTransferStatus())
.isEqualTo(TransferStatus.SERVER_APPROVED);
assertThat(afterTransfer.getCurrentSponsorClientId()).isEqualTo("winner");
assertThat(afterTransfer.getCurrentSponsorRegistrarId()).isEqualTo("winner");
assertThat(afterTransfer.getLastTransferTime()).isEqualTo(fakeClock.nowUtc().plusDays(1));
}
core/src/test/java/google/registry/model/domain/DomainBaseSqlTest.java
+19 -19
View File
@@ -97,9 +97,9 @@ public class DomainBaseSqlTest {
new DomainBase.Builder()
.setDomainName("example.com")
.setRepoId("4-COM")
.setCreationClientId("registrar1")
.setCreationRegistrarId("registrar1")
.setLastEppUpdateTime(fakeClock.nowUtc())
.setLastEppUpdateClientId("registrar2")
.setLastEppUpdateRegistrarId("registrar2")
.setLastTransferTime(fakeClock.nowUtc())
.setNameservers(host1VKey)
.setStatusValues(
@@ -113,7 +113,7 @@ public class DomainBaseSqlTest {
.setRegistrant(contactKey)
.setContacts(ImmutableSet.of(DesignatedContact.create(Type.ADMIN, contact2Key)))
.setSubordinateHosts(ImmutableSet.of("ns1.example.com"))
.setPersistedCurrentSponsorClientId("registrar3")
.setPersistedCurrentSponsorRegistrarId("registrar3")
.setRegistrationExpirationTime(fakeClock.nowUtc().plusYears(1))
.setAuthInfo(DomainAuthInfo.create(PasswordAuth.create("password")))
.setDsData(ImmutableSet.of(DelegationSignerData.create(1, 2, 3, new byte[] {0, 1, 2})))
@@ -129,8 +129,8 @@ public class DomainBaseSqlTest {
new HostResource.Builder()
.setRepoId("host1")
.setHostName("ns1.example.com")
.setCreationClientId("registrar1")
.setPersistedCurrentSponsorClientId("registrar2")
.setCreationRegistrarId("registrar1")
.setPersistedCurrentSponsorRegistrarId("registrar2")
.build();
contact = makeContact("contact_id1");
contact2 = makeContact("contact_id2");
@@ -402,9 +402,9 @@ public class DomainBaseSqlTest {
static ContactResource makeContact(String repoId) {
return new ContactResource.Builder()
.setRepoId(repoId)
.setCreationClientId("registrar1")
.setCreationRegistrarId("registrar1")
.setTransferData(new ContactTransferData.Builder().build())
.setPersistedCurrentSponsorClientId("registrar1")
.setPersistedCurrentSponsorRegistrarId("registrar1")
.build();
}
@@ -442,7 +442,7 @@ public class DomainBaseSqlTest {
.setPeriod(Period.create(1, Period.Unit.YEARS))
.setModificationTime(DateTime.now(UTC))
.setDomainRepoId("4-COM")
.setClientId("registrar1")
.setRegistrarId("registrar1")
// These are non-null, but I don't think some tests set them.
.setReason("felt like it")
.setRequestedByRegistrar(false)
@@ -454,7 +454,7 @@ public class DomainBaseSqlTest {
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId("example.com")
.setClientId("registrar1")
.setRegistrarId("registrar1")
.setDomainRepoId("4-COM")
.setDomainHistoryRevisionId(1L)
.setEventTime(DateTime.now(UTC).plusYears(1))
@@ -464,14 +464,14 @@ public class DomainBaseSqlTest {
PollMessage.Autorenew autorenewPollMessage =
new PollMessage.Autorenew.Builder()
.setId(300L)
.setClientId("registrar1")
.setRegistrarId("registrar1")
.setEventTime(DateTime.now(UTC).plusYears(1))
.setParent(historyEntry)
.build();
PollMessage.OneTime deletePollMessage =
new PollMessage.OneTime.Builder()
.setId(400L)
.setClientId("registrar1")
.setRegistrarId("registrar1")
.setEventTime(DateTime.now(UTC).plusYears(1))
.setParent(historyEntry)
.build();
@@ -481,7 +481,7 @@ public class DomainBaseSqlTest {
// Use SERVER_STATUS so we don't have to add a period.
.setReason(Reason.SERVER_STATUS)
.setTargetId("example.com")
.setClientId("registrar1")
.setRegistrarId("registrar1")
.setDomainRepoId("4-COM")
.setBillingTime(DateTime.now(UTC))
.setCost(Money.of(USD, 100))
@@ -572,7 +572,7 @@ public class DomainBaseSqlTest {
.setPeriod(Period.create(1, Period.Unit.YEARS))
.setModificationTime(DateTime.now(UTC))
.setDomainRepoId("4-COM")
.setClientId("registrar1")
.setRegistrarId("registrar1")
// These are non-null, but I don't think some tests set them.
.setReason("felt like it")
.setRequestedByRegistrar(false)
@@ -584,7 +584,7 @@ public class DomainBaseSqlTest {
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId("example.com")
.setClientId("registrar1")
.setRegistrarId("registrar1")
.setDomainRepoId("4-COM")
.setDomainHistoryRevisionId(1L)
.setEventTime(DateTime.now(UTC).plusYears(1))
@@ -594,14 +594,14 @@ public class DomainBaseSqlTest {
PollMessage.Autorenew autorenewPollMessage =
new PollMessage.Autorenew.Builder()
.setId(300L)
.setClientId("registrar1")
.setRegistrarId("registrar1")
.setEventTime(DateTime.now(UTC).plusYears(1))
.setParent(historyEntry)
.build();
PollMessage.OneTime deletePollMessage =
new PollMessage.OneTime.Builder()
.setId(400L)
.setClientId("registrar1")
.setRegistrarId("registrar1")
.setEventTime(DateTime.now(UTC).plusYears(1))
.setParent(historyEntry)
.build();
@@ -611,7 +611,7 @@ public class DomainBaseSqlTest {
// Use SERVER_STATUS so we don't have to add a period.
.setReason(Reason.SERVER_STATUS)
.setTargetId("example.com")
.setClientId("registrar1")
.setRegistrarId("registrar1")
.setDomainRepoId("4-COM")
.setBillingTime(DateTime.now(UTC))
.setCost(Money.of(USD, 100))
@@ -623,8 +623,8 @@ public class DomainBaseSqlTest {
new DomainTransferData.Builder()
.setTransferRequestTrid(Trid.create("foo", "bar"))
.setTransferRequestTime(fakeClock.nowUtc())
.setGainingClientId("registrar2")
.setLosingClientId("registrar1")
.setGainingRegistrarId("registrar2")
.setLosingRegistrarId("registrar1")
.setPendingTransferExpirationTime(fakeClock.nowUtc().plusDays(1)),
ImmutableSet.of(oneTimeBillingEvent, billEvent, autorenewPollMessage),
Period.create(0, Unit.YEARS));
core/src/test/java/google/registry/model/domain/DomainBaseTest.java
+29 -29
View File
@@ -109,7 +109,7 @@ public class DomainBaseTest extends EntityTestCase {
.setDomainRepoId(domainKey.getOfyKey().getName())
.setModificationTime(fakeClock.nowUtc())
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setClientId("aregistrar")
.setRegistrarId("aregistrar")
.build()));
oneTimeBillKey = VKey.from(Key.create(historyEntryKey, BillingEvent.OneTime.class, 1));
recurringBillKey = VKey.from(Key.create(historyEntryKey, BillingEvent.Recurring.class, 2));
@@ -124,9 +124,9 @@ public class DomainBaseTest extends EntityTestCase {
new DomainBase.Builder()
.setDomainName("example.com")
.setRepoId("4-COM")
.setCreationClientId("aregistrar")
.setCreationRegistrarId("aregistrar")
.setLastEppUpdateTime(fakeClock.nowUtc())
.setLastEppUpdateClientId("AnotherRegistrar")
.setLastEppUpdateRegistrarId("AnotherRegistrar")
.setLastTransferTime(fakeClock.nowUtc())
.setStatusValues(
ImmutableSet.of(
@@ -140,7 +140,7 @@ public class DomainBaseTest extends EntityTestCase {
.setContacts(ImmutableSet.of(DesignatedContact.create(Type.ADMIN, contact2Key)))
.setNameservers(ImmutableSet.of(hostKey))
.setSubordinateHosts(ImmutableSet.of("ns1.example.com"))
.setPersistedCurrentSponsorClientId("losing")
.setPersistedCurrentSponsorRegistrarId("losing")
.setRegistrationExpirationTime(fakeClock.nowUtc().plusYears(1))
.setAuthInfo(DomainAuthInfo.create(PasswordAuth.create("password")))
.setDsData(
@@ -149,8 +149,8 @@ public class DomainBaseTest extends EntityTestCase {
LaunchNotice.create("tcnid", "validatorId", START_OF_TIME, START_OF_TIME))
.setTransferData(
new DomainTransferData.Builder()
.setGainingClientId("gaining")
.setLosingClientId("losing")
.setGainingRegistrarId("gaining")
.setLosingRegistrarId("losing")
.setPendingTransferExpirationTime(fakeClock.nowUtc())
.setServerApproveEntities(
ImmutableSet.of(oneTimeBillKey, recurringBillKey, autorenewPollKey))
@@ -224,23 +224,23 @@ public class DomainBaseTest extends EntityTestCase {
assertThat(
newDomainBase("example.com")
.asBuilder()
.setPersistedCurrentSponsorClientId(null)
.setPersistedCurrentSponsorRegistrarId(null)
.build()
.getCurrentSponsorClientId())
.getCurrentSponsorRegistrarId())
.isNull();
assertThat(
newDomainBase("example.com")
.asBuilder()
.setPersistedCurrentSponsorClientId("")
.setPersistedCurrentSponsorRegistrarId("")
.build()
.getCurrentSponsorClientId())
.getCurrentSponsorRegistrarId())
.isNull();
assertThat(
newDomainBase("example.com")
.asBuilder()
.setPersistedCurrentSponsorClientId(" ")
.setPersistedCurrentSponsorRegistrarId(" ")
.build()
.getCurrentSponsorClientId())
.getCurrentSponsorRegistrarId())
.isNotNull();
}
@@ -369,7 +369,7 @@ public class DomainBaseTest extends EntityTestCase {
VKey<BillingEvent.Recurring> newAutorenewEvent) {
assertThat(domain.getTransferData().getTransferStatus())
.isEqualTo(TransferStatus.SERVER_APPROVED);
assertThat(domain.getCurrentSponsorClientId()).isEqualTo("winner");
assertThat(domain.getCurrentSponsorRegistrarId()).isEqualTo("winner");
assertThat(domain.getLastTransferTime()).isEqualTo(fakeClock.nowUtc().plusDays(1));
assertThat(domain.getRegistrationExpirationTime()).isEqualTo(newExpirationTime);
assertThat(domain.getAutorenewBillingEvent()).isEqualTo(newAutorenewEvent);
@@ -380,14 +380,14 @@ public class DomainBaseTest extends EntityTestCase {
new DomainHistory.Builder()
.setDomain(domain)
.setModificationTime(fakeClock.nowUtc())
.setClientId(domain.getCurrentSponsorClientId())
.setRegistrarId(domain.getCurrentSponsorRegistrarId())
.setType(HistoryEntry.Type.DOMAIN_TRANSFER_REQUEST)
.build();
BillingEvent.OneTime transferBillingEvent =
persistResource(
new BillingEvent.OneTime.Builder()
.setReason(Reason.TRANSFER)
.setClientId("winner")
.setRegistrarId("winner")
.setTargetId("example.com")
.setEventTime(fakeClock.nowUtc())
.setBillingTime(
@@ -410,7 +410,7 @@ public class DomainBaseTest extends EntityTestCase {
.setTransferStatus(TransferStatus.PENDING)
.setTransferRequestTime(fakeClock.nowUtc().minusDays(4))
.setPendingTransferExpirationTime(fakeClock.nowUtc().plusDays(1))
.setGainingClientId("winner")
.setGainingRegistrarId("winner")
.setServerApproveBillingEvent(transferBillingEvent.createVKey())
.setServerApproveEntities(ImmutableSet.of(transferBillingEvent.createVKey()))
.build())
@@ -480,7 +480,7 @@ public class DomainBaseTest extends EntityTestCase {
.setPendingTransferExpirationTime(transferSuccessTime)
.build())
.setLastEppUpdateTime(transferRequestTime)
.setLastEppUpdateClientId(domain.getTransferData().getGainingClientId())
.setLastEppUpdateRegistrarId(domain.getTransferData().getGainingRegistrarId())
.build();
}
@@ -494,13 +494,13 @@ public class DomainBaseTest extends EntityTestCase {
DomainBase beforeAutoRenew = domain.cloneProjectedAtTime(autorenewDateTime.minusDays(1));
assertThat(beforeAutoRenew.getLastEppUpdateTime()).isEqualTo(transferRequestDateTime);
assertThat(beforeAutoRenew.getLastEppUpdateClientId()).isEqualTo("gaining");
assertThat(beforeAutoRenew.getLastEppUpdateRegistrarId()).isEqualTo("gaining");
// If autorenew happens before transfer succeeds(before transfer grace period starts as well),
// lastEppUpdateClientId should still be the current sponsor client id
DomainBase afterAutoRenew = domain.cloneProjectedAtTime(autorenewDateTime.plusDays(1));
assertThat(afterAutoRenew.getLastEppUpdateTime()).isEqualTo(autorenewDateTime);
assertThat(afterAutoRenew.getLastEppUpdateClientId()).isEqualTo("losing");
assertThat(afterAutoRenew.getLastEppUpdateRegistrarId()).isEqualTo("losing");
}
@Test
@@ -513,12 +513,12 @@ public class DomainBaseTest extends EntityTestCase {
DomainBase beforeAutoRenew = domain.cloneProjectedAtTime(autorenewDateTime.minusDays(1));
assertThat(beforeAutoRenew.getLastEppUpdateTime()).isEqualTo(transferRequestDateTime);
assertThat(beforeAutoRenew.getLastEppUpdateClientId()).isEqualTo("gaining");
assertThat(beforeAutoRenew.getLastEppUpdateRegistrarId()).isEqualTo("gaining");
DomainBase afterTransferSuccess =
domain.cloneProjectedAtTime(transferSuccessDateTime.plusDays(1));
assertThat(afterTransferSuccess.getLastEppUpdateTime()).isEqualTo(transferSuccessDateTime);
assertThat(afterTransferSuccess.getLastEppUpdateClientId()).isEqualTo("gaining");
assertThat(afterTransferSuccess.getLastEppUpdateRegistrarId()).isEqualTo("gaining");
}
private void setupUnmodifiedDomain(DateTime oldExpirationTime) {
@@ -529,7 +529,7 @@ public class DomainBaseTest extends EntityTestCase {
.setTransferData(DomainTransferData.EMPTY)
.setGracePeriods(ImmutableSet.of())
.setLastEppUpdateTime(null)
.setLastEppUpdateClientId(null)
.setLastEppUpdateRegistrarId(null)
.build();
}
@@ -541,11 +541,11 @@ public class DomainBaseTest extends EntityTestCase {
DomainBase beforeAutoRenew = domain.cloneProjectedAtTime(autorenewDateTime.minusDays(1));
assertThat(beforeAutoRenew.getLastEppUpdateTime()).isEqualTo(null);
assertThat(beforeAutoRenew.getLastEppUpdateClientId()).isEqualTo(null);
assertThat(beforeAutoRenew.getLastEppUpdateRegistrarId()).isEqualTo(null);
DomainBase afterAutoRenew = domain.cloneProjectedAtTime(autorenewDateTime.plusDays(1));
assertThat(afterAutoRenew.getLastEppUpdateTime()).isEqualTo(autorenewDateTime);
assertThat(afterAutoRenew.getLastEppUpdateClientId()).isEqualTo("losing");
assertThat(afterAutoRenew.getLastEppUpdateRegistrarId()).isEqualTo("losing");
}
@Test
@@ -679,7 +679,7 @@ public class DomainBaseTest extends EntityTestCase {
oldExpirationTime
.plusYears(2)
.plus(Registry.get("com").getAutoRenewGracePeriodLength()),
renewedThreeTimes.getCurrentSponsorClientId(),
renewedThreeTimes.getCurrentSponsorRegistrarId(),
renewedThreeTimes.autorenewBillingEvent,
renewedThreeTimes.getGracePeriods().iterator().next().getGracePeriodId()));
}
@@ -751,7 +751,7 @@ public class DomainBaseTest extends EntityTestCase {
new DomainTransferData.Builder()
.setPendingTransferExpirationTime(transferExpirationTime)
.setTransferStatus(TransferStatus.PENDING)
.setGainingClientId("TheRegistrar")
.setGainingRegistrarId("TheRegistrar")
.build();
Period extensionPeriod = transferData.getTransferPeriod();
DateTime newExpiration = previousExpiration.plusYears(extensionPeriod.getValue());
@@ -779,7 +779,7 @@ public class DomainBaseTest extends EntityTestCase {
new DomainTransferData.Builder()
.setPendingTransferExpirationTime(transferExpirationTime)
.setTransferStatus(TransferStatus.PENDING)
.setGainingClientId("TheRegistrar")
.setGainingRegistrarId("TheRegistrar")
.build();
Period extensionPeriod = transferData.getTransferPeriod();
DateTime newExpiration = previousExpiration.plusYears(extensionPeriod.getValue());
@@ -806,7 +806,7 @@ public class DomainBaseTest extends EntityTestCase {
new DomainTransferData.Builder()
.setPendingTransferExpirationTime(transferExpirationTime)
.setTransferStatus(TransferStatus.PENDING)
.setGainingClientId("TheRegistrar")
.setGainingRegistrarId("TheRegistrar")
.build();
domain =
persistResource(
@@ -832,7 +832,7 @@ public class DomainBaseTest extends EntityTestCase {
new DomainTransferData.Builder()
.setPendingTransferExpirationTime(transferExpirationTime)
.setTransferStatus(TransferStatus.PENDING)
.setGainingClientId("TheRegistrar")
.setGainingRegistrarId("TheRegistrar")
.setServerApproveAutorenewEvent(recurringBillKey)
.setServerApproveBillingEvent(oneTimeBillKey)
.build();
core/src/test/java/google/registry/model/domain/GracePeriodTest.java
+4 -4
View File
@@ -52,7 +52,7 @@ public class GracePeriodTest {
new BillingEvent.OneTime.Builder()
.setEventTime(now)
.setBillingTime(now.plusDays(1))
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setCost(Money.of(CurrencyUnit.USD, 42))
.setParent(
Key.create(Key.create(DomainBase.class, "domain"), DomainHistory.class, 12345))
@@ -77,7 +77,7 @@ public class GracePeriodTest {
assertThat(gracePeriod.getDomainRepoId()).isEqualTo("1-TEST");
assertThat(gracePeriod.getOneTimeBillingEvent()).isEqualTo(onetime.createVKey());
assertThat(gracePeriod.getRecurringBillingEvent()).isNull();
assertThat(gracePeriod.getClientId()).isEqualTo("TheRegistrar");
assertThat(gracePeriod.getRegistrarId()).isEqualTo("TheRegistrar");
assertThat(gracePeriod.getExpirationTime()).isEqualTo(now.plusDays(1));
assertThat(gracePeriod.hasBillingEvent()).isTrue();
}
@@ -91,7 +91,7 @@ public class GracePeriodTest {
assertThat(gracePeriod.getDomainRepoId()).isEqualTo("1-TEST");
assertThat(gracePeriod.getOneTimeBillingEvent()).isNull();
assertThat(gracePeriod.getRecurringBillingEvent()).isEqualTo(recurringKey);
assertThat(gracePeriod.getClientId()).isEqualTo("TheRegistrar");
assertThat(gracePeriod.getRegistrarId()).isEqualTo("TheRegistrar");
assertThat(gracePeriod.getExpirationTime()).isEqualTo(now.plusDays(1));
assertThat(gracePeriod.hasBillingEvent()).isTrue();
}
@@ -105,7 +105,7 @@ public class GracePeriodTest {
assertThat(gracePeriod.getDomainRepoId()).isEqualTo("1-TEST");
assertThat(gracePeriod.getOneTimeBillingEvent()).isNull();
assertThat(gracePeriod.getRecurringBillingEvent()).isNull();
assertThat(gracePeriod.getClientId()).isEqualTo("TheRegistrar");
assertThat(gracePeriod.getRegistrarId()).isEqualTo("TheRegistrar");
assertThat(gracePeriod.getExpirationTime()).isEqualTo(now);
assertThat(gracePeriod.hasBillingEvent()).isFalse();
}
core/src/test/java/google/registry/model/history/ContactHistoryTest.java
+2 -2
View File
@@ -113,7 +113,7 @@ public class ContactHistoryTest extends EntityTestCase {
.setType(HistoryEntry.Type.HOST_CREATE)
.setXmlBytes("<xml></xml>".getBytes(UTF_8))
.setModificationTime(fakeClock.nowUtc())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setTrid(Trid.create("ABC-123", "server-trid"))
.setBySuperuser(false)
.setReason("reason")
@@ -140,7 +140,7 @@ public class ContactHistoryTest extends EntityTestCase {
.setType(HistoryEntry.Type.HOST_CREATE)
.setXmlBytes("<xml></xml>".getBytes(UTF_8))
.setModificationTime(fakeClock.nowUtc())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setTrid(Trid.create("ABC-123", "server-trid"))
.setBySuperuser(false)
.setReason("reason")
core/src/test/java/google/registry/model/history/DomainHistoryTest.java
+5 -5
View File
@@ -200,13 +200,13 @@ public class DomainHistoryTest extends EntityTestCase {
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setXmlBytes("<xml></xml>".getBytes(UTF_8))
.setModificationTime(fakeClock.nowUtc())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setTrid(Trid.create("ABC-123", "server-trid"))
.setBySuperuser(false)
.setReason("reason")
.setRequestedByRegistrar(true)
.setDomainRepoId(domain.getRepoId())
.setOtherClientId("otherClient")
.setOtherRegistrarId("otherClient")
.setPeriod(Period.create(1, Period.Unit.YEARS))
.build();
jpaTm()
@@ -216,7 +216,7 @@ public class DomainHistoryTest extends EntityTestCase {
.put(
domain
.asBuilder()
.setPersistedCurrentSponsorClientId("NewRegistrar")
.setPersistedCurrentSponsorRegistrarId("NewRegistrar")
.build());
historyWithoutResource.beforeSqlSaveOnReplay();
jpaTm().put(historyWithoutResource);
@@ -290,7 +290,7 @@ public class DomainHistoryTest extends EntityTestCase {
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setXmlBytes("<xml></xml>".getBytes(UTF_8))
.setModificationTime(fakeClock.nowUtc())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setTrid(Trid.create("ABC-123", "server-trid"))
.setBySuperuser(false)
.setReason("reason")
@@ -298,7 +298,7 @@ public class DomainHistoryTest extends EntityTestCase {
.setDomain(domain)
.setDomainRepoId(domain.getRepoId())
.setDomainTransactionRecords(ImmutableSet.of(transactionRecord))
.setOtherClientId("otherClient")
.setOtherRegistrarId("otherClient")
.setPeriod(Period.create(1, Period.Unit.YEARS))
.build();
}
core/src/test/java/google/registry/model/history/HostHistoryTest.java
+2 -2
View File
@@ -113,7 +113,7 @@ public class HostHistoryTest extends EntityTestCase {
.setType(HistoryEntry.Type.HOST_CREATE)
.setXmlBytes("<xml></xml>".getBytes(UTF_8))
.setModificationTime(fakeClock.nowUtc())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setTrid(Trid.create("ABC-123", "server-trid"))
.setBySuperuser(false)
.setReason("reason")
@@ -147,7 +147,7 @@ public class HostHistoryTest extends EntityTestCase {
.setType(HistoryEntry.Type.HOST_CREATE)
.setXmlBytes("<xml></xml>".getBytes(UTF_8))
.setModificationTime(fakeClock.nowUtc())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setTrid(Trid.create("ABC-123", "server-trid"))
.setBySuperuser(false)
.setReason("reason")
core/src/test/java/google/registry/model/history/LegacyHistoryObjectTest.java
+2 -2
View File
@@ -195,7 +195,7 @@ public class LegacyHistoryObjectTest extends EntityTestCase {
return historyEntryBuilderFor(domain)
.setPeriod(Period.create(1, Period.Unit.YEARS))
.setDomainTransactionRecords(ImmutableSet.of(transactionRecord))
.setOtherClientId("TheRegistrar")
.setOtherRegistrarId("TheRegistrar")
.build();
}
@@ -204,7 +204,7 @@ public class LegacyHistoryObjectTest extends EntityTestCase {
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setXmlBytes("<xml></xml>".getBytes(UTF_8))
.setModificationTime(fakeClock.nowUtc())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setTrid(Trid.create("ABC-123", "server-trid"))
.setBySuperuser(false)
.setReason("reason")
core/src/test/java/google/registry/model/host/HostResourceTest.java
+12 -12
View File
@@ -71,8 +71,8 @@ class HostResourceTest extends EntityTestCase {
.setRepoId("1-COM")
.setTransferData(
new DomainTransferData.Builder()
.setGainingClientId("gaining")
.setLosingClientId("losing")
.setGainingRegistrarId("gaining")
.setLosingRegistrarId("losing")
.setPendingTransferExpirationTime(fakeClock.nowUtc())
.setTransferRequestTime(fakeClock.nowUtc())
.setTransferStatus(TransferStatus.SERVER_APPROVED)
@@ -85,9 +85,9 @@ class HostResourceTest extends EntityTestCase {
new HostResource.Builder()
.setRepoId("DEADBEEF-COM")
.setHostName("ns1.example.com")
.setCreationClientId("thisRegistrar")
.setCreationRegistrarId("thisRegistrar")
.setLastEppUpdateTime(fakeClock.nowUtc())
.setLastEppUpdateClientId("thatRegistrar")
.setLastEppUpdateRegistrarId("thatRegistrar")
.setLastTransferTime(fakeClock.nowUtc())
.setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
.setStatusValues(ImmutableSet.of(StatusValue.OK))
@@ -134,21 +134,21 @@ class HostResourceTest extends EntityTestCase {
void testEmptyStringsBecomeNull() {
assertThat(
new HostResource.Builder()
.setPersistedCurrentSponsorClientId(null)
.setPersistedCurrentSponsorRegistrarId(null)
.build()
.getPersistedCurrentSponsorClientId())
.getPersistedCurrentSponsorRegistrarId())
.isNull();
assertThat(
new HostResource.Builder()
.setPersistedCurrentSponsorClientId("")
.setPersistedCurrentSponsorRegistrarId("")
.build()
.getPersistedCurrentSponsorClientId())
.getPersistedCurrentSponsorRegistrarId())
.isNull();
assertThat(
new HostResource.Builder()
.setPersistedCurrentSponsorClientId(" ")
.setPersistedCurrentSponsorRegistrarId(" ")
.build()
.getPersistedCurrentSponsorClientId())
.getPersistedCurrentSponsorRegistrarId())
.isNotNull();
}
@@ -247,9 +247,9 @@ class HostResourceTest extends EntityTestCase {
.setCreationTime(day2)
.setRepoId("DEADBEEF-COM")
.setHostName("ns1.example.com")
.setCreationClientId("thisRegistrar")
.setCreationRegistrarId("thisRegistrar")
.setLastEppUpdateTime(fakeClock.nowUtc())
.setLastEppUpdateClientId("thatRegistrar")
.setLastEppUpdateRegistrarId("thatRegistrar")
.setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
.setStatusValues(ImmutableSet.of(StatusValue.OK))
.setSuperordinateDomain(domain.createVKey())
core/src/test/java/google/registry/model/index/ForeignKeyIndexTest.java
+4 -1
View File
@@ -211,7 +211,10 @@ class ForeignKeyIndexTest extends EntityTestCase {
.containsExactly("ns1.example.com", originalFki);
HostResource modifiedHost =
persistResource(
originalHost.asBuilder().setPersistedCurrentSponsorClientId("OtherRegistrar").build());
originalHost
.asBuilder()
.setPersistedCurrentSponsorRegistrarId("OtherRegistrar")
.build());
fakeClock.advanceOneMilli();
ForeignKeyIndex<HostResource> newFki = loadHostFki("ns1.example.com");
assertThat(newFki).isNotEqualTo(originalFki);
core/src/test/java/google/registry/model/ofy/OfyTest.java
+1 -1
View File
@@ -76,7 +76,7 @@ public class OfyTest {
createTld("tld");
someObject =
new ContactHistory.Builder()
.setClientId("clientid")
.setRegistrarId("clientid")
.setModificationTime(START_OF_TIME)
.setType(HistoryEntry.Type.CONTACT_CREATE)
.setContact(persistActiveContact("parentContact"))
core/src/test/java/google/registry/model/poll/PollMessageExternalKeyConverterTest.java
+4 -4
View File
@@ -67,7 +67,7 @@ public class PollMessageExternalKeyConverterTest {
.setPeriod(Period.create(1, Period.Unit.YEARS))
.setXmlBytes("<xml></xml>".getBytes(UTF_8))
.setModificationTime(clock.nowUtc())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setTrid(Trid.create("ABC-123", "server-trid"))
.setBySuperuser(false)
.setReason("reason")
@@ -80,7 +80,7 @@ public class PollMessageExternalKeyConverterTest {
PollMessage.OneTime pollMessage =
persistResource(
new PollMessage.OneTime.Builder()
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(clock.nowUtc())
.setMsg("Test poll message")
.setParent(historyEntry)
@@ -97,7 +97,7 @@ public class PollMessageExternalKeyConverterTest {
PollMessage.OneTime pollMessage =
persistResource(
new PollMessage.OneTime.Builder()
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(clock.nowUtc())
.setMsg("Test poll message")
.setParent(historyEntry)
@@ -114,7 +114,7 @@ public class PollMessageExternalKeyConverterTest {
PollMessage.OneTime pollMessage =
persistResource(
new PollMessage.OneTime.Builder()
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(clock.nowUtc())
.setMsg("Test poll message")
.setParent(historyEntry)
core/src/test/java/google/registry/model/poll/PollMessageTest.java
+6 -6
View File
@@ -63,7 +63,7 @@ public class PollMessageTest extends EntityTestCase {
.setPeriod(Period.create(1, Period.Unit.YEARS))
.setXmlBytes("<xml></xml>".getBytes(UTF_8))
.setModificationTime(fakeClock.nowUtc())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setTrid(Trid.create("ABC-123", "server-trid"))
.setBySuperuser(false)
.setReason("reason")
@@ -73,7 +73,7 @@ public class PollMessageTest extends EntityTestCase {
oneTime =
new PollMessage.OneTime.Builder()
.setId(100L)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(fakeClock.nowUtc())
.setMsg("Test poll message")
.setParent(historyEntry)
@@ -81,7 +81,7 @@ public class PollMessageTest extends EntityTestCase {
autoRenew =
new PollMessage.Autorenew.Builder()
.setId(200L)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(fakeClock.nowUtc())
.setMsg("Test poll message")
.setParent(historyEntry)
@@ -113,7 +113,7 @@ public class PollMessageTest extends EntityTestCase {
PollMessage.OneTime pollMessage =
persistResource(
new PollMessage.OneTime.Builder()
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(fakeClock.nowUtc())
.setMsg("Test poll message")
.setParent(historyEntry)
@@ -126,7 +126,7 @@ public class PollMessageTest extends EntityTestCase {
PollMessage.Autorenew pollMessage =
persistResource(
new PollMessage.Autorenew.Builder()
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(fakeClock.nowUtc())
.setMsg("Test poll message")
.setParent(historyEntry)
@@ -141,7 +141,7 @@ public class PollMessageTest extends EntityTestCase {
PollMessage.Autorenew pollMessage =
persistResource(
new PollMessage.Autorenew.Builder()
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(fakeClock.nowUtc())
.setMsg("Test poll message")
.setParent(historyEntry)
core/src/test/java/google/registry/model/registrar/RegistrarTest.java
+23 -19
View File
@@ -63,7 +63,7 @@ class RegistrarTest extends EntityTestCase {
registrar =
cloneAndSetAutoTimestamps(
new Registrar.Builder()
.setClientId("registrar")
.setRegistrarId("registrar")
.setRegistrarName("full registrar name")
.setType(Type.REAL)
.setState(State.PENDING)
@@ -167,22 +167,23 @@ class RegistrarTest extends EntityTestCase {
@TestOfyAndSql
void testSuccess_clientId_bounds() {
registrar = registrar.asBuilder().setClientId("abc").build();
assertThat(registrar.getClientId()).isEqualTo("abc");
registrar = registrar.asBuilder().setClientId("abcdefghijklmnop").build();
assertThat(registrar.getClientId()).isEqualTo("abcdefghijklmnop");
registrar = registrar.asBuilder().setRegistrarId("abc").build();
assertThat(registrar.getRegistrarId()).isEqualTo("abc");
registrar = registrar.asBuilder().setRegistrarId("abcdefghijklmnop").build();
assertThat(registrar.getRegistrarId()).isEqualTo("abcdefghijklmnop");
}
@TestOfyAndSql
void testFailure_clientId_tooShort() {
assertThrows(IllegalArgumentException.class, () -> new Registrar.Builder().setClientId("ab"));
assertThrows(
IllegalArgumentException.class, () -> new Registrar.Builder().setRegistrarId("ab"));
}
@TestOfyAndSql
void testFailure_clientId_tooLong() {
assertThrows(
IllegalArgumentException.class,
() -> new Registrar.Builder().setClientId("abcdefghijklmnopq"));
() -> new Registrar.Builder().setRegistrarId("abcdefghijklmnopq"));
}
@TestOfyAndSql
@@ -329,7 +330,10 @@ class RegistrarTest extends EntityTestCase {
assertThrows(
IllegalArgumentException.class,
() ->
new Registrar.Builder().setClientId("blahid").setType(Registrar.Type.TEST).build());
new Registrar.Builder()
.setRegistrarId("blahid")
.setType(Registrar.Type.TEST)
.build());
assertThat(thrown).hasMessageThat().contains("Registrar name cannot be null");
}
@@ -340,7 +344,7 @@ class RegistrarTest extends EntityTestCase {
IllegalArgumentException.class,
() ->
new Registrar.Builder()
.setClientId("blahid")
.setRegistrarId("blahid")
.setType(Registrar.Type.TEST)
.setRegistrarName("Blah Co")
.build());
@@ -625,7 +629,7 @@ class RegistrarTest extends EntityTestCase {
void testLoadByClientIdCached_isTransactionless() {
tm().transact(
() -> {
assertThat(Registrar.loadByClientIdCached("registrar")).isPresent();
assertThat(Registrar.loadByRegistrarIdCached("registrar")).isPresent();
// Load something as a control to make sure we are seeing loaded keys in the
// session cache.
auditedOfy().load().entity(abuseAdminContact).now();
@@ -634,35 +638,35 @@ class RegistrarTest extends EntityTestCase {
});
tm().clearSessionCache();
// Conversely, loads outside of a transaction should end up in the session cache.
assertThat(Registrar.loadByClientIdCached("registrar")).isPresent();
assertThat(Registrar.loadByRegistrarIdCached("registrar")).isPresent();
assertThat(auditedOfy().getSessionKeys()).contains(Key.create(registrar));
}
@TestOfyAndSql
void testFailure_loadByClientId_clientIdIsNull() {
IllegalArgumentException thrown =
assertThrows(IllegalArgumentException.class, () -> Registrar.loadByClientId(null));
assertThat(thrown).hasMessageThat().contains("clientId must be specified");
assertThrows(IllegalArgumentException.class, () -> Registrar.loadByRegistrarId(null));
assertThat(thrown).hasMessageThat().contains("registrarId must be specified");
}
@TestOfyAndSql
void testFailure_loadByClientId_clientIdIsEmpty() {
IllegalArgumentException thrown =
assertThrows(IllegalArgumentException.class, () -> Registrar.loadByClientId(""));
assertThat(thrown).hasMessageThat().contains("clientId must be specified");
assertThrows(IllegalArgumentException.class, () -> Registrar.loadByRegistrarId(""));
assertThat(thrown).hasMessageThat().contains("registrarId must be specified");
}
@TestOfyAndSql
void testFailure_loadByClientIdCached_clientIdIsNull() {
IllegalArgumentException thrown =
assertThrows(IllegalArgumentException.class, () -> Registrar.loadByClientIdCached(null));
assertThat(thrown).hasMessageThat().contains("clientId must be specified");
assertThrows(IllegalArgumentException.class, () -> Registrar.loadByRegistrarIdCached(null));
assertThat(thrown).hasMessageThat().contains("registrarId must be specified");
}
@TestOfyAndSql
void testFailure_loadByClientIdCached_clientIdIsEmpty() {
IllegalArgumentException thrown =
assertThrows(IllegalArgumentException.class, () -> Registrar.loadByClientIdCached(""));
assertThat(thrown).hasMessageThat().contains("clientId must be specified");
assertThrows(IllegalArgumentException.class, () -> Registrar.loadByRegistrarIdCached(""));
assertThat(thrown).hasMessageThat().contains("registrarId must be specified");
}
}
core/src/test/java/google/registry/model/reporting/HistoryEntryDaoTest.java
+2 -2
View File
@@ -63,8 +63,8 @@ class HistoryEntryDaoTest extends EntityTestCase {
.setPeriod(Period.create(1, Period.Unit.YEARS))
.setXmlBytes("<xml></xml>".getBytes(UTF_8))
.setModificationTime(fakeClock.nowUtc())
.setClientId("TheRegistrar")
.setOtherClientId("otherClient")
.setRegistrarId("TheRegistrar")
.setOtherRegistrarId("otherClient")
.setTrid(Trid.create("ABC-123", "server-trid"))
.setBySuperuser(false)
.setReason("reason")
core/src/test/java/google/registry/model/reporting/HistoryEntryTest.java
+5 -5
View File
@@ -64,8 +64,8 @@ class HistoryEntryTest extends EntityTestCase {
.setPeriod(Period.create(1, Period.Unit.YEARS))
.setXmlBytes("<xml></xml>".getBytes(UTF_8))
.setModificationTime(fakeClock.nowUtc())
.setClientId("TheRegistrar")
.setOtherClientId("otherClient")
.setRegistrarId("TheRegistrar")
.setOtherRegistrarId("otherClient")
.setTrid(Trid.create("ABC-123", "server-trid"))
.setBySuperuser(false)
.setReason("reason")
@@ -100,7 +100,7 @@ class HistoryEntryTest extends EntityTestCase {
new ContactHistory.Builder()
.setId(5L)
.setModificationTime(DateTime.parse("1985-07-12T22:30:00Z"))
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setReason("Reason")
.build());
assertThat(thrown).hasMessageThat().isEqualTo("History entry type must be specified");
@@ -115,7 +115,7 @@ class HistoryEntryTest extends EntityTestCase {
new ContactHistory.Builder()
.setId(5L)
.setType(HistoryEntry.Type.CONTACT_CREATE)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setReason("Reason")
.build());
assertThat(thrown).hasMessageThat().isEqualTo("Modification time must be specified");
@@ -146,7 +146,7 @@ class HistoryEntryTest extends EntityTestCase {
.setId(5L)
.setType(HistoryEntry.Type.SYNTHETIC)
.setModificationTime(DateTime.parse("1985-07-12T22:30:00Z"))
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setReason("Reason")
.setRequestedByRegistrar(true)
.build());
core/src/test/java/google/registry/model/reporting/Spec11ThreatMatchTest.java
+6 -6
View File
@@ -66,8 +66,8 @@ public final class Spec11ThreatMatchTest extends EntityTestCase {
domain =
new DomainBase()
.asBuilder()
.setCreationClientId(REGISTRAR_ID)
.setPersistedCurrentSponsorClientId(REGISTRAR_ID)
.setCreationRegistrarId(REGISTRAR_ID)
.setPersistedCurrentSponsorRegistrarId(REGISTRAR_ID)
.setDomainName("foo.tld")
.setRepoId(domainRepoId)
.setNameservers(hostVKey)
@@ -79,9 +79,9 @@ public final class Spec11ThreatMatchTest extends EntityTestCase {
registrantContact =
new ContactResource.Builder()
.setRepoId("contact_id")
.setCreationClientId(REGISTRAR_ID)
.setCreationRegistrarId(REGISTRAR_ID)
.setTransferData(new ContactTransferData.Builder().build())
.setPersistedCurrentSponsorClientId(REGISTRAR_ID)
.setPersistedCurrentSponsorRegistrarId(REGISTRAR_ID)
.build();
/** Create a host for the purpose of testing a foreign key reference in the Domain table. */
@@ -89,8 +89,8 @@ public final class Spec11ThreatMatchTest extends EntityTestCase {
new HostResource.Builder()
.setRepoId("host")
.setHostName("ns1.example.com")
.setCreationClientId(REGISTRAR_ID)
.setPersistedCurrentSponsorClientId(REGISTRAR_ID)
.setCreationRegistrarId(REGISTRAR_ID)
.setPersistedCurrentSponsorRegistrarId(REGISTRAR_ID)
.build();
threat =
core/src/test/java/google/registry/model/transfer/TransferDataTest.java
+2 -2
View File
@@ -84,8 +84,8 @@ public class TransferDataTest {
new DomainTransferData.Builder()
.setTransferRequestTrid(Trid.create("server-trid", "client-trid"))
.setTransferRequestTime(now)
.setGainingClientId("NewRegistrar")
.setLosingClientId("TheRegistrar")
.setGainingRegistrarId("NewRegistrar")
.setLosingRegistrarId("TheRegistrar")
// Test must use a non-1-year period, since that's the default value.
.setTransferPeriod(Period.create(5, Period.Unit.YEARS))
.build();
core/src/test/java/google/registry/rdap/RdapActionBaseTestCase.java
+2 -2
View File
@@ -89,8 +89,8 @@ abstract class RdapActionBaseTestCase<A extends RdapActionBase> {
logout();
}
protected void login(String clientId) {
action.rdapAuthorization = RdapAuthorization.create(REGISTRAR, clientId);
protected void login(String registrarId) {
action.rdapAuthorization = RdapAuthorization.create(REGISTRAR, registrarId);
action.rdapJsonFormatter.rdapAuthorization = action.rdapAuthorization;
metricRole = REGISTRAR;
}
core/src/test/java/google/registry/rdap/RdapDomainActionTest.java
+4 -4
View File
@@ -95,7 +95,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
registrarLol)
.asBuilder()
.setCreationTimeForTest(clock.nowUtc().minusYears(3))
.setCreationClientId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.build());
// deleted domain in lol
@@ -128,7 +128,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
registrarLol)
.asBuilder()
.setCreationTimeForTest(clock.nowUtc().minusYears(3))
.setCreationClientId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.setDeletionTime(clock.nowUtc().minusDays(1))
.build());
// cat.みんな
@@ -168,7 +168,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
registrarIdn)
.asBuilder()
.setCreationTimeForTest(clock.nowUtc().minusYears(3))
.setCreationClientId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.build());
// 1.tld
@@ -208,7 +208,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
registrar1Tld)
.asBuilder()
.setCreationTimeForTest(clock.nowUtc().minusYears(3))
.setCreationClientId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.build());
// history entries
core/src/test/java/google/registry/rdap/RdapDomainSearchActionTest.java
+6 -6
View File
@@ -180,7 +180,7 @@ class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDomainSear
.asBuilder()
.setSubordinateHosts(ImmutableSet.of("ns1.cat.lol", "ns2.cat.lol"))
.setCreationTimeForTest(clock.nowUtc().minusYears(3))
.setCreationClientId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.build());
persistResource(
hostNs1CatLol.asBuilder().setSuperordinateDomain(domainCatLol.createVKey()).build());
@@ -220,7 +220,7 @@ class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDomainSear
registrar)
.asBuilder()
.setCreationTimeForTest(clock.nowUtc().minusYears(3))
.setCreationClientId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.build());
// cat.example
createTld("example");
@@ -259,7 +259,7 @@ class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDomainSear
registrar)
.asBuilder()
.setCreationTimeForTest(clock.nowUtc().minusYears(3))
.setCreationClientId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.build());
// cat.みんな
createTld("xn--q9jyb4c");
@@ -298,7 +298,7 @@ class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDomainSear
registrar)
.asBuilder()
.setCreationTimeForTest(clock.nowUtc().minusYears(3))
.setCreationClientId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.build());
// cat.1.test
createTld("1.test");
@@ -338,7 +338,7 @@ class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDomainSear
.asBuilder()
.setSubordinateHosts(ImmutableSet.of("ns1.cat.1.test"))
.setCreationTimeForTest(clock.nowUtc().minusYears(3))
.setCreationClientId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.build());
persistResource(makeRegistrar("otherregistrar", "other", Registrar.State.ACTIVE));
@@ -441,7 +441,7 @@ class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDomainSear
.asBuilder()
.setNameservers(hostKeys)
.setCreationTimeForTest(clock.nowUtc().minusYears(3))
.setCreationClientId("TheRegistrar");
.setCreationRegistrarId("TheRegistrar");
if (domainName.equals(mainDomainName)) {
builder.setSubordinateHosts(subordinateHostnamesBuilder.build());
}
core/src/test/java/google/registry/rdap/RdapJsonFormatterTest.java
+2 -2
View File
@@ -171,9 +171,9 @@ class RdapJsonFormatterTest {
.setTransferData(
new DomainTransferData.Builder()
.setTransferStatus(TransferStatus.PENDING)
.setGainingClientId("NewRegistrar")
.setGainingRegistrarId("NewRegistrar")
.setTransferRequestTime(clock.nowUtc().minusDays(1))
.setLosingClientId("TheRegistrar")
.setLosingRegistrarId("TheRegistrar")
.setPendingTransferExpirationTime(
clock.nowUtc().plusYears(100))
.setTransferredRegistrationExpirationTime(
core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java
+3 -3
View File
@@ -145,11 +145,11 @@ public final class UpdateRegistrarRdapBaseUrlsActionTest {
}
private static void persistRegistrar(
String clientId, Long ianaId, Registrar.Type type, String... rdapBaseUrls) {
String registrarId, Long ianaId, Registrar.Type type, String... rdapBaseUrls) {
persistSimpleResource(
new Registrar.Builder()
.setClientId(clientId)
.setRegistrarName(clientId)
.setRegistrarId(registrarId)
.setRegistrarName(registrarId)
.setType(type)
.setIanaIdentifier(ianaId)
.setRdapBaseUrls(ImmutableSet.copyOf(rdapBaseUrls))
core/src/test/java/google/registry/rde/ContactResourceToXjcConverterTest.java
+5 -5
View File
@@ -287,9 +287,9 @@ public class ContactResourceToXjcConverterTest {
return new ContactResource.Builder()
.setContactId("love-id")
.setRepoId("2-ROID")
.setCreationClientId("NewRegistrar")
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setLastEppUpdateClientId("TheRegistrar")
.setCreationRegistrarId("NewRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.setLastEppUpdateRegistrarId("TheRegistrar")
.setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("2fooBAR")))
.setCreationTimeForTest(DateTime.parse("1900-01-01TZ"))
.setLastTransferTime(DateTime.parse("1925-04-20TZ"))
@@ -320,8 +320,8 @@ public class ContactResourceToXjcConverterTest {
.setFaxNumber(new ContactPhoneNumber.Builder().setPhoneNumber("+1.2126660001").build())
.setTransferData(
new ContactTransferData.Builder()
.setGainingClientId("TheRegistrar")
.setLosingClientId("NewRegistrar")
.setGainingRegistrarId("TheRegistrar")
.setLosingRegistrarId("NewRegistrar")
.setTransferRequestTime(DateTime.parse("1925-04-19TZ"))
.setPendingTransferExpirationTime(DateTime.parse("1925-04-21TZ"))
.setTransferStatus(TransferStatus.SERVER_APPROVED)
core/src/test/java/google/registry/rde/DomainBaseToXjcConverterTest.java
+17 -17
View File
@@ -225,14 +225,14 @@ public class DomainBaseToXjcConverterTest {
.setModificationTime(clock.nowUtc())
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setDomain(domain)
.setClientId(domain.getCreationClientId())
.setRegistrarId(domain.getCreationRegistrarId())
.build());
BillingEvent.OneTime billingEvent =
persistResource(
new BillingEvent.OneTime.Builder()
.setReason(Reason.CREATE)
.setTargetId("example.xn--q9jyb4c")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setCost(Money.of(USD, 26))
.setPeriodYears(2)
.setEventTime(DateTime.parse("1910-01-01T00:00:00Z"))
@@ -263,15 +263,15 @@ public class DomainBaseToXjcConverterTest {
"bird or fiend!? i shrieked upstarting",
"bog@cat.みんな")
.createVKey())))
.setCreationClientId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.setDsData(
ImmutableSet.of(
DelegationSignerData.create(123, 200, 230, base16().decode("1234567890"))))
.setDomainName(Idn.toASCII("love.みんな"))
.setLastTransferTime(DateTime.parse("1910-01-01T00:00:00Z"))
.setLastEppUpdateClientId("TheRegistrar")
.setLastEppUpdateRegistrarId("TheRegistrar")
.setLastEppUpdateTime(DateTime.parse("1920-01-01T00:00:00Z"))
.setNameservers(
ImmutableSet.of(
@@ -293,7 +293,7 @@ public class DomainBaseToXjcConverterTest {
new BillingEvent.OneTime.Builder()
.setReason(Reason.RENEW)
.setTargetId("love.xn--q9jyb4c")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setCost(Money.of(USD, 456))
.setPeriodYears(2)
.setEventTime(DateTime.parse("1920-01-01T00:00:00Z"))
@@ -319,7 +319,7 @@ public class DomainBaseToXjcConverterTest {
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId("lol")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(END_OF_TIME)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(domainHistory)
@@ -329,7 +329,7 @@ public class DomainBaseToXjcConverterTest {
persistResource(
new PollMessage.Autorenew.Builder()
.setTargetId("lol")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(END_OF_TIME)
.setAutorenewEndTime(END_OF_TIME)
.setMsg("Domain was auto-renewed.")
@@ -338,8 +338,8 @@ public class DomainBaseToXjcConverterTest {
.createVKey())
.setTransferData(
new DomainTransferData.Builder()
.setGainingClientId("NewRegistrar")
.setLosingClientId("TheRegistrar")
.setGainingRegistrarId("NewRegistrar")
.setLosingRegistrarId("TheRegistrar")
.setPendingTransferExpirationTime(DateTime.parse("1925-04-20T00:00:00Z"))
.setServerApproveBillingEvent(billingEvent.createVKey())
.setServerApproveAutorenewEvent(
@@ -348,7 +348,7 @@ public class DomainBaseToXjcConverterTest {
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId("example.xn--q9jyb4c")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(END_OF_TIME)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(domainHistory)
@@ -358,7 +358,7 @@ public class DomainBaseToXjcConverterTest {
persistResource(
new Autorenew.Builder()
.setTargetId("example.xn--q9jyb4c")
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(END_OF_TIME)
.setAutorenewEndTime(END_OF_TIME)
.setMsg("Domain was auto-renewed.")
@@ -384,8 +384,8 @@ public class DomainBaseToXjcConverterTest {
new ContactResource.Builder()
.setContactId(id)
.setEmailAddress(email)
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setCreationClientId("TheRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.setCreationTimeForTest(END_OF_TIME)
.setInternationalizedPostalInfo(
new PostalInfo.Builder()
@@ -413,13 +413,13 @@ public class DomainBaseToXjcConverterTest {
clock.advanceOneMilli();
return persistEppResource(
new HostResource.Builder()
.setCreationClientId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.setHostName(Idn.toASCII(fqhn))
.setInetAddresses(ImmutableSet.of(InetAddresses.forString(ip)))
.setLastTransferTime(DateTime.parse("1910-01-01T00:00:00Z"))
.setLastEppUpdateClientId("TheRegistrar")
.setLastEppUpdateRegistrarId("TheRegistrar")
.setLastEppUpdateTime(DateTime.parse("1920-01-01T00:00:00Z"))
.setRepoId(repoId)
.setStatusValues(ImmutableSet.of(StatusValue.OK))
core/src/test/java/google/registry/rde/HostResourceToXjcConverterTest.java
+16 -16
View File
@@ -59,20 +59,20 @@ public class HostResourceToXjcConverterTest {
DomainBase domain =
newDomainBase("love.foobar")
.asBuilder()
.setPersistedCurrentSponsorClientId("LeisureDog")
.setPersistedCurrentSponsorRegistrarId("LeisureDog")
.setLastTransferTime(DateTime.parse("2010-01-01T00:00:00Z"))
.addStatusValue(StatusValue.PENDING_TRANSFER)
.build();
XjcRdeHost bean =
HostResourceToXjcConverter.convertSubordinateHost(
new HostResource.Builder()
.setCreationClientId("LawyerCat")
.setCreationRegistrarId("LawyerCat")
.setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
.setPersistedCurrentSponsorClientId("BusinessCat")
.setPersistedCurrentSponsorRegistrarId("BusinessCat")
.setHostName("ns1.love.foobar")
.setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
.setLastTransferTime(DateTime.parse("1910-01-01T00:00:00Z"))
.setLastEppUpdateClientId("CeilingCat")
.setLastEppUpdateRegistrarId("CeilingCat")
.setLastEppUpdateTime(DateTime.parse("1920-01-01T00:00:00Z"))
.setRepoId("2-roid")
.setStatusValues(ImmutableSet.of(StatusValue.OK))
@@ -122,13 +122,13 @@ public class HostResourceToXjcConverterTest {
XjcRdeHost bean =
HostResourceToXjcConverter.convertExternalHost(
new HostResource.Builder()
.setCreationClientId("LawyerCat")
.setCreationRegistrarId("LawyerCat")
.setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
.setPersistedCurrentSponsorClientId("BusinessCat")
.setPersistedCurrentSponsorRegistrarId("BusinessCat")
.setHostName("ns1.love.lol")
.setInetAddresses(ImmutableSet.of(InetAddresses.forString("127.0.0.1")))
.setLastTransferTime(DateTime.parse("1910-01-01T00:00:00Z"))
.setLastEppUpdateClientId("CeilingCat")
.setLastEppUpdateRegistrarId("CeilingCat")
.setLastEppUpdateTime(DateTime.parse("1920-01-01T00:00:00Z"))
.setRepoId("2-roid")
.setStatusValues(ImmutableSet.of(StatusValue.OK))
@@ -171,13 +171,13 @@ public class HostResourceToXjcConverterTest {
XjcRdeHost bean =
HostResourceToXjcConverter.convertExternalHost(
new HostResource.Builder()
.setCreationClientId("LawyerCat")
.setCreationRegistrarId("LawyerCat")
.setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
.setPersistedCurrentSponsorClientId("BusinessCat")
.setPersistedCurrentSponsorRegistrarId("BusinessCat")
.setHostName("ns1.love.lol")
.setInetAddresses(ImmutableSet.of(InetAddresses.forString("cafe::abba")))
.setLastTransferTime(DateTime.parse("1910-01-01T00:00:00Z"))
.setLastEppUpdateClientId("CeilingCat")
.setLastEppUpdateRegistrarId("CeilingCat")
.setLastEppUpdateTime(DateTime.parse("1920-01-01T00:00:00Z"))
.setRepoId("2-LOL")
.setStatusValues(ImmutableSet.of(StatusValue.OK))
@@ -194,13 +194,13 @@ public class HostResourceToXjcConverterTest {
() ->
HostResourceToXjcConverter.convertExternalHost(
new HostResource.Builder()
.setCreationClientId("LawyerCat")
.setCreationRegistrarId("LawyerCat")
.setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
.setPersistedCurrentSponsorClientId("BusinessCat")
.setPersistedCurrentSponsorRegistrarId("BusinessCat")
.setHostName("ns1.love.lol")
.setInetAddresses(ImmutableSet.of(InetAddresses.forString("cafe::abba")))
.setLastTransferTime(DateTime.parse("1910-01-01T00:00:00Z"))
.setLastEppUpdateClientId("CeilingCat")
.setLastEppUpdateRegistrarId("CeilingCat")
.setLastEppUpdateTime(DateTime.parse("1920-01-01T00:00:00Z"))
.setRepoId("2-LOL")
.setStatusValues(ImmutableSet.of(StatusValue.SERVER_HOLD)) // <-- OOPS
@@ -213,13 +213,13 @@ public class HostResourceToXjcConverterTest {
XjcRdeHostElement bean =
HostResourceToXjcConverter.convertExternal(
new HostResource.Builder()
.setCreationClientId("LawyerCat")
.setCreationRegistrarId("LawyerCat")
.setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
.setPersistedCurrentSponsorClientId("BusinessCat")
.setPersistedCurrentSponsorRegistrarId("BusinessCat")
.setHostName("ns1.love.lol")
.setInetAddresses(ImmutableSet.of(InetAddresses.forString("cafe::abba")))
.setLastTransferTime(DateTime.parse("1910-01-01T00:00:00Z"))
.setLastEppUpdateClientId("CeilingCat")
.setLastEppUpdateRegistrarId("CeilingCat")
.setLastEppUpdateTime(DateTime.parse("1920-01-01T00:00:00Z"))
.setRepoId("2-LOL")
.setStatusValues(ImmutableSet.of(StatusValue.OK))
core/src/test/java/google/registry/rde/RdeFixtures.java
+17 -17
View File
@@ -72,7 +72,7 @@ final class RdeFixtures {
.setDomain(domain)
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setModificationTime(clock.nowUtc())
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.build());
clock.advanceOneMilli();
BillingEvent.OneTime billingEvent =
@@ -80,7 +80,7 @@ final class RdeFixtures {
new BillingEvent.OneTime.Builder()
.setReason(Reason.CREATE)
.setTargetId("example." + tld)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setCost(Money.of(USD, 26))
.setPeriodYears(2)
.setEventTime(DateTime.parse("1990-01-01T00:00:00Z"))
@@ -109,15 +109,15 @@ final class RdeFixtures {
"bird or fiend!? i shrieked upstarting",
"bog@cat.みんな")
.createVKey())))
.setCreationClientId("TheRegistrar")
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.setCreationTimeForTest(clock.nowUtc())
.setDsData(
ImmutableSet.of(
DelegationSignerData.create(123, 200, 230, base16().decode("1234567890"))))
.setDomainName(Idn.toASCII("love." + tld))
.setLastTransferTime(DateTime.parse("1990-01-01T00:00:00Z"))
.setLastEppUpdateClientId("IntoTheTempest")
.setLastEppUpdateRegistrarId("IntoTheTempest")
.setLastEppUpdateTime(clock.nowUtc())
.setIdnTableName("extended_latin")
.setNameservers(
@@ -134,7 +134,7 @@ final class RdeFixtures {
new BillingEvent.OneTime.Builder()
.setReason(Reason.RENEW)
.setTargetId("love." + tld)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setCost(Money.of(USD, 456))
.setPeriodYears(2)
.setEventTime(DateTime.parse("1992-01-01T00:00:00Z"))
@@ -160,7 +160,7 @@ final class RdeFixtures {
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId(tld)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(END_OF_TIME)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntry)
@@ -170,7 +170,7 @@ final class RdeFixtures {
persistSimpleResource(
new PollMessage.Autorenew.Builder()
.setTargetId(tld)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(END_OF_TIME)
.setAutorenewEndTime(END_OF_TIME)
.setMsg("Domain was auto-renewed.")
@@ -179,8 +179,8 @@ final class RdeFixtures {
.createVKey())
.setTransferData(
new DomainTransferData.Builder()
.setGainingClientId("gaining")
.setLosingClientId("losing")
.setGainingRegistrarId("gaining")
.setLosingRegistrarId("losing")
.setPendingTransferExpirationTime(DateTime.parse("1993-04-20T00:00:00Z"))
.setServerApproveBillingEvent(billingEvent.createVKey())
.setServerApproveAutorenewEvent(
@@ -189,7 +189,7 @@ final class RdeFixtures {
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId("example." + tld)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(END_OF_TIME)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntry)
@@ -199,7 +199,7 @@ final class RdeFixtures {
persistResource(
new Autorenew.Builder()
.setTargetId("example." + tld)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(END_OF_TIME)
.setAutorenewEndTime(END_OF_TIME)
.setMsg("Domain was auto-renewed.")
@@ -227,8 +227,8 @@ final class RdeFixtures {
.setRepoId(generateNewContactHostRoid())
.setEmailAddress(email)
.setStatusValues(ImmutableSet.of(StatusValue.OK))
.setPersistedCurrentSponsorClientId("GetTheeBack")
.setCreationClientId("GetTheeBack")
.setPersistedCurrentSponsorRegistrarId("GetTheeBack")
.setCreationRegistrarId("GetTheeBack")
.setCreationTimeForTest(clock.nowUtc())
.setInternationalizedPostalInfo(
new PostalInfo.Builder()
@@ -255,13 +255,13 @@ final class RdeFixtures {
return persistResourceWithCommitLog(
new HostResource.Builder()
.setRepoId(generateNewContactHostRoid())
.setCreationClientId("LawyerCat")
.setCreationRegistrarId("LawyerCat")
.setCreationTimeForTest(clock.nowUtc())
.setPersistedCurrentSponsorClientId("BusinessCat")
.setPersistedCurrentSponsorRegistrarId("BusinessCat")
.setHostName(Idn.toASCII(fqhn))
.setInetAddresses(ImmutableSet.of(InetAddresses.forString(ip)))
.setLastTransferTime(DateTime.parse("1990-01-01T00:00:00Z"))
.setLastEppUpdateClientId("CeilingCat")
.setLastEppUpdateRegistrarId("CeilingCat")
.setLastEppUpdateTime(clock.nowUtc())
.setStatusValues(ImmutableSet.of(StatusValue.OK))
.build());
core/src/test/java/google/registry/rde/RegistrarToXjcConverterTest.java
+29 -26
View File
@@ -57,32 +57,35 @@ public class RegistrarToXjcConverterTest {
@BeforeEach
void beforeEach() {
registrar = new Registrar.Builder()
.setClientId("GoblinMarket")
.setRegistrarName("Maids heard the goblins cry: Come buy, come buy:")
.setType(Registrar.Type.REAL)
.setIanaIdentifier(8L)
.setState(Registrar.State.ACTIVE)
.setInternationalizedAddress(new RegistrarAddress.Builder()
.setStreet(ImmutableList.of("123 Detonation Boulevard"))
.setCity("Williamsburg")
.setState("NY")
.setZip("11211")
.setCountryCode("US")
.build())
.setLocalizedAddress(new RegistrarAddress.Builder()
.setStreet(ImmutableList.of("123 Example Boulevard."))
.setCity("Hipsterville")
.setState("NY")
.setZip("11211")
.setCountryCode("US")
.build())
.setPhoneNumber("+1.2125551212")
.setFaxNumber("+1.2125551213")
.setEmailAddress("contact-us@goblinmen.example")
.setWhoisServer("whois.goblinmen.example")
.setUrl("http://www.goblinmen.example")
.build();
registrar =
new Registrar.Builder()
.setRegistrarId("GoblinMarket")
.setRegistrarName("Maids heard the goblins cry: Come buy, come buy:")
.setType(Registrar.Type.REAL)
.setIanaIdentifier(8L)
.setState(Registrar.State.ACTIVE)
.setInternationalizedAddress(
new RegistrarAddress.Builder()
.setStreet(ImmutableList.of("123 Detonation Boulevard"))
.setCity("Williamsburg")
.setState("NY")
.setZip("11211")
.setCountryCode("US")
.build())
.setLocalizedAddress(
new RegistrarAddress.Builder()
.setStreet(ImmutableList.of("123 Example Boulevard."))
.setCity("Hipsterville")
.setState("NY")
.setZip("11211")
.setCountryCode("US")
.build())
.setPhoneNumber("+1.2125551212")
.setFaxNumber("+1.2125551213")
.setEmailAddress("contact-us@goblinmen.example")
.setWhoisServer("whois.goblinmen.example")
.setUrl("http://www.goblinmen.example")
.build();
FakeClock clock = new FakeClock(DateTime.parse("2013-01-01T00:00:00Z"));
inject.setStaticField(Ofy.class, "clock", clock);
registrar = cloneAndSetAutoTimestamps(registrar); // Set the creation time in 2013.
core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java
+9 -8
View File
@@ -114,14 +114,14 @@ class AuthenticatedRegistrarAccessorTest {
persistResource(
loadRegistrar(REAL_CLIENT_ID_WITHOUT_CONTACT)
.asBuilder()
.setClientId(OTE_CLIENT_ID_WITHOUT_CONTACT)
.setRegistrarId(OTE_CLIENT_ID_WITHOUT_CONTACT)
.setType(Registrar.Type.OTE)
.setIanaIdentifier(null)
.build());
persistResource(
loadRegistrar(REAL_CLIENT_ID_WITHOUT_CONTACT)
.asBuilder()
.setClientId(ADMIN_CLIENT_ID)
.setRegistrarId(ADMIN_CLIENT_ID)
.setType(Registrar.Type.OTE)
.setIanaIdentifier(null)
.build());
@@ -261,7 +261,7 @@ class AuthenticatedRegistrarAccessorTest {
@TestOfyAndSql
void testGetRegistrarForUser_registrarIsDisabled_isNotAdmin() {
persistResource(
Registrar.loadByClientId("TheRegistrar")
Registrar.loadByRegistrarId("TheRegistrar")
.get()
.asBuilder()
.setState(State.DISABLED)
@@ -326,7 +326,7 @@ class AuthenticatedRegistrarAccessorTest {
@TestOfyAndSql
void testGetRegistrarForUser_registrarIsDisabled_isAdmin() throws Exception {
persistResource(
Registrar.loadByClientId("NewRegistrar")
Registrar.loadByRegistrarId("NewRegistrar")
.get()
.asBuilder()
.setState(State.DISABLED)
@@ -358,19 +358,19 @@ class AuthenticatedRegistrarAccessorTest {
verifyNoInteractions(lazyGroupsConnection);
}
private void expectGetRegistrarSuccess(String clientId, AuthResult authResult, String message)
private void expectGetRegistrarSuccess(String registrarId, AuthResult authResult, String message)
throws Exception {
AuthenticatedRegistrarAccessor registrarAccessor =
new AuthenticatedRegistrarAccessor(
authResult, ADMIN_CLIENT_ID, SUPPORT_GROUP, lazyGroupsConnection);
// make sure loading the registrar succeeds and returns a value
assertThat(registrarAccessor.getRegistrar(clientId)).isNotNull();
assertThat(registrarAccessor.getRegistrar(registrarId)).isNotNull();
assertAboutLogs().that(testLogHandler).hasLogAtLevelWithMessage(Level.INFO, message);
}
private void expectGetRegistrarFailure(
String clientId, AuthResult authResult, String message) {
String registrarId, AuthResult authResult, String message) {
AuthenticatedRegistrarAccessor registrarAccessor =
new AuthenticatedRegistrarAccessor(
authResult, ADMIN_CLIENT_ID, SUPPORT_GROUP, lazyGroupsConnection);
@@ -378,7 +378,8 @@ class AuthenticatedRegistrarAccessorTest {
// make sure getRegistrar fails
RegistrarAccessDeniedException exception =
assertThrows(
RegistrarAccessDeniedException.class, () -> registrarAccessor.getRegistrar(clientId));
RegistrarAccessDeniedException.class,
() -> registrarAccessor.getRegistrar(registrarId));
assertThat(exception).hasMessageThat().contains(message);
}
core/src/test/java/google/registry/schema/registrar/RegistrarDaoTest.java
+2 -2
View File
@@ -55,7 +55,7 @@ public class RegistrarDaoTest {
testRegistrar =
new Registrar.Builder()
.setType(Registrar.Type.TEST)
.setClientId("registrarId")
.setRegistrarId("registrarId")
.setRegistrarName("registrarName")
.setLocalizedAddress(
new RegistrarAddress.Builder()
@@ -104,7 +104,7 @@ public class RegistrarDaoTest {
jpaTm().transact(() -> jpaTm().insert(testRegistrar));
Registrar persisted = jpaTm().transact(() -> jpaTm().loadByKey(registrarKey));
assertThat(persisted.getClientId()).isEqualTo("registrarId");
assertThat(persisted.getRegistrarId()).isEqualTo("registrarId");
assertThat(persisted.getRegistrarName()).isEqualTo("registrarName");
assertThat(persisted.getCreationTime()).isEqualTo(fakeClock.nowUtc());
assertThat(persisted.getLocalizedAddress())
core/src/test/java/google/registry/testing/AbstractEppResourceSubject.java
+7 -7
View File
@@ -161,16 +161,16 @@ abstract class AbstractEppResourceSubject<
return andChainer();
}
public And<S> hasLastEppUpdateClientId(String clientId) {
return hasValue(clientId, actual.getLastEppUpdateClientId(), "getLastEppUpdateClientId()");
public And<S> hasLastEppUpdateClientId(String registrarId) {
return hasValue(
registrarId, actual.getLastEppUpdateRegistrarId(), "getLastEppUpdateRegistrarId()");
}
public And<S> hasPersistedCurrentSponsorClientId(String clientId) {
public And<S> hasPersistedCurrentSponsorRegistrarId(String registrarId) {
return hasValue(
clientId,
actual.getPersistedCurrentSponsorClientId(),
"getPersistedCurrentSponsorClientId()");
registrarId,
actual.getPersistedCurrentSponsorRegistrarId(),
"getPersistedCurrentSponsorRegistrarId()");
}
public And<S> isActiveAt(DateTime time) {
core/src/test/java/google/registry/testing/AppEngineExtension.java
+2 -2
View File
@@ -290,7 +290,7 @@ public final class AppEngineExtension implements BeforeEachCallback, AfterEachCa
/** Public factory for first Registrar to allow comparison against stored value in unit tests. */
public static Registrar makeRegistrar1() {
return makeRegistrarCommon()
.setClientId("NewRegistrar")
.setRegistrarId("NewRegistrar")
.setRegistrarName("New Registrar")
.setEmailAddress("new.registrar@example.com")
.setIanaIdentifier(8L)
@@ -304,7 +304,7 @@ public final class AppEngineExtension implements BeforeEachCallback, AfterEachCa
/** Public factory for second Registrar to allow comparison against stored value in unit tests. */
public static Registrar makeRegistrar2() {
return makeRegistrarCommon()
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setRegistrarName("The Registrar")
.setEmailAddress("the.registrar@example.com")
.setIanaIdentifier(1L)
core/src/test/java/google/registry/testing/ContactResourceSubject.java
+3 -2
View File
@@ -131,8 +131,9 @@ public final class ContactResourceSubject
return doesNotHaveValue(lastTransferTime, actual.getLastTransferTime(), "lastTransferTime");
}
public And<ContactResourceSubject> hasCurrentSponsorClientId(String clientId) {
return hasValue(clientId, actual.getCurrentSponsorClientId(), "has currentSponsorClientId");
public And<ContactResourceSubject> hasCurrentSponsorRegistrarId(String registrarId) {
return hasValue(
registrarId, actual.getCurrentSponsorRegistrarId(), "has currentSponsorRegistrarId");
}
public static SimpleSubjectBuilder<ContactResourceSubject, ContactResource>
core/src/test/java/google/registry/testing/DatabaseHelper.java
+58 -51
View File
@@ -169,8 +169,8 @@ public class DatabaseHelper {
public static HostResource newHostResourceWithRoid(String hostName, String repoId) {
return new HostResource.Builder()
.setHostName(hostName)
.setCreationClientId("TheRegistrar")
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.setCreationTimeForTest(START_OF_TIME)
.setRepoId(repoId)
.build();
@@ -198,8 +198,8 @@ public class DatabaseHelper {
return new DomainBase.Builder()
.setRepoId(repoId)
.setDomainName(domainName)
.setCreationClientId("TheRegistrar")
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.setCreationTimeForTest(START_OF_TIME)
.setAuthInfo(DomainAuthInfo.create(PasswordAuth.create("2fooBAR")))
.setRegistrant(contactKey)
@@ -223,8 +223,8 @@ public class DatabaseHelper {
return new ContactResource.Builder()
.setRepoId(repoId)
.setContactId(contactId)
.setCreationClientId("TheRegistrar")
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("2fooBAR")))
.setCreationTimeForTest(START_OF_TIME)
.build();
@@ -469,14 +469,14 @@ public class DatabaseHelper {
});
}
public static void allowRegistrarAccess(String clientId, String tld) {
Registrar registrar = loadRegistrar(clientId);
public static void allowRegistrarAccess(String registrarId, String tld) {
Registrar registrar = loadRegistrar(registrarId);
persistResource(
registrar.asBuilder().setAllowedTlds(union(registrar.getAllowedTlds(), tld)).build());
}
public static void disallowRegistrarAccess(String clientId, String tld) {
Registrar registrar = loadRegistrar(clientId);
public static void disallowRegistrarAccess(String registrarId, String tld) {
Registrar registrar = loadRegistrar(registrarId);
persistResource(
registrar.asBuilder().setAllowedTlds(difference(registrar.getAllowedTlds(), tld)).build());
}
@@ -485,9 +485,9 @@ public class DatabaseHelper {
DateTime requestTime, DateTime expirationTime) {
return new DomainTransferData.Builder()
.setTransferStatus(TransferStatus.PENDING)
.setGainingClientId("NewRegistrar")
.setGainingRegistrarId("NewRegistrar")
.setTransferRequestTime(requestTime)
.setLosingClientId("TheRegistrar")
.setLosingRegistrarId("TheRegistrar")
.setPendingTransferExpirationTime(expirationTime);
}
@@ -495,16 +495,16 @@ public class DatabaseHelper {
DateTime requestTime, DateTime expirationTime) {
return new ContactTransferData.Builder()
.setTransferStatus(TransferStatus.PENDING)
.setGainingClientId("NewRegistrar")
.setGainingRegistrarId("NewRegistrar")
.setTransferRequestTime(requestTime)
.setLosingClientId("TheRegistrar")
.setLosingRegistrarId("TheRegistrar")
.setPendingTransferExpirationTime(expirationTime);
}
public static PollMessage.OneTime createPollMessageForImplicitTransfer(
EppResource resource,
HistoryEntry historyEntry,
String clientId,
String registrarId,
DateTime requestTime,
DateTime expirationTime,
@Nullable DateTime extendedRegistrationExpirationTime) {
@@ -513,7 +513,7 @@ public class DatabaseHelper {
.setTransferredRegistrationExpirationTime(extendedRegistrationExpirationTime)
.build();
return new PollMessage.OneTime.Builder()
.setClientId(clientId)
.setRegistrarId(registrarId)
.setEventTime(expirationTime)
.setMsg("Transfer server approved.")
.setResponseData(ImmutableList.of(createTransferResponse(resource, transferData)))
@@ -529,7 +529,7 @@ public class DatabaseHelper {
.setEventTime(eventTime)
.setBillingTime(
eventTime.plus(Registry.get(domain.getTld()).getTransferGracePeriodLength()))
.setClientId("NewRegistrar")
.setRegistrarId("NewRegistrar")
.setPeriodYears(1)
.setCost(getDomainRenewCost(domain.getDomainName(), costLookupTime, 1))
.setParent(historyEntry)
@@ -544,13 +544,13 @@ public class DatabaseHelper {
.setType(HistoryEntry.Type.CONTACT_TRANSFER_REQUEST)
.setContact(persistResource(contact))
.setModificationTime(now)
.setClientId(contact.getCurrentSponsorClientId())
.setRegistrarId(contact.getCurrentSponsorRegistrarId())
.build()
.toChildHistoryEntity());
return persistResource(
contact
.asBuilder()
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.addStatusValue(StatusValue.PENDING_TRANSFER)
.setTransferData(
createContactTransferDataBuilder(requestTime, expirationTime)
@@ -596,8 +596,8 @@ public class DatabaseHelper {
new DomainBase.Builder()
.setRepoId(repoId)
.setDomainName(domainName)
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setCreationClientId("TheRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.setCreationRegistrarId("TheRegistrar")
.setCreationTimeForTest(creationTime)
.setRegistrationExpirationTime(expirationTime)
.setRegistrant(contact.createVKey())
@@ -616,7 +616,7 @@ public class DatabaseHelper {
.setType(HistoryEntry.Type.DOMAIN_CREATE)
.setModificationTime(now)
.setDomain(domain)
.setClientId(domain.getCreationClientId())
.setRegistrarId(domain.getCreationRegistrarId())
.build());
BillingEvent.Recurring autorenewEvent =
persistResource(
@@ -624,7 +624,7 @@ public class DatabaseHelper {
.setReason(Reason.RENEW)
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setTargetId(domainName)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(expirationTime)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntryDomainCreate)
@@ -633,7 +633,7 @@ public class DatabaseHelper {
persistResource(
new PollMessage.Autorenew.Builder()
.setTargetId(domainName)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.setEventTime(expirationTime)
.setAutorenewEndTime(END_OF_TIME)
.setMsg("Domain was auto-renewed.")
@@ -658,7 +658,7 @@ public class DatabaseHelper {
.setType(HistoryEntry.Type.DOMAIN_TRANSFER_REQUEST)
.setModificationTime(tm().transact(() -> tm().getTransactionTime()))
.setDomain(domain)
.setClientId("TheRegistrar")
.setRegistrarId("TheRegistrar")
.build());
BillingEvent.OneTime transferBillingEvent =
persistResource(
@@ -670,7 +670,7 @@ public class DatabaseHelper {
.setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
.setReason(Reason.RENEW)
.setTargetId(domain.getDomainName())
.setClientId("NewRegistrar")
.setRegistrarId("NewRegistrar")
.setEventTime(extendedRegistrationExpirationTime)
.setRecurrenceEndTime(END_OF_TIME)
.setParent(historyEntryDomainTransfer)
@@ -679,7 +679,7 @@ public class DatabaseHelper {
persistResource(
new PollMessage.Autorenew.Builder()
.setTargetId(domain.getDomainName())
.setClientId("NewRegistrar")
.setRegistrarId("NewRegistrar")
.setEventTime(extendedRegistrationExpirationTime)
.setAutorenewEndTime(END_OF_TIME)
.setMsg("Domain was auto-renewed.")
@@ -707,7 +707,7 @@ public class DatabaseHelper {
return persistResource(
domain
.asBuilder()
.setPersistedCurrentSponsorClientId("TheRegistrar")
.setPersistedCurrentSponsorRegistrarId("TheRegistrar")
.addStatusValue(StatusValue.PENDING_TRANSFER)
.setTransferData(
transferDataBuilder
@@ -748,10 +748,13 @@ public class DatabaseHelper {
/** Persists and returns a {@link Registrar} with the specified attributes. */
public static Registrar persistNewRegistrar(
String clientId, String registrarName, Registrar.Type type, @Nullable Long ianaIdentifier) {
String registrarId,
String registrarName,
Registrar.Type type,
@Nullable Long ianaIdentifier) {
return persistSimpleResource(
new Registrar.Builder()
.setClientId(clientId)
.setRegistrarId(registrarId)
.setRegistrarName(registrarName)
.setType(type)
.setIanaIdentifier(ianaIdentifier)
@@ -861,8 +864,8 @@ public class DatabaseHelper {
.containsExactlyElementsIn(expected);
}
public static void assertPollMessages(String clientId, PollMessage... expected) {
assertPollMessagesEqual(getPollMessages(clientId), asList(expected));
public static void assertPollMessages(String registrarId, PollMessage... expected) {
assertPollMessagesEqual(getPollMessages(registrarId), asList(expected));
}
public static void assertPollMessages(PollMessage... expected) {
@@ -877,11 +880,11 @@ public class DatabaseHelper {
return ImmutableList.copyOf(transactIfJpaTm(() -> tm().loadAllOf(PollMessage.class)));
}
public static ImmutableList<PollMessage> getPollMessages(String clientId) {
public static ImmutableList<PollMessage> getPollMessages(String registrarId) {
return transactIfJpaTm(
() ->
tm().loadAllOf(PollMessage.class).stream()
.filter(pollMessage -> pollMessage.getClientId().equals(clientId))
.filter(pollMessage -> pollMessage.getRegistrarId().equals(registrarId))
.collect(toImmutableList()));
}
@@ -895,18 +898,19 @@ public class DatabaseHelper {
.collect(toImmutableList()));
}
public static ImmutableList<PollMessage> getPollMessages(String clientId, DateTime beforeOrAt) {
public static ImmutableList<PollMessage> getPollMessages(
String registrarId, DateTime beforeOrAt) {
return transactIfJpaTm(
() ->
tm().loadAllOf(PollMessage.class).stream()
.filter(pollMessage -> pollMessage.getClientId().equals(clientId))
.filter(pollMessage -> pollMessage.getRegistrarId().equals(registrarId))
.filter(pollMessage -> isBeforeOrAt(pollMessage.getEventTime(), beforeOrAt))
.collect(toImmutableList()));
}
/** Gets all PollMessages associated with the given EppResource. */
public static ImmutableList<PollMessage> getPollMessages(
EppResource resource, String clientId, DateTime now) {
EppResource resource, String registrarId, DateTime now) {
return transactIfJpaTm(
() ->
tm().loadAllOf(PollMessage.class).stream()
@@ -917,7 +921,7 @@ public class DatabaseHelper {
.getParent()
.getName()
.equals(resource.getRepoId()))
.filter(pollMessage -> pollMessage.getClientId().equals(clientId))
.filter(pollMessage -> pollMessage.getRegistrarId().equals(registrarId))
.filter(
pollMessage ->
pollMessage.getEventTime().isEqual(now)
@@ -925,25 +929,28 @@ public class DatabaseHelper {
.collect(toImmutableList()));
}
public static PollMessage getOnlyPollMessage(String clientId) {
return Iterables.getOnlyElement(getPollMessages(clientId));
public static PollMessage getOnlyPollMessage(String registrarId) {
return Iterables.getOnlyElement(getPollMessages(registrarId));
}
public static PollMessage getOnlyPollMessage(String clientId, DateTime now) {
return Iterables.getOnlyElement(getPollMessages(clientId, now));
public static PollMessage getOnlyPollMessage(String registrarId, DateTime now) {
return Iterables.getOnlyElement(getPollMessages(registrarId, now));
}
public static PollMessage getOnlyPollMessage(
String clientId, DateTime now, Class<? extends PollMessage> subType) {
return getPollMessages(clientId, now).stream()
String registrarId, DateTime now, Class<? extends PollMessage> subType) {
return getPollMessages(registrarId, now).stream()
.filter(subType::isInstance)
.map(subType::cast)
.collect(onlyElement());
}
public static PollMessage getOnlyPollMessage(
DomainContent domain, String clientId, DateTime now, Class<? extends PollMessage> subType) {
return getPollMessages(domain, clientId, now).stream()
DomainContent domain,
String registrarId,
DateTime now,
Class<? extends PollMessage> subType) {
return getPollMessages(domain, registrarId, now).stream()
.filter(subType::isInstance)
.map(subType::cast)
.collect(onlyElement());
@@ -1083,7 +1090,7 @@ public class DatabaseHelper {
tm().put(resource);
tm().put(
HistoryEntry.createBuilderForResource(resource)
.setClientId(resource.getCreationClientId())
.setRegistrarId(resource.getCreationRegistrarId())
.setType(getHistoryEntryType(resource))
.setModificationTime(tm().getTransactionTime())
.build());
@@ -1183,7 +1190,7 @@ public class DatabaseHelper {
HistoryEntry.createBuilderForResource(parentResource)
.setType(getHistoryEntryType(parentResource))
.setModificationTime(DateTime.now(DateTimeZone.UTC))
.setClientId(parentResource.getPersistedCurrentSponsorClientId())
.setRegistrarId(parentResource.getPersistedCurrentSponsorRegistrarId())
.build());
}
@@ -1249,11 +1256,11 @@ public class DatabaseHelper {
}
/** Loads and returns the registrar with the given client ID, or throws IAE if not present. */
public static Registrar loadRegistrar(String clientId) {
public static Registrar loadRegistrar(String registrarId) {
return checkArgumentPresent(
Registrar.loadByClientId(clientId),
Registrar.loadByRegistrarId(registrarId),
"Error in tests: Registrar %s does not exist",
clientId);
registrarId);
}
/**
core/src/test/java/google/registry/testing/DomainBaseSubject.java
+3 -2
View File
@@ -67,8 +67,9 @@ public final class DomainBaseSubject
return hasValue(pw, authInfo == null ? null : authInfo.getPw().getValue(), "has auth info pw");
}
public And<DomainBaseSubject> hasCurrentSponsorClientId(String clientId) {
return hasValue(clientId, actual.getCurrentSponsorClientId(), "has currentSponsorClientId");
public And<DomainBaseSubject> hasCurrentSponsorRegistrarId(String registrarId) {
return hasValue(
registrarId, actual.getCurrentSponsorRegistrarId(), "has currentSponsorRegistrarId");
}
public And<DomainBaseSubject> hasRegistrationExpirationTime(DateTime expiration) {
core/src/test/java/google/registry/testing/EppMetricSubject.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class EppMetricSubject extends Subject {
}
public And<EppMetricSubject> hasClientId(String clientId) {
return hasValue(clientId, actual.getClientId(), "getClientId()");
return hasValue(clientId, actual.getRegistrarId(), "getClientId()");
}
public And<EppMetricSubject> hasCommandName(String commandName) {
core/src/test/java/google/registry/testing/FullFieldsTestEntityHelper.java
+41 -38
View File
@@ -50,40 +50,43 @@ import org.joda.time.DateTime;
public final class FullFieldsTestEntityHelper {
public static Registrar makeRegistrar(
String clientId, String registrarName, Registrar.State state) {
return makeRegistrar(clientId, registrarName, state, 1L);
String registrarId, String registrarName, Registrar.State state) {
return makeRegistrar(registrarId, registrarName, state, 1L);
}
public static Registrar makeRegistrar(
String clientId, String registrarName, Registrar.State state, Long ianaIdentifier) {
String registrarId, String registrarName, Registrar.State state, Long ianaIdentifier) {
return new Registrar.Builder()
.setClientId(clientId)
.setRegistrarName(registrarName)
.setType(Registrar.Type.REAL)
.setIanaIdentifier(ianaIdentifier)
.setState(state)
.setInternationalizedAddress(new RegistrarAddress.Builder()
.setStreet(ImmutableList.of("123 Example Boulevard <script>"))
.setCity("Williamsburg <script>")
.setState("NY")
.setZip("11211")
.setCountryCode("US")
.build())
.setLocalizedAddress(new RegistrarAddress.Builder()
.setStreet(ImmutableList.of("123 Example Boulevard <script>"))
.setCity("Williamsburg <script>")
.setState("NY")
.setZip("11211")
.setCountryCode("US")
.build())
.setPhoneNumber("+1.2125551212")
.setFaxNumber("+1.2125551213")
.setEmailAddress("contact-us@example.com")
.setWhoisServer("whois.example.com")
.setRdapBaseUrls(ImmutableSet.of(
"https://rdap.example.com/withSlash/", "https://rdap.example.com/withoutSlash"))
.setUrl("http://my.fake.url")
.build();
.setRegistrarId(registrarId)
.setRegistrarName(registrarName)
.setType(Registrar.Type.REAL)
.setIanaIdentifier(ianaIdentifier)
.setState(state)
.setInternationalizedAddress(
new RegistrarAddress.Builder()
.setStreet(ImmutableList.of("123 Example Boulevard <script>"))
.setCity("Williamsburg <script>")
.setState("NY")
.setZip("11211")
.setCountryCode("US")
.build())
.setLocalizedAddress(
new RegistrarAddress.Builder()
.setStreet(ImmutableList.of("123 Example Boulevard <script>"))
.setCity("Williamsburg <script>")
.setState("NY")
.setZip("11211")
.setCountryCode("US")
.build())
.setPhoneNumber("+1.2125551212")
.setFaxNumber("+1.2125551213")
.setEmailAddress("contact-us@example.com")
.setWhoisServer("whois.example.com")
.setRdapBaseUrls(
ImmutableSet.of(
"https://rdap.example.com/withSlash/", "https://rdap.example.com/withoutSlash"))
.setUrl("http://my.fake.url")
.build();
}
public static ImmutableList<RegistrarContact> makeRegistrarContacts(Registrar registrar) {
@@ -138,7 +141,7 @@ public final class FullFieldsTestEntityHelper {
.setRepoId(generateNewContactHostRoid())
.setHostName(Idn.toASCII(fqhn))
.setCreationTimeForTest(DateTime.parse("2000-10-08T00:45:00Z"))
.setPersistedCurrentSponsorClientId(registrarClientId);
.setPersistedCurrentSponsorRegistrarId(registrarClientId);
if ((ip1 != null) || (ip2 != null)) {
ImmutableSet.Builder<InetAddress> ipBuilder = new ImmutableSet.Builder<>();
if (ip1 != null) {
@@ -230,8 +233,8 @@ public final class FullFieldsTestEntityHelper {
if (email != null) {
builder.setEmailAddress(email);
}
String registrarId = registrar == null ? "TheRegistrar" : registrar.getClientId();
builder.setCreationClientId(registrarId).setPersistedCurrentSponsorClientId(registrarId);
String registrarId = registrar == null ? "TheRegistrar" : registrar.getRegistrarId();
builder.setCreationRegistrarId(registrarId).setPersistedCurrentSponsorRegistrarId(registrarId);
if (deletionTime != null) {
builder.setDeletionTime(deletionTime);
}
@@ -248,8 +251,8 @@ public final class FullFieldsTestEntityHelper {
.setCreationTimeForTest(DateTime.parse("2000-10-08T00:45:00Z"));
if (registrar != null) {
builder
.setCreationClientId(registrar.getClientId())
.setPersistedCurrentSponsorClientId(registrar.getClientId());
.setCreationRegistrarId(registrar.getRegistrarId())
.setPersistedCurrentSponsorRegistrarId(registrar.getRegistrarId());
}
if (deletionTime != null) {
builder.setDeletionTime(deletionTime);
@@ -342,8 +345,8 @@ public final class FullFieldsTestEntityHelper {
.setLastEppUpdateTime(DateTime.parse("2009-05-29T20:13:00Z"))
.setCreationTimeForTest(DateTime.parse("2000-10-08T00:45:00Z"))
.setRegistrationExpirationTime(DateTime.parse("2110-10-08T00:44:59Z"))
.setPersistedCurrentSponsorClientId(registrar.getClientId())
.setCreationClientId(registrar.getClientId())
.setPersistedCurrentSponsorRegistrarId(registrar.getRegistrarId())
.setCreationRegistrarId(registrar.getRegistrarId())
.setStatusValues(
ImmutableSet.of(
StatusValue.CLIENT_DELETE_PROHIBITED,
@@ -390,7 +393,7 @@ public final class FullFieldsTestEntityHelper {
.setPeriod(period)
.setXmlBytes("<xml></xml>".getBytes(UTF_8))
.setModificationTime(modificationTime)
.setClientId(resource.getPersistedCurrentSponsorClientId())
.setRegistrarId(resource.getPersistedCurrentSponsorRegistrarId())
.setTrid(Trid.create("ABC-123", "server-trid"))
.setBySuperuser(false)
.setReason(reason)
core/src/test/java/google/registry/testing/HistoryEntrySubject.java
+3 -3
View File
@@ -51,12 +51,12 @@ public class HistoryEntrySubject extends Subject {
return hasValue(type, actual.getType(), "getType()");
}
public And<HistoryEntrySubject> hasClientId(String clientId) {
return hasValue(clientId, actual.getClientId(), "getClientId()");
public And<HistoryEntrySubject> hasRegistrarId(String registrarId) {
return hasValue(registrarId, actual.getRegistrarId(), "getRegistrarId()");
}
public And<HistoryEntrySubject> hasOtherClientId(String otherClientId) {
return hasValue(otherClientId, actual.getOtherClientId(), "getOtherClientId()");
return hasValue(otherClientId, actual.getOtherRegistrarId(), "getOtherRegistrarId()");
}
public And<HistoryEntrySubject> hasModificationTime(DateTime modificationTime) {

Some files were not shown because too many files have changed in this diff Show More