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

Refer to Datastore everywhere correctly by its capitalized form

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=147479683
This commit is contained in:
mcilwain 2017-02-14 09:11:30 -08:00 • committed by Ben McIlwain
parent a8cf81bca2
commit cdadb54acd
123 changed files with 232 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

6
javatests/google/registry/testing/AppEngineRule.java
View file

@ -108,7 +108,7 @@ public final class AppEngineRule extends ExternalResource {
private AppEngineRule rule = new AppEngineRule();
/** Turn on the datastore service. */
/** Turn on the Datastore service. */
public Builder withDatastore() {
rule.withDatastore = true;
return this;
@ -327,7 +327,7 @@ public final class AppEngineRule extends ExternalResource {
ObjectifyFilter.complete();
helper.tearDown();
helper = null;
// Test that the datastore didn't need any indexes we don't have listed in our index file.
// Test that Datastore didn't need any indexes we don't have listed in our index file.
try {
Set<String> autoIndexes = getIndexXmlStrings(Files.asCharSource(
new File(temporaryFolder.getRoot(), "datastore-indexes-auto.xml"), UTF_8).read());
@ -345,7 +345,7 @@ public final class AppEngineRule extends ExternalResource {
.readConfiguration(new ByteArrayInputStream(LOGGING_PROPERTIES.getBytes(UTF_8)));
}
/** Read a datastore index file, and parse the indexes into individual strings. */
/** Read a Datastore index file, and parse the indexes into individual strings. */
private static Set<String> getIndexXmlStrings(String indexFile) {
ImmutableSet.Builder<String> builder = new ImmutableSet.Builder<>();
try {

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

@ -621,14 +621,14 @@ public class DatastoreHelper {
}
/** Assert that the expected billing events are exactly the ones found in the fake datastore. */
/** Assert that the expected billing events are exactly the ones found in the fake Datastore. */
public static void assertBillingEvents(BillingEvent... expected) throws Exception {
assertThat(FluentIterable.from(getBillingEvents()).transform(BILLING_EVENT_ID_STRIPPER))
.containsExactlyElementsIn(
FluentIterable.from(expected).transform(BILLING_EVENT_ID_STRIPPER));
}
/** Assert that the expected billing events set is exactly the one found in the fake datastore. */
/** Assert that the expected billing events set is exactly the one found in the fake Datastore. */
public static void assertBillingEvents(ImmutableSet<BillingEvent> expected) throws Exception {
assertThat(FluentIterable.from(getBillingEvents()).transform(BILLING_EVENT_ID_STRIPPER))
.containsExactlyElementsIn(
@ -755,7 +755,7 @@ public class DatastoreHelper {
* <p>Tests should always use this method (or the shortcut persist methods in this class) to
* persist test data, to avoid potentially subtle bugs related to race conditions and a stale
* ofy() session cache. Specifically, this method calls .now() on the save to force the write to
* actually get sent to datastore (although it does not force it to be applied) and clears the
* actually get sent to Datastore (although it does not force it to be applied) and clears the
* session cache. If necessary, this method also updates the relevant {@link EppResourceIndex},
* {@link ForeignKeyIndex} and {@link DomainApplicationIndex}.
*
@ -804,7 +804,7 @@ public class DatastoreHelper {
public void vrun() {
saveResource(resource, wantBackup);
}});
// Force the session to be cleared so that when we read it back, we read from the datastore
// Force the session to be cleared so that when we read it back, we read from Datastore
// and not from the transaction cache or memcache.
ofy().clearSessionCache();
return ofy().load().entity(resource).now();
@ -845,7 +845,7 @@ public class DatastoreHelper {
}
}});
}
// Force the session to be cleared so that when we read it back, we read from the datastore
// Force the session to be cleared so that when we read it back, we read from Datastore
// and not from the transaction cache or memcache.
ofy().clearSessionCache();
for (R resource : resources) {
@ -957,7 +957,7 @@ public class DatastoreHelper {
public void vrun() {
ofy().saveWithoutBackup().entities(resources);
}});
// Force the session to be cleared so that when we read it back, we read from the datastore
// Force the session to be cleared so that when we read it back, we read from Datastore
// and not from the transaction cache or memcache.
ofy().clearSessionCache();
return ImmutableList.copyOf(ofy().load().entities(resources).values());
@ -965,7 +965,7 @@ public class DatastoreHelper {
public static void deleteResource(final Object resource) {
ofy().deleteWithoutBackup().entity(resource).now();
// Force the session to be cleared so that when we read it back, we read from the datastore and
// Force the session to be cleared so that when we read it back, we read from Datastore and
// not from the transaction cache or memcache.
ofy().clearSessionCache();
}