Upgrade App Engine and webserver tests from JUnit 4 to 5 (#720)

* Upgrade App Engine and webserver tests from JUnit 4 to 5

* Fix most errors

* Merge branch 'master' into junit5ification

* Fix test server by extracting non-test setup/tear-down

* Merge branch 'master' into junit5ification

* Fix backup tests

* Don't createFile(); asCharSink does it

* Increase the timeout for all WebDriver tests to 60s (helps w/ flakiness)

config/presubmits.py

@@ -93,20 +93,20 @@ PRESUBMITS = {
     PresubmitCheck(
         r".*\bSystem\.(out|err)\.print", "java", {
             "StackdriverDashboardBuilder.java", "/tools/", "/example/",
-            "RegistryTestServerMain.java", "TestServerRule.java",
+            "RegistryTestServerMain.java", "TestServerExtension.java",
             "FlowDocumentationTool.java"
         }):
         "System.(out|err).println is only allowed in tools/ packages. Please "
         "use a logger instead.",
 
-    # ObjectifyService.register is restricted to main/ or AppEngineRule.
+    # ObjectifyService.register is restricted to main/ or AppEngineExtension.
     PresubmitCheck(
         r".*\bObjectifyService\.register", "java", {
             "/build/", "/generated/", "node_modules/", "src/main/",
-            "AppEngineRule.java"
+            "AppEngineExtension.java"
         }):
-      "ObjectifyService.register is not allowed in tests. Please use "
+      "ObjectifyService.register(...) is not allowed in tests. Please use "
-      "AppengineRule.register instead.",
+      "AppEngineExtension.register(...) instead.",
 
     # PostgreSQLContainer instantiation must specify docker tag
     PresubmitCheck(

core/build.gradle

@@ -315,6 +315,7 @@ dependencies {
   testCompile deps['org.junit.jupiter:junit-jupiter-engine']
   testCompile deps['org.junit.jupiter:junit-jupiter-migrationsupport']
   testCompile deps['org.junit.jupiter:junit-jupiter-params']
+  testCompile deps['org.junit-pioneer:junit-pioneer']
   testCompile deps['org.junit.platform:junit-platform-runner']
   testCompile deps['org.junit.platform:junit-platform-suite-api']
   testCompile deps['org.junit.vintage:junit-vintage-engine']

core/gradle/dependency-locks/testCompile.lockfile

@@ -243,6 +243,7 @@ org.jboss:jandex:2.1.3.Final
 org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
+org.junit-pioneer:junit-pioneer:0.7.0
 org.junit.jupiter:junit-jupiter-api:5.6.2
 org.junit.jupiter:junit-jupiter-engine:5.6.2
 org.junit.jupiter:junit-jupiter-migrationsupport:5.6.2

core/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -241,6 +241,7 @@ org.jboss:jandex:2.1.3.Final
 org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
+org.junit-pioneer:junit-pioneer:0.7.0
 org.junit.jupiter:junit-jupiter-api:5.6.2
 org.junit.jupiter:junit-jupiter-engine:5.6.2
 org.junit.jupiter:junit-jupiter-migrationsupport:5.6.2

core/gradle/dependency-locks/testRuntime.lockfile

@@ -246,6 +246,7 @@ org.jboss:jandex:2.1.3.Final
 org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
+org.junit-pioneer:junit-pioneer:0.7.0
 org.junit.jupiter:junit-jupiter-api:5.6.2
 org.junit.jupiter:junit-jupiter-engine:5.6.2
 org.junit.jupiter:junit-jupiter-migrationsupport:5.6.2

core/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -246,6 +246,7 @@ org.jboss:jandex:2.1.3.Final
 org.jetbrains:annotations:19.0.0
 org.joda:joda-money:1.0.1
 org.json:json:20160810
+org.junit-pioneer:junit-pioneer:0.7.0
 org.junit.jupiter:junit-jupiter-api:5.6.2
 org.junit.jupiter:junit-jupiter-engine:5.6.2
 org.junit.jupiter:junit-jupiter-migrationsupport:5.6.2

core/src/main/java/google/registry/beam/initsql/InitSqlPipelineOptions.java

@@ -60,8 +60,8 @@ public interface InitSqlPipelineOptions extends GcpOptions {
 
   void setEnvironment(String environment);
 
-  @Description("The GCP project that contains the keyring used for decrypting the "
+  @Description(
-      + "SQL credential file.")
+      "The GCP project that contains the keyring used for decrypting the " + "SQL credential file.")
   @Nullable
   String getCloudKmsProjectId();
 

core/src/main/java/google/registry/tools/DeploySpec11PipelineCommand.java

@@ -27,18 +27,40 @@ import javax.inject.Inject;
 @Parameters(commandDescription = "Deploy the Spec11 pipeline to GCS.")
 public class DeploySpec11PipelineCommand implements Command {
 
-  @Inject @Config("projectId") String projectId;
+  @Inject
-  @Inject @Config("beamStagingUrl") String beamStagingUrl;
+  @Config("projectId")
-  @Inject @Config("spec11TemplateUrl")String spec11TemplateUrl;
+  String projectId;
-  @Inject @Config("reportingBucketUrl")String reportingBucketUrl;
+
+  @Inject
+  @Config("beamStagingUrl")
+  String beamStagingUrl;
+
+  @Inject
+  @Config("spec11TemplateUrl")
+  String spec11TemplateUrl;
+
+  @Inject
+  @Config("reportingBucketUrl")
+  String reportingBucketUrl;
+
   @Inject @LocalCredential GoogleCredentialsBundle googleCredentialsBundle;
   @Inject Retrier retrier;
-  @Inject @Nullable @Config("sqlAccessInfoFile") String sqlAccessInfoFile;
+
+  @Inject
+  @Nullable
+  @Config("sqlAccessInfoFile")
+  String sqlAccessInfoFile;
 
   @Override
   public void run() {
-    Spec11Pipeline pipeline = new Spec11Pipeline(projectId, beamStagingUrl, spec11TemplateUrl,
+    Spec11Pipeline pipeline =
-        reportingBucketUrl, googleCredentialsBundle, retrier);
+        new Spec11Pipeline(
+            projectId,
+            beamStagingUrl,
+            spec11TemplateUrl,
+            reportingBucketUrl,
+            googleCredentialsBundle,
+            retrier);
     pipeline.deploy();
   }
 }

core/src/main/java/google/registry/tools/DomainLockUtils.java

@@ -303,8 +303,8 @@ public final class DomainLockUtils {
 
   private static void verifyDomainLocked(DomainBase domainBase, boolean isAdmin) {
     checkArgument(
-        isAdmin || !Sets.intersection(domainBase.getStatusValues(), REGISTRY_LOCK_STATUSES)
+        isAdmin
-            .isEmpty(),
+            || !Sets.intersection(domainBase.getStatusValues(), REGISTRY_LOCK_STATUSES).isEmpty(),
         "Domain %s is already unlocked",
         domainBase.getDomainName());
   }
@@ -312,8 +312,7 @@ public final class DomainLockUtils {
   private DomainBase getDomain(String domainName, String registrarId, DateTime now) {
     DomainBase domain =
         loadByForeignKeyCached(DomainBase.class, domainName, now)
-            .orElseThrow(
+            .orElseThrow(() -> new IllegalArgumentException("Domain doesn't exist"));
-                () -> new IllegalArgumentException("Domain doesn't exist"));
     // The user must have specified either the correct registrar ID or the admin registrar ID
     checkArgument(
         registryAdminRegistrarId.equals(registrarId)

core/src/main/java/google/registry/tools/LockOrUnlockDomainCommand.java

@@ -34,9 +34,7 @@ import google.registry.model.eppcommon.StatusValue;
 import java.util.List;
 import javax.inject.Inject;
 
-/**
+/** Shared base class for commands to registry lock or unlock a domain via EPP. */
- * Shared base class for commands to registry lock or unlock a domain via EPP.
- */
 public abstract class LockOrUnlockDomainCommand extends ConfirmingCommand
     implements CommandWithRemoteApi {
 
@@ -61,8 +59,7 @@ public abstract class LockOrUnlockDomainCommand extends ConfirmingCommand
   @Config("registryAdminClientId")
   String registryAdminClientId;
 
-  @Inject
+  @Inject DomainLockUtils domainLockUtils;
-  DomainLockUtils domainLockUtils;
 
   protected ImmutableSet<String> getDomains() {
     return ImmutableSet.copyOf(mainParameters);
@@ -88,25 +85,28 @@ public abstract class LockOrUnlockDomainCommand extends ConfirmingCommand
         .forEach(
             batch ->
                 // we require that the jpaTm is the outer transaction in DomainLockUtils
-                jpaTm().transact(() -> tm().transact(
+                jpaTm()
-                    () -> {
+                    .transact(
-                      for (String domain : batch) {
+                        () ->
-                        try {
+                            tm().transact(
-                          createAndApplyRequest(domain);
+                                    () -> {
-                        } catch (Throwable t) {
+                                      for (String domain : batch) {
-                          logger.atSevere().withCause(t).log(
+                                        try {
-                              "Error when (un)locking domain %s.", domain);
+                                          createAndApplyRequest(domain);
-                          failedDomainsToReasons.put(domain, t.getMessage());
+                                        } catch (Throwable t) {
-                          continue;
+                                          logger.atSevere().withCause(t).log(
-                        }
+                                              "Error when (un)locking domain %s.", domain);
-                        successfulDomainsBuilder.add(domain);
+                                          failedDomainsToReasons.put(domain, t.getMessage());
-                      }
+                                          continue;
-                    })));
+                                        }
+                                        successfulDomainsBuilder.add(domain);
+                                      }
+                                    })));
     ImmutableSet<String> successfulDomains = successfulDomainsBuilder.build();
-    ImmutableSet<String> failedDomains = failedDomainsToReasons.build().entrySet()
+    ImmutableSet<String> failedDomains =
-        .stream()
+        failedDomainsToReasons.build().entrySet().stream()
-        .map(entry -> String.format("%s (%s)", entry.getKey(), entry.getValue()))
+            .map(entry -> String.format("%s (%s)", entry.getKey(), entry.getValue()))
-        .collect(toImmutableSet());
+            .collect(toImmutableSet());
     return String.format(
         "Successfully locked/unlocked domains:\n%s\nFailed domains:\n%s",
         successfulDomains, failedDomains);

core/src/main/java/google/registry/tools/RegistryCli.java

@@ -68,8 +68,9 @@ final class RegistryCli implements AutoCloseable, CommandRunner {
 
   @Parameter(
       names = {"--sql_access_info"},
-      description = "Name of a file containing space-separated SQL access info used when deploying "
+      description =
-          + "Beam pipelines")
+          "Name of a file containing space-separated SQL access info used when deploying "
+              + "Beam pipelines")
   private String sqlAccessInfoFile = null;
 
   // Do not make this final - compile-time constant inlining may interfere with JCommander.

core/src/nonprod/java/google/registry/tools/GenerateSqlSchemaCommand.java

@@ -36,6 +36,7 @@ import org.testcontainers.containers.PostgreSQLContainer;
  */
 @Parameters(separators = " =", commandDescription = "Generate PostgreSQL schema.")
 public class GenerateSqlSchemaCommand implements Command {
+
   private static final String DB_NAME = "postgres";
   private static final String DB_USERNAME = "postgres";
   private static final String DB_PASSWORD = "domain-registry";

core/src/test/java/google/registry/backup/CommitLogCheckpointActionTest.java

@@ -27,7 +27,7 @@ import static org.mockito.Mockito.when;
 import com.google.common.collect.ImmutableMap;
 import google.registry.model.ofy.CommitLogCheckpoint;
 import google.registry.model.ofy.CommitLogCheckpointRoot;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.util.Retrier;
@@ -43,8 +43,8 @@ public class CommitLogCheckpointActionTest {
   private static final String QUEUE_NAME = "export-commits";
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   private CommitLogCheckpointStrategy strategy = mock(CommitLogCheckpointStrategy.class);
 

core/src/test/java/google/registry/backup/CommitLogCheckpointStrategyTest.java

@@ -31,7 +31,7 @@ import google.registry.model.ofy.Ofy;
 import google.registry.model.registry.Registry;
 import google.registry.persistence.transaction.TransactionManager;
 import google.registry.schema.cursor.CursorDao;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
 import org.joda.time.DateTime;
@@ -44,7 +44,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class CommitLogCheckpointStrategyTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @RegisterExtension public final InjectRule inject = new InjectRule();
 

core/src/test/java/google/registry/backup/ExportCommitLogDiffActionTest.java

@@ -34,7 +34,7 @@ import google.registry.model.ofy.CommitLogBucket;
 import google.registry.model.ofy.CommitLogCheckpoint;
 import google.registry.model.ofy.CommitLogManifest;
 import google.registry.model.ofy.CommitLogMutation;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.GcsTestingUtils;
 import google.registry.testing.TestObject;
 import java.util.List;
@@ -47,8 +47,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class ExportCommitLogDiffActionTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder()
+      AppEngineExtension.builder()
           .withDatastoreAndCloudSql()
           .withOfyTestEntities(TestObject.class)
           .build();

core/src/test/java/google/registry/backup/GcsDiffFileListerTest.java

@@ -34,7 +34,7 @@ import com.google.appengine.tools.cloudstorage.ListResult;
 import com.google.common.collect.Iterators;
 import com.google.common.flogger.LoggerConfig;
 import com.google.common.testing.TestLogHandler;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import java.io.IOException;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -59,7 +59,8 @@ public class GcsDiffFileListerTest {
   private final TestLogHandler logHandler = new TestLogHandler();
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @BeforeEach
   void beforeEach() throws Exception {

core/src/test/java/google/registry/backup/RestoreCommitLogsActionTest.java

@@ -42,7 +42,7 @@ import google.registry.model.ofy.CommitLogCheckpoint;
 import google.registry.model.ofy.CommitLogCheckpointRoot;
 import google.registry.model.ofy.CommitLogManifest;
 import google.registry.model.ofy.CommitLogMutation;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeSleeper;
 import google.registry.testing.TestObject;
@@ -68,8 +68,8 @@ public class RestoreCommitLogsActionTest {
   private final GcsService gcsService = createGcsService();
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder()
+      AppEngineExtension.builder()
           .withDatastoreAndCloudSql()
           .withOfyTestEntities(TestObject.class)
           .build();

core/src/test/java/google/registry/batch/AsyncTaskEnqueuerTest.java

@@ -39,7 +39,7 @@ import com.google.common.flogger.LoggerConfig;
 import com.googlecode.objectify.Key;
 import google.registry.model.contact.ContactResource;
 import google.registry.schema.domain.RegistryLock;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeSleeper;
 import google.registry.testing.InjectRule;
@@ -64,8 +64,8 @@ import org.mockito.quality.Strictness;
 public class AsyncTaskEnqueuerTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   @RegisterExtension public final InjectRule inject = new InjectRule();
 

core/src/test/java/google/registry/batch/RelockDomainActionTest.java

@@ -34,7 +34,7 @@ import com.google.common.collect.ImmutableSet;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.host.HostResource;
 import google.registry.schema.domain.RegistryLock;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.DeterministicStringGenerator;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeResponse;
@@ -65,8 +65,8 @@ public class RelockDomainActionTest {
               mock(AppEngineServiceUtils.class), clock, Duration.ZERO));
 
   @RegisterExtension
-  public final AppEngineRule appEngineRule =
+  public final AppEngineExtension appEngineRule =
-      AppEngineRule.builder()
+      AppEngineExtension.builder()
           .withDatastoreAndCloudSql()
           .withUserService(UserInfo.create(POC_ID, "12345"))
           .build();

core/src/test/java/google/registry/batch/ResaveEntityActionTest.java

@@ -42,7 +42,7 @@ import google.registry.model.domain.rgp.GracePeriodStatus;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.ofy.Ofy;
 import google.registry.request.Response;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
@@ -63,8 +63,8 @@ import org.mockito.quality.Strictness;
 public class ResaveEntityActionTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   @RegisterExtension public final InjectRule inject = new InjectRule();
 

core/src/test/java/google/registry/beam/initsql/BackupTestStore.java

@@ -26,7 +26,7 @@ import com.googlecode.objectify.Key;
 import google.registry.backup.CommitLogExports;
 import google.registry.backup.VersionedEntity;
 import google.registry.model.ofy.CommitLogCheckpoint;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.tools.LevelDbFileBuilder;
 import java.io.File;
@@ -53,7 +53,7 @@ class BackupTestStore implements AutoCloseable {
       DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss_SSS");
 
   private final FakeClock fakeClock;
-  private AppEngineRule appEngine;
+  private AppEngineExtension appEngine;
   /** For fetching the persisted Datastore Entity directly. */
   private DatastoreService datastoreService;
 
@@ -62,12 +62,12 @@ class BackupTestStore implements AutoCloseable {
   BackupTestStore(FakeClock fakeClock) throws Exception {
     this.fakeClock = fakeClock;
     this.appEngine =
-        new AppEngineRule.Builder()
+        new AppEngineExtension.Builder()
             .withDatastore()
             .withoutCannedData()
             .withClock(fakeClock)
             .build();
-    this.appEngine.beforeEach(null);
+    this.appEngine.setUp();
     datastoreService = DatastoreServiceFactory.getDatastoreService();
   }
 
@@ -186,7 +186,7 @@ class BackupTestStore implements AutoCloseable {
   @Override
   public void close() throws Exception {
     if (appEngine != null) {
-      appEngine.afterEach(null);
+      appEngine.tearDown();
       appEngine = null;
     }
   }

core/src/test/java/google/registry/beam/initsql/DomainBaseUtilTest.java

@@ -46,7 +46,7 @@ import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.transfer.DomainTransferData;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.persistence.VKey;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.DatastoreHelper;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
@@ -67,8 +67,8 @@ public class DomainBaseUtilTest {
   private Key<DomainBase> domainKey;
 
   @RegisterExtension
-  AppEngineRule appEngineRule =
+  AppEngineExtension appEngineRule =
-      AppEngineRule.builder().withDatastore().withClock(fakeClock).build();
+      AppEngineExtension.builder().withDatastore().withClock(fakeClock).build();
 
   @RegisterExtension InjectRule injectRule = new InjectRule();
 

core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java

@@ -49,8 +49,8 @@ import google.registry.model.transfer.DomainTransferData;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.persistence.VKey;
 import google.registry.persistence.transaction.JpaTestRules;
-import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationTestRule;
+import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationTestExtension;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.DatastoreEntityExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
@@ -95,7 +95,7 @@ class InitSqlPipelineTest {
       TestPipelineExtension.create().enableAbandonedNodeEnforcement(true);
 
   @RegisterExtension
-  final transient JpaIntegrationTestRule database =
+  final transient JpaIntegrationTestExtension database =
       new JpaTestRules.Builder().withClock(fakeClock).buildIntegrationTestRule();
 
   // Must not be transient!
@@ -118,14 +118,14 @@ class InitSqlPipelineTest {
   private transient HistoryEntry historyEntry;
 
   @BeforeEach
-  public void beforeEach() throws Exception {
+  void beforeEach() throws Exception {
     try (BackupTestStore store = new BackupTestStore(fakeClock)) {
       injectRule.setStaticField(Ofy.class, "clock", fakeClock);
       exportRootDir = Files.createDirectory(tmpDir.resolve("exports")).toFile();
 
       persistResource(newRegistry("com", "COM"));
-      registrar1 = persistResource(AppEngineRule.makeRegistrar1());
+      registrar1 = persistResource(AppEngineExtension.makeRegistrar1());
-      registrar2 = persistResource(AppEngineRule.makeRegistrar2());
+      registrar2 = persistResource(AppEngineExtension.makeRegistrar2());
       Key<DomainBase> domainKey = Key.create(null, DomainBase.class, "4-COM");
       hostResource =
           persistResource(
@@ -222,7 +222,7 @@ class InitSqlPipelineTest {
   }
 
   @Test
-  public void runPipeline() {
+  void runPipeline() {
     InitSqlPipelineOptions options =
         PipelineOptionsFactory.fromArgs(
                 "--sqlCredentialUrlOverride="

core/src/test/java/google/registry/beam/initsql/WriteToSqlTest.java

@@ -27,8 +27,8 @@ import google.registry.model.contact.ContactResource;
 import google.registry.model.ofy.Ofy;
 import google.registry.model.registrar.Registrar;
 import google.registry.persistence.transaction.JpaTestRules;
-import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationTestRule;
+import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationTestExtension;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.DatastoreEntityExtension;
 import google.registry.testing.DatastoreHelper;
 import google.registry.testing.FakeClock;
@@ -58,7 +58,7 @@ class WriteToSqlTest implements Serializable {
   @RegisterExtension final transient InjectRule injectRule = new InjectRule();
 
   @RegisterExtension
-  final transient JpaIntegrationTestRule database =
+  final transient JpaIntegrationTestExtension database =
       new JpaTestRules.Builder().withClock(fakeClock).buildIntegrationTestRule();
 
   @SuppressWarnings("WeakerAccess")
@@ -72,7 +72,7 @@ class WriteToSqlTest implements Serializable {
   // Must not be transient!
   @RegisterExtension
   @Order(Order.DEFAULT + 1)
-  public final BeamJpaExtension beamJpaExtension =
+  final BeamJpaExtension beamJpaExtension =
       new BeamJpaExtension(() -> tmpDir.resolve("credential.dat"), database.getDatabase());
 
   private ImmutableList<Entity> contacts;
@@ -83,7 +83,7 @@ class WriteToSqlTest implements Serializable {
       injectRule.setStaticField(Ofy.class, "clock", fakeClock);
 
       // Required for contacts created below.
-      Registrar ofyRegistrar = AppEngineRule.makeRegistrar2();
+      Registrar ofyRegistrar = AppEngineExtension.makeRegistrar2();
       store.insertOrUpdate(ofyRegistrar);
       jpaTm().transact(() -> jpaTm().saveNewOrUpdate(store.loadAsOfyEntity(ofyRegistrar)));
 

core/src/test/java/google/registry/cron/CommitLogFanoutActionTest.java

@@ -19,7 +19,7 @@ import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
 
 import com.google.common.base.Joiner;
 import google.registry.model.ofy.CommitLogBucket;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.util.Retrier;
 import google.registry.util.TaskQueueUtils;
@@ -36,8 +36,8 @@ class CommitLogFanoutActionTest {
   private static final String QUEUE = "the-queue";
 
   @RegisterExtension
-  final AppEngineRule appEngineRule =
+  final AppEngineExtension appEngineRule =
-      AppEngineRule.builder()
+      AppEngineExtension.builder()
           .withDatastoreAndCloudSql()
           .withTaskQueue(
               Joiner.on('\n')

core/src/test/java/google/registry/cron/TldFanoutActionTest.java

@@ -31,7 +31,7 @@ import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableSet;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.Registry.TldType;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeResponse;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.util.Retrier;
@@ -51,8 +51,8 @@ class TldFanoutActionTest {
   private final FakeResponse response = new FakeResponse();
 
   @RegisterExtension
-  final AppEngineRule appEngine =
+  final AppEngineExtension appEngine =
-      AppEngineRule.builder()
+      AppEngineExtension.builder()
           .withDatastoreAndCloudSql()
           .withTaskQueue(
               Joiner.on('\n')

core/src/test/java/google/registry/dns/DnsInjectionTest.java

@@ -27,7 +27,7 @@ import static org.mockito.Mockito.when;
 import google.registry.model.ofy.Ofy;
 import google.registry.request.HttpException.NotFoundException;
 import google.registry.request.RequestModule;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
 import java.io.PrintWriter;
@@ -43,8 +43,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public final class DnsInjectionTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   @RegisterExtension public final InjectRule inject = new InjectRule();
 

core/src/test/java/google/registry/dns/DnsQueueTest.java

@@ -20,7 +20,7 @@ import static google.registry.testing.TaskQueueHelper.assertNoTasksEnqueued;
 import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
 import static org.junit.Assert.assertThrows;
 
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import org.joda.time.DateTime;
@@ -32,8 +32,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class DnsQueueTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   private DnsQueue dnsQueue;
   private final FakeClock clock = new FakeClock(DateTime.parse("2010-01-01T10:00:00Z"));

core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java

@@ -38,7 +38,7 @@ import google.registry.model.ofy.Ofy;
 import google.registry.model.registry.Registry;
 import google.registry.request.HttpException.ServiceUnavailableException;
 import google.registry.request.lock.LockHandler;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeLockHandler;
 import google.registry.testing.InjectRule;
@@ -52,8 +52,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class PublishDnsUpdatesActionTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   @RegisterExtension public final InjectRule inject = new InjectRule();
   private final FakeClock clock = new FakeClock(DateTime.parse("1971-01-01TZ"));

core/src/test/java/google/registry/dns/ReadDnsQueueActionTest.java

@@ -45,7 +45,7 @@ import com.google.common.net.InternetDomainName;
 import google.registry.dns.DnsConstants.TargetType;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.Registry.TldType;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.util.Retrier;
@@ -70,8 +70,8 @@ public class ReadDnsQueueActionTest {
   private FakeClock clock = new FakeClock(DateTime.parse("3000-01-01TZ"));
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder()
+      AppEngineExtension.builder()
           .withDatastoreAndCloudSql()
           .withTaskQueue(
               Joiner.on('\n')

core/src/test/java/google/registry/dns/RefreshDnsActionTest.java

@@ -28,7 +28,7 @@ import google.registry.dns.DnsConstants.TargetType;
 import google.registry.model.domain.DomainBase;
 import google.registry.request.HttpException.BadRequestException;
 import google.registry.request.HttpException.NotFoundException;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -38,8 +38,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class RefreshDnsActionTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   private final DnsQueue dnsQueue = mock(DnsQueue.class);
   private final FakeClock clock = new FakeClock();

core/src/test/java/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java

@@ -44,7 +44,7 @@ import google.registry.model.domain.secdns.DelegationSignerData;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.host.HostResource;
 import google.registry.persistence.VKey;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.util.Retrier;
 import google.registry.util.SystemClock;
 import google.registry.util.SystemSleeper;
@@ -70,7 +70,8 @@ import org.mockito.quality.Strictness;
 public class CloudDnsWriterTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   private static final Inet4Address IPv4 = (Inet4Address) InetAddresses.forString("127.0.0.1");
   private static final Inet6Address IPv6 = (Inet6Address) InetAddresses.forString("::1");

core/src/test/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java

@@ -41,7 +41,7 @@ import google.registry.model.domain.secdns.DelegationSignerData;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.host.HostResource;
 import google.registry.model.ofy.Ofy;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
 import java.util.ArrayList;
@@ -74,8 +74,8 @@ import org.xbill.DNS.Update;
 public class DnsUpdateWriterTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   @RegisterExtension public final InjectRule inject = new InjectRule();
 

core/src/test/java/google/registry/export/BackupDatastoreActionTest.java

@@ -24,7 +24,7 @@ import com.google.common.base.Joiner;
 import google.registry.export.datastore.DatastoreAdmin;
 import google.registry.export.datastore.DatastoreAdmin.Export;
 import google.registry.export.datastore.Operation;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeResponse;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import org.junit.jupiter.api.BeforeEach;
@@ -39,7 +39,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 public class BackupDatastoreActionTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withTaskQueue().build();
+  public final AppEngineExtension appEngine = AppEngineExtension.builder().withTaskQueue().build();
 
   @Mock private DatastoreAdmin datastoreAdmin;
   @Mock private Export exportRequest;

core/src/test/java/google/registry/export/BigqueryPollJobActionTest.java

@@ -39,7 +39,7 @@ import com.google.common.flogger.LoggerConfig;
 import google.registry.export.BigqueryPollJobAction.BigqueryPollJobEnqueuer;
 import google.registry.request.HttpException.BadRequestException;
 import google.registry.request.HttpException.NotModifiedException;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeSleeper;
 import google.registry.testing.TaskQueueHelper;
@@ -60,8 +60,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class BigqueryPollJobActionTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   private static final String PROJECT_ID = "project_id";
   private static final String JOB_ID = "job_id";

core/src/test/java/google/registry/export/CheckBackupActionTest.java

@@ -35,7 +35,7 @@ import google.registry.request.Action.Method;
 import google.registry.request.HttpException.BadRequestException;
 import google.registry.request.HttpException.NoContentException;
 import google.registry.request.HttpException.NotModifiedException;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeResponse;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
@@ -61,7 +61,7 @@ public class CheckBackupActionTest {
   private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withTaskQueue().build();
+  public final AppEngineExtension appEngine = AppEngineExtension.builder().withTaskQueue().build();
 
   @Mock private DatastoreAdmin datastoreAdmin;
   @Mock private Get getNotFoundBackupProgressRequest;

core/src/test/java/google/registry/export/ExportPremiumTermsActionTest.java

@@ -41,7 +41,7 @@ import google.registry.model.registry.Registry;
 import google.registry.model.registry.label.PremiumList;
 import google.registry.request.Response;
 import google.registry.storage.drive.DriveConnection;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import java.io.IOException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -58,7 +58,8 @@ public class ExportPremiumTermsActionTest {
       DISCLAIMER_WITH_NEWLINE + "0,USD 549.00\n" + "2048,USD 549.00\n";
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   private final DriveConnection driveConnection = mock(DriveConnection.class);
   private final Response response = mock(Response.class);

core/src/test/java/google/registry/export/ExportReservedTermsActionTest.java

@@ -36,7 +36,7 @@ import google.registry.model.registry.Registry;
 import google.registry.model.registry.label.ReservedList;
 import google.registry.request.Response;
 import google.registry.storage.drive.DriveConnection;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import java.io.IOException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -46,7 +46,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class ExportReservedTermsActionTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   private final DriveConnection driveConnection = mock(DriveConnection.class);
   private final Response response = mock(Response.class);

core/src/test/java/google/registry/export/ExportUtilsTest.java

@@ -21,7 +21,7 @@ import static google.registry.testing.DatastoreHelper.persistResource;
 
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.label.ReservedList;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -29,7 +29,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 class ExportUtilsTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @Test
   void test_exportReservedTerms() {

core/src/test/java/google/registry/export/SyncGroupMembersActionTest.java

@@ -39,7 +39,7 @@ import google.registry.groups.GroupsConnection.Role;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registrar.RegistrarContact;
 import google.registry.request.Response;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeSleeper;
 import google.registry.testing.InjectRule;
@@ -52,12 +52,13 @@ import org.junit.jupiter.api.extension.RegisterExtension;
  * Unit tests for {@link SyncGroupMembersAction}.
  *
  * <p>Note that this relies on the registrars NewRegistrar and TheRegistrar created by default in
- * {@link AppEngineRule}.
+ * {@link AppEngineExtension}.
  */
 public class SyncGroupMembersActionTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @RegisterExtension public final InjectRule inject = new InjectRule();
 

core/src/test/java/google/registry/export/UpdateSnapshotViewActionTest.java

@@ -37,7 +37,7 @@ import com.google.api.services.bigquery.model.Table;
 import com.google.common.collect.Iterables;
 import google.registry.bigquery.CheckedBigquery;
 import google.registry.request.HttpException.InternalServerErrorException;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import java.io.IOException;
 import org.junit.jupiter.api.BeforeEach;
@@ -50,7 +50,7 @@ import org.mockito.InOrder;
 public class UpdateSnapshotViewActionTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withTaskQueue().build();
+  public final AppEngineExtension appEngine = AppEngineExtension.builder().withTaskQueue().build();
 
   private final CheckedBigquery checkedBigquery = mock(CheckedBigquery.class);
   private final Bigquery bigquery = mock(Bigquery.class);

core/src/test/java/google/registry/export/UploadDatastoreBackupActionTest.java

@@ -45,7 +45,7 @@ import com.google.common.collect.Iterables;
 import google.registry.bigquery.CheckedBigquery;
 import google.registry.export.BigqueryPollJobAction.BigqueryPollJobEnqueuer;
 import google.registry.request.HttpException.InternalServerErrorException;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import java.io.IOException;
 import java.util.List;
@@ -58,7 +58,7 @@ import org.mockito.ArgumentCaptor;
 public class UploadDatastoreBackupActionTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withTaskQueue().build();
+  public final AppEngineExtension appEngine = AppEngineExtension.builder().withTaskQueue().build();
 
   private final CheckedBigquery checkedBigquery = mock(CheckedBigquery.class);
   private final Bigquery bigquery = mock(Bigquery.class);

core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetActionTest.java

@@ -23,7 +23,7 @@ import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeLockHandler;
 import google.registry.testing.FakeResponse;
 import java.util.Optional;
@@ -37,8 +37,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class SyncRegistrarsSheetActionTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   private final FakeResponse response = new FakeResponse();
   private final SyncRegistrarsSheet syncRegistrarsSheet = mock(SyncRegistrarsSheet.class);

core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java

@@ -38,7 +38,7 @@ import google.registry.model.ofy.Ofy;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registrar.RegistrarAddress;
 import google.registry.model.registrar.RegistrarContact;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.DatastoreHelper;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
@@ -57,7 +57,8 @@ import org.mockito.junit.jupiter.MockitoExtension;
 public class SyncRegistrarsSheetTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @RegisterExtension public final InjectRule inject = new InjectRule();
 

core/src/test/java/google/registry/flows/CheckApiActionTest.java

@@ -33,7 +33,7 @@ import google.registry.monitoring.whitebox.CheckApiMetric;
 import google.registry.monitoring.whitebox.CheckApiMetric.Availability;
 import google.registry.monitoring.whitebox.CheckApiMetric.Status;
 import google.registry.monitoring.whitebox.CheckApiMetric.Tier;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeResponse;
 import java.util.Map;
@@ -55,7 +55,8 @@ class CheckApiActionTest {
   private static final DateTime START_TIME = DateTime.parse("2000-01-01T00:00:00.0Z");
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @Mock private CheckApiMetrics checkApiMetrics;
   @Captor private ArgumentCaptor<CheckApiMetric> metricCaptor;

core/src/test/java/google/registry/flows/EppCommitLogsTest.java

@@ -30,7 +30,7 @@ import google.registry.flows.EppTestComponent.FakesAndMocksModule;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.ofy.Ofy;
 import google.registry.monitoring.whitebox.EppMetric;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.EppLoader;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeHttpSession;
@@ -44,8 +44,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 class EppCommitLogsTest {
 
   @RegisterExtension
-  final AppEngineRule appEngine =
+  final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   @RegisterExtension final InjectRule inject = new InjectRule();
 

core/src/test/java/google/registry/flows/EppControllerTest.java

@@ -40,7 +40,7 @@ import google.registry.model.eppoutput.EppResponse;
 import google.registry.model.eppoutput.Result;
 import google.registry.model.eppoutput.Result.Code;
 import google.registry.monitoring.whitebox.EppMetric;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.util.Clock;
 import google.registry.xml.ValidationMode;
@@ -67,7 +67,8 @@ import org.mockito.quality.Strictness;
 class EppControllerTest {
 
   @RegisterExtension
-  AppEngineRule appEngineRule = new AppEngineRule.Builder().withDatastoreAndCloudSql().build();
+  AppEngineExtension appEngineRule =
+      new AppEngineExtension.Builder().withDatastoreAndCloudSql().build();
 
   @Mock SessionMetadata sessionMetadata;
   @Mock TransportCredentials transportCredentials;

core/src/test/java/google/registry/flows/EppLifecycleContactTest.java

@@ -21,7 +21,7 @@ import static google.registry.model.eppoutput.Result.Code.SUCCESS_WITH_NO_MESSAG
 import static google.registry.testing.EppMetricSubject.assertThat;
 
 import com.google.common.collect.ImmutableMap;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -29,8 +29,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 class EppLifecycleContactTest extends EppTestCase {
 
   @RegisterExtension
-  final AppEngineRule appEngine =
+  final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   @Test
   void testContactLifecycle() throws Exception {

core/src/test/java/google/registry/flows/EppLifecycleDomainTest.java

@@ -45,7 +45,7 @@ import google.registry.model.domain.DomainBase;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.Registry.TldState;
 import google.registry.model.reporting.HistoryEntry.Type;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.BeforeEach;
@@ -62,8 +62,8 @@ class EppLifecycleDomainTest extends EppTestCase {
           "EXDATE", "2003-06-01T00:04:00Z");
 
   @RegisterExtension
-  final AppEngineRule appEngine =
+  final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   @BeforeEach
   void beforeEach() {

core/src/test/java/google/registry/flows/EppLifecycleHostTest.java

@@ -26,7 +26,7 @@ import static google.registry.testing.HostResourceSubject.assertAboutHosts;
 import com.google.common.collect.ImmutableMap;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.host.HostResource;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -35,8 +35,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 class EppLifecycleHostTest extends EppTestCase {
 
   @RegisterExtension
-  final AppEngineRule appEngine =
+  final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   @Test
   void testLifecycle() throws Exception {

core/src/test/java/google/registry/flows/EppLifecycleLoginTest.java

@@ -18,7 +18,7 @@ import static google.registry.model.eppoutput.Result.Code.SUCCESS;
 import static google.registry.model.eppoutput.Result.Code.SUCCESS_AND_CLOSE;
 import static google.registry.testing.EppMetricSubject.assertThat;
 
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -26,8 +26,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 class EppLifecycleLoginTest extends EppTestCase {
 
   @RegisterExtension
-  final AppEngineRule appEngine =
+  final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   @Test
   void testLoginAndLogout_recordsEppMetric() throws Exception {

core/src/test/java/google/registry/flows/EppLoggedOutTest.java

@@ -18,7 +18,7 @@ import static org.joda.time.DateTimeZone.UTC;
 import static org.joda.time.format.ISODateTimeFormat.dateTimeNoMillis;
 
 import com.google.common.collect.ImmutableMap;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -27,7 +27,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 class EppLoggedOutTest extends EppTestCase {
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @Test
   void testHello() throws Exception {

core/src/test/java/google/registry/flows/EppLoginTlsTest.java

@@ -19,7 +19,7 @@ import static google.registry.testing.DatastoreHelper.persistResource;
 import static org.joda.time.DateTimeZone.UTC;
 
 import com.google.common.collect.ImmutableMap;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.CertificateSamples;
 import java.util.Optional;
 import org.joda.time.DateTime;
@@ -31,7 +31,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 class EppLoginTlsTest extends EppTestCase {
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   void setClientCertificateHash(String clientCertificateHash) {
     setTransportCredentials(

core/src/test/java/google/registry/flows/EppXxeAttackTest.java

@@ -15,7 +15,7 @@
 package google.registry.flows;
 
 import com.google.common.collect.ImmutableMap;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -23,7 +23,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 class EppXxeAttackTest extends EppTestCase {
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @Test
   void testRemoteXmlExternalEntity() throws Exception {

core/src/test/java/google/registry/flows/ExtensionManagerTest.java

@@ -35,7 +35,7 @@ import google.registry.model.domain.superuser.DomainTransferRequestSuperuserExte
 import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension;
 import google.registry.model.eppinput.EppInput;
 import google.registry.model.eppinput.EppInput.CommandExtension;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.util.TypeUtils;
 import java.util.logging.LogRecord;
 import org.junit.jupiter.api.Test;
@@ -45,7 +45,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 class ExtensionManagerTest {
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @Test
   void testDuplicateExtensionsForbidden() {

core/src/test/java/google/registry/flows/FlowRunnerTest.java

@@ -33,7 +33,7 @@ import google.registry.model.eppcommon.Trid;
 import google.registry.model.eppoutput.EppOutput.ResponseOrGreeting;
 import google.registry.model.eppoutput.EppResponse;
 import google.registry.monitoring.whitebox.EppMetric;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeHttpSession;
 import java.util.List;
@@ -46,7 +46,8 @@ import org.mockito.Mockito;
 /** Unit tests for {@link FlowRunner}. */
 class FlowRunnerTest {
 
-  @RegisterExtension final AppEngineRule appEngineRule = new AppEngineRule.Builder().build();
+  @RegisterExtension
+  final AppEngineExtension appEngineRule = new AppEngineExtension.Builder().build();
 
   private final FlowRunner flowRunner = new FlowRunner();
   private final EppMetric.Builder eppMetricBuilder = EppMetric.builderForRequest(new FakeClock());

core/src/test/java/google/registry/flows/FlowTestCase.java

@@ -48,7 +48,7 @@ import google.registry.model.poll.PollMessage;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.tmch.ClaimsListShard.ClaimsListSingleton;
 import google.registry.monitoring.whitebox.EppMetric;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.EppLoader;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeHttpSession;
@@ -86,8 +86,8 @@ public abstract class FlowTestCase<F extends Flow> {
   }
 
   @RegisterExtension
-  final AppEngineRule appEngine =
+  final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   @RegisterExtension final InjectRule inject = new InjectRule();
 

core/src/test/java/google/registry/flows/TlsCredentialsTest.java

@@ -24,7 +24,7 @@ import static org.mockito.Mockito.when;
 
 import google.registry.model.registrar.Registrar;
 import google.registry.request.HttpException.BadRequestException;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import java.util.Optional;
 import javax.servlet.http.HttpServletRequest;
 import org.joda.time.DateTime;
@@ -35,7 +35,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 final class TlsCredentialsTest {
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @Test
   void testProvideClientCertificateHash() {

core/src/test/java/google/registry/flows/contact/ContactTransferFlowTestCase.java

@@ -25,7 +25,7 @@ import google.registry.model.EppResource;
 import google.registry.model.contact.ContactResource;
 import google.registry.model.registry.Registry;
 import google.registry.model.transfer.TransferStatus;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 import org.junit.jupiter.api.BeforeEach;
@@ -58,8 +58,7 @@ abstract class ContactTransferFlowTestCase<F extends Flow, R extends EppResource
   void beforeEachContactTransferFlowTestCase() {
     // Registrar ClientZ is used in tests that need another registrar that definitely doesn't own
     // the resources in question.
-    persistResource(
+    persistResource(AppEngineExtension.makeRegistrar1().asBuilder().setClientId("ClientZ").build());
-        AppEngineRule.makeRegistrar1().asBuilder().setClientId("ClientZ").build());
   }
 
   /** Adds a contact that has a pending transfer on it from TheRegistrar to NewRegistrar. */

core/src/test/java/google/registry/flows/contact/ContactTransferRequestFlowTest.java

@@ -65,7 +65,7 @@ class ContactTransferRequestFlowTest
   }
 
   @BeforeEach
-  void setUp() {
+  void beforeEach() {
     setEppInput("contact_transfer_request.xml");
     setClientIdForFlow("NewRegistrar");
     contact = persistActiveContact("sh8013");

core/src/test/java/google/registry/flows/domain/DomainFlowUtilsTest.java

@@ -32,7 +32,7 @@ import google.registry.flows.domain.DomainFlowUtils.LeadingDashException;
 import google.registry.flows.domain.DomainFlowUtils.TldDoesNotExistException;
 import google.registry.flows.domain.DomainFlowUtils.TrailingDashException;
 import google.registry.model.domain.DomainBase;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -42,7 +42,7 @@ class DomainFlowUtilsTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBas
   void setup() {
     setEppInput("domain_info.xml");
     createTld("tld");
-    persistResource(AppEngineRule.makeRegistrar1().asBuilder().build());
+    persistResource(AppEngineExtension.makeRegistrar1().asBuilder().build());
   }
 
   @Test

core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java

@@ -62,7 +62,7 @@ import google.registry.model.ofy.RequestCapturingAsyncDatastoreService;
 import google.registry.model.registry.Registry;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.persistence.VKey;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -95,7 +95,7 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, DomainBase
     sessionMetadata.setClientId("NewRegistrar");
     clock.setTo(DateTime.parse("2005-03-03T22:00:00.000Z"));
     createTld("tld");
-    persistResource(AppEngineRule.makeRegistrar1().asBuilder().setClientId("ClientZ").build());
+    persistResource(AppEngineExtension.makeRegistrar1().asBuilder().setClientId("ClientZ").build());
   }
 
   private void persistTestEntities(String domainName, boolean inactive) {

core/src/test/java/google/registry/flows/domain/DomainTransferFlowTestCase.java

@@ -43,7 +43,7 @@ import google.registry.model.registry.Registry;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferStatus;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 import org.junit.jupiter.api.BeforeEach;
@@ -84,8 +84,7 @@ abstract class DomainTransferFlowTestCase<F extends Flow, R extends EppResource>
   void beforeEachDomainTransferFlowTestCase() {
     // Registrar ClientZ is used in tests that need another registrar that definitely doesn't own
     // the resources in question.
-    persistResource(
+    persistResource(AppEngineExtension.makeRegistrar1().asBuilder().setClientId("ClientZ").build());
-        AppEngineRule.makeRegistrar1().asBuilder().setClientId("ClientZ").build());
   }
 
   static DomainBase persistWithPendingTransfer(DomainBase domain) {

core/src/test/java/google/registry/flows/domain/DomainTransferQueryFlowTest.java

@@ -42,7 +42,7 @@ class DomainTransferQueryFlowTest
     extends DomainTransferFlowTestCase<DomainTransferQueryFlow, DomainBase> {
 
   @BeforeEach
-  void setUp() {
+  void beforeEach() {
     setEppInput("domain_transfer_query.xml");
     setClientIdForFlow("NewRegistrar");
     setupDomainWithPendingTransfer("example", "tld");

core/src/test/java/google/registry/flows/domain/token/AllocationTokenFlowUtilsTest.java

@@ -47,7 +47,7 @@ import google.registry.model.domain.token.AllocationToken;
 import google.registry.model.domain.token.AllocationToken.TokenStatus;
 import google.registry.model.registry.Registry;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -60,7 +60,8 @@ class AllocationTokenFlowUtilsTest {
       new AllocationTokenFlowUtils(new AllocationTokenCustomLogic());
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @BeforeEach
   void beforeEach() {

core/src/test/java/google/registry/flows/host/HostFlowUtilsTest.java

@@ -25,7 +25,7 @@ import google.registry.flows.host.HostFlowUtils.HostNameNotPunyCodedException;
 import google.registry.flows.host.HostFlowUtils.HostNameTooLongException;
 import google.registry.flows.host.HostFlowUtils.HostNameTooShallowException;
 import google.registry.flows.host.HostFlowUtils.InvalidHostNameException;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -33,7 +33,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 class HostFlowUtilsTest {
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @Test
   void test_validExternalHostName_validates() throws Exception {

core/src/test/java/google/registry/keyring/kms/KmsKeyringTest.java

@@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableList;
 import google.registry.keyring.api.KeySerializer;
 import google.registry.model.server.KmsSecret;
 import google.registry.model.server.KmsSecretRevision;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.BouncyCastleProviderExtension;
 import org.bouncycastle.openpgp.PGPKeyPair;
 import org.bouncycastle.openpgp.PGPPrivateKey;
@@ -37,7 +37,8 @@ class KmsKeyringTest {
   final BouncyCastleProviderExtension bouncy = new BouncyCastleProviderExtension();
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   private KmsKeyring keyring;
 

core/src/test/java/google/registry/keyring/kms/KmsUpdaterTest.java

@@ -22,7 +22,7 @@ import com.googlecode.objectify.Key;
 import google.registry.keyring.api.KeySerializer;
 import google.registry.model.server.KmsSecret;
 import google.registry.model.server.KmsSecretRevision;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.BouncyCastleProviderExtension;
 import java.io.IOException;
 import org.bouncycastle.openpgp.PGPKeyPair;
@@ -35,7 +35,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class KmsUpdaterTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @RegisterExtension
   public final BouncyCastleProviderExtension bouncy = new BouncyCastleProviderExtension();

core/src/test/java/google/registry/mapreduce/inputs/ChildEntityInputTest.java

@@ -39,7 +39,7 @@ import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.index.EppResourceIndex;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
@@ -59,7 +59,8 @@ class ChildEntityInputTest {
   private static final DateTime now = DateTime.now(DateTimeZone.UTC);
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   private DomainBase domainA;
   private DomainBase domainB;

core/src/test/java/google/registry/mapreduce/inputs/CommitLogManifestInputTest.java

@@ -22,7 +22,7 @@ import com.google.appengine.tools.mapreduce.InputReader;
 import com.googlecode.objectify.Key;
 import google.registry.model.ofy.CommitLogBucket;
 import google.registry.model.ofy.CommitLogManifest;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.DatastoreHelper;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -45,7 +45,8 @@ final class CommitLogManifestInputTest {
   private static final DateTime DATE_TIME_NEW2 = DateTime.parse("2017-12-19T12:00Z");
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @Test
   void testInputOlderThan_allFound() throws Exception {

core/src/test/java/google/registry/mapreduce/inputs/EppResourceInputsTest.java

@@ -36,7 +36,7 @@ import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.host.HostResource;
 import google.registry.model.index.EppResourceIndex;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
@@ -53,7 +53,8 @@ class EppResourceInputsTest {
   private static final double EPSILON = 0.0001;
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @SuppressWarnings("unchecked")
   private <T> T serializeAndDeserialize(T obj) throws Exception {

core/src/test/java/google/registry/model/CreateAutoTimestampTest.java

@@ -21,7 +21,7 @@ import static org.joda.time.DateTimeZone.UTC;
 
 import com.googlecode.objectify.annotation.Entity;
 import google.registry.model.common.CrossTldSingleton;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -30,8 +30,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class CreateAutoTimestampTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder()
+      AppEngineExtension.builder()
           .withDatastoreAndCloudSql()
           .withOfyTestEntities(TestObject.class)
           .build();

core/src/test/java/google/registry/model/EntityTestCase.java

@@ -29,7 +29,7 @@ import com.googlecode.objectify.annotation.Serialize;
 import com.googlecode.objectify.cmd.Query;
 import google.registry.model.ofy.Ofy;
 import google.registry.persistence.VKey;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
 import google.registry.util.CidrAddressBlock;
@@ -59,7 +59,7 @@ public abstract class EntityTestCase {
 
   protected FakeClock fakeClock = new FakeClock(DateTime.now(UTC));
 
-  @RegisterExtension public final AppEngineRule appEngine;
+  @RegisterExtension public final AppEngineExtension appEngine;
 
   @RegisterExtension public InjectRule inject = new InjectRule();
 
@@ -69,7 +69,7 @@ public abstract class EntityTestCase {
 
   protected EntityTestCase(JpaEntityCoverageCheck jpaEntityCoverageCheck) {
     appEngine =
-        AppEngineRule.builder()
+        AppEngineExtension.builder()
             .withDatastoreAndCloudSql()
             .enableJpaEntityCoverageCheck(jpaEntityCoverageCheck == JpaEntityCoverageCheck.ENABLED)
             .withClock(fakeClock)

core/src/test/java/google/registry/model/EppResourceUtilsTest.java

@@ -25,7 +25,7 @@ import static org.joda.time.DateTimeZone.UTC;
 
 import google.registry.model.host.HostResource;
 import google.registry.model.ofy.Ofy;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
 import org.joda.time.DateTime;
@@ -38,8 +38,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class EppResourceUtilsTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder().withDatastoreAndCloudSql().withTaskQueue().build();
+      AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build();
 
   @RegisterExtension public final InjectRule inject = new InjectRule();
 

core/src/test/java/google/registry/model/ImmutableObjectTest.java

@@ -29,7 +29,7 @@ import com.google.common.collect.Iterables;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.Id;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.util.CidrAddressBlock;
 import java.util.ArrayDeque;
 import java.util.Arrays;
@@ -45,8 +45,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class ImmutableObjectTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder()
+      AppEngineExtension.builder()
           .withDatastoreAndCloudSql()
           .withOfyTestEntities(ValueObject.class)
           .build();

core/src/test/java/google/registry/model/ModelUtilsTest.java

@@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.collect.ImmutableMap;
 import com.googlecode.objectify.annotation.Id;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import java.lang.reflect.Field;
 import java.util.Map;
 import org.junit.jupiter.api.BeforeEach;
@@ -28,7 +28,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 /** Unit tests for {@link ModelUtils}. */
 public class ModelUtilsTest {
 
-  @RegisterExtension public AppEngineRule appEngineRule = new AppEngineRule.Builder().build();
+  @RegisterExtension
+  public AppEngineExtension appEngineRule = new AppEngineExtension.Builder().build();
 
   /** Test class for reflection methods. */
   public static class TestClass extends ImmutableObject implements Buildable {

core/src/test/java/google/registry/model/OteAccountBuilderTest.java

@@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth8.assertThat;
 import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABILITY;
 import static google.registry.model.registry.Registry.TldState.START_DATE_SUNRISE;
-import static google.registry.testing.AppEngineRule.makeRegistrar1;
+import static google.registry.testing.AppEngineExtension.makeRegistrar1;
 import static google.registry.testing.CertificateSamples.SAMPLE_CERT;
 import static google.registry.testing.CertificateSamples.SAMPLE_CERT_HASH;
 import static google.registry.testing.DatastoreHelper.createTld;
@@ -33,7 +33,7 @@ import google.registry.model.registrar.Registrar;
 import google.registry.model.registrar.RegistrarContact;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.Registry.TldState;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.util.CidrAddressBlock;
 import google.registry.util.SystemClock;
 import org.joda.money.Money;
@@ -47,7 +47,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public final class OteAccountBuilderTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @Test
   void testGetRegistrarToTldMap() {

core/src/test/java/google/registry/model/OteStatsTest.java

@@ -17,14 +17,15 @@ package google.registry.model;
 import static com.google.common.truth.Truth.assertThat;
 
 import google.registry.model.OteStats.StatType;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 public final class OteStatsTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @Test
   void testSuccess_allPass() throws Exception {

core/src/test/java/google/registry/model/SchemaVersionTest.java

@@ -14,7 +14,7 @@
 
 package google.registry.model;
 
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.GoldenFileTestHelper;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -27,7 +27,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class SchemaVersionTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @Test
   void testGoldenSchemaFile() {

core/src/test/java/google/registry/model/UpdateAutoTimestampTest.java

@@ -21,7 +21,7 @@ import static org.joda.time.DateTimeZone.UTC;
 
 import com.googlecode.objectify.annotation.Entity;
 import google.registry.model.common.CrossTldSingleton;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -30,8 +30,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class UpdateAutoTimestampTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder()
+      AppEngineExtension.builder()
           .withDatastoreAndCloudSql()
           .withOfyTestEntities(UpdateAutoTimestampTestObject.class)
           .build();

core/src/test/java/google/registry/model/common/GaeUserIdConverterTest.java

@@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -27,7 +27,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class GaeUserIdConverterTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @AfterEach
   void verifyNoLingeringEntities() {

core/src/test/java/google/registry/model/contact/ContactCommandTest.java

@@ -20,7 +20,7 @@ import static google.registry.xml.ValidationMode.LENIENT;
 import static google.registry.xml.XmlTestUtils.assertXmlEquals;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.EppLoader;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -29,7 +29,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class ContactCommandTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   private void doXmlRoundtripTest(String inputFilename) throws Exception {
     EppLoader eppLoader = new EppLoader(this, inputFilename);

core/src/test/java/google/registry/model/domain/GracePeriodTest.java

@@ -25,7 +25,7 @@ import google.registry.model.billing.BillingEvent.Recurring;
 import google.registry.model.domain.rgp.GracePeriodStatus;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.persistence.VKey;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.joda.money.CurrencyUnit;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
@@ -37,8 +37,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class GracePeriodTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder()
+      AppEngineExtension.builder()
           .withDatastoreAndCloudSql() // Needed to be able to construct Keys.
           .build();
 

core/src/test/java/google/registry/model/ofy/CommitLogBucketTest.java

@@ -25,7 +25,7 @@ import static org.junit.Assert.assertThrows;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableSet;
 import com.googlecode.objectify.annotation.Cache;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.InjectRule;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -35,7 +35,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class CommitLogBucketTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @RegisterExtension public final InjectRule inject = new InjectRule();
   private CommitLogBucket bucket;

core/src/test/java/google/registry/model/ofy/CommitLogCheckpointTest.java

@@ -20,7 +20,7 @@ import static org.joda.time.DateTimeZone.UTC;
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableMap;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -29,7 +29,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class CommitLogCheckpointTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   private static final DateTime T1 = START_OF_TIME;
   private static final DateTime T2 = START_OF_TIME.plusMillis(1);

core/src/test/java/google/registry/model/ofy/CommitLogMutationTest.java

@@ -25,7 +25,7 @@ import com.google.appengine.api.datastore.KeyFactory;
 import com.googlecode.objectify.Key;
 import google.registry.model.ImmutableObject;
 import google.registry.model.registry.Registry;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.junit.jupiter.api.BeforeEach;
@@ -36,7 +36,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class CommitLogMutationTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   private static final DateTime NOW = DateTime.now(DateTimeZone.UTC);
 

core/src/test/java/google/registry/model/ofy/ObjectifyServiceTest.java

@@ -14,7 +14,7 @@
 
 package google.registry.model.ofy;
 
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -22,7 +22,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class ObjectifyServiceTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @Test
   void test_initOfy_canBeCalledTwice() {

core/src/test/java/google/registry/model/ofy/OfyCommitLogTest.java

@@ -30,7 +30,7 @@ import com.googlecode.objectify.annotation.Parent;
 import google.registry.model.BackupGroupRoot;
 import google.registry.model.ImmutableObject;
 import google.registry.model.common.EntityGroupRoot;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
 import google.registry.testing.TestObject.TestVirtualObject;
@@ -43,8 +43,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class OfyCommitLogTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine =
+  public final AppEngineExtension appEngine =
-      AppEngineRule.builder()
+      AppEngineExtension.builder()
           .withDatastoreAndCloudSql()
           .withOfyTestEntities(TestVirtualObject.class, Root.class, Child.class)
           .build();

core/src/test/java/google/registry/model/ofy/OfyTest.java

@@ -45,7 +45,7 @@ import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.DatastoreHelper;
 import google.registry.testing.FakeClock;
 import google.registry.util.SystemClock;
@@ -60,7 +60,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class OfyTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   /** An entity to use in save and delete tests. */
   private HistoryEntry someObject;

core/src/test/java/google/registry/model/poll/PollMessageExternalKeyConverterTest.java

@@ -31,7 +31,7 @@ import google.registry.model.eppcommon.Trid;
 import google.registry.model.ofy.Ofy;
 import google.registry.model.poll.PollMessageExternalKeyConverter.PollMessageExternalKeyParseException;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
 import org.joda.time.DateTime;
@@ -43,7 +43,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class PollMessageExternalKeyConverterTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @RegisterExtension public InjectRule inject = new InjectRule();
 

core/src/test/java/google/registry/model/rde/RdeRevisionTest.java

@@ -23,7 +23,7 @@ import static google.registry.persistence.transaction.TransactionManagerFactory.
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.base.VerifyException;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -32,7 +32,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class RdeRevisionTest {
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @Test
   void testGetNextRevision_objectDoesntExist_returnsZero() {

core/src/test/java/google/registry/model/registrar/RegistrarTest.java

@@ -49,6 +49,7 @@ import org.junit.jupiter.api.Test;
 
 /** Unit tests for {@link Registrar}. */
 class RegistrarTest extends EntityTestCase {
+
   private Registrar registrar;
   private RegistrarContact abuseAdminContact;
 

core/src/test/java/google/registry/model/registry/RegistriesTest.java

@@ -23,7 +23,7 @@ import static org.junit.Assert.assertThrows;
 
 import com.google.common.net.InternetDomainName;
 import google.registry.model.registry.Registry.TldType;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -31,7 +31,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 class RegistriesTest {
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   private void initTestTlds() {
     createTlds("foo", "a.b.c"); // Test a multipart tld.

core/src/test/java/google/registry/model/registry/label/GenrulePremiumListTest.java

@@ -21,7 +21,7 @@ import com.google.common.flogger.FluentLogger;
 import com.google.common.io.Resources;
 import com.google.common.reflect.ClassPath;
 import com.google.common.reflect.ClassPath.ResourceInfo;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import java.net.URL;
 import java.util.List;
 import org.junit.jupiter.api.Test;
@@ -34,7 +34,8 @@ class GenrulePremiumListTest {
   private static final String LISTS_DIRECTORY = "google/registry/config/files/premium/";
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @Test
   void testParse_allPremiumLists() throws Exception {

core/src/test/java/google/registry/model/registry/label/GenruleReservedListTest.java

@@ -21,7 +21,7 @@ import com.google.common.flogger.FluentLogger;
 import com.google.common.io.Resources;
 import com.google.common.reflect.ClassPath;
 import com.google.common.reflect.ClassPath.ResourceInfo;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import java.net.URL;
 import java.util.List;
 import org.junit.jupiter.api.Test;
@@ -34,7 +34,8 @@ class GenruleReservedListTest {
   private static final String LISTS_DIRECTORY = "google/registry/config/files/reserved/";
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @Test
   void testParse_allReservedLists() throws Exception {

core/src/test/java/google/registry/model/registry/label/PremiumListTest.java

@@ -27,7 +27,7 @@ import com.google.common.collect.ImmutableList;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.label.PremiumList.PremiumListEntry;
 import google.registry.model.registry.label.PremiumList.PremiumListRevision;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.joda.money.Money;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -37,7 +37,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class PremiumListTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   @BeforeEach
   void before() {

core/src/test/java/google/registry/model/registry/label/PremiumListUtilsTest.java

@@ -47,7 +47,7 @@ import google.registry.model.pricing.StaticPremiumListPricingEngine;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.label.PremiumList.PremiumListEntry;
 import google.registry.model.registry.label.PremiumList.PremiumListRevision;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.TestCacheExtension;
 import java.util.Map;
 import org.joda.money.Money;
@@ -59,7 +59,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class PremiumListUtilsTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   // Set long persist times on caches so they can be tested (cache times default to 0 in tests).
   @RegisterExtension

core/src/test/java/google/registry/model/registry/label/ReservedListTest.java

@@ -35,7 +35,7 @@ import com.google.common.collect.ImmutableSet;
 import google.registry.model.ofy.Ofy;
 import google.registry.model.registry.Registry;
 import google.registry.model.registry.label.ReservedList.ReservedListEntry;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
 import org.joda.time.DateTime;
@@ -49,7 +49,8 @@ class ReservedListTest {
   @RegisterExtension final InjectRule inject = new InjectRule();
 
   @RegisterExtension
-  final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   private FakeClock clock = new FakeClock(DateTime.parse("2010-01-01T10:00:00Z"));
 

core/src/test/java/google/registry/model/server/KmsSecretRevisionTest.java

@@ -20,7 +20,7 @@ import static google.registry.testing.DatastoreHelper.persistResource;
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.base.Strings;
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -29,7 +29,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class KmsSecretRevisionTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   private KmsSecretRevision secretRevision;
 

core/src/test/java/google/registry/model/server/KmsSecretTest.java

@@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static google.registry.model.ofy.ObjectifyService.ofy;
 import static google.registry.testing.DatastoreHelper.persistResource;
 
-import google.registry.testing.AppEngineRule;
+import google.registry.testing.AppEngineExtension;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -26,7 +26,8 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 public class KmsSecretTest {
 
   @RegisterExtension
-  public final AppEngineRule appEngine = AppEngineRule.builder().withDatastoreAndCloudSql().build();
+  public final AppEngineExtension appEngine =
+      AppEngineExtension.builder().withDatastoreAndCloudSql().build();
 
   private KmsSecret secret;
   private KmsSecretRevision secretRevision;