diff --git a/buildSrc/gradle/dependency-locks/errorproneJavac.lockfile b/buildSrc/gradle/dependency-locks/errorproneJavac.lockfile deleted file mode 100644 index 43f098f5c..000000000 --- a/buildSrc/gradle/dependency-locks/errorproneJavac.lockfile +++ /dev/null @@ -1,4 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.google.errorprone:javac:9+181-r4173-1 diff --git a/core/build.gradle b/core/build.gradle index 518607b4c..be9d593e1 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -269,7 +269,6 @@ dependencies { compile deps['org.testcontainers:postgresql'] testCompile deps['org.testcontainers:selenium'] testCompile deps['org.testcontainers:testcontainers'] - testCompile deps['pl.pragmatists:JUnitParams'] compile deps['xerces:xmlParserAPIs'] compile deps['xpp3:xpp3'] // This dependency must come after javax.mail:mail as it would otherwise @@ -313,7 +312,6 @@ dependencies { 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'] testCompile deps['org.mockito:mockito-core'] testCompile deps['org.mockito:mockito-junit-jupiter'] runtime deps['org.postgresql:postgresql'] diff --git a/core/gradle/dependency-locks/testCompile.lockfile b/core/gradle/dependency-locks/testCompile.lockfile index b64193962..4edc95acc 100644 --- a/core/gradle/dependency-locks/testCompile.lockfile +++ b/core/gradle/dependency-locks/testCompile.lockfile @@ -253,7 +253,6 @@ org.junit.platform:junit-platform-engine:1.6.2 org.junit.platform:junit-platform-launcher:1.6.2 org.junit.platform:junit-platform-runner:1.6.2 org.junit.platform:junit-platform-suite-api:1.6.2 -org.junit.vintage:junit-vintage-engine:5.6.2 org.junit:junit-bom:5.6.2 org.jvnet.staxex:stax-ex:1.8 org.mockito:mockito-core:3.3.3 @@ -293,6 +292,5 @@ org.tukaani:xz:1.8 org.w3c.css:sac:1.3 org.xerial.snappy:snappy-java:1.1.4 org.yaml:snakeyaml:1.17 -pl.pragmatists:JUnitParams:1.1.1 xerces:xmlParserAPIs:2.6.2 xpp3:xpp3:1.1.4c diff --git a/core/gradle/dependency-locks/testCompileClasspath.lockfile b/core/gradle/dependency-locks/testCompileClasspath.lockfile index ca24218ab..7d2df0a24 100644 --- a/core/gradle/dependency-locks/testCompileClasspath.lockfile +++ b/core/gradle/dependency-locks/testCompileClasspath.lockfile @@ -251,7 +251,6 @@ org.junit.platform:junit-platform-engine:1.6.2 org.junit.platform:junit-platform-launcher:1.6.2 org.junit.platform:junit-platform-runner:1.6.2 org.junit.platform:junit-platform-suite-api:1.6.2 -org.junit.vintage:junit-vintage-engine:5.6.2 org.junit:junit-bom:5.6.2 org.jvnet.staxex:stax-ex:1.8 org.mockito:mockito-core:3.3.3 @@ -291,6 +290,5 @@ org.tukaani:xz:1.8 org.w3c.css:sac:1.3 org.xerial.snappy:snappy-java:1.1.4 org.yaml:snakeyaml:1.17 -pl.pragmatists:JUnitParams:1.1.1 xerces:xmlParserAPIs:2.6.2 xpp3:xpp3:1.1.4c diff --git a/core/gradle/dependency-locks/testRuntime.lockfile b/core/gradle/dependency-locks/testRuntime.lockfile index 10a523e53..724e4029e 100644 --- a/core/gradle/dependency-locks/testRuntime.lockfile +++ b/core/gradle/dependency-locks/testRuntime.lockfile @@ -256,7 +256,6 @@ org.junit.platform:junit-platform-engine:1.6.2 org.junit.platform:junit-platform-launcher:1.6.2 org.junit.platform:junit-platform-runner:1.6.2 org.junit.platform:junit-platform-suite-api:1.6.2 -org.junit.vintage:junit-vintage-engine:5.6.2 org.junit:junit-bom:5.6.2 org.jvnet.staxex:stax-ex:1.8 org.mockito:mockito-core:3.3.3 @@ -297,6 +296,5 @@ org.tukaani:xz:1.8 org.w3c.css:sac:1.3 org.xerial.snappy:snappy-java:1.1.4 org.yaml:snakeyaml:1.17 -pl.pragmatists:JUnitParams:1.1.1 xerces:xmlParserAPIs:2.6.2 xpp3:xpp3:1.1.4c diff --git a/core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/core/gradle/dependency-locks/testRuntimeClasspath.lockfile index 6fd63311d..dcbc95aab 100644 --- a/core/gradle/dependency-locks/testRuntimeClasspath.lockfile +++ b/core/gradle/dependency-locks/testRuntimeClasspath.lockfile @@ -256,7 +256,6 @@ org.junit.platform:junit-platform-engine:1.6.2 org.junit.platform:junit-platform-launcher:1.6.2 org.junit.platform:junit-platform-runner:1.6.2 org.junit.platform:junit-platform-suite-api:1.6.2 -org.junit.vintage:junit-vintage-engine:5.6.2 org.junit:junit-bom:5.6.2 org.jvnet.staxex:stax-ex:1.8 org.mockito:mockito-core:3.3.3 @@ -298,6 +297,5 @@ org.tukaani:xz:1.8 org.w3c.css:sac:1.3 org.xerial.snappy:snappy-java:1.1.4 org.yaml:snakeyaml:1.17 -pl.pragmatists:JUnitParams:1.1.1 xerces:xmlParserAPIs:2.6.2 xpp3:xpp3:1.1.4c diff --git a/core/src/test/java/google/registry/backup/CommitLogCheckpointStrategyTest.java b/core/src/test/java/google/registry/backup/CommitLogCheckpointStrategyTest.java index ee812db54..dbfccf98e 100644 --- a/core/src/test/java/google/registry/backup/CommitLogCheckpointStrategyTest.java +++ b/core/src/test/java/google/registry/backup/CommitLogCheckpointStrategyTest.java @@ -33,7 +33,7 @@ import google.registry.persistence.transaction.TransactionManager; import google.registry.schema.cursor.CursorDao; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.jupiter.api.BeforeEach; @@ -47,7 +47,7 @@ public class CommitLogCheckpointStrategyTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private final FakeClock clock = new FakeClock(DateTime.parse("2000-01-01TZ")); private final Ofy ofy = new Ofy(clock); diff --git a/core/src/test/java/google/registry/backup/DeleteOldCommitLogsActionTest.java b/core/src/test/java/google/registry/backup/DeleteOldCommitLogsActionTest.java index fa0c6f26f..fe03983e8 100644 --- a/core/src/test/java/google/registry/backup/DeleteOldCommitLogsActionTest.java +++ b/core/src/test/java/google/registry/backup/DeleteOldCommitLogsActionTest.java @@ -25,7 +25,7 @@ import google.registry.model.ofy.Ofy; import google.registry.testing.DatastoreHelper; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.testing.mapreduce.MapreduceTestCase; import org.joda.time.DateTime; import org.joda.time.Duration; @@ -41,7 +41,7 @@ public class DeleteOldCommitLogsActionTest private final FakeResponse response = new FakeResponse(); private ContactResource contact; - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); @BeforeEach void beforeEach() { diff --git a/core/src/test/java/google/registry/batch/AsyncTaskEnqueuerTest.java b/core/src/test/java/google/registry/batch/AsyncTaskEnqueuerTest.java index d7bd102de..e3f160044 100644 --- a/core/src/test/java/google/registry/batch/AsyncTaskEnqueuerTest.java +++ b/core/src/test/java/google/registry/batch/AsyncTaskEnqueuerTest.java @@ -42,7 +42,7 @@ import google.registry.schema.domain.RegistryLock; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; import google.registry.testing.FakeSleeper; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.testing.TaskQueueHelper.TaskMatcher; import google.registry.util.AppEngineServiceUtils; import google.registry.util.CapturingLogHandler; @@ -67,7 +67,7 @@ public class AsyncTaskEnqueuerTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); @Mock private AppEngineServiceUtils appEngineServiceUtils; diff --git a/core/src/test/java/google/registry/batch/DeleteContactsAndHostsActionTest.java b/core/src/test/java/google/registry/batch/DeleteContactsAndHostsActionTest.java index 8753d337b..5968e6348 100644 --- a/core/src/test/java/google/registry/batch/DeleteContactsAndHostsActionTest.java +++ b/core/src/test/java/google/registry/batch/DeleteContactsAndHostsActionTest.java @@ -94,7 +94,7 @@ import google.registry.model.transfer.TransferStatus; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.FakeSleeper; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.testing.TaskQueueHelper.TaskMatcher; import google.registry.testing.mapreduce.MapreduceTestCase; import google.registry.util.AppEngineServiceUtils; @@ -114,7 +114,7 @@ import org.mockito.Mock; public class DeleteContactsAndHostsActionTest extends MapreduceTestCase { - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private AsyncTaskEnqueuer enqueuer; private final FakeClock clock = new FakeClock(DateTime.parse("2015-01-15T11:22:33Z")); diff --git a/core/src/test/java/google/registry/batch/ExpandRecurringBillingEventsActionTest.java b/core/src/test/java/google/registry/batch/ExpandRecurringBillingEventsActionTest.java index f63ce59a2..5ff99ef53 100644 --- a/core/src/test/java/google/registry/batch/ExpandRecurringBillingEventsActionTest.java +++ b/core/src/test/java/google/registry/batch/ExpandRecurringBillingEventsActionTest.java @@ -52,7 +52,7 @@ import google.registry.model.reporting.HistoryEntry; import google.registry.schema.cursor.CursorDao; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.testing.mapreduce.MapreduceTestCase; import java.util.ArrayList; import java.util.List; @@ -67,7 +67,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; public class ExpandRecurringBillingEventsActionTest extends MapreduceTestCase { - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private final DateTime beginningOfTest = DateTime.parse("2000-10-02T00:00:00Z"); private final FakeClock clock = new FakeClock(beginningOfTest); diff --git a/core/src/test/java/google/registry/batch/RefreshDnsOnHostRenameActionTest.java b/core/src/test/java/google/registry/batch/RefreshDnsOnHostRenameActionTest.java index 7b1944295..3eca36003 100644 --- a/core/src/test/java/google/registry/batch/RefreshDnsOnHostRenameActionTest.java +++ b/core/src/test/java/google/registry/batch/RefreshDnsOnHostRenameActionTest.java @@ -50,7 +50,7 @@ import google.registry.model.server.Lock; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.FakeSleeper; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.testing.TaskQueueHelper.TaskMatcher; import google.registry.testing.mapreduce.MapreduceTestCase; import google.registry.util.AppEngineServiceUtils; @@ -70,7 +70,7 @@ import org.mockito.Mock; public class RefreshDnsOnHostRenameActionTest extends MapreduceTestCase { - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private AsyncTaskEnqueuer enqueuer; private final FakeClock clock = new FakeClock(DateTime.parse("2015-01-15T11:22:33Z")); diff --git a/core/src/test/java/google/registry/batch/ResaveEntityActionTest.java b/core/src/test/java/google/registry/batch/ResaveEntityActionTest.java index f26bc2278..dc78b4c39 100644 --- a/core/src/test/java/google/registry/batch/ResaveEntityActionTest.java +++ b/core/src/test/java/google/registry/batch/ResaveEntityActionTest.java @@ -44,7 +44,7 @@ import google.registry.model.ofy.Ofy; import google.registry.request.Response; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.testing.TaskQueueHelper.TaskMatcher; import google.registry.util.AppEngineServiceUtils; import org.joda.time.DateTime; @@ -66,7 +66,7 @@ public class ResaveEntityActionTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); @Mock private AppEngineServiceUtils appEngineServiceUtils; @Mock private Response response; diff --git a/core/src/test/java/google/registry/beam/initsql/BackupTestStoreTest.java b/core/src/test/java/google/registry/beam/initsql/BackupTestStoreTest.java index d14512e0a..bbef30f72 100644 --- a/core/src/test/java/google/registry/beam/initsql/BackupTestStoreTest.java +++ b/core/src/test/java/google/registry/beam/initsql/BackupTestStoreTest.java @@ -35,7 +35,7 @@ import google.registry.model.ofy.Ofy; import google.registry.model.registry.Registry; import google.registry.persistence.VKey; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.tools.LevelDbLogReader; import java.io.File; import java.io.IOException; @@ -58,7 +58,7 @@ public class BackupTestStoreTest { @TempDir File tempDir; - @RegisterExtension InjectRule injectRule = new InjectRule(); + @RegisterExtension InjectExtension injectRule = new InjectExtension(); private FakeClock fakeClock; private BackupTestStore store; diff --git a/core/src/test/java/google/registry/beam/initsql/CommitLogTransformsTest.java b/core/src/test/java/google/registry/beam/initsql/CommitLogTransformsTest.java index a9a1f8435..2b976183d 100644 --- a/core/src/test/java/google/registry/beam/initsql/CommitLogTransformsTest.java +++ b/core/src/test/java/google/registry/beam/initsql/CommitLogTransformsTest.java @@ -27,7 +27,7 @@ import google.registry.model.domain.DomainBase; import google.registry.model.ofy.Ofy; import google.registry.model.registry.Registry; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import java.io.File; import java.io.IOException; import java.io.Serializable; @@ -57,7 +57,7 @@ class CommitLogTransformsTest implements Serializable { @TempDir transient Path tmpDir; - @RegisterExtension final transient InjectRule injectRule = new InjectRule(); + @RegisterExtension final transient InjectExtension injectRule = new InjectExtension(); @RegisterExtension final transient TestPipelineExtension testPipeline = diff --git a/core/src/test/java/google/registry/beam/initsql/DomainBaseUtilTest.java b/core/src/test/java/google/registry/beam/initsql/DomainBaseUtilTest.java index 5f6b7c95e..abe47221b 100644 --- a/core/src/test/java/google/registry/beam/initsql/DomainBaseUtilTest.java +++ b/core/src/test/java/google/registry/beam/initsql/DomainBaseUtilTest.java @@ -49,7 +49,7 @@ import google.registry.persistence.VKey; import google.registry.testing.AppEngineExtension; import google.registry.testing.DatastoreHelper; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import org.joda.time.Instant; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -70,7 +70,7 @@ public class DomainBaseUtilTest { AppEngineExtension appEngineRule = AppEngineExtension.builder().withDatastore().withClock(fakeClock).build(); - @RegisterExtension InjectRule injectRule = new InjectRule(); + @RegisterExtension InjectExtension injectRule = new InjectExtension(); @BeforeEach void beforeEach() { diff --git a/core/src/test/java/google/registry/beam/initsql/ExportloadingTransformsTest.java b/core/src/test/java/google/registry/beam/initsql/ExportloadingTransformsTest.java index 25ca4fa0b..a3ac3e1db 100644 --- a/core/src/test/java/google/registry/beam/initsql/ExportloadingTransformsTest.java +++ b/core/src/test/java/google/registry/beam/initsql/ExportloadingTransformsTest.java @@ -28,7 +28,7 @@ import google.registry.model.domain.DomainBase; import google.registry.model.ofy.Ofy; import google.registry.model.registry.Registry; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import java.io.File; import java.io.Serializable; import java.nio.file.Path; @@ -66,7 +66,7 @@ class ExportloadingTransformsTest implements Serializable { @TempDir transient Path tmpDir; - @RegisterExtension final transient InjectRule injectRule = new InjectRule(); + @RegisterExtension final transient InjectExtension injectRule = new InjectExtension(); @RegisterExtension final transient TestPipelineExtension testPipeline = diff --git a/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java b/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java index 8125b6e0c..b813a0a13 100644 --- a/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java +++ b/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java @@ -53,7 +53,7 @@ import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationTestEx import google.registry.testing.AppEngineExtension; import google.registry.testing.DatastoreEntityExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import java.io.File; import java.nio.file.Files; import java.nio.file.Path; @@ -84,7 +84,7 @@ class InitSqlPipelineTest { @Order(Order.DEFAULT - 1) final transient DatastoreEntityExtension datastore = new DatastoreEntityExtension(); - @RegisterExtension final transient InjectRule injectRule = new InjectRule(); + @RegisterExtension final transient InjectExtension injectRule = new InjectExtension(); @SuppressWarnings("WeakerAccess") @TempDir diff --git a/core/src/test/java/google/registry/beam/initsql/LoadDatastoreSnapshotTest.java b/core/src/test/java/google/registry/beam/initsql/LoadDatastoreSnapshotTest.java index 010c7441e..8c5a14358 100644 --- a/core/src/test/java/google/registry/beam/initsql/LoadDatastoreSnapshotTest.java +++ b/core/src/test/java/google/registry/beam/initsql/LoadDatastoreSnapshotTest.java @@ -30,7 +30,7 @@ import google.registry.model.eppcommon.AuthInfo.PasswordAuth; import google.registry.model.ofy.Ofy; import google.registry.model.registry.Registry; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import java.io.File; import java.nio.file.Files; import java.nio.file.Path; @@ -82,7 +82,7 @@ class LoadDatastoreSnapshotTest { @TempDir transient Path tmpDir; - @RegisterExtension final transient InjectRule injectRule = new InjectRule(); + @RegisterExtension final transient InjectExtension injectRule = new InjectExtension(); @RegisterExtension final transient TestPipelineExtension testPipeline = diff --git a/core/src/test/java/google/registry/beam/initsql/WriteToSqlTest.java b/core/src/test/java/google/registry/beam/initsql/WriteToSqlTest.java index d83ef9627..51eb1efe8 100644 --- a/core/src/test/java/google/registry/beam/initsql/WriteToSqlTest.java +++ b/core/src/test/java/google/registry/beam/initsql/WriteToSqlTest.java @@ -32,7 +32,7 @@ import google.registry.testing.AppEngineExtension; import google.registry.testing.DatastoreEntityExtension; import google.registry.testing.DatastoreHelper; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import java.io.Serializable; import java.nio.file.Path; import java.util.stream.Collectors; @@ -55,7 +55,7 @@ class WriteToSqlTest implements Serializable { @Order(Order.DEFAULT - 1) final transient DatastoreEntityExtension datastore = new DatastoreEntityExtension(); - @RegisterExtension final transient InjectRule injectRule = new InjectRule(); + @RegisterExtension final transient InjectExtension injectRule = new InjectExtension(); @RegisterExtension final transient JpaIntegrationTestExtension database = diff --git a/core/src/test/java/google/registry/dns/DnsInjectionTest.java b/core/src/test/java/google/registry/dns/DnsInjectionTest.java index 2e3beb7ca..c2141b8c9 100644 --- a/core/src/test/java/google/registry/dns/DnsInjectionTest.java +++ b/core/src/test/java/google/registry/dns/DnsInjectionTest.java @@ -29,7 +29,7 @@ import google.registry.request.HttpException.NotFoundException; import google.registry.request.RequestModule; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import java.io.PrintWriter; import java.io.StringWriter; import javax.servlet.http.HttpServletRequest; @@ -46,7 +46,7 @@ public final class DnsInjectionTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private final HttpServletRequest req = mock(HttpServletRequest.class); private final HttpServletResponse rsp = mock(HttpServletResponse.class); diff --git a/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java b/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java index e265fdabf..d45f700cd 100644 --- a/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java +++ b/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java @@ -41,7 +41,7 @@ import google.registry.request.lock.LockHandler; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; import google.registry.testing.FakeLockHandler; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.jupiter.api.BeforeEach; @@ -55,7 +55,7 @@ public class PublishDnsUpdatesActionTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private final FakeClock clock = new FakeClock(DateTime.parse("1971-01-01TZ")); private final FakeLockHandler lockHandler = new FakeLockHandler(true); private final DnsWriter dnsWriter = mock(DnsWriter.class); diff --git a/core/src/test/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java b/core/src/test/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java index 9b7358572..2b1217afd 100644 --- a/core/src/test/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java +++ b/core/src/test/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java @@ -43,7 +43,7 @@ import google.registry.model.host.HostResource; import google.registry.model.ofy.Ofy; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -77,7 +77,7 @@ public class DnsUpdateWriterTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); @Mock private DnsMessageTransport mockResolver; @Captor private ArgumentCaptor updateCaptor; diff --git a/core/src/test/java/google/registry/export/SyncGroupMembersActionTest.java b/core/src/test/java/google/registry/export/SyncGroupMembersActionTest.java index fc7428d0b..625cb5e41 100644 --- a/core/src/test/java/google/registry/export/SyncGroupMembersActionTest.java +++ b/core/src/test/java/google/registry/export/SyncGroupMembersActionTest.java @@ -42,7 +42,7 @@ import google.registry.request.Response; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; import google.registry.testing.FakeSleeper; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.util.Retrier; import java.io.IOException; import org.junit.jupiter.api.Test; @@ -60,7 +60,7 @@ public class SyncGroupMembersActionTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private final DirectoryGroupsConnection connection = mock(DirectoryGroupsConnection.class); private final Response response = mock(Response.class); diff --git a/core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java b/core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java index 66c18ebbb..815433ae6 100644 --- a/core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java +++ b/core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java @@ -41,7 +41,7 @@ import google.registry.model.registrar.RegistrarContact; import google.registry.testing.AppEngineExtension; import google.registry.testing.DatastoreHelper; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -60,7 +60,7 @@ public class SyncRegistrarsSheetTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); @Captor private ArgumentCaptor>> rowsCaptor; @Mock private SheetSynchronizer sheetSynchronizer; diff --git a/core/src/test/java/google/registry/flows/EppCommitLogsTest.java b/core/src/test/java/google/registry/flows/EppCommitLogsTest.java index 1d1a28556..4e3fabc2c 100644 --- a/core/src/test/java/google/registry/flows/EppCommitLogsTest.java +++ b/core/src/test/java/google/registry/flows/EppCommitLogsTest.java @@ -34,7 +34,7 @@ import google.registry.testing.AppEngineExtension; import google.registry.testing.EppLoader; import google.registry.testing.FakeClock; import google.registry.testing.FakeHttpSession; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -47,7 +47,7 @@ class EppCommitLogsTest { final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build(); - @RegisterExtension final InjectRule inject = new InjectRule(); + @RegisterExtension final InjectExtension inject = new InjectExtension(); private final FakeClock clock = new FakeClock(DateTime.now(UTC)); private EppLoader eppLoader; diff --git a/core/src/test/java/google/registry/flows/EppTestCase.java b/core/src/test/java/google/registry/flows/EppTestCase.java index 8fa2189b3..14e6809c2 100644 --- a/core/src/test/java/google/registry/flows/EppTestCase.java +++ b/core/src/test/java/google/registry/flows/EppTestCase.java @@ -45,7 +45,7 @@ import google.registry.persistence.VKey; import google.registry.testing.FakeClock; import google.registry.testing.FakeHttpSession; import google.registry.testing.FakeResponse; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import java.util.Map; import java.util.Objects; import java.util.Optional; @@ -60,7 +60,7 @@ public class EppTestCase { private static final MediaType APPLICATION_EPP_XML_UTF8 = MediaType.create("application", "epp+xml").withCharset(UTF_8); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); protected final FakeClock clock = new FakeClock(); diff --git a/core/src/test/java/google/registry/flows/FlowTestCase.java b/core/src/test/java/google/registry/flows/FlowTestCase.java index 03c529df6..a522aaa9d 100644 --- a/core/src/test/java/google/registry/flows/FlowTestCase.java +++ b/core/src/test/java/google/registry/flows/FlowTestCase.java @@ -52,7 +52,7 @@ import google.registry.testing.AppEngineExtension; import google.registry.testing.EppLoader; import google.registry.testing.FakeClock; import google.registry.testing.FakeHttpSession; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.testing.TestDataHelper; import google.registry.tmch.TmchCertificateAuthority; import google.registry.tmch.TmchXmlSignature; @@ -89,7 +89,7 @@ public abstract class FlowTestCase { final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build(); - @RegisterExtension final InjectRule inject = new InjectRule(); + @RegisterExtension final InjectExtension inject = new InjectExtension(); protected EppLoader eppLoader; protected SessionMetadata sessionMetadata; diff --git a/core/src/test/java/google/registry/model/EntityTestCase.java b/core/src/test/java/google/registry/model/EntityTestCase.java index 94326ffdc..c165f29e7 100644 --- a/core/src/test/java/google/registry/model/EntityTestCase.java +++ b/core/src/test/java/google/registry/model/EntityTestCase.java @@ -31,7 +31,7 @@ import google.registry.model.ofy.Ofy; import google.registry.persistence.VKey; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.util.CidrAddressBlock; import java.lang.reflect.Array; import java.lang.reflect.Field; @@ -61,7 +61,7 @@ public abstract class EntityTestCase { @RegisterExtension public final AppEngineExtension appEngine; - @RegisterExtension public InjectRule inject = new InjectRule(); + @RegisterExtension public InjectExtension inject = new InjectExtension(); protected EntityTestCase() { this(JpaEntityCoverageCheck.DISABLED); diff --git a/core/src/test/java/google/registry/model/EppResourceUtilsTest.java b/core/src/test/java/google/registry/model/EppResourceUtilsTest.java index c0a60b6f2..9755d76fc 100644 --- a/core/src/test/java/google/registry/model/EppResourceUtilsTest.java +++ b/core/src/test/java/google/registry/model/EppResourceUtilsTest.java @@ -27,7 +27,7 @@ import google.registry.model.host.HostResource; import google.registry.model.ofy.Ofy; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import org.joda.time.DateTime; import org.joda.time.Duration; import org.junit.jupiter.api.BeforeEach; @@ -41,7 +41,7 @@ public class EppResourceUtilsTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private final FakeClock clock = new FakeClock(DateTime.now(UTC)); diff --git a/core/src/test/java/google/registry/model/ofy/CommitLogBucketTest.java b/core/src/test/java/google/registry/model/ofy/CommitLogBucketTest.java index 49e3a88bb..770734227 100644 --- a/core/src/test/java/google/registry/model/ofy/CommitLogBucketTest.java +++ b/core/src/test/java/google/registry/model/ofy/CommitLogBucketTest.java @@ -26,7 +26,7 @@ import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableSet; import com.googlecode.objectify.annotation.Cache; import google.registry.testing.AppEngineExtension; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -38,7 +38,7 @@ public class CommitLogBucketTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private CommitLogBucket bucket; @BeforeEach diff --git a/core/src/test/java/google/registry/model/ofy/OfyCommitLogTest.java b/core/src/test/java/google/registry/model/ofy/OfyCommitLogTest.java index eba2a60b5..0d1549339 100644 --- a/core/src/test/java/google/registry/model/ofy/OfyCommitLogTest.java +++ b/core/src/test/java/google/registry/model/ofy/OfyCommitLogTest.java @@ -32,7 +32,7 @@ import google.registry.model.ImmutableObject; import google.registry.model.common.EntityGroupRoot; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.testing.TestObject.TestVirtualObject; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; @@ -49,7 +49,7 @@ public class OfyCommitLogTest { .withOfyTestEntities(TestVirtualObject.class, Root.class, Child.class) .build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private final FakeClock clock = new FakeClock(DateTime.parse("2000-01-01TZ")); diff --git a/core/src/test/java/google/registry/model/poll/PollMessageExternalKeyConverterTest.java b/core/src/test/java/google/registry/model/poll/PollMessageExternalKeyConverterTest.java index 7f7340c5f..eea803237 100644 --- a/core/src/test/java/google/registry/model/poll/PollMessageExternalKeyConverterTest.java +++ b/core/src/test/java/google/registry/model/poll/PollMessageExternalKeyConverterTest.java @@ -33,7 +33,7 @@ import google.registry.model.poll.PollMessageExternalKeyConverter.PollMessageExt import google.registry.model.reporting.HistoryEntry; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -46,7 +46,7 @@ public class PollMessageExternalKeyConverterTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().build(); - @RegisterExtension public InjectRule inject = new InjectRule(); + @RegisterExtension public InjectExtension inject = new InjectExtension(); private HistoryEntry historyEntry; private FakeClock clock = new FakeClock(DateTime.parse("2007-07-07T01:01:01Z")); diff --git a/core/src/test/java/google/registry/model/registry/label/ReservedListTest.java b/core/src/test/java/google/registry/model/registry/label/ReservedListTest.java index 632d2a23e..63e583e75 100644 --- a/core/src/test/java/google/registry/model/registry/label/ReservedListTest.java +++ b/core/src/test/java/google/registry/model/registry/label/ReservedListTest.java @@ -37,7 +37,7 @@ import google.registry.model.registry.Registry; import google.registry.model.registry.label.ReservedList.ReservedListEntry; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -46,7 +46,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; /** Unit tests for {@link ReservedList}. */ class ReservedListTest { - @RegisterExtension final InjectRule inject = new InjectRule(); + @RegisterExtension final InjectExtension inject = new InjectExtension(); @RegisterExtension final AppEngineExtension appEngine = diff --git a/core/src/test/java/google/registry/model/server/LockTest.java b/core/src/test/java/google/registry/model/server/LockTest.java index b5e31e4d3..6524e4934 100644 --- a/core/src/test/java/google/registry/model/server/LockTest.java +++ b/core/src/test/java/google/registry/model/server/LockTest.java @@ -30,7 +30,7 @@ import google.registry.model.ofy.Ofy; import google.registry.model.server.Lock.LockState; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.util.RequestStatusChecker; import java.util.Optional; import org.joda.time.Duration; @@ -54,7 +54,7 @@ public class LockTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().withClock(clock).build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private Optional acquire(String tld, Duration leaseLength, LockState expectedLockState) { Lock.lockMetrics = mock(LockMetrics.class); diff --git a/core/src/test/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java b/core/src/test/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java index 5522ccdce..311fe9946 100644 --- a/core/src/test/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java +++ b/core/src/test/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java @@ -29,7 +29,7 @@ import google.registry.model.ofy.CommitLogManifest; import google.registry.model.ofy.Ofy; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import java.util.List; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; @@ -53,7 +53,7 @@ public class CommitLogRevisionsTranslatorFactoryTest { .withOfyTestEntities(TestObject.class) .build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private final FakeClock clock = new FakeClock(START_TIME); diff --git a/core/src/test/java/google/registry/persistence/transaction/TransactionManagerTest.java b/core/src/test/java/google/registry/persistence/transaction/TransactionManagerTest.java index 813f90b5e..f1df41cf5 100644 --- a/core/src/test/java/google/registry/persistence/transaction/TransactionManagerTest.java +++ b/core/src/test/java/google/registry/persistence/transaction/TransactionManagerTest.java @@ -32,7 +32,7 @@ import google.registry.persistence.VKey; import google.registry.testing.AppEngineExtension; import google.registry.testing.DualDatabaseTest; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import java.util.List; import java.util.NoSuchElementException; import java.util.Set; @@ -57,7 +57,7 @@ public class TransactionManagerTest { new TestEntity("entity2", "bar"), new TestEntity("entity3", "qux")); - @RegisterExtension public InjectRule inject = new InjectRule(); + @RegisterExtension public InjectExtension inject = new InjectExtension(); @RegisterExtension public final AppEngineExtension appEngine = diff --git a/core/src/test/java/google/registry/rdap/RdapActionBaseTestCase.java b/core/src/test/java/google/registry/rdap/RdapActionBaseTestCase.java index a8c320ffd..4cae71a04 100644 --- a/core/src/test/java/google/registry/rdap/RdapActionBaseTestCase.java +++ b/core/src/test/java/google/registry/rdap/RdapActionBaseTestCase.java @@ -33,7 +33,7 @@ import google.registry.request.auth.UserAuthInfo; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.util.Idn; import google.registry.util.TypeUtils; import java.util.HashMap; @@ -49,7 +49,7 @@ abstract class RdapActionBaseTestCase { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); protected static final AuthResult AUTH_RESULT = AuthResult.create( diff --git a/core/src/test/java/google/registry/rdap/RdapJsonFormatterTest.java b/core/src/test/java/google/registry/rdap/RdapJsonFormatterTest.java index bda33bee7..9b2141777 100644 --- a/core/src/test/java/google/registry/rdap/RdapJsonFormatterTest.java +++ b/core/src/test/java/google/registry/rdap/RdapJsonFormatterTest.java @@ -48,7 +48,7 @@ import google.registry.rdap.RdapObjectClasses.ReplyPayloadBase; import google.registry.rdap.RdapObjectClasses.TopLevelReplyObject; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -61,7 +61,7 @@ class RdapJsonFormatterTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private final FakeClock clock = new FakeClock(DateTime.parse("1999-01-01T00:00:00Z")); diff --git a/core/src/test/java/google/registry/rde/PendingDepositCheckerTest.java b/core/src/test/java/google/registry/rde/PendingDepositCheckerTest.java index 04aa57fc2..5fe688265 100644 --- a/core/src/test/java/google/registry/rde/PendingDepositCheckerTest.java +++ b/core/src/test/java/google/registry/rde/PendingDepositCheckerTest.java @@ -33,7 +33,7 @@ import google.registry.model.registry.Registry; import google.registry.schema.cursor.CursorDao; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -42,7 +42,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; /** Unit tests for {@link PendingDepositChecker}. */ public class PendingDepositCheckerTest { - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); @RegisterExtension public final AppEngineExtension appEngine = diff --git a/core/src/test/java/google/registry/rde/RdeStagingActionTest.java b/core/src/test/java/google/registry/rde/RdeStagingActionTest.java index 37c7e9dd0..1d8173fd4 100644 --- a/core/src/test/java/google/registry/rde/RdeStagingActionTest.java +++ b/core/src/test/java/google/registry/rde/RdeStagingActionTest.java @@ -59,7 +59,7 @@ import google.registry.testing.FakeClock; import google.registry.testing.FakeKeyringModule; import google.registry.testing.FakeLockHandler; import google.registry.testing.FakeResponse; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.testing.TaskQueueHelper.TaskMatcher; import google.registry.testing.mapreduce.MapreduceTestCase; import google.registry.tldconfig.idn.IdnTableEnum; @@ -103,7 +103,7 @@ public class RdeStagingActionTest extends MapreduceTestCase { private static final GcsFilename LENGTH_FILE = new GcsFilename("rde-bucket", "lol_2000-01-01_full_S1_R0.xml.length"); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private final FakeClock clock = new FakeClock(); private final FakeResponse response = new FakeResponse(); diff --git a/core/src/test/java/google/registry/rde/RegistrarToXjcConverterTest.java b/core/src/test/java/google/registry/rde/RegistrarToXjcConverterTest.java index dfd52757f..2cfab84b5 100644 --- a/core/src/test/java/google/registry/rde/RegistrarToXjcConverterTest.java +++ b/core/src/test/java/google/registry/rde/RegistrarToXjcConverterTest.java @@ -27,7 +27,7 @@ import google.registry.model.registrar.Registrar.State; import google.registry.model.registrar.RegistrarAddress; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.xjc.rderegistrar.XjcRdeRegistrar; import google.registry.xjc.rderegistrar.XjcRdeRegistrarAddrType; import google.registry.xjc.rderegistrar.XjcRdeRegistrarPostalInfoEnumType; @@ -51,7 +51,7 @@ public class RegistrarToXjcConverterTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private Registrar registrar; diff --git a/core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java b/core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java index 22c9c1878..b5463787e 100644 --- a/core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java +++ b/core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java @@ -38,7 +38,7 @@ import google.registry.model.registrar.Registrar; import google.registry.model.registrar.Registrar.State; import google.registry.request.auth.AuthenticatedRegistrarAccessor.RegistrarAccessDeniedException; import google.registry.testing.AppEngineExtension; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import java.util.Optional; import java.util.logging.Level; import javax.servlet.http.HttpServletRequest; @@ -62,7 +62,7 @@ class AuthenticatedRegistrarAccessorTest { final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().build(); - @RegisterExtension final InjectRule inject = new InjectRule(); + @RegisterExtension final InjectExtension inject = new InjectExtension(); @Mock private HttpServletRequest req; @Mock private HttpServletResponse rsp; diff --git a/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java b/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java index b75ebcefa..2611fa0ca 100644 --- a/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java +++ b/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java @@ -26,6 +26,7 @@ import google.registry.model.registry.RegistryLockDaoTest; import google.registry.model.registry.label.ReservedListSqlDaoTest; import google.registry.model.reporting.Spec11ThreatMatchTest; import google.registry.persistence.transaction.JpaEntityCoverageExtension; +import google.registry.persistence.transaction.JpaTestRules.JpaIntegrationWithCoverageExtension; import google.registry.schema.cursor.CursorDaoTest; import google.registry.schema.integration.SqlIntegrationTestSuite.AfterSuiteTest; import google.registry.schema.integration.SqlIntegrationTestSuite.BeforeSuiteTest; @@ -50,8 +51,8 @@ import org.junit.runner.RunWith; * AppEngineExtension.Builder#enableJpaEntityCoverageCheck} and have at least one test method that * persists a JPA entity declared in persistence.xml. * - *

Note that with {@code JpaIntegrationWithCoverageRule}, each method starts with an empty - * database. Therefore this is not the right place for verifying backward data compatibility in + *

Note that with {@link JpaIntegrationWithCoverageExtension}, each method starts with an empty + * database. Therefore this is not the right place for verifying backwards data compatibility in * end-to-end functional tests. * *

As of April 2020, none of the before/after annotations ({@code BeforeClass} and {@code diff --git a/core/src/test/java/google/registry/security/XsrfTokenManagerTest.java b/core/src/test/java/google/registry/security/XsrfTokenManagerTest.java index 2b36744ec..8a1a5d04d 100644 --- a/core/src/test/java/google/registry/security/XsrfTokenManagerTest.java +++ b/core/src/test/java/google/registry/security/XsrfTokenManagerTest.java @@ -22,7 +22,7 @@ import com.google.common.base.Splitter; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; import google.registry.testing.FakeUserService; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import org.joda.time.Duration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -35,7 +35,7 @@ class XsrfTokenManagerTest { final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().build(); - @RegisterExtension InjectRule inject = new InjectRule(); + @RegisterExtension InjectExtension inject = new InjectExtension(); private final User testUser = new User("test@example.com", "test@example.com"); private final FakeClock clock = new FakeClock(START_OF_TIME); diff --git a/core/src/test/java/google/registry/server/Fixture.java b/core/src/test/java/google/registry/server/Fixture.java index fcbc8d99f..de3c09fa5 100644 --- a/core/src/test/java/google/registry/server/Fixture.java +++ b/core/src/test/java/google/registry/server/Fixture.java @@ -34,7 +34,7 @@ import google.registry.model.contact.PostalInfo; import google.registry.model.domain.DesignatedContact; import google.registry.model.ofy.Ofy; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import java.io.IOException; import org.joda.time.DateTime; @@ -49,7 +49,7 @@ public enum Fixture { INJECTED_FAKE_CLOCK { @Override public void load() { - new InjectRule() + new InjectExtension() .setStaticField(Ofy.class, "clock", new FakeClock(DateTime.parse("2000-01-01TZ"))); } }, diff --git a/core/src/test/java/google/registry/testing/InjectRule.java b/core/src/test/java/google/registry/testing/InjectExtension.java similarity index 77% rename from core/src/test/java/google/registry/testing/InjectRule.java rename to core/src/test/java/google/registry/testing/InjectExtension.java index 3fffb31d7..1c792b233 100644 --- a/core/src/test/java/google/registry/testing/InjectRule.java +++ b/core/src/test/java/google/registry/testing/InjectExtension.java @@ -45,10 +45,10 @@ import org.junit.jupiter.api.extension.ExtensionContext; * to be evil; but hopefully one day we'll be able to delete this class and do things * properly with Dagger dependency injection. * - *

This class temporarily supports both JUnit4 and JUnit5. You use this class in JUnit4 by - * declaring it as a {@link org.junit.Rule @Rule} field and then calling {@link - * #setStaticField} from either your {@link org.junit.Test @Test} or {@link org.junit.Before - * @Before} methods. For example: + *

You use this class in by declaring it as an {@link + * org.junit.jupiter.api.extension.RegisterExtension @RegisterExtension} field and then call + * {@link #setStaticField} from either your {@link org.junit.jupiter.api.Test @Test} or {@link + * org.junit.jupiter.api.BeforeEach @BeforeEach} methods. For example: * * 

  * // Doomsday.java
@@ -62,16 +62,15 @@ import org.junit.jupiter.api.extension.ExtensionContext;
  * }
  *
  * // DoomsdayTest.java
- * @RunWith(JUnit4.class)
  * public class DoomsdayTest {
  *
- *   @Rule
- *   public InjectRule inject = new InjectRule();
+ *   @RegisterExtension
+ *   public InjectExtension inject = new InjectExtension();
  *
  *   private final FakeClock clock = new FakeClock();
  *
- *   @Before
- *   public void before() {
+ *   @BeforeEach
+ *   public void beforeEach() {
  *     inject.setStaticField(Doomsday.class, "clock", clock);
  *   }
  *
@@ -85,9 +84,8 @@ import org.junit.jupiter.api.extension.ExtensionContext;
  *
* * @see google.registry.util.NonFinalForTesting - * @see org.junit.rules.ExternalResource */ -public class InjectRule implements AfterEachCallback { +public class InjectExtension implements AfterEachCallback { private static class Change { private final Field field; @@ -109,9 +107,9 @@ public class InjectRule implements AfterEachCallback { * *

The field is allowed to be {@code private}, but it most not be {@code final}. * - *

This method may be called either from either your {@link org.junit.Before @Before} - * method or from the {@link org.junit.Test @Test} method itself. However you may not - * inject the same field multiple times during the same test. + *

This method may be called either from either your {@link org.junit.Before @Before} method or + * from the {@link org.junit.Test @Test} method itself. However you may not inject the same field + * multiple times during the same test. * * @throws IllegalArgumentException if the static field could not be found or modified. * @throws IllegalStateException if the field has already been injected during this test. @@ -127,16 +125,19 @@ public class InjectRule implements AfterEachCallback { | SecurityException | IllegalArgumentException | IllegalAccessException e) { - throw new IllegalArgumentException(String.format( - "Static field not found: %s.%s", clazz.getSimpleName(), fieldName), e); + throw new IllegalArgumentException( + String.format("Static field not found: %s.%s", clazz.getSimpleName(), fieldName), e); } - checkState(!injected.contains(field), - "Static field already injected: %s.%s", clazz.getSimpleName(), fieldName); + checkState( + !injected.contains(field), + "Static field already injected: %s.%s", + clazz.getSimpleName(), + fieldName); try { field.set(null, newValue); } catch (IllegalArgumentException | IllegalAccessException e) { - throw new IllegalArgumentException(String.format( - "Static field not settable: %s.%s", clazz.getSimpleName(), fieldName), e); + throw new IllegalArgumentException( + String.format("Static field not settable: %s.%s", clazz.getSimpleName(), fieldName), e); } changes.add(new Change(field, oldValue, newValue)); injected.add(field); @@ -147,13 +148,13 @@ public class InjectRule implements AfterEachCallback { RuntimeException thrown = null; for (Change change : changes) { try { - checkState(change.field.get(null).equals(change.newValue), + checkState( + change.field.get(null).equals(change.newValue), "Static field value was changed post-injection: %s.%s", - change.field.getDeclaringClass().getSimpleName(), change.field.getName()); + change.field.getDeclaringClass().getSimpleName(), + change.field.getName()); change.field.set(null, change.oldValue); - } catch (IllegalArgumentException - | IllegalStateException - | IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalStateException | IllegalAccessException e) { if (thrown == null) { thrown = new RuntimeException(e); } else { diff --git a/core/src/test/java/google/registry/tmch/LordnTaskUtilsTest.java b/core/src/test/java/google/registry/tmch/LordnTaskUtilsTest.java index cdd8c4302..ae7c09893 100644 --- a/core/src/test/java/google/registry/tmch/LordnTaskUtilsTest.java +++ b/core/src/test/java/google/registry/tmch/LordnTaskUtilsTest.java @@ -30,7 +30,7 @@ import google.registry.model.ofy.Ofy; import google.registry.model.registrar.Registrar.Type; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.testing.TaskQueueHelper.TaskMatcher; import google.registry.util.Clock; import org.joda.time.DateTime; @@ -47,7 +47,7 @@ public class LordnTaskUtilsTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); @BeforeEach void beforeEach() { diff --git a/core/src/test/java/google/registry/tmch/NordnUploadActionTest.java b/core/src/test/java/google/registry/tmch/NordnUploadActionTest.java index 003272b6a..afebc8947 100644 --- a/core/src/test/java/google/registry/tmch/NordnUploadActionTest.java +++ b/core/src/test/java/google/registry/tmch/NordnUploadActionTest.java @@ -57,7 +57,7 @@ import google.registry.model.registry.Registry; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; import google.registry.testing.FakeSleeper; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.testing.TaskQueueHelper.TaskMatcher; import google.registry.util.Retrier; import google.registry.util.TaskQueueUtils; @@ -100,7 +100,7 @@ class NordnUploadActionTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); @Mock private URLFetchService fetchService; @Mock private HTTPResponse httpResponse; diff --git a/core/src/test/java/google/registry/tmch/TmchXmlSignatureTest.java b/core/src/test/java/google/registry/tmch/TmchXmlSignatureTest.java index b3ce45db1..afd3cc0df 100644 --- a/core/src/test/java/google/registry/tmch/TmchXmlSignatureTest.java +++ b/core/src/test/java/google/registry/tmch/TmchXmlSignatureTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertThrows; import google.registry.config.RegistryConfig.ConfigModule.TmchCaMode; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.tmch.TmchXmlSignature.CertificateSignatureException; import java.security.cert.CertificateExpiredException; import java.security.cert.CertificateNotYetValidException; @@ -43,7 +43,7 @@ class TmchXmlSignatureTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); // This should be a date which falls within the validity range of the test files contained in the // testdata/active directory. Note that test files claiming to be valid for a particular date diff --git a/core/src/test/java/google/registry/tools/AckPollMessagesCommandTest.java b/core/src/test/java/google/registry/tools/AckPollMessagesCommandTest.java index 62d63f556..f11e1bb54 100644 --- a/core/src/test/java/google/registry/tools/AckPollMessagesCommandTest.java +++ b/core/src/test/java/google/registry/tools/AckPollMessagesCommandTest.java @@ -29,7 +29,7 @@ import google.registry.model.poll.PollMessage.OneTime; import google.registry.model.reporting.HistoryEntry; import google.registry.persistence.VKey; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -40,7 +40,7 @@ public class AckPollMessagesCommandTest extends CommandTestCase { - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); @Mock AppEngineServiceUtils appEngineServiceUtils; diff --git a/core/src/test/java/google/registry/tools/GhostrydeCommandTest.java b/core/src/test/java/google/registry/tools/GhostrydeCommandTest.java index 566656b42..01ee300d2 100644 --- a/core/src/test/java/google/registry/tools/GhostrydeCommandTest.java +++ b/core/src/test/java/google/registry/tools/GhostrydeCommandTest.java @@ -22,7 +22,7 @@ import google.registry.keyring.api.Keyring; import google.registry.rde.Ghostryde; import google.registry.testing.BouncyCastleProviderExtension; import google.registry.testing.FakeKeyringModule; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import java.nio.file.Files; import java.nio.file.Path; import org.junit.jupiter.api.BeforeEach; @@ -51,7 +51,7 @@ class GhostrydeCommandTest extends CommandTestCase { + "Haply I may remember, \n" + " And haply may forget. \n").getBytes(UTF_8); - @RegisterExtension final InjectRule inject = new InjectRule(); + @RegisterExtension final InjectExtension inject = new InjectExtension(); @RegisterExtension final BouncyCastleProviderExtension bouncy = new BouncyCastleProviderExtension(); diff --git a/core/src/test/java/google/registry/tools/ListCursorsCommandTest.java b/core/src/test/java/google/registry/tools/ListCursorsCommandTest.java index 143738d37..0d976c054 100644 --- a/core/src/test/java/google/registry/tools/ListCursorsCommandTest.java +++ b/core/src/test/java/google/registry/tools/ListCursorsCommandTest.java @@ -25,7 +25,7 @@ import google.registry.model.common.Cursor.CursorType; import google.registry.model.ofy.Ofy; import google.registry.model.registry.Registry; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -40,7 +40,7 @@ public class ListCursorsCommandTest extends CommandTestCase private static final String HEADER_TWO = "--------------------------------------------------------------------------"; - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); @BeforeEach void beforeEach() { diff --git a/core/src/test/java/google/registry/tools/RenewDomainCommandTest.java b/core/src/test/java/google/registry/tools/RenewDomainCommandTest.java index a7d42002c..72141c16f 100644 --- a/core/src/test/java/google/registry/tools/RenewDomainCommandTest.java +++ b/core/src/test/java/google/registry/tools/RenewDomainCommandTest.java @@ -28,7 +28,7 @@ import google.registry.model.domain.DomainBase; import google.registry.model.ofy.Ofy; import google.registry.model.registrar.Registrar; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.util.Clock; import java.util.List; import org.joda.time.DateTime; @@ -40,7 +40,7 @@ import org.testcontainers.shaded.com.google.common.collect.ImmutableList; /** Unit tests for {@link RenewDomainCommand}. */ public class RenewDomainCommandTest extends EppToolCommandTestCase { - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private final Clock clock = new FakeClock(DateTime.parse("2015-04-05T05:05:05Z")); diff --git a/core/src/test/java/google/registry/tools/SetNumInstancesCommandTest.java b/core/src/test/java/google/registry/tools/SetNumInstancesCommandTest.java index 4028806cb..141b76ae5 100644 --- a/core/src/test/java/google/registry/tools/SetNumInstancesCommandTest.java +++ b/core/src/test/java/google/registry/tools/SetNumInstancesCommandTest.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify; import com.beust.jcommander.ParameterException; import com.google.common.collect.ImmutableMultimap; import google.registry.testing.AppEngineAdminApiHelper; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.util.AppEngineServiceUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -34,7 +34,7 @@ import org.mockito.quality.Strictness; /** Unit tests for {@link SetNumInstancesCommand}. */ public class SetNumInstancesCommandTest extends CommandTestCase { - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); @Mock AppEngineServiceUtils appEngineServiceUtils; diff --git a/core/src/test/java/google/registry/tools/UnrenewDomainCommandTest.java b/core/src/test/java/google/registry/tools/UnrenewDomainCommandTest.java index 886bd464b..6011ebe79 100644 --- a/core/src/test/java/google/registry/tools/UnrenewDomainCommandTest.java +++ b/core/src/test/java/google/registry/tools/UnrenewDomainCommandTest.java @@ -46,7 +46,7 @@ import google.registry.model.ofy.Ofy; import google.registry.model.poll.PollMessage; import google.registry.model.reporting.HistoryEntry; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import org.joda.time.DateTime; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -55,7 +55,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; /** Unit tests for {@link UnrenewDomainCommand}. */ public class UnrenewDomainCommandTest extends CommandTestCase { - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private final FakeClock clock = new FakeClock(DateTime.parse("2016-12-06T13:55:01Z")); diff --git a/core/src/test/java/google/registry/tools/server/CreateGroupsActionTest.java b/core/src/test/java/google/registry/tools/server/CreateGroupsActionTest.java index d5e130957..7e4d934e9 100644 --- a/core/src/test/java/google/registry/tools/server/CreateGroupsActionTest.java +++ b/core/src/test/java/google/registry/tools/server/CreateGroupsActionTest.java @@ -28,7 +28,7 @@ import google.registry.request.HttpException.BadRequestException; import google.registry.request.HttpException.InternalServerErrorException; import google.registry.request.Response; import google.registry.testing.AppEngineExtension; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import java.util.Optional; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -40,7 +40,7 @@ class CreateGroupsActionTest { final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().build(); - @RegisterExtension final InjectRule inject = new InjectRule(); + @RegisterExtension final InjectExtension inject = new InjectExtension(); private final DirectoryGroupsConnection connection = mock(DirectoryGroupsConnection.class); private final Response response = mock(Response.class); diff --git a/core/src/test/java/google/registry/tools/server/RefreshDnsForAllDomainsActionTest.java b/core/src/test/java/google/registry/tools/server/RefreshDnsForAllDomainsActionTest.java index 51f4218a3..387a50b92 100644 --- a/core/src/test/java/google/registry/tools/server/RefreshDnsForAllDomainsActionTest.java +++ b/core/src/test/java/google/registry/tools/server/RefreshDnsForAllDomainsActionTest.java @@ -29,7 +29,7 @@ import static org.mockito.Mockito.verify; import com.google.common.collect.ImmutableSet; import google.registry.dns.DnsQueue; import google.registry.testing.FakeResponse; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.testing.mapreduce.MapreduceTestCase; import google.registry.tools.server.RefreshDnsForAllDomainsAction.RefreshDnsForAllDomainsActionMapper; import java.util.Random; @@ -45,7 +45,7 @@ import org.mockito.ArgumentCaptor; public class RefreshDnsForAllDomainsActionTest extends MapreduceTestCase { - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); private final DnsQueue dnsQueue = mock(DnsQueue.class); private DnsQueue origDnsQueue; diff --git a/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java b/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java index eeb2b987c..97997c1ed 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java +++ b/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java @@ -43,7 +43,7 @@ import google.registry.request.auth.AuthenticatedRegistrarAccessor; import google.registry.request.auth.UserAuthInfo; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.ui.server.SendEmailUtils; import google.registry.util.AppEngineServiceUtils; import google.registry.util.EmailMessage; @@ -75,7 +75,7 @@ public abstract class RegistrarSettingsActionTestCase { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().withTaskQueue().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); @Mock AppEngineServiceUtils appEngineServiceUtils; @Mock HttpServletRequest req; diff --git a/core/src/test/java/google/registry/whois/WhoisActionTest.java b/core/src/test/java/google/registry/whois/WhoisActionTest.java index 24f321f9d..307ed706a 100644 --- a/core/src/test/java/google/registry/whois/WhoisActionTest.java +++ b/core/src/test/java/google/registry/whois/WhoisActionTest.java @@ -57,7 +57,7 @@ import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; import google.registry.testing.FakeSleeper; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.testing.TestCacheExtension; import google.registry.util.Retrier; import google.registry.whois.WhoisMetrics.WhoisMetric; @@ -78,7 +78,7 @@ public class WhoisActionTest { public final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().build(); - @RegisterExtension public final InjectRule inject = new InjectRule(); + @RegisterExtension public final InjectExtension inject = new InjectExtension(); @RegisterExtension public final TestCacheExtension testCacheExtension = diff --git a/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java b/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java index d34eee298..266ec2505 100644 --- a/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java +++ b/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java @@ -43,7 +43,7 @@ import google.registry.model.registry.Registry; import google.registry.testing.AppEngineExtension; import google.registry.testing.FakeClock; import google.registry.testing.FakeResponse; -import google.registry.testing.InjectRule; +import google.registry.testing.InjectExtension; import google.registry.whois.WhoisMetrics.WhoisMetric; import java.io.IOException; import java.io.Reader; @@ -66,7 +66,7 @@ class WhoisHttpActionTest { final AppEngineExtension appEngine = AppEngineExtension.builder().withDatastoreAndCloudSql().build(); - @RegisterExtension final InjectRule inject = new InjectRule(); + @RegisterExtension final InjectExtension inject = new InjectExtension(); private final FakeResponse response = new FakeResponse(); private final FakeClock clock = new FakeClock(DateTime.parse("2009-06-29T20:13:00Z")); diff --git a/dependencies.gradle b/dependencies.gradle index c9efc6597..26e3e22b0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -157,7 +157,6 @@ ext { 'org.testcontainers:selenium:1.14.3', 'org.testcontainers:testcontainers:1.14.3', 'org.yaml:snakeyaml:1.17', - 'pl.pragmatists:JUnitParams:1.1.1', 'xerces:xmlParserAPIs:2.6.2', 'xpp3:xpp3:1.1.4c' ]