Remove some unnecessary uses of MockitoJUnitRunner, which is discouraged

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

javatests/google/registry/backup/CommitLogCheckpointActionTest.java

@@ -21,6 +21,7 @@ import static google.registry.testing.TaskQueueHelper.assertNoTasksEnqueued;
 import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
 import static google.registry.util.DateTimeUtils.START_OF_TIME;
 import static org.joda.time.DateTimeZone.UTC;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.google.common.collect.ImmutableMap;
@@ -36,11 +37,10 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
+import org.junit.runners.JUnit4;
-import org.mockito.runners.MockitoJUnitRunner;
 
 /** Unit tests for {@link CommitLogCheckpointAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class CommitLogCheckpointActionTest {
 
   private static final String QUEUE_NAME = "export-commits";
@@ -51,8 +51,7 @@ public class CommitLogCheckpointActionTest {
       .withTaskQueue()
       .build();
 
-  @Mock
+  CommitLogCheckpointStrategy strategy = mock(CommitLogCheckpointStrategy.class);
-  CommitLogCheckpointStrategy strategy;
 
   DateTime now = DateTime.now(UTC);
   CommitLogCheckpointAction task = new CommitLogCheckpointAction();

javatests/google/registry/backup/CommitLogCheckpointStrategyTest.java

@@ -39,10 +39,10 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.runners.JUnit4;
 
 /** Unit tests for {@link CommitLogCheckpointStrategy}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class CommitLogCheckpointStrategyTest {
 
   @Rule

javatests/google/registry/batch/VerifyEntityIntegrityActionTest.java

@@ -66,12 +66,11 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
 
 /** Unit tests for {@link VerifyEntityIntegrityAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class VerifyEntityIntegrityActionTest
     extends MapreduceTestCase<VerifyEntityIntegrityAction> {
 
@@ -82,20 +81,13 @@ public class VerifyEntityIntegrityActionTest
   private ArgumentCaptor<TableDataInsertAllRequest> rowsCaptor;
   private final DateTime now = DateTime.parse("2012-01-02T03:04:05Z");
 
-  @Mock
+  private final Bigquery bigquery = mock(Bigquery.class);
-  private Bigquery bigquery;
+  private final Bigquery.Tabledata bigqueryTableData = mock(Bigquery.Tabledata.class);
-
+  private final Bigquery.Tabledata.InsertAll bigqueryInsertAll =
-  @Mock
+      mock(Bigquery.Tabledata.InsertAll.class);
-  private Bigquery.Tabledata bigqueryTableData;
+  private final BigqueryFactory bigqueryFactory = mock(BigqueryFactory.class);
-
+  private final VerifyEntityIntegrityStreamerFactory streamerFactory =
-  @Mock
+      mock(VerifyEntityIntegrityStreamerFactory.class);
-  private Bigquery.Tabledata.InsertAll bigqueryInsertAll;
-
-  @Mock
-  private BigqueryFactory bigqueryFactory;
-
-  @Mock
-  private VerifyEntityIntegrityStreamerFactory streamerFactory;
 
   @Before
   public void before() throws Exception {

javatests/google/registry/bigquery/BigqueryFactoryTest.java

@@ -19,6 +19,7 @@ import static google.registry.bigquery.BigqueryUtils.FieldType.STRING;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -35,31 +36,20 @@ import com.google.common.collect.ImmutableMap;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
 
 /** Unit tests for {@link BigqueryFactory}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class BigqueryFactoryTest {
 
-  @Mock
+  private final BigqueryFactory.Subfactory subfactory = mock(BigqueryFactory.Subfactory.class);
-  private BigqueryFactory.Subfactory subfactory;
+  private final Bigquery bigquery = mock(Bigquery.class);
-
+  private final Bigquery.Datasets bigqueryDatasets = mock(Bigquery.Datasets.class);
-  @Mock
+  private final Bigquery.Datasets.Insert bigqueryDatasetsInsert =
-  private Bigquery bigquery;
+      mock(Bigquery.Datasets.Insert.class);
-
+  private final Bigquery.Tables bigqueryTables = mock(Bigquery.Tables.class);
-  @Mock
+  private final Bigquery.Tables.Insert bigqueryTablesInsert = mock(Bigquery.Tables.Insert.class);
-  private Bigquery.Datasets bigqueryDatasets;
-
-  @Mock
-  private Bigquery.Datasets.Insert bigqueryDatasetsInsert;
-
-  @Mock
-  private Bigquery.Tables bigqueryTables;
-
-  @Mock
-  private Bigquery.Tables.Insert bigqueryTablesInsert;
 
   private BigqueryFactory factory;
 

javatests/google/registry/dns/PublishDnsUpdatesActionTest.java

@@ -39,10 +39,10 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.runners.JUnit4;
 
 /** Unit tests for {@link PublishDnsUpdatesAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class PublishDnsUpdatesActionTest {
 
   @Rule

javatests/google/registry/dns/writer/dnsupdate/DnsMessageTransportTest.java

@@ -38,8 +38,7 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
+import org.junit.runners.JUnit4;
-import org.mockito.runners.MockitoJUnitRunner;
 import org.xbill.DNS.ARecord;
 import org.xbill.DNS.DClass;
 import org.xbill.DNS.Flags;
@@ -52,16 +51,13 @@ import org.xbill.DNS.Type;
 import org.xbill.DNS.Update;
 
 /** Unit tests for {@link DnsMessageTransport}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class DnsMessageTransportTest {
 
   private static final String UPDATE_HOST = "127.0.0.1";
 
-  @Mock
+  private final SocketFactory mockFactory = mock(SocketFactory.class);
-  private SocketFactory mockFactory;
+  private final Socket mockSocket = mock(Socket.class);
-
-  @Mock
-  private Socket mockSocket;
 
   private Message simpleQuery;
   private Message expectedResponse;

javatests/google/registry/export/BigqueryPollJobActionTest.java

@@ -22,6 +22,7 @@ import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.SEVERE;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.google.api.services.bigquery.Bigquery;
@@ -57,11 +58,10 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
+import org.junit.runners.JUnit4;
-import org.mockito.runners.MockitoJUnitRunner;
 
 /** Unit tests for {@link BigqueryPollJobAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class BigqueryPollJobActionTest {
 
   @Rule
@@ -73,16 +73,16 @@ public class BigqueryPollJobActionTest {
   @Rule
   public final ExceptionRule thrown = new ExceptionRule();
 
-  @Mock Bigquery bigquery;
+  private static final String PROJECT_ID = "project_id";
-  @Mock Bigquery.Jobs bigqueryJobs;
+  private static final String JOB_ID = "job_id";
-  @Mock Bigquery.Jobs.Get bigqueryJobsGet;
+  private static final String CHAINED_QUEUE_NAME = UpdateSnapshotViewAction.QUEUE;
-
+  private static final TaskEnqueuer ENQUEUER =
-  static final String PROJECT_ID = "project_id";
-  static final String JOB_ID = "job_id";
-  static final String CHAINED_QUEUE_NAME = UpdateSnapshotViewAction.QUEUE;
-  static final TaskEnqueuer ENQUEUER =
       new TaskEnqueuer(new Retrier(new FakeSleeper(new FakeClock()), 1));
 
+  private final Bigquery bigquery = mock(Bigquery.class);
+  private final Bigquery.Jobs bigqueryJobs = mock(Bigquery.Jobs.class);
+  private final Bigquery.Jobs.Get bigqueryJobsGet = mock(Bigquery.Jobs.Get.class);
+
   private final CapturingLogHandler logHandler = new CapturingLogHandler();
   private BigqueryPollJobAction action = new BigqueryPollJobAction();
 
@@ -139,7 +139,7 @@ public class BigqueryPollJobActionTest {
 
   private void assertLogMessage(Level level, String message) {
     for (LogRecord logRecord : logHandler.getRecords()) {
-      if (logRecord.getLevel() == level && logRecord.getMessage().contains(message)) {
+      if (logRecord.getLevel().equals(level) && logRecord.getMessage().contains(message)) {
         return;
       }
     }

javatests/google/registry/export/CheckSnapshotActionTest.java

@@ -19,6 +19,7 @@ import static google.registry.export.CheckSnapshotAction.CHECK_SNAPSHOT_KINDS_TO
 import static google.registry.export.CheckSnapshotAction.CHECK_SNAPSHOT_NAME_PARAM;
 import static google.registry.testing.TaskQueueHelper.assertNoTasksEnqueued;
 import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.google.common.base.Joiner;
@@ -41,11 +42,10 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
+import org.junit.runners.JUnit4;
-import org.mockito.runners.MockitoJUnitRunner;
 
 /** Unit tests for {@link CheckSnapshotAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class CheckSnapshotActionTest {
 
   static final DateTime START_TIME = DateTime.parse("2014-08-01T01:02:03Z");
@@ -55,7 +55,7 @@ public class CheckSnapshotActionTest {
   @Rule public final AppEngineRule appEngine = AppEngineRule.builder().withTaskQueue().build();
   @Rule public final ExceptionRule thrown = new ExceptionRule();
 
-  @Mock private DatastoreBackupService backupService;
+  private final DatastoreBackupService backupService = mock(DatastoreBackupService.class);
 
   private DatastoreBackupInfo backupInfo;
 

javatests/google/registry/export/DatastoreBackupServiceTest.java

@@ -18,6 +18,7 @@ import static com.google.appengine.api.datastore.DatastoreServiceFactory.getData
 import static com.google.common.collect.Iterables.transform;
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.google.appengine.api.datastore.Entity;
@@ -35,11 +36,10 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
+import org.junit.runners.JUnit4;
-import org.mockito.runners.MockitoJUnitRunner;
 
 /** Unit tests for {@link DatastoreBackupService}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class DatastoreBackupServiceTest {
 
   @Rule
@@ -54,8 +54,7 @@ public class DatastoreBackupServiceTest {
       .withTaskQueue()
       .build();
 
-  @Mock
+  private final ModulesService modulesService = mock(ModulesService.class);
-  private ModulesService modulesService;
 
   private static final DateTime START_TIME = DateTime.parse("2014-08-01T01:02:03Z");
 

javatests/google/registry/export/ExportReservedTermsActionTest.java

@@ -26,6 +26,7 @@ import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -41,11 +42,10 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
+import org.junit.runners.JUnit4;
-import org.mockito.runners.MockitoJUnitRunner;
 
 /** Unit tests for {@link ExportReservedTermsAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class ExportReservedTermsActionTest {
 
   @Rule
@@ -53,11 +53,8 @@ public class ExportReservedTermsActionTest {
       .withDatastore()
       .build();
 
-  @Mock
+  private final DriveConnection driveConnection = mock(DriveConnection.class);
-  private DriveConnection driveConnection;
+  private final Response response = mock(Response.class);
-
-  @Mock
-  private Response response;
 
   private void runAction(String tld) {
     ExportReservedTermsAction action = new ExportReservedTermsAction();

javatests/google/registry/export/ExportSnapshotActionTest.java

@@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static google.registry.export.CheckSnapshotAction.CHECK_SNAPSHOT_KINDS_TO_LOAD_PARAM;
 import static google.registry.export.CheckSnapshotAction.CHECK_SNAPSHOT_NAME_PARAM;
 import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
 import com.google.common.base.Joiner;
@@ -30,16 +31,15 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
+import org.junit.runners.JUnit4;
-import org.mockito.runners.MockitoJUnitRunner;
 
 /** Unit tests for {@link ExportSnapshotAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class ExportSnapshotActionTest {
 
   @Rule public final AppEngineRule appEngine = AppEngineRule.builder().withTaskQueue().build();
 
-  @Mock private DatastoreBackupService backupService;
+  private final DatastoreBackupService backupService = mock(DatastoreBackupService.class);
 
   private final FakeResponse response = new FakeResponse();
   private final FakeClock clock = new FakeClock(DateTime.parse("2014-08-01T01:02:03Z"));

javatests/google/registry/export/LoadSnapshotActionTest.java

@@ -26,6 +26,7 @@ import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
 import static org.joda.time.DateTimeZone.UTC;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -54,12 +55,11 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
 
 /** Unit tests for {@link LoadSnapshotAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class LoadSnapshotActionTest {
 
   @Rule
@@ -70,26 +70,14 @@ public class LoadSnapshotActionTest {
   @Rule
   public final ExceptionRule thrown = new ExceptionRule();
 
-  @Mock
+  private final BigqueryFactory bigqueryFactory = mock(BigqueryFactory.class);
-  private BigqueryFactory bigqueryFactory;
+  private final Bigquery bigquery = mock(Bigquery.class);
-
+  private final Bigquery.Jobs bigqueryJobs = mock(Bigquery.Jobs.class);
-  @Mock
+  private final Bigquery.Jobs.Insert bigqueryJobsInsert = mock(Bigquery.Jobs.Insert.class);
-  private Bigquery bigquery;
+  private final Bigquery.Datasets bigqueryDatasets = mock(Bigquery.Datasets.class);
-
+  private final Bigquery.Datasets.Insert bigqueryDatasetsInsert =
-  @Mock
+      mock(Bigquery.Datasets.Insert.class);
-  private Bigquery.Jobs bigqueryJobs;
+  private final BigqueryPollJobEnqueuer bigqueryPollEnqueuer = mock(BigqueryPollJobEnqueuer.class);
-
-  @Mock
-  private Bigquery.Jobs.Insert bigqueryJobsInsert;
-
-  @Mock
-  private Bigquery.Datasets bigqueryDatasets;
-
-  @Mock
-  private Bigquery.Datasets.Insert bigqueryDatasetsInsert;
-
-  @Mock
-  private BigqueryPollJobEnqueuer bigqueryPollEnqueuer;
 
   private FakeClock clock = new FakeClock(new DateTime(1391096117045L, UTC));
   private LoadSnapshotAction action;

javatests/google/registry/export/PublishDetailReportActionTest.java

@@ -23,6 +23,7 @@ import static google.registry.testing.DatastoreHelper.persistResource;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -46,11 +47,10 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
+import org.junit.runners.JUnit4;
-import org.mockito.runners.MockitoJUnitRunner;
 
 /** Unit tests for {@link PublishDetailReportAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class PublishDetailReportActionTest {
 
   @Rule
@@ -61,8 +61,7 @@ public class PublishDetailReportActionTest {
       .withDatastore()
       .build();
 
-  @Mock
+  private final DriveConnection driveConnection = mock(DriveConnection.class);
-  private DriveConnection driveConnection;
 
   private final PublishDetailReportAction action = new PublishDetailReportAction();
   private final GcsService gcsService = GcsServiceFactory.createGcsService();

javatests/google/registry/export/SyncGroupMembersActionTest.java

@@ -26,6 +26,7 @@ import static javax.servlet.http.HttpServletResponse.SC_OK;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -48,8 +49,7 @@ import java.io.IOException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
+import org.junit.runners.JUnit4;
-import org.mockito.runners.MockitoJUnitRunner;
 
 /**
  * Unit tests for {@link SyncGroupMembersAction}.
@@ -57,7 +57,7 @@ import org.mockito.runners.MockitoJUnitRunner;
  * <p>Note that this relies on the registrars NewRegistrar and TheRegistrar created by default in
  * {@link AppEngineRule}.
  */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class SyncGroupMembersActionTest {
 
   @Rule
@@ -71,11 +71,8 @@ public class SyncGroupMembersActionTest {
   @Rule
   public final InjectRule inject = new InjectRule();
 
-  @Mock
+  private final DirectoryGroupsConnection connection = mock(DirectoryGroupsConnection.class);
-  private DirectoryGroupsConnection connection;
+  private final Response response = mock(Response.class);
-
-  @Mock
-  private Response response;
 
   private void runAction() {
     SyncGroupMembersAction action = new SyncGroupMembersAction();

javatests/google/registry/export/UpdateSnapshotViewActionTest.java

@@ -25,6 +25,7 @@ import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -41,12 +42,11 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
 
 /** Unit tests for {@link UpdateSnapshotViewAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class UpdateSnapshotViewActionTest {
 
   @Rule
@@ -57,23 +57,13 @@ public class UpdateSnapshotViewActionTest {
   @Rule
   public final ExceptionRule thrown = new ExceptionRule();
 
-  @Mock
+  private final BigqueryFactory bigqueryFactory = mock(BigqueryFactory.class);
-  private BigqueryFactory bigqueryFactory;
+  private final Bigquery bigquery = mock(Bigquery.class);
-
+  private final Bigquery.Datasets bigqueryDatasets = mock(Bigquery.Datasets.class);
-  @Mock
+  private final Bigquery.Datasets.Insert bigqueryDatasetsInsert =
-  private Bigquery bigquery;
+      mock(Bigquery.Datasets.Insert.class);
-
+  private final Bigquery.Tables bigqueryTables = mock(Bigquery.Tables.class);
-  @Mock
+  private final Bigquery.Tables.Update bigqueryTablesUpdate = mock(Bigquery.Tables.Update.class);
-  private Bigquery.Datasets bigqueryDatasets;
-
-  @Mock
-  private Bigquery.Datasets.Insert bigqueryDatasetsInsert;
-
-  @Mock
-  private Bigquery.Tables bigqueryTables;
-
-  @Mock
-  private Bigquery.Tables.Update bigqueryTablesUpdate;
 
   private UpdateSnapshotViewAction action;
 

javatests/google/registry/util/CollectionUtilsTest.java

@@ -26,10 +26,10 @@ import java.util.Map;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.runners.JUnit4;
 
 /** Unit tests for {@link CollectionUtils} */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class CollectionUtilsTest {
 
   @Rule

javatests/google/registry/util/ComparingInvocationHandlerTest.java

@@ -16,21 +16,19 @@ package google.registry.util;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-
 import javax.annotation.Nullable;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
+import org.junit.runners.JUnit4;
-import org.mockito.runners.MockitoJUnitRunner;
 
 /** Unit tests for {@link ComparingInvocationHandler}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class ComparingInvocationHandlerTest {
 
   static class Dummy {
@@ -106,8 +104,8 @@ public class ComparingInvocationHandlerTest {
   private static final String ACTUAL_RESULT = "actual result";
   private static final String SECOND_RESULT = "second result";
 
-  @Mock MyInterface myActualMock;
+  private final MyInterface myActualMock = mock(MyInterface.class);
-  @Mock MyInterface mySecondMock;
+  private final MyInterface mySecondMock = mock(MyInterface.class);
   private MyInterfaceComparingInvocationHandler invocationHandler;
 
   @Before public void setUp() {