zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-19 18:59:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove temporary @OnLoad used for setting period in DomainApplication

Browse source 
Now that the registration period has been added to DomainApplication, we
can remove this @OnLoad that was populating it for objects that were
missing the period.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=159464438
This commit is contained in:
Ben McIlwain 2017-06-19 12:53:57 -07:00
parent fc78fd7d4a
commit fd1051f90a
4 changed files with 2 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

77
javatests/google/registry/model/domain/DomainApplicationTest.java
View file

@ -16,7 +16,6 @@ package google.registry.model.domain;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.model.EppResourceUtils.loadDomainApplication;
import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.testing.DatastoreHelper.cloneAndSetAutoTimestamps;
import static google.registry.testing.DatastoreHelper.createTld;
import static google.registry.testing.DatastoreHelper.newDomainApplication;
@ -24,17 +23,12 @@ import static google.registry.testing.DatastoreHelper.newHostResource;
import static google.registry.testing.DatastoreHelper.persistActiveContact;
import static google.registry.testing.DatastoreHelper.persistActiveHost;
import static google.registry.testing.DatastoreHelper.persistResource;
import static google.registry.testing.FullFieldsTestEntityHelper.makeHistoryEntry;
import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions;
import static google.registry.util.DateTimeUtils.START_OF_TIME;
import static org.joda.money.CurrencyUnit.USD;
import static org.joda.time.DateTimeZone.UTC;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.googlecode.objectify.Key;
import com.googlecode.objectify.VoidWork;
import google.registry.model.EntityTestCase;
import google.registry.model.domain.launch.ApplicationStatus;
import google.registry.model.domain.launch.LaunchNotice;
@ -44,11 +38,9 @@ import google.registry.model.eppcommon.AuthInfo.PasswordAuth;
import google.registry.model.eppcommon.StatusValue;
import google.registry.model.eppcommon.Trid;
import google.registry.model.host.HostResource;
import google.registry.model.reporting.HistoryEntry;
import google.registry.model.smd.EncodedSignedMark;
import google.registry.testing.ExceptionRule;
import org.joda.money.Money;
import org.joda.time.DateTime;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@ -92,7 +84,7 @@ public class DomainApplicationTest extends EntityTestCase {
LaunchNotice.create("tcnid", "validatorId", START_OF_TIME, START_OF_TIME))
.setCreationTrid(Trid.create("client-creation-trid", "server-trid"))
.setPhase(LaunchPhase.LANDRUSH)
// TODO(b/32447342): set period
.setPeriod(Period.create(5, Period.Unit.YEARS))
.setEncodedSignedMarks(ImmutableList.of(EncodedSignedMark.create("base64", "abcdefg=")))
.setApplicationStatus(ApplicationStatus.ALLOCATED)
.setAuctionPrice(Money.of(USD, 11))
@ -169,71 +161,4 @@ public class DomainApplicationTest extends EntityTestCase {
// If there are circular references, this will overflow the stack.
domainApplication.toHydratedString();
}
// TODO(b/32447342): remove this once the period has been populated on all DomainApplications
private void triggerTheOnLoadMethod() {
ofy().transact(new VoidWork() {
@Override
public void vrun() {
domainApplication = ofy().load().fromEntity(ofy().save().toEntity(domainApplication));
}
});
}
// TODO(b/32447342): remove this once the period has been populated on all DomainApplications
@Test
public void testPeriodIsNullByDefault() {
triggerTheOnLoadMethod();
assertThat(domainApplication.getPeriod()).isNull();
}
// TODO(b/32447342): remove this once the period has been populated on all DomainApplications
@Test
public void testPeriodIsOneYearBecauseHistoryEntryHasNoPeriod() {
persistResource(makeHistoryEntry(
domainApplication,
HistoryEntry.Type.DOMAIN_APPLICATION_CREATE,
Period.create(5, Period.Unit.YEARS),
"testing",
DateTime.now(UTC),
loadFileWithSubstitutions(
getClass(), "domain_create_landrush.xml", ImmutableMap.<String, String>of())));
triggerTheOnLoadMethod();
assertThat(domainApplication.getPeriod()).isNotNull();
assertThat(domainApplication.getPeriod()).isEqualTo(Period.create(1, Period.Unit.YEARS));
}
// TODO(b/32447342): remove this once the period has been populated on all DomainApplications
@Test
public void testPeriodDefaultedFromHistoryEntry() {
persistResource(makeHistoryEntry(
domainApplication,
HistoryEntry.Type.DOMAIN_APPLICATION_CREATE,
Period.create(5, Period.Unit.YEARS),
"testing",
DateTime.now(UTC),
loadFileWithSubstitutions(
getClass(), "domain_create_landrush_with_period.xml", ImmutableMap.of("PERIOD", "5"))));
triggerTheOnLoadMethod();
assertThat(domainApplication.getPeriod()).isNotNull();
assertThat(domainApplication.getPeriod()).isEqualTo(Period.create(5, Period.Unit.YEARS));
}
// TODO(b/32447342): remove this once the period has been populated on all DomainApplications
@Test
public void testPeriodAlreadySet() {
domainApplication = persistResource(
domainApplication.asBuilder().setPeriod(Period.create(1, Period.Unit.YEARS)).build());
persistResource(makeHistoryEntry(
domainApplication,
HistoryEntry.Type.DOMAIN_APPLICATION_CREATE,
Period.create(5, Period.Unit.YEARS),
"testing",
DateTime.now(UTC),
loadFileWithSubstitutions(
getClass(), "domain_create_landrush_with_period.xml", ImmutableMap.of("PERIOD", "5"))));
triggerTheOnLoadMethod();
assertThat(domainApplication.getPeriod()).isNotNull();
assertThat(domainApplication.getPeriod()).isEqualTo(Period.create(1, Period.Unit.YEARS));
}
}