zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-20 03:09:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rename InjectRule and remove some JUnit4-only dependencies (#726)

Browse source 
* Rename InjectRule and remove some deps

* Merge remote-tracking branch 'upstream/master' into final-core-tests
This commit is contained in:
Ben McIlwain 2020-07-29 20:27:47 -04:00 • committed by GitHub
parent 38f535fd49
commit 69aa2ecf4b
64 changed files with 139 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

4
buildSrc/gradle/dependency-locks/errorproneJavac.lockfile
View file

@ -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

2
core/build.gradle
View file

@ -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']

2
core/gradle/dependency-locks/testCompile.lockfile
View file

@ -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

2
core/gradle/dependency-locks/testCompileClasspath.lockfile
View file

@ -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

2
core/gradle/dependency-locks/testRuntime.lockfile
View file

@ -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

2
core/gradle/dependency-locks/testRuntimeClasspath.lockfile
View file

@ -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

4
core/src/test/java/google/registry/backup/CommitLogCheckpointStrategyTest.java
View file

@ -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);

4
core/src/test/java/google/registry/backup/DeleteOldCommitLogsActionTest.java
View file

@ -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() {

4
core/src/test/java/google/registry/batch/AsyncTaskEnqueuerTest.java
View file

@ -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;

4
core/src/test/java/google/registry/batch/DeleteContactsAndHostsActionTest.java
View file

@ -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<DeleteContactsAndHostsAction> {
@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"));

4
core/src/test/java/google/registry/batch/ExpandRecurringBillingEventsActionTest.java
View file

@ -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<ExpandRecurringBillingEventsAction> {
@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);

4
core/src/test/java/google/registry/batch/RefreshDnsOnHostRenameActionTest.java
View file

@ -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<RefreshDnsOnHostRenameAction> {
@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"));

4
core/src/test/java/google/registry/batch/ResaveEntityActionTest.java
View file

@ -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;

4
core/src/test/java/google/registry/beam/initsql/BackupTestStoreTest.java
View file

@ -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;

4
core/src/test/java/google/registry/beam/initsql/CommitLogTransformsTest.java
View file

@ -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 =

4
core/src/test/java/google/registry/beam/initsql/DomainBaseUtilTest.java
View file

@ -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() {

4
core/src/test/java/google/registry/beam/initsql/ExportloadingTransformsTest.java
View file

@ -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 =

4
core/src/test/java/google/registry/beam/initsql/InitSqlPipelineTest.java
View file

@ -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

4
core/src/test/java/google/registry/beam/initsql/LoadDatastoreSnapshotTest.java
View file

@ -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 =

4
core/src/test/java/google/registry/beam/initsql/WriteToSqlTest.java
View file

@ -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 =

4
core/src/test/java/google/registry/dns/DnsInjectionTest.java
View file

@ -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);

4
core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java
View file

@ -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);

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

@ -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<Update> updateCaptor;

4
core/src/test/java/google/registry/export/SyncGroupMembersActionTest.java
View file

@ -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);

4
core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java
View file

@ -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<ImmutableList<ImmutableMap<String, String>>> rowsCaptor;
@Mock private SheetSynchronizer sheetSynchronizer;

4
core/src/test/java/google/registry/flows/EppCommitLogsTest.java
View file

@ -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;

4
core/src/test/java/google/registry/flows/EppTestCase.java
View file

@ -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();

4
core/src/test/java/google/registry/flows/FlowTestCase.java
View file

@ -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<F extends Flow> {
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;

4
core/src/test/java/google/registry/model/EntityTestCase.java
View file

@ -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);

4
core/src/test/java/google/registry/model/EppResourceUtilsTest.java
View file

@ -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));

4
core/src/test/java/google/registry/model/ofy/CommitLogBucketTest.java
View file

@ -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

4
core/src/test/java/google/registry/model/ofy/OfyCommitLogTest.java
View file

@ -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"));

4
core/src/test/java/google/registry/model/poll/PollMessageExternalKeyConverterTest.java
View file

@ -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"));

4
core/src/test/java/google/registry/model/registry/label/ReservedListTest.java
View file

@ -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 =

4
core/src/test/java/google/registry/model/server/LockTest.java
View file

@ -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<Lock> acquire(String tld, Duration leaseLength, LockState expectedLockState) {
Lock.lockMetrics = mock(LockMetrics.class);

4
core/src/test/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java
View file

@ -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);

4
core/src/test/java/google/registry/persistence/transaction/TransactionManagerTest.java
View file

@ -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 =

4
core/src/test/java/google/registry/rdap/RdapActionBaseTestCase.java
View file

@ -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<A extends RdapActionBase> {
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(

4
core/src/test/java/google/registry/rdap/RdapJsonFormatterTest.java
View file

@ -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"));

4
core/src/test/java/google/registry/rde/PendingDepositCheckerTest.java
View file

@ -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 =

4
core/src/test/java/google/registry/rde/RdeStagingActionTest.java
View file

@ -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<RdeStagingAction> {
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();

4
core/src/test/java/google/registry/rde/RegistrarToXjcConverterTest.java
View file

@ -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;

4
core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java
View file

@ -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;

5
core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java
View file

@ -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.
*
* <p>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
* <p>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.
*
* <p>As of April 2020, none of the before/after annotations ({@code BeforeClass} and {@code

4
core/src/test/java/google/registry/security/XsrfTokenManagerTest.java
View file

@ -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);

4
core/src/test/java/google/registry/server/Fixture.java
View file

@ -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")));
}
},

51
core/src/test/java/google/registry/testing/InjectRule.java → core/src/test/java/google/registry/testing/InjectExtension.java
View file

@ -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
* <i>properly</i> with <a href="http://square.github.io/dagger/">Dagger</a> dependency injection.
*
* <p>This class temporarily supports both JUnit4 and JUnit5. You use this class in JUnit4 by
* declaring it as a {@link org.junit.Rule &#064;Rule} field and then calling {@link
* #setStaticField} from either your {@link org.junit.Test &#064;Test} or {@link org.junit.Before
* &#064;Before} methods. For example:
* <p>You use this class in by declaring it as an {@link
* org.junit.jupiter.api.extension.RegisterExtension &#064;RegisterExtension} field and then call
* {@link #setStaticField} from either your {@link org.junit.jupiter.api.Test &#064;Test} or {@link
* org.junit.jupiter.api.BeforeEach &#064;BeforeEach} methods. For example:
*
* <pre>
* // Doomsday.java
@ -62,16 +62,15 @@ import org.junit.jupiter.api.extension.ExtensionContext;
* }
*
* // DoomsdayTest.java
* &#064;RunWith(JUnit4.class)
* public class DoomsdayTest {
*
* &#064;Rule
* public InjectRule inject = new InjectRule();
* &#064;RegisterExtension
* public InjectExtension inject = new InjectExtension();
*
* private final FakeClock clock = new FakeClock();
*
* &#064;Before
* public void before() {
* &#064;BeforeEach
* public void beforeEach() {
* inject.setStaticField(Doomsday.class, "clock", clock);
* }
*
@ -85,9 +84,8 @@ import org.junit.jupiter.api.extension.ExtensionContext;
* </pre>
*
* @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 {
*
* <p>The field is allowed to be {@code private}, but it most not be {@code final}.
*
* <p>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.
* <p>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 {

4
core/src/test/java/google/registry/tmch/LordnTaskUtilsTest.java
View file

@ -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() {

4
core/src/test/java/google/registry/tmch/NordnUploadActionTest.java
View file

@ -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;

4
core/src/test/java/google/registry/tmch/TmchXmlSignatureTest.java
View file

@ -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

4
core/src/test/java/google/registry/tools/AckPollMessagesCommandTest.java
View file

@ -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<AckPollMessagesC
private FakeClock clock = new FakeClock(DateTime.parse("2015-02-04T08:16:32.064Z"));
@RegisterExtension public final InjectRule inject = new InjectRule();
@RegisterExtension public final InjectExtension inject = new InjectExtension();
@BeforeEach
final void beforeEach() {

4
core/src/test/java/google/registry/tools/CountDomainsCommandTest.java
View file

@ -21,7 +21,7 @@ import static org.joda.time.DateTimeZone.UTC;
import google.registry.model.ofy.Ofy;
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;
@ -32,7 +32,7 @@ public class CountDomainsCommandTest extends CommandTestCase<CountDomainsCommand
protected FakeClock clock = new FakeClock(DateTime.now(UTC));
@RegisterExtension public final InjectRule inject = new InjectRule();
@RegisterExtension public final InjectExtension inject = new InjectExtension();
@BeforeEach
final void beforeEach() {

4
core/src/test/java/google/registry/tools/GenerateEscrowDepositCommandTest.java
View file

@ -22,7 +22,7 @@ import static org.junit.Assert.assertThrows;
import static org.mockito.Mockito.when;
import com.beust.jcommander.ParameterException;
import google.registry.testing.InjectRule;
import google.registry.testing.InjectExtension;
import google.registry.testing.TaskQueueHelper.TaskMatcher;
import google.registry.util.AppEngineServiceUtils;
import java.util.Optional;
@ -38,7 +38,7 @@ import org.mockito.quality.Strictness;
public class GenerateEscrowDepositCommandTest
extends CommandTestCase<GenerateEscrowDepositCommand> {
@RegisterExtension public final InjectRule inject = new InjectRule();
@RegisterExtension public final InjectExtension inject = new InjectExtension();
@Mock AppEngineServiceUtils appEngineServiceUtils;

4
core/src/test/java/google/registry/tools/GhostrydeCommandTest.java
View file

@ -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<GhostrydeCommand> {
+ "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();

4
core/src/test/java/google/registry/tools/ListCursorsCommandTest.java
View file

@ -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<ListCursorsCommand>
private static final String HEADER_TWO =
"--------------------------------------------------------------------------";
@RegisterExtension public final InjectRule inject = new InjectRule();
@RegisterExtension public final InjectExtension inject = new InjectExtension();
@BeforeEach
void beforeEach() {

4
core/src/test/java/google/registry/tools/RenewDomainCommandTest.java
View file

@ -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<RenewDomainCommand> {
@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"));

4
core/src/test/java/google/registry/tools/SetNumInstancesCommandTest.java
View file

@ -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<SetNumInstancesCommand> {
@RegisterExtension public final InjectRule inject = new InjectRule();
@RegisterExtension public final InjectExtension inject = new InjectExtension();
@Mock AppEngineServiceUtils appEngineServiceUtils;

4
core/src/test/java/google/registry/tools/UnrenewDomainCommandTest.java
View file

@ -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<UnrenewDomainCommand> {
@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"));

4
core/src/test/java/google/registry/tools/server/CreateGroupsActionTest.java
View file

@ -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);

4
core/src/test/java/google/registry/tools/server/RefreshDnsForAllDomainsActionTest.java
View file

@ -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<RefreshDnsForAllDomainsAction> {
@RegisterExtension public final InjectRule inject = new InjectRule();
@RegisterExtension public final InjectExtension inject = new InjectExtension();
private final DnsQueue dnsQueue = mock(DnsQueue.class);
private DnsQueue origDnsQueue;

4
core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java
View file

@ -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;

4
core/src/test/java/google/registry/whois/WhoisActionTest.java
View file

@ -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 =

4
core/src/test/java/google/registry/whois/WhoisHttpActionTest.java
View file

@ -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"));

1
dependencies.gradle
View file

@ -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'
]