Remove some unnecessary uses of MockitoJUnitRunner, which is discouraged

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

javatests/google/registry/flows/FlowTestCase.java

@@ -64,14 +64,14 @@ import org.joda.time.DateTime;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.runners.JUnit4;
 
 /**
  * Base class for resource flow unit tests.
  *
  * @param <F> the flow type
  */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public abstract class FlowTestCase<F extends Flow> extends ShardableTestCase {
 
   /** Whether to actually write to Datastore or just simulate. */

javatests/google/registry/groups/DirectoryGroupsConnectionTest.java

@@ -22,6 +22,7 @@ import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
 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.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -53,50 +54,29 @@ 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 DirectoryGroupsConnection}.
  */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class DirectoryGroupsConnectionTest {
 
   @Rule
   public final ExceptionRule thrown = new ExceptionRule();
 
-  @Mock
+  private final Directory directory = mock(Directory.class);
-  private Directory directory;
+  private final Groupssettings groupsSettings = mock(Groupssettings.class);
-
+  private final Directory.Members members = mock(Directory.Members.class);
-  @Mock
+  private final Directory.Groups directoryGroups = mock(Directory.Groups.class);
-  private Groupssettings groupsSettings;
+  private final Groupssettings.Groups settingsGroups = mock(Groupssettings.Groups.class);
-
+  private final Directory.Members.Insert membersInsert = mock(Directory.Members.Insert.class);
-  @Mock
+  private final Directory.Groups.Insert groupsInsert = mock(Directory.Groups.Insert.class);
-  private Directory.Members members;
+  private final Directory.Groups.Get groupsGet = mock(Directory.Groups.Get.class);
-
+  private final Directory.Members.Get membersGet = mock(Directory.Members.Get.class);
-  @Mock
+  private final Directory.Members.List membersList = mock(Directory.Members.List.class);
-  private Directory.Groups directoryGroups;
+  private final Groupssettings.Groups.Patch groupsSettingsPatch =
-
+      mock(Groupssettings.Groups.Patch.class);
-  @Mock
-  private Groupssettings.Groups settingsGroups;
-
-  @Mock
-  private Directory.Members.Insert membersInsert;
-
-  @Mock
-  private Directory.Groups.Insert groupsInsert;
-
-  @Mock
-  private Directory.Groups.Get groupsGet;
-
-  @Mock
-  private Directory.Members.Get membersGet;
-
-  @Mock
-  private Directory.Members.List membersList;
-
-  @Mock
-  private Groupssettings.Groups.Patch groupsSettingsPatch;
 
   private DirectoryGroupsConnection connection;
   private Member expectedOwner = new Member();

javatests/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuerTest.java

@@ -18,6 +18,7 @@ import static com.google.appengine.api.taskqueue.QueueFactory.getQueue;
 import static google.registry.bigquery.BigqueryUtils.toBigqueryTimestamp;
 import static google.registry.monitoring.whitebox.BigQueryMetricsEnqueuer.QUEUE_BIGQUERY_STREAMING_METRICS;
 import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.google.api.services.bigquery.model.TableFieldSchema;
@@ -34,12 +35,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.Matchers;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
 
 /** Unit tests for {@link BigQueryMetricsEnqueuer}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class BigQueryMetricsEnqueuerTest {
 
   @Rule
@@ -52,7 +52,7 @@ public class BigQueryMetricsEnqueuerTest {
       .withTaskQueue()
       .build();
 
-  @Mock ModulesService modulesService;
+  private final ModulesService modulesService = mock(ModulesService.class);
 
   private BigQueryMetricsEnqueuer enqueuer;
 

javatests/google/registry/monitoring/whitebox/MetricsExportActionTest.java

@@ -16,6 +16,7 @@ package google.registry.monitoring.whitebox;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -37,7 +38,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
-import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 /** Unit tests for {@link MetricsExportAction}. */
@@ -50,17 +50,10 @@ public class MetricsExportActionTest {
       .withTaskQueue()
       .build();
 
-  @Mock
+  private final BigqueryFactory bigqueryFactory = mock(BigqueryFactory.class);
-  BigqueryFactory bigqueryFactory;
+  private final Bigquery bigquery = mock(Bigquery.class);
-
+  private final Tabledata tabledata = mock(Tabledata.class);
-  @Mock
+  private final InsertAll insertAll = mock(InsertAll.class);
-  Bigquery bigquery;
-
-  @Mock
-  Tabledata tabledata;
-
-  @Mock
-  InsertAll insertAll;
 
   private TableDataInsertAllResponse response = new TableDataInsertAllResponse();
   private long currentTimeMillis = 1000000000000L;

javatests/google/registry/rde/RdeUploadActionTest.java

@@ -89,11 +89,11 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.runners.JUnit4;
 import org.mockito.stubbing.OngoingStubbing;
 
 /** Unit tests for {@link RdeUploadAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class RdeUploadActionTest {
 
   private static final int BUFFER_SIZE = 64 * 1024;

javatests/google/registry/rde/imports/RdeContactImportActionTest.java

@@ -46,10 +46,10 @@ import org.joda.time.DateTime;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.runners.JUnit4;
 
 /** Unit tests for {@link RdeContactImportAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class RdeContactImportActionTest extends MapreduceTestCase<RdeContactImportAction> {
 
   private static final ByteSource DEPOSIT_1_CONTACT =

javatests/google/registry/rde/imports/RdeContactInputTest.java

@@ -33,10 +33,10 @@ import java.util.List;
 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 RdeContactInput} */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class RdeContactInputTest {
 
   private static final ByteSource DEPOSIT_0_CONTACT =

javatests/google/registry/rde/imports/RdeContactReaderTest.java

@@ -40,10 +40,10 @@ import java.util.NoSuchElementException;
 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 RdeContactReader} */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class RdeContactReaderTest {
 
   private static final ByteSource DEPOSIT_1_CONTACT =

javatests/google/registry/rde/imports/RdeDomainImportActionTest.java

@@ -60,10 +60,10 @@ import org.joda.time.Seconds;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.runners.JUnit4;
 
 /** Unit tests for {@link RdeDomainImportAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class RdeDomainImportActionTest extends MapreduceTestCase<RdeDomainImportAction> {
 
   private static final ByteSource DEPOSIT_1_DOMAIN = RdeImportsTestData.get("deposit_1_domain.xml");

javatests/google/registry/rde/imports/RdeHostImportActionTest.java

@@ -46,10 +46,10 @@ import org.joda.time.DateTime;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.runners.JUnit4;
 
 /** Unit tests for {@link RdeHostImportAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class RdeHostImportActionTest extends MapreduceTestCase<RdeHostImportAction> {
 
   private static final ByteSource DEPOSIT_1_HOST = RdeImportsTestData.get("deposit_1_host.xml");

javatests/google/registry/rde/imports/RdeHostReaderTest.java

@@ -40,10 +40,10 @@ import java.util.NoSuchElementException;
 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 RdeHostReader} */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class RdeHostReaderTest {
 
   private static final ByteSource DEPOSIT_1_HOST = RdeImportsTestData.get("deposit_1_host.xml");

javatests/google/registry/rde/imports/RdeImportUtilsTest.java

@@ -23,6 +23,7 @@ import static google.registry.testing.DatastoreHelper.persistResource;
 import static org.joda.time.DateTimeZone.UTC;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -61,11 +62,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 RdeImportUtils} */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class RdeImportUtilsTest extends ShardableTestCase {
 
   private static final ByteSource DEPOSIT_XML = RdeImportsTestData.get("deposit_full.xml");
@@ -84,8 +84,7 @@ public class RdeImportUtilsTest extends ShardableTestCase {
   @Rule
   public final ExceptionRule thrown = new ExceptionRule();
 
-  @Mock
+  private final GcsUtils gcsUtils = mock(GcsUtils.class);
-  private GcsUtils gcsUtils;
 
   private RdeImportUtils rdeImportUtils;
   private FakeClock clock;

javatests/google/registry/request/RequestHandlerTest.java

@@ -17,6 +17,7 @@ package google.registry.request;
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.request.Action.Method.GET;
 import static google.registry.request.Action.Method.POST;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.verifyZeroInteractions;
@@ -51,11 +52,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 RequestHandler}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public final class RequestHandlerTest {
 
   @Rule
@@ -221,23 +221,12 @@ public final class RequestHandlerTest {
     }
   }
 
-  @Mock
+  private final HttpServletRequest req = mock(HttpServletRequest.class);
-  private HttpServletRequest req;
+  private final HttpServletResponse rsp = mock(HttpServletResponse.class);
-
+  private final BumblebeeTask bumblebeeTask = mock(BumblebeeTask.class);
-  @Mock
+  private final SlothTask slothTask = mock(SlothTask.class);
-  private HttpServletResponse rsp;
+  private final UsersOnlyAction usersOnlyAction = mock(UsersOnlyAction.class);
-
+  private final SafeSlothTask safeSlothTask = mock(SafeSlothTask.class);
-  @Mock
-  private BumblebeeTask bumblebeeTask;
-
-  @Mock
-  private SlothTask slothTask;
-
-  @Mock
-  private UsersOnlyAction usersOnlyAction;
-
-  @Mock
-  private SafeSlothTask safeSlothTask;
 
   private final Component component = new Component();
   private final StringWriter httpOutput = new StringWriter();

javatests/google/registry/request/RequestParametersTest.java

@@ -21,6 +21,7 @@ import static google.registry.request.RequestParameters.extractOptionalDatetimeP
 import static google.registry.request.RequestParameters.extractOptionalParameter;
 import static google.registry.request.RequestParameters.extractRequiredDatetimeParameter;
 import static google.registry.request.RequestParameters.extractRequiredParameter;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.google.common.collect.ImmutableMap;
@@ -31,18 +32,16 @@ import org.joda.time.DateTime;
 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 RequestParameters}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class RequestParametersTest {
 
   @Rule
   public final ExceptionRule thrown = new ExceptionRule();
 
-  @Mock
+  private final HttpServletRequest req = mock(HttpServletRequest.class);
-  private HttpServletRequest req;
 
   @Test
   public void testExtractRequiredParameter_valuePresent_returnsValue() throws Exception {

javatests/google/registry/request/ResponseImplTest.java

@@ -16,6 +16,7 @@ package google.registry.request;
 
 import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
@@ -27,18 +28,16 @@ import javax.servlet.http.HttpServletResponse;
 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 ResponseImpl}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class ResponseImplTest {
 
   @Rule
   public final ExceptionRule thrown = new ExceptionRule();
 
-  @Mock
+  private final HttpServletResponse rsp = mock(HttpServletResponse.class);
-  private HttpServletResponse rsp;
 
   @Test
   public void testSetStatus() throws Exception {