zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-08-05 17:28:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

Break domain flow TMCH helper methods into separate injected class

Browse source 
This is a necessary prerequisite to subsequently injecting the configuration
dependencies.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=143567753
This commit is contained in:
mcilwain 2017-01-04 10:23:08 -08:00 • committed by Ben McIlwain
parent c35c3a678b
commit 8252e97dfb
8 changed files with 285 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

32
javatests/google/registry/flows/EppTestComponent.java
View file

@ -25,6 +25,7 @@ import google.registry.config.ConfigModule;
import google.registry.dns.DnsQueue;
import google.registry.flows.custom.CustomLogicFactory;
import google.registry.flows.custom.TestCustomLogicFactory;
import google.registry.flows.domain.DomainFlowTmchUtils;
import google.registry.monitoring.whitebox.BigQueryMetricsEnqueuer;
import google.registry.monitoring.whitebox.EppMetric;
import google.registry.request.RequestScope;
@ -49,15 +50,17 @@ interface EppTestComponent {
@Module
static class FakesAndMocksModule {
final FakeClock clock;
final Sleeper sleeper;
final DnsQueue dnsQueue;
final BigQueryMetricsEnqueuer metricsEnqueuer;
final DnsQueue dnsQueue;
final DomainFlowTmchUtils domainFlowTmchUtils;
final EppMetric.Builder metricBuilder;
final FakeClock clock;
final ModulesService modulesService;
final Sleeper sleeper;
FakesAndMocksModule(FakeClock clock) {
this.clock = clock;
this.domainFlowTmchUtils = new DomainFlowTmchUtils();
this.sleeper = new FakeSleeper(clock);
this.dnsQueue = DnsQueue.create();
this.metricBuilder = EppMetric.builderForRequest("request-id-1", clock);
@ -65,14 +68,19 @@ interface EppTestComponent {
this.metricsEnqueuer = mock(BigQueryMetricsEnqueuer.class);
}
@Provides
BigQueryMetricsEnqueuer provideBigQueryMetricsEnqueuer() {
return metricsEnqueuer;
}
@Provides
Clock provideClock() {
return clock;
}
@Provides
Sleeper provideSleeper() {
return sleeper;
CustomLogicFactory provideCustomLogicFactory() {
return new TestCustomLogicFactory();
}
@Provides
@ -80,6 +88,11 @@ interface EppTestComponent {
return dnsQueue;
}
@Provides
DomainFlowTmchUtils provideDomainFlowTmchUtils() {
return domainFlowTmchUtils;
}
@Provides
EppMetric.Builder provideMetrics() {
return metricBuilder;
@ -91,13 +104,8 @@ interface EppTestComponent {
}
@Provides
BigQueryMetricsEnqueuer provideBigQueryMetricsEnqueuer() {
return metricsEnqueuer;
}
@Provides
CustomLogicFactory provideCustomLogicFactory() {
return new TestCustomLogicFactory();
Sleeper provideSleeper() {
return sleeper;
}
}

26
javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java
View file

@ -48,12 +48,24 @@ import google.registry.flows.domain.DomainApplicationCreateFlow.LandrushApplicat
import google.registry.flows.domain.DomainApplicationCreateFlow.NoticeCannotBeUsedWithSignedMarkException;
import google.registry.flows.domain.DomainApplicationCreateFlow.SunriseApplicationDisallowedDuringLandrushException;
import google.registry.flows.domain.DomainApplicationCreateFlow.UncontestedSunriseApplicationBlockedInLandrushException;
import google.registry.flows.domain.DomainFlowTmchUtils.Base64RequiredForEncodedSignedMarksException;
import google.registry.flows.domain.DomainFlowTmchUtils.NoMarksFoundMatchingDomainException;
import google.registry.flows.domain.DomainFlowTmchUtils.SignedMarkCertificateExpiredException;
import google.registry.flows.domain.DomainFlowTmchUtils.SignedMarkCertificateInvalidException;
import google.registry.flows.domain.DomainFlowTmchUtils.SignedMarkCertificateNotYetValidException;
import google.registry.flows.domain.DomainFlowTmchUtils.SignedMarkCertificateRevokedException;
import google.registry.flows.domain.DomainFlowTmchUtils.SignedMarkCertificateSignatureException;
import google.registry.flows.domain.DomainFlowTmchUtils.SignedMarkEncodingErrorException;
import google.registry.flows.domain.DomainFlowTmchUtils.SignedMarkParsingErrorException;
import google.registry.flows.domain.DomainFlowTmchUtils.SignedMarkRevokedErrorException;
import google.registry.flows.domain.DomainFlowTmchUtils.SignedMarkSignatureException;
import google.registry.flows.domain.DomainFlowTmchUtils.SignedMarksMustBeEncodedException;
import google.registry.flows.domain.DomainFlowTmchUtils.TooManySignedMarksException;
import google.registry.flows.domain.DomainFlowUtils.AcceptedTooLongAgoException;
import google.registry.flows.domain.DomainFlowUtils.BadCommandForRegistryPhaseException;
import google.registry.flows.domain.DomainFlowUtils.BadDomainNameCharacterException;
import google.registry.flows.domain.DomainFlowUtils.BadDomainNamePartsCountException;
import google.registry.flows.domain.DomainFlowUtils.BadPeriodUnitException;
import google.registry.flows.domain.DomainFlowUtils.Base64RequiredForEncodedSignedMarksException;
import google.registry.flows.domain.DomainFlowUtils.ClaimsPeriodEndedException;
import google.registry.flows.domain.DomainFlowUtils.CurrencyUnitMismatchException;
import google.registry.flows.domain.DomainFlowUtils.CurrencyValueScaleException;
@ -79,24 +91,12 @@ import google.registry.flows.domain.DomainFlowUtils.MissingClaimsNoticeException
import google.registry.flows.domain.DomainFlowUtils.MissingContactTypeException;
import google.registry.flows.domain.DomainFlowUtils.NameserversNotAllowedException;
import google.registry.flows.domain.DomainFlowUtils.NameserversNotSpecifiedException;
import google.registry.flows.domain.DomainFlowUtils.NoMarksFoundMatchingDomainException;
import google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException;
import google.registry.flows.domain.DomainFlowUtils.PremiumNameBlockedException;
import google.registry.flows.domain.DomainFlowUtils.RegistrantNotAllowedException;
import google.registry.flows.domain.DomainFlowUtils.SignedMarkCertificateExpiredException;
import google.registry.flows.domain.DomainFlowUtils.SignedMarkCertificateInvalidException;
import google.registry.flows.domain.DomainFlowUtils.SignedMarkCertificateNotYetValidException;
import google.registry.flows.domain.DomainFlowUtils.SignedMarkCertificateRevokedException;
import google.registry.flows.domain.DomainFlowUtils.SignedMarkCertificateSignatureException;
import google.registry.flows.domain.DomainFlowUtils.SignedMarkEncodingErrorException;
import google.registry.flows.domain.DomainFlowUtils.SignedMarkParsingErrorException;
import google.registry.flows.domain.DomainFlowUtils.SignedMarkRevokedErrorException;
import google.registry.flows.domain.DomainFlowUtils.SignedMarkSignatureException;
import google.registry.flows.domain.DomainFlowUtils.SignedMarksMustBeEncodedException;
import google.registry.flows.domain.DomainFlowUtils.TldDoesNotExistException;
import google.registry.flows.domain.DomainFlowUtils.TooManyDsRecordsException;
import google.registry.flows.domain.DomainFlowUtils.TooManyNameserversException;
import google.registry.flows.domain.DomainFlowUtils.TooManySignedMarksException;
import google.registry.flows.domain.DomainFlowUtils.TrailingDashException;
import google.registry.flows.domain.DomainFlowUtils.UnexpectedClaimsNoticeException;
import google.registry.flows.domain.DomainFlowUtils.UnsupportedFeeAttributeException;

2
javatests/google/registry/tools/UpdateSmdCommandTest.java
View file

@ -29,6 +29,7 @@ import com.google.common.collect.ImmutableMap;
import google.registry.flows.EppException.ParameterValuePolicyErrorException;
import google.registry.flows.EppException.ParameterValueSyntaxErrorException;
import google.registry.flows.EppException.RequiredParameterMissingException;
import google.registry.flows.domain.DomainFlowTmchUtils;
import google.registry.model.domain.DomainApplication;
import google.registry.model.reporting.HistoryEntry;
import google.registry.model.smd.EncodedSignedMark;
@ -65,6 +66,7 @@ public class UpdateSmdCommandTest extends CommandTestCase<UpdateSmdCommand> {
.setCurrentSponsorClientId("TheRegistrar")
.setEncodedSignedMarks(ImmutableList.of(EncodedSignedMark.create("base64", "garbage")))
.build());
command.tmchUtils = new DomainFlowTmchUtils();
}
private DomainApplication reloadDomainApplication() {