Remove some unnecessary uses of MockitoJUnitRunner, which is discouraged

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=153589104
This commit is contained in:
mountford 2017-04-19 08:23:08 -07:00 committed by Ben McIlwain
parent fb25b625f3
commit d35be27b65
17 changed files with 97 additions and 152 deletions

View file

@ -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.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** 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;
CommitLogCheckpointStrategy strategy = mock(CommitLogCheckpointStrategy.class);
DateTime now = DateTime.now(UTC);
CommitLogCheckpointAction task = new CommitLogCheckpointAction();

View file

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

View file

@ -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 Bigquery bigquery;
@Mock
private Bigquery.Tabledata bigqueryTableData;
@Mock
private Bigquery.Tabledata.InsertAll bigqueryInsertAll;
@Mock
private BigqueryFactory bigqueryFactory;
@Mock
private VerifyEntityIntegrityStreamerFactory streamerFactory;
private final Bigquery bigquery = mock(Bigquery.class);
private final Bigquery.Tabledata bigqueryTableData = mock(Bigquery.Tabledata.class);
private final Bigquery.Tabledata.InsertAll bigqueryInsertAll =
mock(Bigquery.Tabledata.InsertAll.class);
private final BigqueryFactory bigqueryFactory = mock(BigqueryFactory.class);
private final VerifyEntityIntegrityStreamerFactory streamerFactory =
mock(VerifyEntityIntegrityStreamerFactory.class);
@Before
public void before() throws Exception {

View file

@ -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 BigqueryFactory.Subfactory subfactory;
@Mock
private Bigquery bigquery;
@Mock
private Bigquery.Datasets bigqueryDatasets;
@Mock
private Bigquery.Datasets.Insert bigqueryDatasetsInsert;
@Mock
private Bigquery.Tables bigqueryTables;
@Mock
private Bigquery.Tables.Insert bigqueryTablesInsert;
private final BigqueryFactory.Subfactory subfactory = mock(BigqueryFactory.Subfactory.class);
private final Bigquery bigquery = mock(Bigquery.class);
private final Bigquery.Datasets bigqueryDatasets = mock(Bigquery.Datasets.class);
private final Bigquery.Datasets.Insert bigqueryDatasetsInsert =
mock(Bigquery.Datasets.Insert.class);
private final Bigquery.Tables bigqueryTables = mock(Bigquery.Tables.class);
private final Bigquery.Tables.Insert bigqueryTablesInsert = mock(Bigquery.Tables.Insert.class);
private BigqueryFactory factory;

View file

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

View file

@ -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.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
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 SocketFactory mockFactory;
@Mock
private Socket mockSocket;
private final SocketFactory mockFactory = mock(SocketFactory.class);
private final Socket mockSocket = mock(Socket.class);
private Message simpleQuery;
private Message expectedResponse;

View file

@ -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.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** 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;
@Mock Bigquery.Jobs bigqueryJobs;
@Mock Bigquery.Jobs.Get bigqueryJobsGet;
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 =
private static final String PROJECT_ID = "project_id";
private static final String JOB_ID = "job_id";
private static final String CHAINED_QUEUE_NAME = UpdateSnapshotViewAction.QUEUE;
private 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;
}
}

View file

@ -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.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** 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;

View file

@ -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.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** 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 ModulesService modulesService;
private final ModulesService modulesService = mock(ModulesService.class);
private static final DateTime START_TIME = DateTime.parse("2014-08-01T01:02:03Z");

View file

@ -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.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** 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 DriveConnection driveConnection;
@Mock
private Response response;
private final DriveConnection driveConnection = mock(DriveConnection.class);
private final Response response = mock(Response.class);
private void runAction(String tld) {
ExportReservedTermsAction action = new ExportReservedTermsAction();

View file

@ -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.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** 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"));

View file

@ -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 BigqueryFactory bigqueryFactory;
@Mock
private Bigquery bigquery;
@Mock
private Bigquery.Jobs bigqueryJobs;
@Mock
private Bigquery.Jobs.Insert bigqueryJobsInsert;
@Mock
private Bigquery.Datasets bigqueryDatasets;
@Mock
private Bigquery.Datasets.Insert bigqueryDatasetsInsert;
@Mock
private BigqueryPollJobEnqueuer bigqueryPollEnqueuer;
private final BigqueryFactory bigqueryFactory = mock(BigqueryFactory.class);
private final Bigquery bigquery = mock(Bigquery.class);
private final Bigquery.Jobs bigqueryJobs = mock(Bigquery.Jobs.class);
private final Bigquery.Jobs.Insert bigqueryJobsInsert = mock(Bigquery.Jobs.Insert.class);
private final Bigquery.Datasets bigqueryDatasets = mock(Bigquery.Datasets.class);
private final Bigquery.Datasets.Insert bigqueryDatasetsInsert =
mock(Bigquery.Datasets.Insert.class);
private final BigqueryPollJobEnqueuer bigqueryPollEnqueuer = mock(BigqueryPollJobEnqueuer.class);
private FakeClock clock = new FakeClock(new DateTime(1391096117045L, UTC));
private LoadSnapshotAction action;

View file

@ -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.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** 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 DriveConnection driveConnection;
private final DriveConnection driveConnection = mock(DriveConnection.class);
private final PublishDetailReportAction action = new PublishDetailReportAction();
private final GcsService gcsService = GcsServiceFactory.createGcsService();

View file

@ -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.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/**
* 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 DirectoryGroupsConnection connection;
@Mock
private Response response;
private final DirectoryGroupsConnection connection = mock(DirectoryGroupsConnection.class);
private final Response response = mock(Response.class);
private void runAction() {
SyncGroupMembersAction action = new SyncGroupMembersAction();

View file

@ -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 BigqueryFactory bigqueryFactory;
@Mock
private Bigquery bigquery;
@Mock
private Bigquery.Datasets bigqueryDatasets;
@Mock
private Bigquery.Datasets.Insert bigqueryDatasetsInsert;
@Mock
private Bigquery.Tables bigqueryTables;
@Mock
private Bigquery.Tables.Update bigqueryTablesUpdate;
private final BigqueryFactory bigqueryFactory = mock(BigqueryFactory.class);
private final Bigquery bigquery = mock(Bigquery.class);
private final Bigquery.Datasets bigqueryDatasets = mock(Bigquery.Datasets.class);
private final Bigquery.Datasets.Insert bigqueryDatasetsInsert =
mock(Bigquery.Datasets.Insert.class);
private final Bigquery.Tables bigqueryTables = mock(Bigquery.Tables.class);
private final Bigquery.Tables.Update bigqueryTablesUpdate = mock(Bigquery.Tables.Update.class);
private UpdateSnapshotViewAction action;

View file

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

View file

@ -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.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** 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;
@Mock MyInterface mySecondMock;
private final MyInterface myActualMock = mock(MyInterface.class);
private final MyInterface mySecondMock = mock(MyInterface.class);
private MyInterfaceComparingInvocationHandler invocationHandler;
@Before public void setUp() {