mirror of
https://github.com/google/nomulus.git
synced 2025-05-20 11:19:35 +02:00
Typo in comment
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=122449880
This commit is contained in:
Corey Goldfeder
Justine Tunney
parent
13f5106070
commit
86f3287761
18 changed files with 84 additions and 107 deletions
|
|
@ -1012,7 +1012,7 @@ public class DomainFlowUtils {
|
|||
}
|
||||
}
|
||||
|
||||
/** Nameserver are not whitelisted for this TLD. */
|
||||
/** Nameservers are not whitelisted for this TLD. */
|
||||
public static class NameserversNotAllowedException extends StatusProhibitsOperationException {
|
||||
public NameserversNotAllowedException(Set<String> fullyQualifiedHostNames) {
|
||||
super(String.format(
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
|
|||
import static google.registry.testing.DatastoreHelper.createTld;
|
||||
import static google.registry.testing.DatastoreHelper.deleteResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResources;
|
||||
import static org.joda.time.DateTimeZone.UTC;
|
||||
import static org.joda.time.Duration.standardHours;
|
||||
import static org.mockito.Matchers.eq;
|
||||
|
|
@ -189,7 +189,7 @@ public class SyncRegistrarsSheetTest {
|
|||
.setTypes(ImmutableSet.of(RegistrarContact.Type.TECH))
|
||||
.build());
|
||||
// Use registrar ref for contacts' parent.
|
||||
persistSimpleGlobalResources(contacts);
|
||||
persistSimpleResources(contacts);
|
||||
persistResource(registrar);
|
||||
|
||||
newSyncRegistrarsSheet().run("foobar");
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ package google.registry.model.billing;
|
|||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static google.registry.testing.DatastoreHelper.createTlds;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResources;
|
||||
import static google.registry.util.DateTimeUtils.START_OF_TIME;
|
||||
import static java.util.Arrays.asList;
|
||||
import static org.joda.money.CurrencyUnit.JPY;
|
||||
|
|
@ -105,7 +105,7 @@ public final class RegistrarBillingUtilsTest {
|
|||
.setDescription("USD Invoice for August")
|
||||
.setAmount(Money.parse("USD 23.00"))
|
||||
.build();
|
||||
persistSimpleGlobalResources(asList(entry1, entry2));
|
||||
persistSimpleResources(asList(entry1, entry2));
|
||||
Map<CurrencyUnit, Money> balance = RegistrarBillingUtils.loadBalance(registrar);
|
||||
assertThat(balance).hasSize(2);
|
||||
assertThat(balance).containsEntry(USD, Money.parse("USD 33.00"));
|
||||
|
|
@ -136,7 +136,7 @@ public final class RegistrarBillingUtilsTest {
|
|||
.setDescription("JPY Invoice for August")
|
||||
.setAmount(Money.parse("JPY 666"))
|
||||
.build();
|
||||
persistSimpleGlobalResources(asList(entry1, entry2, entry3));
|
||||
persistSimpleResources(asList(entry1, entry2, entry3));
|
||||
Map<CurrencyUnit, Money> balance = RegistrarBillingUtils.loadBalance(registrar);
|
||||
assertThat(balance).hasSize(2);
|
||||
assertThat(balance).containsEntry(USD, Money.parse("USD 13.50"));
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ import static google.registry.model.index.DomainApplicationIndex.loadActiveAppli
|
|||
import static google.registry.testing.DatastoreHelper.createTld;
|
||||
import static google.registry.testing.DatastoreHelper.newDomainApplication;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResource;
|
||||
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
|
||||
|
|
@ -61,8 +61,7 @@ public class DomainApplicationIndexTest extends EntityTestCase {
|
|||
|
||||
@Test
|
||||
public void testSuccess_singleApplication() {
|
||||
DomainApplication application =
|
||||
persistSimpleGlobalResource(newDomainApplication("example.com"));
|
||||
DomainApplication application = persistSimpleResource(newDomainApplication("example.com"));
|
||||
persistResource(createUpdatedInstance(application));
|
||||
DomainApplicationIndex savedIndex = DomainApplicationIndex.load("example.com");
|
||||
assertThat(savedIndex).isNotNull();
|
||||
|
|
@ -79,12 +78,9 @@ public class DomainApplicationIndexTest extends EntityTestCase {
|
|||
|
||||
@Test
|
||||
public void testSuccess_multipleApplications() {
|
||||
DomainApplication application1 =
|
||||
persistSimpleGlobalResource(newDomainApplication("example.com"));
|
||||
DomainApplication application2 =
|
||||
persistSimpleGlobalResource(newDomainApplication("example.com"));
|
||||
DomainApplication application3 =
|
||||
persistSimpleGlobalResource(newDomainApplication("example.com"));
|
||||
DomainApplication application1 = persistSimpleResource(newDomainApplication("example.com"));
|
||||
DomainApplication application2 = persistSimpleResource(newDomainApplication("example.com"));
|
||||
DomainApplication application3 = persistSimpleResource(newDomainApplication("example.com"));
|
||||
persistResource(createUpdatedInstance(application1));
|
||||
persistResource(createUpdatedInstance(application2));
|
||||
persistResource(createUpdatedInstance(application3));
|
||||
|
|
@ -98,10 +94,8 @@ public class DomainApplicationIndexTest extends EntityTestCase {
|
|||
|
||||
@Test
|
||||
public void testSuccess_doesntStoreSameApplicationMultipleTimes() {
|
||||
DomainApplication application1 =
|
||||
persistSimpleGlobalResource(newDomainApplication("example.com"));
|
||||
DomainApplication application2 =
|
||||
persistSimpleGlobalResource(newDomainApplication("example.com"));
|
||||
DomainApplication application1 = persistSimpleResource(newDomainApplication("example.com"));
|
||||
DomainApplication application2 = persistSimpleResource(newDomainApplication("example.com"));
|
||||
persistResource(createUpdatedInstance(application1));
|
||||
persistResource(createUpdatedInstance(application2));
|
||||
persistResource(createUpdatedInstance(application1));
|
||||
|
|
@ -111,9 +105,9 @@ public class DomainApplicationIndexTest extends EntityTestCase {
|
|||
|
||||
@Test
|
||||
public void testSuccess_doesntIncludePastApplications() {
|
||||
DomainApplication application1 =
|
||||
persistSimpleGlobalResource(newDomainApplication("example.com"));
|
||||
DomainApplication application2 = persistSimpleGlobalResource(
|
||||
DomainApplication application1 = persistSimpleResource(newDomainApplication("example.com"));
|
||||
DomainApplication application2 =
|
||||
persistSimpleResource(
|
||||
newDomainApplication("example.com")
|
||||
.asBuilder()
|
||||
.setDeletionTime(DateTime.now().minusDays(30))
|
||||
|
|
|
|||
|
|
@ -23,7 +23,8 @@ import static google.registry.testing.CertificateSamples.SAMPLE_CERT_HASH;
|
|||
import static google.registry.testing.DatastoreHelper.cloneAndSetAutoTimestamps;
|
||||
import static google.registry.testing.DatastoreHelper.createTld;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResources;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
|
|
@ -92,7 +93,7 @@ public class RegistrarTest extends EntityTestCase {
|
|||
.setPhonePasscode("01234")
|
||||
.build());
|
||||
persistResource(registrar);
|
||||
persistSimpleGlobalResources(ImmutableList.of(
|
||||
persistSimpleResources(ImmutableList.of(
|
||||
new RegistrarContact.Builder()
|
||||
.setParent(registrar)
|
||||
.setName("John Abused")
|
||||
|
|
@ -260,7 +261,7 @@ public class RegistrarTest extends EntityTestCase {
|
|||
|
||||
@Test
|
||||
public void testSuccess_emptyContactTypesAllowed() throws Exception {
|
||||
persistSimpleGlobalResources(ImmutableList.of(
|
||||
persistSimpleResource(
|
||||
new RegistrarContact.Builder()
|
||||
.setParent(registrar)
|
||||
.setName("John Abused")
|
||||
|
|
@ -268,7 +269,7 @@ public class RegistrarTest extends EntityTestCase {
|
|||
.setPhoneNumber("+1.2125551213")
|
||||
.setFaxNumber("+1.2125551213")
|
||||
// No setTypes(...)
|
||||
.build()));
|
||||
.build());
|
||||
for (RegistrarContact rc : registrar.getContacts()) {
|
||||
rc.toJsonMap();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ package google.registry.rdap;
|
|||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static google.registry.testing.DatastoreHelper.createTld;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResources;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHostResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeDomainResource;
|
||||
|
|
@ -77,7 +77,7 @@ public class RdapDomainActionTest {
|
|||
createTld("lol");
|
||||
Registrar registrarLol = persistResource(makeRegistrar(
|
||||
"evilregistrar", "Yes Virginia <script>", Registrar.State.ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrarLol));
|
||||
persistSimpleResources(makeRegistrarContacts(registrarLol));
|
||||
ContactResource registrant = makeAndPersistContactResource(
|
||||
"5372808-ERL", "Goblin Market", "lol@cat.lol", clock.nowUtc().minusYears(1));
|
||||
ContactResource adminContact = makeAndPersistContactResource(
|
||||
|
|
@ -104,7 +104,7 @@ public class RdapDomainActionTest {
|
|||
createTld("xn--q9jyb4c");
|
||||
Registrar registrarIdn =
|
||||
persistResource(makeRegistrar("idnregistrar", "IDN Registrar", Registrar.State.ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrarIdn));
|
||||
persistSimpleResources(makeRegistrarContacts(registrarIdn));
|
||||
DomainBase domainCatIdn = persistResource(makeDomainResource("cat.みんな",
|
||||
registrant,
|
||||
adminContact,
|
||||
|
|
@ -115,7 +115,7 @@ public class RdapDomainActionTest {
|
|||
createTld("1.tld");
|
||||
Registrar registrar1tld = persistResource(
|
||||
makeRegistrar("1tldregistrar", "Multilevel Registrar", Registrar.State.ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar1tld));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar1tld));
|
||||
DomainBase domainCat1Tld = persistResource(makeDomainResource("cat.1.tld",
|
||||
registrant,
|
||||
adminContact,
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat;
|
|||
import static google.registry.testing.DatastoreHelper.createTld;
|
||||
import static google.registry.testing.DatastoreHelper.persistDomainAsDeleted;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResources;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHostResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeDomainResource;
|
||||
|
|
@ -118,7 +118,7 @@ public class RdapDomainSearchActionTest {
|
|||
createTld("lol");
|
||||
Registrar registrar = persistResource(
|
||||
makeRegistrar("evilregistrar", "Yes Virginia <script>", Registrar.State.ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
domainCatLol = persistResource(makeDomainResource(
|
||||
"cat.lol",
|
||||
makeAndPersistContactResource(
|
||||
|
|
@ -176,7 +176,7 @@ public class RdapDomainSearchActionTest {
|
|||
createTld("example");
|
||||
registrar = persistResource(
|
||||
makeRegistrar("goodregistrar", "St. John Chrysostom", Registrar.State.ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
domainCatExample = persistResource(makeDomainResource(
|
||||
"cat.example",
|
||||
makeAndPersistContactResource(
|
||||
|
|
@ -201,7 +201,7 @@ public class RdapDomainSearchActionTest {
|
|||
// cat.みんな
|
||||
createTld("xn--q9jyb4c");
|
||||
registrar = persistResource(makeRegistrar("unicoderegistrar", "みんな", Registrar.State.ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
persistResource(makeDomainResource(
|
||||
"cat.みんな",
|
||||
makeAndPersistContactResource(
|
||||
|
|
@ -227,7 +227,7 @@ public class RdapDomainSearchActionTest {
|
|||
createTld("1.test");
|
||||
registrar =
|
||||
persistResource(makeRegistrar("unicoderegistrar", "1.test", Registrar.State.ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
persistResource(makeDomainResource(
|
||||
"cat.1.test",
|
||||
makeAndPersistContactResource(
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ package google.registry.rdap;
|
|||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static google.registry.testing.DatastoreHelper.createTld;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResources;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeContactResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeDomainResource;
|
||||
|
|
@ -79,7 +79,7 @@ public class RdapEntityActionTest {
|
|||
createTld("lol");
|
||||
registrarLol = persistResource(makeRegistrar(
|
||||
"evilregistrar", "Yes Virginia <script>", Registrar.State.ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrarLol));
|
||||
persistSimpleResources(makeRegistrarContacts(registrarLol));
|
||||
registrant = makeAndPersistContactResource(
|
||||
"8372808-ERL",
|
||||
"(◕‿◕)",
|
||||
|
|
@ -113,7 +113,7 @@ public class RdapEntityActionTest {
|
|||
createTld("xn--q9jyb4c");
|
||||
Registrar registrarIdn =
|
||||
persistResource(makeRegistrar("idnregistrar", "IDN Registrar", Registrar.State.ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrarIdn));
|
||||
persistSimpleResources(makeRegistrarContacts(registrarIdn));
|
||||
persistResource(makeDomainResource("cat.みんな",
|
||||
registrant,
|
||||
adminContact,
|
||||
|
|
@ -124,7 +124,7 @@ public class RdapEntityActionTest {
|
|||
createTld("1.tld");
|
||||
Registrar registrar1tld = persistResource(
|
||||
makeRegistrar("1tldregistrar", "Multilevel Registrar", Registrar.State.ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar1tld));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar1tld));
|
||||
persistResource(makeDomainResource("cat.1.tld",
|
||||
registrant,
|
||||
adminContact,
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ package google.registry.rdap;
|
|||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static google.registry.testing.DatastoreHelper.createTld;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResources;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeContactResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar;
|
||||
|
|
@ -96,12 +96,12 @@ public class RdapEntitySearchActionTest {
|
|||
registrar =
|
||||
persistResource(
|
||||
makeRegistrar("2-Registrar", "Yes Virginia <script>", Registrar.State.ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
|
||||
// inactive
|
||||
registrarInactive =
|
||||
persistResource(makeRegistrar("2-RegistrarInact", "No Way", Registrar.State.PENDING));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrarInactive));
|
||||
persistSimpleResources(makeRegistrarContacts(registrarInactive));
|
||||
|
||||
// test
|
||||
registrarTest =
|
||||
|
|
@ -111,7 +111,7 @@ public class RdapEntitySearchActionTest {
|
|||
.setType(Registrar.Type.TEST)
|
||||
.setIanaIdentifier(null)
|
||||
.build());
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrarTest));
|
||||
persistSimpleResources(makeRegistrarContacts(registrarTest));
|
||||
|
||||
action.clock = clock;
|
||||
action.requestPath = RdapEntitySearchAction.PATH;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ package google.registry.rdap;
|
|||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static google.registry.testing.DatastoreHelper.createTld;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResources;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHostResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeDomainResource;
|
||||
|
|
@ -94,7 +94,7 @@ public class RdapJsonFormatterTest {
|
|||
clock.setTo(DateTime.parse("2000-01-01T00:00:00Z"));
|
||||
registrar = persistResource(registrar);
|
||||
|
||||
persistSimpleGlobalResources(makeMoreRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeMoreRegistrarContacts(registrar));
|
||||
|
||||
contactResourceRegistrant = makeAndPersistContactResource(
|
||||
"8372808-ERL",
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ package google.registry.rdap;
|
|||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static google.registry.testing.DatastoreHelper.createTld;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResources;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHostResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeContactResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeDomainResource;
|
||||
|
|
@ -86,7 +86,7 @@ public class RdapNameserverSearchActionTest {
|
|||
Registrar registrar =
|
||||
persistResource(
|
||||
makeRegistrar("evilregistrar", "Yes Virginia <script>", Registrar.State.ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
hostNs1CatLol = makeAndPersistHostResource(
|
||||
"ns1.cat.lol", "1.2.3.4", clock.nowUtc().minusYears(1));
|
||||
hostNs2CatLol = makeAndPersistHostResource(
|
||||
|
|
@ -98,13 +98,13 @@ public class RdapNameserverSearchActionTest {
|
|||
// cat.みんな
|
||||
createTld("xn--q9jyb4c");
|
||||
registrar = persistResource(makeRegistrar("unicoderegistrar", "みんな", Registrar.State.ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
makeAndPersistHostResource("ns1.cat.みんな", "1.2.3.5", clock.nowUtc().minusYears(1));
|
||||
|
||||
// cat.1.test
|
||||
createTld("1.test");
|
||||
registrar = persistResource(makeRegistrar("multiregistrar", "1.test", Registrar.State.ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
makeAndPersistHostResource("ns1.cat.1.test", "1.2.3.6", clock.nowUtc().minusYears(1));
|
||||
|
||||
// create a domain so that we can use it as a test nameserver search string suffix
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
package google.registry.testing;
|
||||
|
||||
import static com.google.common.truth.Truth.assert_;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResources;
|
||||
import static google.registry.util.ResourceUtils.readResourceUtf8;
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
import static org.json.XML.toJSONObject;
|
||||
|
|
@ -55,7 +56,6 @@ import org.junit.runners.model.Statement;
|
|||
import java.io.ByteArrayInputStream;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
|
@ -401,10 +401,8 @@ public final class AppEngineRule extends ExternalResource {
|
|||
|
||||
/** Create some fake registrars. */
|
||||
public static void loadInitialData() {
|
||||
DatastoreHelper.persistSimpleGlobalResources(Arrays.asList(
|
||||
makeRegistrar1(),
|
||||
makeRegistrarContact1(),
|
||||
makeRegistrar2(),
|
||||
makeRegistrarContact2()));
|
||||
persistSimpleResources(
|
||||
ImmutableList.of(
|
||||
makeRegistrar1(), makeRegistrarContact1(), makeRegistrar2(), makeRegistrarContact2()));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -842,24 +842,6 @@ public class DatastoreHelper {
|
|||
return persistSimpleResources(ImmutableList.of(resource)).get(0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Persists a single Objectify resource in the global namespace, without adjusting foreign
|
||||
* resources or keys.
|
||||
*/
|
||||
public static <R> R persistSimpleGlobalResource(final R resource) {
|
||||
return persistSimpleResources(ImmutableList.of(resource)).get(0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Like persistResource but for multiple entities, with no helper for saving
|
||||
* ForeignKeyedEppResources. All entities are persisted into the global namespace.
|
||||
*
|
||||
* @see "http://docs.objectify-appengine.googlecode.com/git/apidocs/com/googlecode/objectify/cmd/Loader.htmls#entities(java.lang.Iterable)"
|
||||
*/
|
||||
public static <R> ImmutableList<R> persistSimpleGlobalResources(Iterable<R> resources) {
|
||||
return persistSimpleResources(resources);
|
||||
}
|
||||
|
||||
/**
|
||||
* Like persistResource but for multiple entities, with no helper for saving
|
||||
* ForeignKeyedEppResources.
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@ import static com.google.common.truth.Truth.assertThat;
|
|||
import static google.registry.model.registrar.RegistrarContact.Type.ABUSE;
|
||||
import static google.registry.model.registrar.RegistrarContact.Type.ADMIN;
|
||||
import static google.registry.model.registrar.RegistrarContact.Type.WHOIS;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResources;
|
||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
|
|
@ -75,7 +76,7 @@ public class RegistrarContactCommandTest extends CommandTestCase<RegistrarContac
|
|||
.setVisibleInWhoisAsAdmin(true)
|
||||
.setVisibleInWhoisAsTech(true)
|
||||
.build());
|
||||
persistSimpleGlobalResources(contacts);
|
||||
persistSimpleResources(contacts);
|
||||
runCommand(
|
||||
"--force",
|
||||
"--mode=UPDATE",
|
||||
|
|
@ -105,12 +106,12 @@ public class RegistrarContactCommandTest extends CommandTestCase<RegistrarContac
|
|||
@Test
|
||||
public void testUpdate_enableConsoleAccess() throws Exception {
|
||||
Registrar registrar = Registrar.loadByClientId("NewRegistrar");
|
||||
persistSimpleGlobalResources(ImmutableList.of(
|
||||
persistSimpleResource(
|
||||
new RegistrarContact.Builder()
|
||||
.setParent(registrar)
|
||||
.setName("Jane Doe")
|
||||
.setEmailAddress("jane.doe@example.com")
|
||||
.build()));
|
||||
.build());
|
||||
runCommand(
|
||||
"--force",
|
||||
"--mode=UPDATE",
|
||||
|
|
@ -125,13 +126,13 @@ public class RegistrarContactCommandTest extends CommandTestCase<RegistrarContac
|
|||
@Test
|
||||
public void testUpdate_disableConsoleAccess() throws Exception {
|
||||
Registrar registrar = Registrar.loadByClientId("NewRegistrar");
|
||||
persistSimpleGlobalResources(ImmutableList.of(
|
||||
persistSimpleResource(
|
||||
new RegistrarContact.Builder()
|
||||
.setParent(registrar)
|
||||
.setName("Judith Doe")
|
||||
.setEmailAddress("judith.doe@example.com")
|
||||
.setGaeUserId("11111")
|
||||
.build()));
|
||||
.build());
|
||||
runCommand(
|
||||
"--force",
|
||||
"--mode=UPDATE",
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ package google.registry.ui.server.registrar;
|
|||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static google.registry.security.JsonHttpTestUtils.createJsonPayload;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResource;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
|
|
@ -25,7 +27,6 @@ import com.google.common.collect.ImmutableSet;
|
|||
import google.registry.model.registrar.Registrar;
|
||||
import google.registry.model.registrar.RegistrarContact;
|
||||
import google.registry.testing.AppEngineRule;
|
||||
import google.registry.testing.DatastoreHelper;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
|
@ -122,8 +123,8 @@ public class ContactSettingsTest extends RegistrarServletTestCase {
|
|||
.setTypes(ImmutableSet.of(RegistrarContact.Type.ADMIN, RegistrarContact.Type.TECH))
|
||||
.build();
|
||||
// Lest we anger the timestamp inversion bug.
|
||||
DatastoreHelper.persistResource(registrar);
|
||||
DatastoreHelper.persistSimpleGlobalResources(ImmutableSet.of(rc));
|
||||
persistResource(registrar);
|
||||
persistSimpleResource(rc);
|
||||
|
||||
// Now try to remove the phone number.
|
||||
rc = rc.asBuilder().setPhoneNumber(null).build();
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ package google.registry.whois;
|
|||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResources;
|
||||
import static google.registry.whois.WhoisHelper.loadWhoisTestFile;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
|
|
@ -110,7 +110,7 @@ public class RegistrarWhoisResponseTest {
|
|||
.setTypes(ImmutableSet.of(RegistrarContact.Type.TECH))
|
||||
.setVisibleInWhoisAsTech(true)
|
||||
.build());
|
||||
persistSimpleGlobalResources(contacts);
|
||||
persistSimpleResources(contacts);
|
||||
persistResource(registrar);
|
||||
|
||||
RegistrarWhoisResponse registrarWhoisResponse =
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
|
|||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static google.registry.testing.DatastoreHelper.createTlds;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResources;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeContactResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeDomainResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeHostResource;
|
||||
|
|
@ -127,7 +127,7 @@ public class WhoisHttpServerTest {
|
|||
persistResource(makeHostResource("ns1.cat.lol", "1.2.3.4")),
|
||||
persistResource(makeHostResource("ns2.cat.lol", "bad:f00d:cafe::15:beef")),
|
||||
registrar));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
newWhoisHttpServer("/domain/cat.lol").run();
|
||||
assertThat(response.getStatus()).isEqualTo(404);
|
||||
assertThat(response.getContentType()).isEqualTo(PLAIN_TEXT_UTF_8);
|
||||
|
|
@ -147,7 +147,7 @@ public class WhoisHttpServerTest {
|
|||
persistResource(makeHostResource("ns1.cat.みんな", "1.2.3.4")),
|
||||
persistResource(makeHostResource("ns2.cat.みんな", "bad:f00d:cafe::15:beef")),
|
||||
registrar));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
newWhoisHttpServer("/domain/cat.みんな").run();
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
assertThat(response.getPayload()).isEqualTo(loadWhoisTestFile("whois_server_idn_utf8.txt"));
|
||||
|
|
@ -217,7 +217,7 @@ public class WhoisHttpServerTest {
|
|||
persistResource(makeHostResource("ns1.cat.みんな", "1.2.3.4")),
|
||||
persistResource(makeHostResource("ns2.cat.みんな", "bad:f00d:cafe::15:beef")),
|
||||
registrar));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
newWhoisHttpServer("/domain/cat.xn--q9jyb4c").run();
|
||||
assertThat(response.getPayload()).isEqualTo(loadWhoisTestFile("whois_server_idn_utf8.txt"));
|
||||
}
|
||||
|
|
@ -304,7 +304,7 @@ public class WhoisHttpServerTest {
|
|||
public void testRun_registrarLookup_works() throws Exception {
|
||||
Registrar registrar = persistResource(
|
||||
makeRegistrar("example", "Example Registrar, Inc.", Registrar.State.ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
// Notice the partial search without "inc".
|
||||
newWhoisHttpServer("/registrar/Example%20Registrar").run();
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
|
|
@ -315,7 +315,7 @@ public class WhoisHttpServerTest {
|
|||
public void testRun_registrarLookupInPendingState_returnsNotFound() throws Exception {
|
||||
Registrar registrar = persistResource(
|
||||
makeRegistrar("example", "Example Registrar, Inc.", Registrar.State.PENDING));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
newWhoisHttpServer("/registrar/Example%20Registrar,%20Inc.").run();
|
||||
assertThat(response.getStatus()).isEqualTo(404);
|
||||
assertThat(response.getPayload())
|
||||
|
|
@ -327,7 +327,7 @@ public class WhoisHttpServerTest {
|
|||
Registrar registrar = persistResource(
|
||||
makeRegistrar("example", "Example Registrar, Inc.", Registrar.State.ACTIVE)
|
||||
.asBuilder().setType(Registrar.Type.TEST).setIanaIdentifier(null).build());
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
newWhoisHttpServer("/registrar/Example%20Registrar,%20Inc.").run();
|
||||
assertThat(response.getStatus()).isEqualTo(404);
|
||||
assertThat(response.getPayload())
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import static google.registry.model.registrar.Registrar.State.ACTIVE;
|
|||
import static google.registry.model.registrar.Registrar.Type.PDT;
|
||||
import static google.registry.testing.DatastoreHelper.createTlds;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleGlobalResources;
|
||||
import static google.registry.testing.DatastoreHelper.persistSimpleResources;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeContactResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeDomainResource;
|
||||
import static google.registry.testing.FullFieldsTestEntityHelper.makeHostResource;
|
||||
|
|
@ -96,7 +96,7 @@ public class WhoisServerTest {
|
|||
persistResource(makeHostResource("ns1.cat.lol", "1.2.3.4")),
|
||||
persistResource(makeHostResource("ns2.cat.lol", "bad:f00d:cafe::15:beef")),
|
||||
registrar));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
newWhoisServer("domain cat.lol\r\n").run();
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
assertThat(response.getPayload()).isEqualTo(loadWhoisTestFile("whois_server_domain.txt"));
|
||||
|
|
@ -114,7 +114,7 @@ public class WhoisServerTest {
|
|||
persistResource(makeHostResource("ns1.cat.みんな", "1.2.3.4")),
|
||||
persistResource(makeHostResource("ns2.cat.みんな", "bad:f00d:cafe::15:beef")),
|
||||
registrar));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
newWhoisServer("domain cat.みんな\r\n").run();
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
assertThat(response.getPayload()).isEqualTo(loadWhoisTestFile("whois_server_idn_punycode.txt"));
|
||||
|
|
@ -132,7 +132,7 @@ public class WhoisServerTest {
|
|||
persistResource(makeHostResource("ns1.cat.みんな", "1.2.3.4")),
|
||||
persistResource(makeHostResource("ns2.cat.みんな", "bad:f00d:cafe::15:beef")),
|
||||
registrar));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
newWhoisServer("domain cat.xn--q9jyb4c\r\n").run();
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
assertThat(response.getPayload()).isEqualTo(loadWhoisTestFile("whois_server_idn_punycode.txt"));
|
||||
|
|
@ -161,7 +161,7 @@ public class WhoisServerTest {
|
|||
persistResource(makeHostResource("ns1.cat.lol", "1.2.3.4")),
|
||||
persistResource(makeHostResource("ns2.cat.lol", "bad:f00d:cafe::15:beef")),
|
||||
registrar));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
newWhoisServer("domain cat.lol\r\n").run();
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
assertThat(response.getPayload())
|
||||
|
|
@ -183,7 +183,7 @@ public class WhoisServerTest {
|
|||
persistResource(
|
||||
(registrar = makeRegistrar("example", "Example Registrar", ACTIVE))))
|
||||
.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
newWhoisServer("domain cat.lol\r\n").run();
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
assertThat(response.getPayload())
|
||||
|
|
@ -223,7 +223,7 @@ public class WhoisServerTest {
|
|||
persistResource((registrar = makeRegistrar(
|
||||
"example", "Example Registrar", ACTIVE)))).asBuilder()
|
||||
.setCreationTimeForTest(DateTime.now()).build());
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
assertThat(domain1.getRepoId()).isNotEqualTo(domain2.getRepoId());
|
||||
newWhoisServer("domain cat.lol\r\n").run();
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
|
|
@ -369,7 +369,7 @@ public class WhoisServerTest {
|
|||
public void testRun_registrarLookup_works() throws Exception {
|
||||
Registrar registrar = persistResource(
|
||||
makeRegistrar("example", "Example Registrar, Inc.", ACTIVE));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
// Notice the partial search without "inc".
|
||||
newWhoisServer("registrar example registrar").run();
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
|
|
@ -385,7 +385,7 @@ public class WhoisServerTest {
|
|||
.setIanaIdentifier(9995L)
|
||||
.setType(PDT)
|
||||
.build());
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
// Notice the partial search without "inc".
|
||||
newWhoisServer("registrar example registrar").run();
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
|
|
@ -396,7 +396,7 @@ public class WhoisServerTest {
|
|||
public void testRun_registrarLookupInPendingState_returnsNotFound() throws Exception {
|
||||
Registrar registrar = persistResource(
|
||||
makeRegistrar("example", "Example Registrar, Inc.", Registrar.State.PENDING));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
newWhoisServer("registrar Example Registrar, Inc.").run();
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
assertThat(response.getPayload())
|
||||
|
|
@ -411,7 +411,7 @@ public class WhoisServerTest {
|
|||
.setIanaIdentifier(null)
|
||||
.setType(Registrar.Type.TEST)
|
||||
.build());
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
newWhoisServer("registrar Example Registrar, Inc.").run();
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
assertThat(response.getPayload())
|
||||
|
|
@ -429,7 +429,7 @@ public class WhoisServerTest {
|
|||
persistResource(makeHostResource("ns1.cat.1.test", "1.2.3.4")),
|
||||
persistResource(makeHostResource("ns2.cat.1.test", "bad:f00d:cafe::15:beef")),
|
||||
registrar));
|
||||
persistSimpleGlobalResources(makeRegistrarContacts(registrar));
|
||||
persistSimpleResources(makeRegistrarContacts(registrar));
|
||||
|
||||
newWhoisServer("domain cat.1.test\r\n").run();
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue