Remove backported MockitoJUnitRule

Mockito in third_party is updated to 1.10. We do not need to backport this rule anymore.

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

gradle/core/gradle/dependency-locks/testCompile.lockfile

@@ -189,7 +189,7 @@ org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest-library:1.3
 org.joda:joda-money:0.10.0
 org.json:json:20160810
-org.mockito:mockito-all:1.9.5
+org.mockito:mockito-all:1.10.19
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.mortbay.jetty:servlet-api:2.5-20081211

gradle/core/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -184,7 +184,7 @@ org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest-library:1.3
 org.joda:joda-money:0.10.0
 org.json:json:20160810
-org.mockito:mockito-all:1.9.5
+org.mockito:mockito-all:1.10.19
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.mortbay.jetty:servlet-api:2.5-20081211

gradle/core/gradle/dependency-locks/testRuntime.lockfile

@@ -196,7 +196,7 @@ org.hamcrest:hamcrest-library:1.3
 org.joda:joda-money:0.10.0
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.7.8
-org.mockito:mockito-all:1.9.5
+org.mockito:mockito-all:1.10.19
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.mortbay.jetty:servlet-api:2.5-20081211

gradle/core/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -196,7 +196,7 @@ org.hamcrest:hamcrest-library:1.3
 org.joda:joda-money:0.10.0
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.7.8
-org.mockito:mockito-all:1.9.5
+org.mockito:mockito-all:1.10.19
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.mortbay.jetty:servlet-api:2.5-20081211

gradle/dependencies.gradle

@@ -136,7 +136,7 @@ ext {
       'org.joda:joda-money:0.10.0',
       'org.json:json:20160810',
       'org.khronos:opengl-api:gl1.1-android-2.1_r1',
-      'org.mockito:mockito-all:1.9.5',
+      'org.mockito:mockito-all:1.10.19',
       'org.mortbay.jetty:jetty:6.1.26',
       'org.mortbay.jetty:jetty-util:6.1.26',
       'org.mortbay.jetty:servlet-api:2.5-20081211',

gradle/proxy/gradle/dependency-locks/testCompile.lockfile

@@ -196,7 +196,7 @@ org.hamcrest:hamcrest-library:1.3
 org.joda:joda-money:0.10.0
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.7.8
-org.mockito:mockito-all:1.9.5
+org.mockito:mockito-all:1.10.19
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.mortbay.jetty:servlet-api:2.5-20081211

gradle/proxy/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -191,7 +191,7 @@ org.hamcrest:hamcrest-library:1.3
 org.joda:joda-money:0.10.0
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.7.8
-org.mockito:mockito-all:1.9.5
+org.mockito:mockito-all:1.10.19
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.mortbay.jetty:servlet-api:2.5-20081211

gradle/proxy/gradle/dependency-locks/testRuntime.lockfile

@@ -196,7 +196,7 @@ org.hamcrest:hamcrest-library:1.3
 org.joda:joda-money:0.10.0
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.7.8
-org.mockito:mockito-all:1.9.5
+org.mockito:mockito-all:1.10.19
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.mortbay.jetty:servlet-api:2.5-20081211

gradle/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -196,7 +196,7 @@ org.hamcrest:hamcrest-library:1.3
 org.joda:joda-money:0.10.0
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.7.8
-org.mockito:mockito-all:1.9.5
+org.mockito:mockito-all:1.10.19
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.mortbay.jetty:servlet-api:2.5-20081211

gradle/util/gradle/dependency-locks/testCompile.lockfile

@@ -196,7 +196,7 @@ org.hamcrest:hamcrest-library:1.3
 org.joda:joda-money:0.10.0
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.7.8
-org.mockito:mockito-all:1.9.5
+org.mockito:mockito-all:1.10.19
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.mortbay.jetty:servlet-api:2.5-20081211

gradle/util/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -191,7 +191,7 @@ org.hamcrest:hamcrest-library:1.3
 org.joda:joda-money:0.10.0
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.7.8
-org.mockito:mockito-all:1.9.5
+org.mockito:mockito-all:1.10.19
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.mortbay.jetty:servlet-api:2.5-20081211

gradle/util/gradle/dependency-locks/testRuntime.lockfile

@@ -196,7 +196,7 @@ org.hamcrest:hamcrest-library:1.3
 org.joda:joda-money:0.10.0
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.7.8
-org.mockito:mockito-all:1.9.5
+org.mockito:mockito-all:1.10.19
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.mortbay.jetty:servlet-api:2.5-20081211

gradle/util/gradle/dependency-locks/testRuntimeClasspath.lockfile

@@ -196,7 +196,7 @@ org.hamcrest:hamcrest-library:1.3
 org.joda:joda-money:0.10.0
 org.json:json:20160810
 org.jvnet.staxex:stax-ex:1.7.8
-org.mockito:mockito-all:1.9.5
+org.mockito:mockito-all:1.10.19
 org.mortbay.jetty:jetty-util:6.1.26
 org.mortbay.jetty:jetty:6.1.26
 org.mortbay.jetty:servlet-api:2.5-20081211

java/google/registry/repositories.bzl

@@ -2498,10 +2498,10 @@ def org_khronos_opengl_api():
 def org_mockito_all():
     java_import_external(
         name = "org_mockito_all",
-        jar_sha256 = "b2a63307d1dce3aa1623fdaacb2327a4cd7795b0066f31bf542b1e8f2683239e",
+        jar_sha256 = "d1a7a7ef14b3db5c0fc3e0a63a81b374b510afe85add9f7984b97911f4c70605",
         jar_urls = [
-            "http://maven.ibiblio.org/maven2/org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.jar",
-            "http://repo1.maven.org/maven2/org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.jar",
+            "http://maven.ibiblio.org/maven2/org/mockito/mockito-all/1.10.19/mockito-all-1.10.19.jar",
+            "http://repo1.maven.org/maven2/org/mockito/mockito-all/1.10.19/mockito-all-1.10.19.jar",
         ],
         licenses = ["notice"],  # The MIT License
         testonly_ = True,

javatests/google/registry/batch/AsyncTaskEnqueuerTest.java

@@ -39,7 +39,6 @@ import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeSleeper;
 import google.registry.testing.InjectRule;
-import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.ShardableTestCase;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.util.AppEngineServiceUtils;
@@ -53,6 +52,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /** Unit tests for {@link AsyncTaskEnqueuer}. */
 @RunWith(JUnit4.class)
@@ -64,7 +65,7 @@ public class AsyncTaskEnqueuerTest extends ShardableTestCase {
 
   @Rule public final InjectRule inject = new InjectRule();
 
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   @Mock private AppEngineServiceUtils appEngineServiceUtils;
 

javatests/google/registry/batch/ResaveEntityActionTest.java

@@ -49,7 +49,6 @@ import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeSleeper;
 import google.registry.testing.InjectRule;
-import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.ShardableTestCase;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.util.AppEngineServiceUtils;
@@ -62,6 +61,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /** Unit tests for {@link ResaveEntityAction}. */
 @RunWith(JUnit4.class)
@@ -72,7 +73,7 @@ public class ResaveEntityActionTest extends ShardableTestCase {
       AppEngineRule.builder().withDatastore().withTaskQueue().build();
 
   @Rule public final InjectRule inject = new InjectRule();
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   @Mock private AppEngineServiceUtils appEngineServiceUtils;
   @Mock private Response response;

javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java

@@ -45,7 +45,6 @@ import google.registry.model.domain.secdns.DelegationSignerData;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.host.HostResource;
 import google.registry.testing.AppEngineRule;
-import google.registry.testing.MockitoJUnitRule;
 import google.registry.util.Retrier;
 import google.registry.util.SystemClock;
 import google.registry.util.SystemSleeper;
@@ -63,13 +62,15 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Matchers;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /** Test case for {@link CloudDnsWriter}. */
 @RunWith(JUnit4.class)
 public class CloudDnsWriterTest {
 
   @Rule public final AppEngineRule appEngine = AppEngineRule.builder().withDatastore().build();
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   private static final Inet4Address IPv4 = (Inet4Address) InetAddresses.forString("127.0.0.1");
   private static final Inet6Address IPv6 = (Inet6Address) InetAddresses.forString("::1");

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

@@ -45,7 +45,6 @@ import google.registry.model.ofy.Ofy;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
-import google.registry.testing.MockitoJUnitRule;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
@@ -59,6 +58,8 @@ import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 import org.xbill.DNS.Flags;
 import org.xbill.DNS.Message;
 import org.xbill.DNS.Opcode;
@@ -77,7 +78,7 @@ public class DnsUpdateWriterTest {
   public final AppEngineRule appEngine =
       AppEngineRule.builder().withDatastore().withTaskQueue().build();
 
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
   @Rule public final InjectRule inject = new InjectRule();
 
   @Mock private DnsMessageTransport mockResolver;

javatests/google/registry/export/BackupDatastoreActionTest.java

@@ -26,7 +26,6 @@ import google.registry.export.datastore.DatastoreAdmin.Export;
 import google.registry.export.datastore.Operation;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeResponse;
-import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import org.junit.Before;
 import org.junit.Rule;
@@ -34,13 +33,15 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /** Unit tests for {@link BackupDatastoreAction}. */
 @RunWith(JUnit4.class)
 public class BackupDatastoreActionTest {
 
   @Rule public final AppEngineRule appEngine = AppEngineRule.builder().withTaskQueue().build();
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   @Mock private DatastoreAdmin datastoreAdmin;
   @Mock private Export exportRequest;

javatests/google/registry/export/CheckBackupActionTest.java

@@ -38,7 +38,6 @@ import google.registry.request.HttpException.NotModifiedException;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeResponse;
-import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.testing.TestDataHelper;
 import org.joda.time.DateTime;
@@ -49,6 +48,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /** Unit tests for {@link CheckBackupAction}. */
 @RunWith(JUnit4.class)
@@ -60,7 +61,7 @@ public class CheckBackupActionTest {
   static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
 
   @Rule public final AppEngineRule appEngine = AppEngineRule.builder().withTaskQueue().build();
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   @Mock private DatastoreAdmin datastoreAdmin;
   @Mock private Get getNotFoundBackupProgressRequest;

javatests/google/registry/export/datastore/DatastoreAdminTest.java

@@ -24,7 +24,6 @@ import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.common.collect.ImmutableList;
-import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.TestDataHelper;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -35,6 +34,8 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /** Unit tests for {@link DatastoreAdmin}. */
 @RunWith(JUnit4.class)
@@ -45,7 +46,7 @@ public class DatastoreAdminTest {
   private static final ImmutableList<String> KINDS =
       ImmutableList.of("Registry", "Registrar", "DomainBase");
 
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   private HttpTransport httpTransport;
   private GoogleCredential googleCredential;

javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java

@@ -42,7 +42,6 @@ import google.registry.testing.AppEngineRule;
 import google.registry.testing.DatastoreHelper;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
-import google.registry.testing.MockitoJUnitRule;
 import org.joda.time.DateTime;
 import org.junit.Before;
 import org.junit.Rule;
@@ -52,13 +51,15 @@ import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /** Unit tests for {@link SyncRegistrarsSheet}. */
 @RunWith(JUnit4.class)
 public class SyncRegistrarsSheetTest {
 
   @Rule public final AppEngineRule appEngine = AppEngineRule.builder().withDatastore().build();
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
   @Rule public final InjectRule inject = new InjectRule();
 
   @Captor private ArgumentCaptor<ImmutableList<ImmutableMap<String, String>>> rowsCaptor;

javatests/google/registry/flows/CheckApiActionTest.java

@@ -36,7 +36,6 @@ import google.registry.monitoring.whitebox.CheckApiMetric.Tier;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeResponse;
-import google.registry.testing.MockitoJUnitRule;
 import java.util.Map;
 import org.joda.time.DateTime;
 import org.json.simple.JSONValue;
@@ -48,6 +47,8 @@ import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /** Tests for {@link CheckApiAction}. */
 @RunWith(JUnit4.class)
@@ -56,7 +57,7 @@ public class CheckApiActionTest {
   private static final DateTime START_TIME = DateTime.parse("2000-01-01T00:00:00.0Z");
 
   @Rule public final AppEngineRule appEngine = AppEngineRule.builder().withDatastore().build();
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   @Mock private CheckApiMetrics checkApiMetrics;
   @Captor private ArgumentCaptor<CheckApiMetric> metricCaptor;

javatests/google/registry/flows/EppControllerTest.java

@@ -42,7 +42,6 @@ import google.registry.model.eppoutput.Result.Code;
 import google.registry.monitoring.whitebox.EppMetric;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
-import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.ShardableTestCase;
 import google.registry.util.Clock;
 import google.registry.xml.ValidationMode;
@@ -60,13 +59,15 @@ import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Matchers;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /** Unit tests for {@link EppController}. */
 @RunWith(JUnit4.class)
 public class EppControllerTest extends ShardableTestCase {
 
   @Rule public AppEngineRule appEngineRule = new AppEngineRule.Builder().withDatastore().build();
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   @Mock SessionMetadata sessionMetadata;
   @Mock TransportCredentials transportCredentials;

javatests/google/registry/keyring/kms/KmsConnectionImplTest.java

@@ -36,7 +36,6 @@ import com.google.api.services.cloudkms.v1.model.KeyRing;
 import com.google.api.services.cloudkms.v1.model.UpdateCryptoKeyPrimaryVersionRequest;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeSleeper;
-import google.registry.testing.MockitoJUnitRule;
 import google.registry.util.Retrier;
 import java.io.ByteArrayInputStream;
 import org.junit.Before;
@@ -47,11 +46,13 @@ import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 @RunWith(JUnit4.class)
 public class KmsConnectionImplTest {
 
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   @Mock private CloudKMS kms;
   @Mock private CloudKMS.Projects kmsProjects;

javatests/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java

@@ -38,7 +38,6 @@ import google.registry.model.registrar.Registrar;
 import google.registry.request.auth.AuthenticatedRegistrarAccessor.RegistrarAccessDeniedException;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.InjectRule;
-import google.registry.testing.MockitoJUnitRule;
 import java.util.Optional;
 import java.util.logging.Level;
 import javax.servlet.http.HttpServletRequest;
@@ -50,6 +49,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /** Unit tests for {@link AuthenticatedRegistrarAccessor}. */
 @RunWith(JUnit4.class)
@@ -57,7 +58,7 @@ public class AuthenticatedRegistrarAccessorTest {
 
   @Rule public final AppEngineRule appEngine = AppEngineRule.builder().withDatastore().build();
   @Rule public final InjectRule inject = new InjectRule();
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   @Mock private HttpServletRequest req;
   @Mock private HttpServletResponse rsp;

javatests/google/registry/request/auth/LegacyAuthenticationMechanismTest.java

@@ -27,7 +27,6 @@ import com.google.appengine.api.users.UserService;
 import google.registry.security.XsrfTokenManager;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
-import google.registry.testing.MockitoJUnitRule;
 import javax.servlet.http.HttpServletRequest;
 import org.junit.After;
 import org.junit.Before;
@@ -36,6 +35,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 @RunWith(JUnit4.class)
 public final class LegacyAuthenticationMechanismTest {
@@ -46,7 +47,7 @@ public final class LegacyAuthenticationMechanismTest {
       .withDatastore()
       .build();
 
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   @Mock private UserService userService;
   @Mock private HttpServletRequest req;

javatests/google/registry/testing/MockitoJUnitRule.java

@@ -1,45 +0,0 @@
-// Copyright 2018 The Nomulus Authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package google.registry.testing;
-
-import org.junit.rules.MethodRule;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.Statement;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-
-/** A rule that initializes Mockito-annotated fields (e.g. mocks and captors). */
-// TODO(b/77815684): Replace with native version from Mockito v1.10 once we upgrade to that.
-public class MockitoJUnitRule implements MethodRule {
-
-  public static MockitoJUnitRule create() {
-    return new MockitoJUnitRule();
-  }
-
-  @Override
-  public Statement apply(Statement base, FrameworkMethod method, Object target) {
-    return new Statement() {
-      @Override
-      public void evaluate() throws Throwable {
-        MockitoAnnotations.initMocks(target);
-        try {
-          base.evaluate();
-        } finally {
-          Mockito.validateMockitoUsage();
-        }
-      }
-    };
-  }
-}

javatests/google/registry/testing/mapreduce/MapreduceTestCase.java

@@ -36,7 +36,6 @@ import com.google.common.flogger.FluentLogger;
 import google.registry.mapreduce.MapreduceRunner;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
-import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.ShardableTestCase;
 import google.registry.util.AppEngineServiceUtils;
 import google.registry.util.AppEngineServiceUtilsImpl;
@@ -55,6 +54,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.junit.Before;
 import org.junit.Rule;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /**
  * Base test class for mapreduces.
@@ -84,7 +85,7 @@ public abstract class MapreduceTestCase<T> extends ShardableTestCase {
       .withTaskQueue()
       .build();
 
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   AppEngineServiceUtils appEngineServiceUtils;
 

javatests/google/registry/tmch/NordnUploadActionTest.java

@@ -58,7 +58,6 @@ import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeSleeper;
 import google.registry.testing.InjectRule;
-import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.TaskQueueHelper.TaskMatcher;
 import google.registry.util.Retrier;
 import google.registry.util.TaskQueueUtils;
@@ -76,6 +75,8 @@ import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /** Unit tests for {@link NordnUploadAction}. */
 @RunWith(JUnit4.class)
@@ -97,7 +98,7 @@ public class NordnUploadActionTest {
   public final AppEngineRule appEngine =
       AppEngineRule.builder().withDatastore().withTaskQueue().build();
 
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
   @Rule public final InjectRule inject = new InjectRule();
 
   @Mock private URLFetchService fetchService;

javatests/google/registry/tmch/NordnVerifyActionTest.java

@@ -36,7 +36,6 @@ import google.registry.model.registry.Registry;
 import google.registry.request.HttpException.ConflictException;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeResponse;
-import google.registry.testing.MockitoJUnitRule;
 import java.net.URL;
 import java.util.Optional;
 import org.junit.Before;
@@ -47,6 +46,8 @@ import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /** Unit tests for {@link NordnVerifyAction}. */
 @RunWith(JUnit4.class)
@@ -80,7 +81,7 @@ public class NordnVerifyActionTest {
   public final AppEngineRule appEngine =
       AppEngineRule.builder().withDatastore().withTaskQueue().build();
 
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   @Mock private URLFetchService fetchService;
   @Mock private HTTPResponse httpResponse;

javatests/google/registry/tmch/TmchActionTestCase.java

@@ -24,7 +24,6 @@ import com.google.appengine.api.urlfetch.URLFetchService;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.BouncyCastleProviderRule;
 import google.registry.testing.FakeClock;
-import google.registry.testing.MockitoJUnitRule;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
@@ -32,6 +31,8 @@ import org.junit.runners.JUnit4;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /** Common code for unit tests of classes that extend {@link Marksdb}. */
 @RunWith(JUnit4.class)
@@ -41,7 +42,7 @@ public class TmchActionTestCase {
   static final String MARKSDB_URL = "http://127.0.0.1/love";
 
   @Rule public final AppEngineRule appEngine = AppEngineRule.builder().withDatastore().build();
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
   @Rule public final BouncyCastleProviderRule bouncy = new BouncyCastleProviderRule();
 
   @Mock URLFetchService fetchService;

javatests/google/registry/tools/AppEngineConnectionTest.java

@@ -24,7 +24,6 @@ import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.MediaType;
-import google.registry.testing.MockitoJUnitRule;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.HashMap;
@@ -34,11 +33,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 @RunWith(JUnit4.class)
 public final class AppEngineConnectionTest {
 
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   AppEngineConnection connection;
   TestHttpTransport httpTransport;

javatests/google/registry/tools/CommandTestCase.java

@@ -31,7 +31,6 @@ import com.google.common.reflect.TypeToken;
 import google.registry.model.poll.PollMessage;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.CertificateSamples;
-import google.registry.testing.MockitoJUnitRule;
 import google.registry.testing.SystemPropertyRule;
 import google.registry.tools.params.ParameterFactory;
 import java.io.ByteArrayOutputStream;
@@ -44,6 +43,8 @@ import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /**
  * Base class for all command tests.
@@ -64,7 +65,7 @@ public abstract class CommandTestCase<C extends Command> {
 
   @Rule public final SystemPropertyRule systemPropertyRule = new SystemPropertyRule();
 
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   @Rule
   public TemporaryFolder tmpDir = new TemporaryFolder();

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

@@ -39,7 +39,6 @@ import google.registry.testing.AppEngineRule;
 import google.registry.testing.DeterministicStringGenerator;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeResponse;
-import google.registry.testing.MockitoJUnitRule;
 import google.registry.ui.server.SendEmailUtils;
 import google.registry.util.SendEmailService;
 import java.util.Optional;
@@ -54,6 +53,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 @RunWith(JUnit4.class)
 public final class ConsoleOteSetupActionTest {
@@ -63,7 +64,7 @@ public final class ConsoleOteSetupActionTest {
       .withDatastore()
       .build();
 
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   private final FakeResponse response = new FakeResponse();
   private final ConsoleOteSetupAction action = new ConsoleOteSetupAction();

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

@@ -40,7 +40,6 @@ import google.registry.testing.AppEngineRule;
 import google.registry.testing.DeterministicStringGenerator;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeResponse;
-import google.registry.testing.MockitoJUnitRule;
 import google.registry.ui.server.SendEmailUtils;
 import google.registry.util.SendEmailService;
 import java.util.Optional;
@@ -56,6 +55,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 @RunWith(JUnit4.class)
 public final class ConsoleRegistrarCreatorActionTest {
@@ -65,7 +66,7 @@ public final class ConsoleRegistrarCreatorActionTest {
       .withDatastore()
       .build();
 
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   private final FakeResponse response = new FakeResponse();
   private final ConsoleRegistrarCreatorAction action = new ConsoleRegistrarCreatorAction();

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

@@ -40,7 +40,6 @@ import google.registry.request.auth.UserAuthInfo;
 import google.registry.testing.AppEngineRule;
 import google.registry.testing.FakeClock;
 import google.registry.testing.InjectRule;
-import google.registry.testing.MockitoJUnitRule;
 import google.registry.ui.server.SendEmailUtils;
 import google.registry.util.AppEngineServiceUtils;
 import google.registry.util.SendEmailService;
@@ -59,6 +58,8 @@ import org.junit.Rule;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /** Base class for tests using {@link RegistrarSettingsAction}. */
 @RunWith(JUnit4.class)
@@ -71,7 +72,7 @@ public class RegistrarSettingsActionTestCase {
       AppEngineRule.builder().withDatastore().withTaskQueue().build();
 
   @Rule public final InjectRule inject = new InjectRule();
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   @Mock AppEngineServiceUtils appEngineServiceUtils;
   @Mock HttpServletRequest req;

javatests/google/registry/util/AppEngineServiceUtilsImplTest.java

@@ -24,19 +24,20 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import com.google.appengine.api.modules.ModulesService;
-import google.registry.testing.MockitoJUnitRule;
 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.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 
 /** Unit tests for {@link AppEngineServiceUtilsImpl}. */
 @RunWith(JUnit4.class)
 public class AppEngineServiceUtilsImplTest {
 
-  @Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
+  @Rule public final MockitoRule mocks = MockitoJUnit.rule();
 
   @Mock private ModulesService modulesService;