Use Dagger to @Inject DnsQueue everywhere that is feasible

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=136062053
This commit is contained in:
mcilwain 2016-10-13 11:10:02 -07:00 committed by Ben McIlwain
parent a13f6aded8
commit 6a738557fb
17 changed files with 47 additions and 15 deletions

View file

@ -14,8 +14,10 @@
package google.registry.dns;
import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
import static com.google.common.collect.Lists.transform;
import static google.registry.dns.DnsConstants.DNS_PUBLISH_PUSH_QUEUE_NAME;
import static google.registry.dns.DnsConstants.DNS_PULL_QUEUE_NAME;
import static google.registry.dns.DnsConstants.DNS_TARGET_NAME_PARAM;
import static google.registry.dns.DnsConstants.DNS_TARGET_TYPE_PARAM;
import static google.registry.request.RequestParameters.PARAM_TLD;
@ -84,7 +86,8 @@ public class ReadDnsQueueActionTest {
clock.setTo(DateTime.now(DateTimeZone.UTC));
createTlds("com", "net", "example");
persistResource(Registry.get("example").asBuilder().setTldType(TldType.TEST).build());
dnsQueue = DnsQueue.create();
dnsQueue = new DnsQueue();
dnsQueue.queue = getQueue(DNS_PULL_QUEUE_NAME);
dnsQueue.writeLockTimeout = Duration.standardSeconds(10);
}

View file

@ -22,6 +22,7 @@ import dagger.Module;
import dagger.Provides;
import dagger.Subcomponent;
import google.registry.config.ConfigModule;
import google.registry.dns.DnsQueue;
import google.registry.monitoring.whitebox.BigQueryMetricsEnqueuer;
import google.registry.monitoring.whitebox.EppMetric;
import google.registry.request.RequestScope;
@ -43,13 +44,16 @@ interface EppTestComponent {
/** Module for injecting fakes and mocks. */
@Module
static class FakesAndMocksModule {
final FakeClock clock;
final EppMetric.Builder metricBuilder;
final DnsQueue dnsQueue;
final BigQueryMetricsEnqueuer metricsEnqueuer;
final EppMetric.Builder metricBuilder;
final ModulesService modulesService;
FakesAndMocksModule(FakeClock clock) {
this.clock = clock;
this.dnsQueue = DnsQueue.create();
this.metricBuilder = EppMetric.builderForRequest("request-id-1", clock);
this.modulesService = mock(ModulesService.class);
this.metricsEnqueuer = mock(BigQueryMetricsEnqueuer.class);
@ -60,6 +64,11 @@ interface EppTestComponent {
return clock;
}
@Provides
DnsQueue provideDnsQueue() {
return dnsQueue;
}
@Provides
EppMetric.Builder provideMetrics() {
return metricBuilder;