Wrap ModulesService in new AppEngineServiceUtils

ModulesService does not provide a great API. Specifically, it doesn't have a
way to get the hostname for a specific service; you have to get the hostname for
a specific version as well. This is very rarely what we want, as we publish new
versions every week and don't expect old ones to hang around for very long, so
a task should execute against whatever the live version is, not whatever the
current version was back when the task was enqueued (especially because that
version might be deleted by now).

This new and improved wrapper API removes the confusion and plays better with
dependency injection to boot. We can also fold in other methods having to do
with App Engine services, whereas ModulesService was quite limited in scope.

This also has the side effect of fixing ResaveEntityAction, which is
currently broken because the tasks it's enqueuing to execute up to 30 days in
the future have the version hard-coded into the hostname, and we typically
delete old versions sooner than that.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=206173763

javatests/google/registry/batch/DeleteContactsAndHostsActionTest.java

@@ -61,7 +61,6 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import com.google.appengine.api.modules.ModulesService;
 import com.google.appengine.api.taskqueue.TaskOptions;
 import com.google.appengine.api.taskqueue.TaskOptions.Method;
 import com.google.common.collect.ImmutableList;
@@ -102,6 +101,7 @@ import google.registry.testing.InjectRule;
 import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.testing.mapreduce.MapreduceTestCase;
+import google.registry.util.AppEngineServiceUtils;
 import google.registry.util.RequestStatusChecker;
 import google.registry.util.Retrier;
 import google.registry.util.Sleeper;
@@ -160,7 +160,7 @@ public class DeleteContactsAndHostsActionTest
             getQueue(QUEUE_ASYNC_DELETE),
             getQueue(QUEUE_ASYNC_HOST_RENAME),
             Duration.ZERO,
-            mock(ModulesService.class),
+            mock(AppEngineServiceUtils.class),
             new Retrier(new FakeSleeper(clock), 1));
     AsyncFlowMetrics asyncFlowMetricsMock = mock(AsyncFlowMetrics.class);
     action = new DeleteContactsAndHostsAction();

javatests/google/registry/batch/RefreshDnsOnHostRenameActionTest.java

@@ -45,7 +45,6 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import com.google.appengine.api.modules.ModulesService;
 import com.google.common.collect.ImmutableSet;
 import com.googlecode.objectify.Key;
 import google.registry.batch.RefreshDnsOnHostRenameAction.RefreshDnsOnHostRenameReducer;
@@ -61,6 +60,7 @@ import google.registry.testing.InjectRule;
 import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.testing.mapreduce.MapreduceTestCase;
+import google.registry.util.AppEngineServiceUtils;
 import google.registry.util.RequestStatusChecker;
 import google.registry.util.Retrier;
 import google.registry.util.Sleeper;
@@ -97,7 +97,7 @@ public class RefreshDnsOnHostRenameActionTest
             getQueue(QUEUE_ASYNC_DELETE),
             getQueue(QUEUE_ASYNC_HOST_RENAME),
             Duration.ZERO,
-            mock(ModulesService.class),
+            mock(AppEngineServiceUtils.class),
             new Retrier(new FakeSleeper(clock), 1));
     AsyncFlowMetrics asyncFlowMetricsMock = mock(AsyncFlowMetrics.class);
     action = new RefreshDnsOnHostRenameAction();

javatests/google/registry/batch/ResaveEntityActionTest.java

@@ -32,11 +32,9 @@ import static google.registry.testing.DatastoreHelper.persistResource;
 import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
 import static org.joda.time.Duration.standardDays;
 import static org.joda.time.Duration.standardSeconds;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.google.appengine.api.modules.ModulesService;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedSet;
 import com.googlecode.objectify.Key;
@@ -55,6 +53,7 @@ import google.registry.testing.InjectRule;
 import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.ShardableTestCase;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
+import google.registry.util.AppEngineServiceUtils;
 import google.registry.util.Retrier;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
@@ -76,7 +75,7 @@ public class ResaveEntityActionTest extends ShardableTestCase {
   @Rule public final InjectRule inject = new InjectRule();
   @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
 
-  @Mock private ModulesService modulesService;
+  @Mock private AppEngineServiceUtils appEngineServiceUtils;
   @Mock private Response response;
   private final FakeClock clock = new FakeClock(DateTime.parse("2016-02-11T10:00:00Z"));
   private AsyncFlowEnqueuer asyncFlowEnqueuer;
@@ -84,15 +83,14 @@ public class ResaveEntityActionTest extends ShardableTestCase {
   @Before
   public void before() {
     inject.setStaticField(Ofy.class, "clock", clock);
-    when(modulesService.getVersionHostname(any(String.class), any(String.class)))
-        .thenReturn("backend.hostname.fake");
+    when(appEngineServiceUtils.getServiceHostname("backend")).thenReturn("backend.hostname.fake");
     asyncFlowEnqueuer =
         new AsyncFlowEnqueuer(
             getQueue(QUEUE_ASYNC_ACTIONS),
             getQueue(QUEUE_ASYNC_DELETE),
             getQueue(QUEUE_ASYNC_HOST_RENAME),
             Duration.ZERO,
-            modulesService,
+            appEngineServiceUtils,
             new Retrier(new FakeSleeper(clock), 1));
     createTld("tld");
   }

javatests/google/registry/export/DatastoreBackupServiceTest.java

@@ -19,16 +19,15 @@ import static com.google.common.collect.Iterables.transform;
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.testing.JUnitBackports.assertThrows;
 import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.google.appengine.api.datastore.Entity;
-import com.google.appengine.api.modules.ModulesService;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import google.registry.testing.AppEngineRule;
-import google.registry.testing.InjectRule;
+import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
+import google.registry.util.AppEngineServiceUtils;
 import java.util.Date;
 import org.joda.time.DateTime;
 import org.junit.Before;
@@ -36,30 +35,28 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.mockito.Mock;
 
 /** Unit tests for {@link DatastoreBackupService}. */
 @RunWith(JUnit4.class)
 public class DatastoreBackupServiceTest {
 
   @Rule
-  public final InjectRule inject = new InjectRule();
+  public final AppEngineRule appEngine =
+      AppEngineRule.builder().withDatastore().withTaskQueue().build();
 
-  @Rule
-  public final AppEngineRule appEngine = AppEngineRule.builder()
-      .withDatastore()
-      .withTaskQueue()
-      .build();
+  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
 
-  private final ModulesService modulesService = mock(ModulesService.class);
+  @Mock private AppEngineServiceUtils appEngineServiceUtils;
 
   private static final DateTime START_TIME = DateTime.parse("2014-08-01T01:02:03Z");
 
-  private final DatastoreBackupService backupService = DatastoreBackupService.get();
+  private DatastoreBackupService backupService;
 
   @Before
   public void before() {
-    inject.setStaticField(DatastoreBackupService.class, "modulesService", modulesService);
-    when(modulesService.getVersionHostname("default", "ah-builtin-python-bundle"))
+    backupService = new DatastoreBackupService(appEngineServiceUtils);
+    when(appEngineServiceUtils.getVersionHostname("default", "ah-builtin-python-bundle"))
         .thenReturn("ah-builtin-python-bundle.default.localhost");
 
     persistBackupEntityWithName("backupA1");

javatests/google/registry/flows/EppTestComponent.java

@@ -18,11 +18,9 @@ import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
 import static google.registry.flows.async.AsyncFlowEnqueuer.QUEUE_ASYNC_ACTIONS;
 import static google.registry.flows.async.AsyncFlowEnqueuer.QUEUE_ASYNC_DELETE;
 import static google.registry.flows.async.AsyncFlowEnqueuer.QUEUE_ASYNC_HOST_RENAME;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import com.google.appengine.api.modules.ModulesService;
 import dagger.Component;
 import dagger.Module;
 import dagger.Provides;
@@ -43,6 +41,7 @@ import google.registry.testing.FakeLockHandler;
 import google.registry.testing.FakeSleeper;
 import google.registry.tmch.TmchCertificateAuthority;
 import google.registry.tmch.TmchXmlSignature;
+import google.registry.util.AppEngineServiceUtils;
 import google.registry.util.Clock;
 import google.registry.util.Retrier;
 import google.registry.util.Sleeper;
@@ -71,7 +70,7 @@ interface EppTestComponent {
     private EppMetric.Builder metricBuilder;
     private FakeClock clock;
     private FakeLockHandler lockHandler;
-    private ModulesService modulesService;
+    private AppEngineServiceUtils appEngineServiceUtils;
     private Sleeper sleeper;
 
     public static FakesAndMocksModule create() {
@@ -91,23 +90,22 @@ interface EppTestComponent {
         EppMetric.Builder eppMetricBuilder,
         TmchXmlSignature tmchXmlSignature) {
       FakesAndMocksModule instance = new FakesAndMocksModule();
-      ModulesService modulesService = mock(ModulesService.class);
-      when(modulesService.getVersionHostname(any(String.class), any(String.class)))
-          .thenReturn("backend.hostname.fake");
+      AppEngineServiceUtils appEngineServiceUtils = mock(AppEngineServiceUtils.class);
+      when(appEngineServiceUtils.getServiceHostname("backend")).thenReturn("backend.hostname.fake");
       instance.asyncFlowEnqueuer =
           new AsyncFlowEnqueuer(
               getQueue(QUEUE_ASYNC_ACTIONS),
               getQueue(QUEUE_ASYNC_DELETE),
               getQueue(QUEUE_ASYNC_HOST_RENAME),
               Duration.standardSeconds(90),
-              modulesService,
+              appEngineServiceUtils,
               new Retrier(new FakeSleeper(clock), 1));
       instance.clock = clock;
       instance.domainFlowTmchUtils = new DomainFlowTmchUtils(tmchXmlSignature);
       instance.sleeper = new FakeSleeper(clock);
       instance.dnsQueue = DnsQueue.create();
       instance.metricBuilder = eppMetricBuilder;
-      instance.modulesService = modulesService;
+      instance.appEngineServiceUtils = appEngineServiceUtils;
       instance.metricsEnqueuer = mock(BigQueryMetricsEnqueuer.class);
       instance.lockHandler = new FakeLockHandler(true);
       return instance;
@@ -154,8 +152,8 @@ interface EppTestComponent {
     }
 
     @Provides
-    ModulesService provideModulesService() {
-      return modulesService;
+    AppEngineServiceUtils provideAppEngineServiceUtils() {
+      return appEngineServiceUtils;
     }
 
     @Provides

javatests/google/registry/flows/async/AsyncFlowEnqueuerTest.java

@@ -29,10 +29,8 @@ import static google.registry.testing.TestLogHandlerUtils.assertLogMessage;
 import static org.joda.time.Duration.standardDays;
 import static org.joda.time.Duration.standardHours;
 import static org.joda.time.Duration.standardSeconds;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.when;
 
-import com.google.appengine.api.modules.ModulesService;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.flogger.LoggerConfig;
 import com.googlecode.objectify.Key;
@@ -44,6 +42,7 @@ import google.registry.testing.InjectRule;
 import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.ShardableTestCase;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
+import google.registry.util.AppEngineServiceUtils;
 import google.registry.util.CapturingLogHandler;
 import google.registry.util.Retrier;
 import java.util.logging.Level;
@@ -67,7 +66,7 @@ public class AsyncFlowEnqueuerTest extends ShardableTestCase {
 
   @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
 
-  @Mock private ModulesService modulesService;
+  @Mock private AppEngineServiceUtils appEngineServiceUtils;
 
   private AsyncFlowEnqueuer asyncFlowEnqueuer;
   private final CapturingLogHandler logHandler = new CapturingLogHandler();
@@ -76,15 +75,14 @@ public class AsyncFlowEnqueuerTest extends ShardableTestCase {
   @Before
   public void setUp() {
     LoggerConfig.getConfig(AsyncFlowEnqueuer.class).addHandler(logHandler);
-    when(modulesService.getVersionHostname(any(String.class), any(String.class)))
-        .thenReturn("backend.hostname.fake");
+    when(appEngineServiceUtils.getServiceHostname("backend")).thenReturn("backend.hostname.fake");
     asyncFlowEnqueuer =
         new AsyncFlowEnqueuer(
             getQueue(QUEUE_ASYNC_ACTIONS),
             getQueue(QUEUE_ASYNC_DELETE),
             getQueue(QUEUE_ASYNC_HOST_RENAME),
             standardSeconds(90),
-            modulesService,
+            appEngineServiceUtils,
             new Retrier(new FakeSleeper(clock), 1));
   }
 

javatests/google/registry/monitoring/whitebox/BUILD

@@ -14,6 +14,7 @@ java_library(
         "//java/google/registry/bigquery",
         "//java/google/registry/model",
         "//java/google/registry/monitoring/whitebox",
+        "//java/google/registry/util",
         "//javatests/google/registry/testing",
         "//third_party/objectify:objectify-v4_1",
         "@com_google_apis_google_api_services_bigquery",

javatests/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuerTest.java

@@ -18,41 +18,36 @@ import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
 import static google.registry.bigquery.BigqueryUtils.toBigqueryTimestamp;
 import static google.registry.monitoring.whitebox.BigQueryMetricsEnqueuer.QUEUE_BIGQUERY_STREAMING_METRICS;
 import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.google.api.services.bigquery.model.TableFieldSchema;
-import com.google.appengine.api.modules.ModulesService;
 import com.google.auto.value.AutoValue;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import google.registry.testing.AppEngineRule;
-import google.registry.testing.InjectRule;
+import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
+import google.registry.util.AppEngineServiceUtils;
 import org.joda.time.DateTime;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.mockito.Matchers;
+import org.mockito.Mock;
 
 /** Unit tests for {@link BigQueryMetricsEnqueuer}. */
 @RunWith(JUnit4.class)
 public class BigQueryMetricsEnqueuerTest {
 
   @Rule
-  public final InjectRule inject = new InjectRule();
+  public final AppEngineRule appEngine =
+      AppEngineRule.builder().withDatastore().withLocalModules().withTaskQueue().build();
 
-  @Rule
-  public final AppEngineRule appEngine = AppEngineRule.builder()
-      .withDatastore()
-      .withLocalModules()
-      .withTaskQueue()
-      .build();
+  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
 
-  private final ModulesService modulesService = mock(ModulesService.class);
+  @Mock private AppEngineServiceUtils appEngineServiceUtils;
 
   private BigQueryMetricsEnqueuer enqueuer;
 
@@ -60,10 +55,10 @@ public class BigQueryMetricsEnqueuerTest {
   public void setUp() {
     enqueuer = new BigQueryMetricsEnqueuer();
     enqueuer.idGenerator = Suppliers.ofInstance("laffo");
-    enqueuer.modulesService = modulesService;
+    enqueuer.appEngineServiceUtils = appEngineServiceUtils;
     enqueuer.queue = getQueue(QUEUE_BIGQUERY_STREAMING_METRICS);
-    when(modulesService.getVersionHostname(Matchers.anyString(), Matchers.anyString()))
-        .thenReturn("1.backend.test.localhost");
+    when(appEngineServiceUtils.getCurrentVersionHostname("backend"))
+        .thenReturn("backend.test.localhost");
   }
 
   @Test
@@ -77,7 +72,7 @@ public class BigQueryMetricsEnqueuerTest {
     assertTasksEnqueued("bigquery-streaming-metrics",
         new TaskMatcher()
             .url("/_dr/task/metrics")
-            .header("Host", "1.backend.test.localhost")
+            .header("Host", "backend.test.localhost")
             .param("tableId", "test")
             .param("startTime", "472176000.000000")
             .param("endTime", "472176000.001000")

javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java

@@ -22,13 +22,12 @@ import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
 import static org.mockito.Mockito.when;
 
 import com.beust.jcommander.ParameterException;
-import com.google.appengine.api.modules.ModulesService;
 import google.registry.testing.InjectRule;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
+import google.registry.util.AppEngineServiceUtils;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 
 /** Unit tests for {@link GenerateEscrowDepositCommand}. */
@@ -38,17 +37,17 @@ public class GenerateEscrowDepositCommandTest
   @Rule
   public final InjectRule inject = new InjectRule();
 
-  @Mock ModulesService modulesService;
+  @Mock AppEngineServiceUtils appEngineServiceUtils;
 
   @Before
   public void before() {
     createTld("tld");
     createTld("anothertld");
     command = new GenerateEscrowDepositCommand();
-    command.modulesService = modulesService;
+    command.appEngineServiceUtils = appEngineServiceUtils;
     command.queue = getQueue("rde-report");
-    when(modulesService.getVersionHostname(Matchers.anyString(), Matchers.anyString()))
-        .thenReturn("1.backend.test.localhost");
+    when(appEngineServiceUtils.getCurrentVersionHostname("backend"))
+        .thenReturn("backend.test.localhost");
   }
 
   @Test
@@ -191,7 +190,7 @@ public class GenerateEscrowDepositCommandTest
     assertTasksEnqueued("rde-report",
         new TaskMatcher()
             .url("/_dr/task/rdeStaging")
-            .header("Host", "1.backend.test.localhost")
+            .header("Host", "backend.test.localhost")
             .param("mode", "THIN")
             .param("watermarks", "2017-01-01T00:00:00.000Z")
             .param("tlds", "tld")
@@ -207,7 +206,7 @@ public class GenerateEscrowDepositCommandTest
     assertTasksEnqueued("rde-report",
         new TaskMatcher()
             .url("/_dr/task/rdeStaging")
-            .header("Host", "1.backend.test.localhost")
+            .header("Host", "backend.test.localhost")
             .param("mode", "THIN")
             .param("watermarks", "2017-01-01T00:00:00.000Z")
             .param("tlds", "tld")
@@ -222,7 +221,7 @@ public class GenerateEscrowDepositCommandTest
     assertTasksEnqueued("rde-report",
         new TaskMatcher()
             .url("/_dr/task/rdeStaging")
-            .header("Host", "1.backend.test.localhost")
+            .header("Host", "backend.test.localhost")
             .param("mode", "FULL")
             .param("watermarks", "2017-01-01T00:00:00.000Z")
             .param("tlds", "tld")
@@ -243,7 +242,7 @@ public class GenerateEscrowDepositCommandTest
     assertTasksEnqueued("rde-report",
         new TaskMatcher()
             .url("/_dr/task/rdeStaging")
-            .header("Host", "1.backend.test.localhost")
+            .header("Host", "backend.test.localhost")
             .param("mode", "THIN")
             .param("watermarks", "2017-01-01T00:00:00.000Z,2017-01-02T00:00:00.000Z")
             .param("tlds", "tld,anothertld")

javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java

@@ -17,17 +17,12 @@ package google.registry.ui.server.registrar;
 import static google.registry.config.RegistryConfig.getGSuiteOutgoingEmailAddress;
 import static google.registry.config.RegistryConfig.getGSuiteOutgoingEmailDisplayName;
 import static google.registry.security.JsonHttpTestUtils.createJsonPayload;
-import static google.registry.security.JsonHttpTestUtils.createJsonResponseSupplier;
 import static google.registry.testing.DatastoreHelper.loadRegistrar;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import com.google.appengine.api.modules.ModulesService;
 import com.google.appengine.api.users.User;
-import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import google.registry.export.sheet.SyncRegistrarsSheetAction;
 import google.registry.model.ofy.Ofy;
 import google.registry.request.JsonActionRunner;
 import google.registry.request.JsonResponse;
@@ -38,10 +33,11 @@ import google.registry.request.auth.UserAuthInfo;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
+import google.registry.testing.MockitoJUnitRule;
+import google.registry.util.AppEngineServiceUtils;
 import google.registry.util.SendEmailService;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.Map;
 import java.util.Properties;
 import javax.mail.Message;
 import javax.mail.Session;
@@ -53,6 +49,7 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.mockito.Mock;
 
 /** Base class for tests using {@link RegistrarSettingsAction}. */
 @RunWith(JUnit4.class)
@@ -61,32 +58,31 @@ public class RegistrarSettingsActionTestCase {
   static final String CLIENT_ID = "TheRegistrar";
 
   @Rule
-  public final AppEngineRule appEngine = AppEngineRule.builder()
-      .withDatastore()
-      .withTaskQueue()
-      .build();
+  public final AppEngineRule appEngine =
+      AppEngineRule.builder().withDatastore().withTaskQueue().build();
 
-  @Rule
-  public final InjectRule inject = new InjectRule();
+  @Rule public final InjectRule inject = new InjectRule();
+  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
 
-  final HttpServletRequest req = mock(HttpServletRequest.class);
-  final HttpServletResponse rsp = mock(HttpServletResponse.class);
-  final SendEmailService emailService = mock(SendEmailService.class);
-  final ModulesService modulesService = mock(ModulesService.class);
-  final SessionUtils sessionUtils = mock(SessionUtils.class);
+  @Mock AppEngineServiceUtils appEngineServiceUtils;
+  @Mock HttpServletRequest req;
+  @Mock HttpServletResponse rsp;
+  @Mock SendEmailService emailService;
+  @Mock SessionUtils sessionUtils;
   final User user = new User("user", "gmail.com");
 
   Message message;
 
   final RegistrarSettingsAction action = new RegistrarSettingsAction();
   final StringWriter writer = new StringWriter();
-  final Supplier<Map<String, Object>> json = createJsonResponseSupplier(writer);
   final FakeClock clock = new FakeClock(DateTime.parse("2014-01-01T00:00:00Z"));
 
   @Before
   public void setUp() throws Exception {
     action.request = req;
     action.sessionUtils = sessionUtils;
+    action.appEngineServiceUtils = appEngineServiceUtils;
+    when(appEngineServiceUtils.getCurrentVersionHostname("backend")).thenReturn("backend.hostname");
     action.authResult = AuthResult.create(AuthLevel.USER, UserAuthInfo.create(user, false));
     action.jsonActionRunner = new JsonActionRunner(
         ImmutableMap.of(), new JsonResponse(new ResponseImpl(rsp)));
@@ -96,7 +92,6 @@ public class RegistrarSettingsActionTestCase {
         new SendEmailUtils(getGSuiteOutgoingEmailAddress(), getGSuiteOutgoingEmailDisplayName());
     inject.setStaticField(Ofy.class, "clock", clock);
     inject.setStaticField(SendEmailUtils.class, "emailService", emailService);
-    inject.setStaticField(SyncRegistrarsSheetAction.class, "modulesService", modulesService);
     message = new MimeMessage(Session.getDefaultInstance(new Properties(), null));
     when(emailService.createMessage()).thenReturn(message);
     when(req.getMethod()).thenReturn("POST");
@@ -109,6 +104,5 @@ public class RegistrarSettingsActionTestCase {
     // would still return the old value)
     when(sessionUtils.getRegistrarForAuthResult(req, action.authResult))
         .thenAnswer(x -> loadRegistrar(CLIENT_ID));
-    when(modulesService.getVersionHostname("backend", null)).thenReturn("backend.hostname");
   }
 }

javatests/google/registry/util/AppEngineServiceUtilsImplTest.java

@@ -0,0 +1,78 @@
+// Copyright 2018 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package google.registry.util;
+
+import static com.google.common.truth.Truth.assertThat;
+import static google.registry.testing.JUnitBackports.assertThrows;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNull;
+import static org.mockito.Mockito.when;
+
+import com.google.appengine.api.modules.ModulesService;
+import google.registry.testing.MockitoJUnitRule;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.mockito.Mock;
+
+/** Unit tests for {@link AppEngineServiceUtilsImpl}. */
+@RunWith(JUnit4.class)
+public class AppEngineServiceUtilsImplTest {
+
+  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+
+  @Mock private ModulesService modulesService;
+
+  private AppEngineServiceUtils appEngineServiceUtils;
+
+  @Before
+  public void before() {
+    appEngineServiceUtils = new AppEngineServiceUtilsImpl(modulesService);
+    when(modulesService.getVersionHostname(anyString(), isNull(String.class)))
+        .thenReturn("1234.servicename.projectid.appspot.fake");
+    when(modulesService.getVersionHostname(anyString(), eq("2345")))
+        .thenReturn("2345.servicename.projectid.appspot.fake");
+  }
+
+  @Test
+  public void test_getServiceHostname_doesntIncludeVersionId() {
+    assertThat(appEngineServiceUtils.getServiceHostname("servicename"))
+        .isEqualTo("servicename.projectid.appspot.fake");
+  }
+
+  @Test
+  public void test_getVersionHostname_doesIncludeVersionId() {
+    assertThat(appEngineServiceUtils.getCurrentVersionHostname("servicename"))
+        .isEqualTo("1234.servicename.projectid.appspot.fake");
+  }
+
+  @Test
+  public void test_getVersionHostname_worksWithVersionId() {
+    assertThat(appEngineServiceUtils.getVersionHostname("servicename", "2345"))
+        .isEqualTo("2345.servicename.projectid.appspot.fake");
+  }
+
+  @Test
+  public void test_getVersionHostname_throwsWhenVersionIdIsNull() {
+    IllegalArgumentException thrown =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> appEngineServiceUtils.getVersionHostname("servicename", null));
+    assertThat(thrown).hasMessageThat().isEqualTo("Must specify the version");
+  }
+}