zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-06-28 07:13:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rename DomainNameUtils method to getTldFromSld

Browse source 
This is broken out from []
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=121599268
This commit is contained in:
mcilwain 2016-05-05 11:35:58 -07:00 • committed by Justine Tunney
parent 3ec6aebe44
commit 4a9be60e0b
8 changed files with 37 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
javatests/google/registry/testing/DatastoreHelper.java
View file

@ -30,7 +30,7 @@ import static google.registry.util.CollectionUtils.union;
import static google.registry.util.DateTimeUtils.END_OF_TIME;
import static google.registry.util.DateTimeUtils.START_OF_TIME;
import static google.registry.util.DomainNameUtils.ACE_PREFIX_REGEX;
import static google.registry.util.DomainNameUtils.getTldFromDomainName;
import static google.registry.util.DomainNameUtils.getTldFromSld;
import static google.registry.util.ResourceUtils.readResourceUtf8;
import static java.util.Arrays.asList;
import static org.joda.money.CurrencyUnit.USD;
@ -119,13 +119,13 @@ public class DatastoreHelper {
}
public static DomainResource newDomainResource(String domainName) {
String repoId = generateNewDomainRoid(getTldFromDomainName(domainName));
String repoId = generateNewDomainRoid(getTldFromSld(domainName));
return newDomainResource(domainName, repoId, persistActiveContact("contact1234"));
}
public static DomainResource newDomainResource(String domainName, ContactResource contact) {
return newDomainResource(
domainName, generateNewDomainRoid(getTldFromDomainName(domainName)), contact);
domainName, generateNewDomainRoid(getTldFromSld(domainName)), contact);
}
public static DomainResource newDomainResource(
@ -150,7 +150,7 @@ public class DatastoreHelper {
// contact does, which is usually the applicationId 1.
return newDomainApplication(
domainName,
generateNewDomainRoid(getTldFromDomainName(domainName)),
generateNewDomainRoid(getTldFromSld(domainName)),
persistActiveContact("contact1234"),
LaunchPhase.SUNRISE);
}
@ -163,7 +163,7 @@ public class DatastoreHelper {
String domainName, ContactResource contact, LaunchPhase phase) {
return newDomainApplication(
domainName,
generateNewDomainRoid(getTldFromDomainName(domainName)),
generateNewDomainRoid(getTldFromSld(domainName)),
contact,
phase);
}