Remove some unnecessary uses of MockitoJUnitRunner, which is discouraged

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

javatests/google/registry/security/JsonHttpTest.java

@@ -20,6 +20,7 @@ import static com.google.common.net.MediaType.JSON_UTF_8;
 import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
 import static com.google.common.truth.Truth.assertThat;
 import static java.nio.charset.StandardCharsets.UTF_16;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
@@ -33,18 +34,14 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 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 JsonHttp}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class JsonHttpTest {
 
-  @Mock
-  HttpServletRequest req;
-
-  @Mock
-  HttpServletResponse rsp;
+  private final HttpServletRequest req = mock(HttpServletRequest.class);
+  private final HttpServletResponse rsp = mock(HttpServletResponse.class);
 
   @Test
   public void testRead_postMethod_works() throws Exception {

javatests/google/registry/security/XsrfTokenManagerTest.java

@@ -28,10 +28,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;
 
 /** Tests for {@link XsrfTokenManager}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class XsrfTokenManagerTest {
 
   @Rule

javatests/google/registry/storage/drive/DriveConnectionTest.java

@@ -19,6 +19,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.argThat;
 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;
@@ -40,34 +41,22 @@ 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.ArgumentMatcher;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
 
 /** Tests for {@link DriveConnection}.*/
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class DriveConnectionTest {
 
   @Rule
   public final ExceptionRule thrown = new ExceptionRule();
 
-  @Mock
-  Drive drive;
-
-  @Mock
-  Files files;
-
-  @Mock
-  Children children;
-
-  @Mock
-  Files.Insert insert;
-
-  @Mock
-  Files.Update update;
-
-  @Mock
-  Children.List childrenList;
+  private final Drive drive = mock(Drive.class);
+  private final Files files = mock(Files.class);
+  private final Children children = mock(Children.class);
+  private final Files.Insert insert = mock(Files.Insert.class);
+  private final Files.Update update = mock(Files.Update.class);
+  private final Children.List childrenList = mock(Children.List.class);
 
   private static final byte[] DATA = {1, 2, 3};
   ChildList childList;

javatests/google/registry/tmch/LordnTaskTest.java

@@ -51,10 +51,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 LordnTask}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class LordnTaskTest {
 
   private static final Clock clock = new FakeClock(DateTime.parse("2010-05-01T10:11:12Z"));

javatests/google/registry/tools/MutatingCommandTest.java

@@ -33,10 +33,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 MutatingCommand}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class MutatingCommandTest {
 
   @Rule

javatests/google/registry/tools/server/CreateGroupsActionTest.java

@@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -33,13 +34,12 @@ import google.registry.testing.InjectRule;
 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 CreateGroupsAction}.
  */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class CreateGroupsActionTest {
 
   @Rule
@@ -53,11 +53,8 @@ public class CreateGroupsActionTest {
   @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(String clientId) {
     CreateGroupsAction action = new CreateGroupsAction();

javatests/google/registry/tools/server/DeleteEntityActionTest.java

@@ -30,10 +30,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 DeleteEntityAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class DeleteEntityActionTest {
 
   @Rule

javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java

@@ -16,6 +16,7 @@ package google.registry.ui.server.registrar;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.google.appengine.api.users.UserServiceFactory;
@@ -30,11 +31,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 ConsoleUiAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class ConsoleUiActionTest {
 
   @Rule
@@ -43,8 +43,7 @@ public class ConsoleUiActionTest {
       .withUserService(UserInfo.create("marla.singer@example.com", "12345"))
       .build();
 
-  @Mock
-  private SessionUtils sessionUtils;
+  private final SessionUtils sessionUtils = mock(SessionUtils.class);
 
   private final FakeResponse response = new FakeResponse();
   private final ConsoleUiAction action = new ConsoleUiAction();

javatests/google/registry/ui/server/registrar/ContactSettingsTest.java

@@ -29,7 +29,7 @@ import java.util.List;
 import java.util.Map;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.runners.JUnit4;
 
 /**
  * Unit tests for contact_settings.js use of {@link RegistrarSettingsAction}.
@@ -37,7 +37,7 @@ import org.mockito.runners.MockitoJUnitRunner;
  * <p>The default read and session validation tests are handled by the
  * superclass.
  */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class ContactSettingsTest extends RegistrarSettingsActionTestCase {
 
   @Test

javatests/google/registry/ui/server/registrar/RegistrarPaymentSetupActionTest.java

@@ -17,6 +17,7 @@ package google.registry.ui.server.registrar;
 import static com.google.common.truth.Truth.assertThat;
 import static java.util.Arrays.asList;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -31,11 +32,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;
 
 /** Tests for {@link RegistrarPaymentSetupAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class RegistrarPaymentSetupActionTest {
 
   @Rule
@@ -43,14 +43,9 @@ public class RegistrarPaymentSetupActionTest {
       .withDatastore()
       .build();
 
-  @Mock
-  private BraintreeGateway braintreeGateway;
-
-  @Mock
-  private ClientTokenGateway clientTokenGateway;
-
-  @Mock
-  private BraintreeRegistrarSyncer customerSyncer;
+  private final BraintreeGateway braintreeGateway = mock(BraintreeGateway.class);
+  private final ClientTokenGateway clientTokenGateway = mock(ClientTokenGateway.class);
+  private final BraintreeRegistrarSyncer customerSyncer = mock(BraintreeRegistrarSyncer.class);
 
   private final RegistrarPaymentSetupAction action = new RegistrarPaymentSetupAction();
 

javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java

@@ -32,10 +32,10 @@ import java.util.Map;
 import javax.mail.internet.InternetAddress;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.runners.JUnit4;
 
 /** Tests for {@link RegistrarSettingsAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class RegistrarSettingsActionTest extends RegistrarSettingsActionTestCase {
 
   @Test

javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java

@@ -19,6 +19,7 @@ import static google.registry.config.RegistryConfig.getGSuiteOutgoingEmailDispla
 import static google.registry.security.JsonHttpTestUtils.createJsonPayload;
 import static google.registry.security.JsonHttpTestUtils.createJsonResponseSupplier;
 import static google.registry.util.ResourceUtils.readResourceUtf8;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import com.google.appengine.api.modules.ModulesService;
@@ -50,11 +51,10 @@ import org.json.simple.parser.ParseException;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.runners.JUnit4;
 
 /** Base class for tests using {@link RegistrarSettingsAction}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class RegistrarSettingsActionTestCase {
 
   static final String CLIENT_ID = "TheRegistrar";
@@ -68,20 +68,11 @@ public class RegistrarSettingsActionTestCase {
   @Rule
   public final InjectRule inject = new InjectRule();
 
-  @Mock
-  HttpServletRequest req;
-
-  @Mock
-  HttpServletResponse rsp;
-
-  @Mock
-  SendEmailService emailService;
-
-  @Mock
-  ModulesService modulesService;
-
-  @Mock
-  SessionUtils sessionUtils;
+  final HttpServletRequest req = mock(HttpServletRequest.class);
+  final HttpServletResponse rsp = mock(HttpServletResponse.class);
+  final SendEmailService emailService = mock(SendEmailService.class);
+  final ModulesService modulesService = mock(ModulesService.class);
+  final SessionUtils sessionUtils = mock(SessionUtils.class);
 
   Message message;
 

javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java

@@ -29,7 +29,7 @@ import google.registry.model.registrar.Registrar;
 import java.util.Map;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.runners.JUnit4;
 
 /**
  * Unit tests for security_settings.js use of {@link RegistrarSettingsAction}.
@@ -37,7 +37,7 @@ import org.mockito.runners.MockitoJUnitRunner;
  * <p>The default read and session validation tests are handled by the
  * superclass.
  */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class SecuritySettingsTest extends RegistrarSettingsActionTestCase {
 
   @Test

javatests/google/registry/ui/server/registrar/SendEmailUtilsTest.java

@@ -19,6 +19,7 @@ import static google.registry.config.RegistryConfig.getGSuiteOutgoingEmailAddres
 import static google.registry.config.RegistryConfig.getGSuiteOutgoingEmailDisplayName;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -38,11 +39,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 SendEmailUtils}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class SendEmailUtilsTest {
 
   @Rule
@@ -51,8 +51,7 @@ public class SendEmailUtilsTest {
   @Rule
   public final InjectRule inject = new InjectRule();
 
-  @Mock
-  private SendEmailService emailService;
+  private final SendEmailService emailService = mock(SendEmailService.class);
 
   private Message message;
   private SendEmailUtils sendEmailUtils;

javatests/google/registry/ui/server/registrar/SessionUtilsTest.java

@@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static google.registry.testing.AppEngineRule.THE_REGISTRAR_GAE_USER_ID;
 import static google.registry.testing.DatastoreHelper.deleteResource;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
@@ -37,11 +38,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 SessionUtils}. */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class SessionUtilsTest {
 
   @Rule
@@ -55,17 +55,10 @@ public class SessionUtilsTest {
   @Rule
   public final InjectRule inject = new InjectRule();
 
-  @Mock
-  private UserService userService;
-
-  @Mock
-  private HttpServletRequest req;
-
-  @Mock
-  private HttpServletResponse rsp;
-
-  @Mock
-  private HttpSession session;
+  private final UserService userService = mock(UserService.class);
+  private final HttpServletRequest req = mock(HttpServletRequest.class);
+  private final HttpServletResponse rsp = mock(HttpServletResponse.class);
+  private final HttpSession session = mock(HttpSession.class);
 
   private SessionUtils sessionUtils;
   private final User jart = new User("jart@google.com", "google.com", THE_REGISTRAR_GAE_USER_ID);

javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java

@@ -25,14 +25,14 @@ import google.registry.model.registrar.RegistrarAddress;
 import java.util.Map;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.runners.JUnit4;
 
 /**
  * Unit tests for security_settings.js use of {@link RegistrarSettingsAction}.
  *
  * <p>The default read and session validation tests are handled by the superclass.
  */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(JUnit4.class)
 public class WhoisSettingsTest extends RegistrarSettingsActionTestCase {
 
   @Test