Inject clock for Tmch validity using InjectRule instead of manually

Basically a less patchy version of []

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=202138086
This commit is contained in:
guyben 2018-06-26 09:09:21 -07:00 committed by Ben McIlwain
parent 3550045636
commit b4cb3e0a6f
8 changed files with 14 additions and 20 deletions

View file

@ -124,7 +124,6 @@ import google.registry.model.registry.Registry.TldState;
import google.registry.model.registry.label.ReservedList;
import google.registry.model.reporting.HistoryEntry;
import google.registry.model.smd.SignedMarkRevocationList;
import google.registry.tmch.TmchCertificateAuthority;
import google.registry.tmch.TmchXmlSignature;
import java.security.GeneralSecurityException;
import java.util.List;
@ -151,11 +150,10 @@ public class DomainApplicationCreateFlowTest
@Before
public void setUp() {
clock.setTo(DateTime.parse("2014-09-09T09:09:09Z"));
setEppInput("domain_create_sunrise_encoded_signed_mark.xml");
createTld("tld", TldState.SUNRISE);
persistResource(Registry.get("tld").asBuilder().setReservedLists(createReservedList()).build());
inject.setStaticField(TmchCertificateAuthority.class, "clock", clock);
clock.setTo(DateTime.parse("2014-09-09T09:09:09Z"));
}
/** Create host and contact entries for testing. */

View file

@ -151,7 +151,6 @@ import google.registry.model.reporting.DomainTransactionRecord.TransactionReport
import google.registry.model.reporting.HistoryEntry;
import google.registry.monitoring.whitebox.EppMetric;
import google.registry.testing.TaskQueueHelper.TaskMatcher;
import google.registry.tmch.TmchCertificateAuthority;
import java.util.Map;
import org.joda.money.CurrencyUnit;
import org.joda.money.Money;
@ -173,8 +172,6 @@ public class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow,
@Before
public void initCreateTest() {
// Setting the clock used for SignedMark signature validity.
TmchCertificateAuthority.clock = () -> DateTime.parse("2015-01-01TZ");
createTld("tld");
persistResource(
Registry.get("tld")