Allow third_party/java_src/gtld/ to use :mockito2_for_third_party

In [] a change would have been made to your project that is incompatible with your open source integration. To make sure the open source variant of your project remains working, we have eagerly updated your open source copy to use Mockito 2. This CL integrates that change into []. Please read []and understand the consequences of this change. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=238445356
2025-07-22 18:55:58 +02:00 · 2019-03-14 08:16:18 -07:00 · 2019-03-14 08:16:18 -07:00 · 202ed9db6a
commit 202ed9db6a
parent 1a6c068471
70 changed files with 200 additions and 199 deletions
--- a/javatests/google/registry/backup/BUILD
+++ b/javatests/google/registry/backup/BUILD
@ -17,7 +17,6 @@ java_library(
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
        "//javatests/google/registry/testing/mapreduce",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_appengine_tools_appengine_gcs_client",
@ -29,6 +28,7 @@ java_library(
        "@com_google_truth_extensions_truth_java8_extension",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/batch/BUILD
+++ b/javatests/google/registry/batch/BUILD
@ -18,7 +18,6 @@ java_library(
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
        "//javatests/google/registry/testing/mapreduce",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_appengine_api_stubs",
@ -39,6 +38,7 @@ java_library(
        "@joda_time",
        "@junit",
        "@org_joda_money",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/beam/BUILD
+++ b/javatests/google/registry/beam/BUILD
@ -13,7 +13,6 @@ java_library(
    deps = [
        "//java/google/registry/beam",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_dagger",
        "@com_google_guava",
        "@com_google_truth",
@ -24,6 +23,7 @@ java_library(
        "@org_apache_beam_runners_google_cloud_dataflow_java",
        "@org_apache_beam_sdks_java_core",
        "@org_apache_beam_sdks_java_io_google_cloud_platform",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/beam/invoicing/BUILD
+++ b/javatests/google/registry/beam/invoicing/BUILD
@ -15,7 +15,6 @@ java_library(
        "//java/google/registry/beam/invoicing",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_apis_google_api_services_bigquery",
        "@com_google_dagger",
        "@com_google_guava",
@ -27,6 +26,7 @@ java_library(
        "@org_apache_beam_runners_google_cloud_dataflow_java",
        "@org_apache_beam_sdks_java_core",
        "@org_apache_beam_sdks_java_io_google_cloud_platform",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/beam/spec11/BUILD
+++ b/javatests/google/registry/beam/spec11/BUILD
@ -14,7 +14,6 @@ java_library(
        "//java/google/registry/beam/spec11",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_dagger",
        "@com_google_guava",
        "@com_google_truth",
@ -28,6 +27,7 @@ java_library(
        "@org_apache_httpcomponents_httpclient",
        "@org_apache_httpcomponents_httpcore",
        "@org_json",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/bigquery/BUILD
+++ b/javatests/google/registry/bigquery/BUILD
@ -15,7 +15,6 @@ java_library(
        "//java/google/registry/bigquery",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_apis_google_api_services_bigquery",
        "@com_google_guava",
        "@com_google_http_client",
@ -23,6 +22,7 @@ java_library(
        "@com_google_truth_extensions_truth_java8_extension",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/dns/BUILD
+++ b/javatests/google/registry/dns/BUILD
@ -22,7 +22,6 @@ java_library(
        "//java/google/registry/request/lock",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_appengine_api_stubs",
@ -33,6 +32,7 @@ java_library(
        "@javax_servlet_api",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/dns/writer/clouddns/BUILD
+++ b/javatests/google/registry/dns/writer/clouddns/BUILD
@ -15,7 +15,6 @@ java_library(
        "//java/google/registry/model",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_apis_google_api_services_dns",
        "@com_google_guava",
@ -23,6 +22,7 @@ java_library(
        "@com_google_truth_extensions_truth_java8_extension",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/dns/writer/dnsupdate/BUILD
+++ b/javatests/google/registry/dns/writer/dnsupdate/BUILD
@ -14,7 +14,6 @@ java_library(
        "//java/google/registry/dns/writer/dnsupdate",
        "//java/google/registry/model",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_dagger",
        "@com_google_guava",
@ -23,6 +22,7 @@ java_library(
        "@dnsjava",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/export/BUILD
+++ b/javatests/google/registry/export/BUILD
@ -27,7 +27,6 @@ java_library(
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
        "//javatests/google/registry/testing/mapreduce",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_api_client",
        "@com_google_apis_google_api_services_bigquery",
@ -47,6 +46,7 @@ java_library(
        "@javax_servlet_api",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/export/datastore/BUILD
+++ b/javatests/google/registry/export/datastore/BUILD
@ -15,7 +15,6 @@ java_library(
        "//java/google/registry/export/datastore",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_api_client",
        "@com_google_guava",
        "@com_google_http_client",
@ -24,6 +23,7 @@ java_library(
        "@com_google_truth_extensions_truth_java8_extension",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/export/sheet/BUILD
+++ b/javatests/google/registry/export/sheet/BUILD
@ -13,7 +13,6 @@ java_library(
        "//java/google/registry/export/sheet",
        "//java/google/registry/model",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_apis_google_api_services_sheets",
        "@com_google_code_findbugs_jsr305",
@ -23,6 +22,7 @@ java_library(
        "@joda_time",
        "@junit",
        "@org_joda_money",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/flows/BUILD
+++ b/javatests/google/registry/flows/BUILD
@ -40,7 +40,6 @@ java_library(
        "//javatests/google/registry/model",
        "//javatests/google/registry/testing",
        "//javatests/google/registry/xml",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_appengine_testing",
@ -61,6 +60,7 @@ java_library(
        "@joda_time",
        "@junit",
        "@org_joda_money",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/groups/BUILD
+++ b/javatests/google/registry/groups/BUILD
@ -13,7 +13,6 @@ java_library(
    deps = [
        "//java/google/registry/groups",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_api_client",
        "@com_google_apis_google_api_services_admin_directory",
        "@com_google_apis_google_api_services_groupssettings",
@ -27,6 +26,7 @@ java_library(
        "@com_google_truth_extensions_truth_java8_extension",
        "@javax_servlet_api",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/keyring/api/BUILD
+++ b/javatests/google/registry/keyring/api/BUILD
@ -13,7 +13,6 @@ java_library(
    deps = [
        "//java/google/registry/keyring/api",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_flogger",
        "@com_google_flogger_system_backend",
        "@com_google_guava_testlib",
@ -21,6 +20,7 @@ java_library(
        "@com_google_truth_extensions_truth_java8_extension",
        "@junit",
        "@org_bouncycastle_bcpg_jdk15on",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/keyring/kms/BUILD
+++ b/javatests/google/registry/keyring/kms/BUILD
@ -20,7 +20,6 @@ java_library(
        "//java/google/registry/model",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_api_client",
        "@com_google_apis_google_api_services_cloudkms",
@ -32,6 +31,7 @@ java_library(
        "@junit",
        "@org_bouncycastle_bcpg_jdk15on",
        "@org_bouncycastle_bcpkix_jdk15on",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/model/BUILD
+++ b/javatests/google/registry/model/BUILD
@ -28,7 +28,6 @@ java_library(
        "//java/google/registry/xml",
        "//javatests/google/registry/testing",
        "//javatests/google/registry/xml",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_appengine_testing",
@ -41,6 +40,7 @@ java_library(
        "@joda_time",
        "@junit",
        "@org_joda_money",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/module/backend/BUILD
+++ b/javatests/google/registry/module/backend/BUILD
@ -17,11 +17,11 @@ java_library(
        "//java/google/registry/module/backend",
        "//java/google/registry/request",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_truth",
        "@com_google_truth_extensions_truth_java8_extension",
        "@javax_servlet_api",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/module/frontend/BUILD
+++ b/javatests/google/registry/module/frontend/BUILD
@ -17,11 +17,11 @@ java_library(
        "//java/google/registry/module/frontend",
        "//java/google/registry/request",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_truth",
        "@com_google_truth_extensions_truth_java8_extension",
        "@javax_servlet_api",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/module/pubapi/BUILD
+++ b/javatests/google/registry/module/pubapi/BUILD
@ -17,11 +17,11 @@ java_library(
        "//java/google/registry/module/pubapi",
        "//java/google/registry/request",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_truth",
        "@com_google_truth_extensions_truth_java8_extension",
        "@javax_servlet_api",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/module/tools/BUILD
+++ b/javatests/google/registry/module/tools/BUILD
@ -17,11 +17,11 @@ java_library(
        "//java/google/registry/module/tools",
        "//java/google/registry/request",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_truth",
        "@com_google_truth_extensions_truth_java8_extension",
        "@javax_servlet_api",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/monitoring/whitebox/BUILD
+++ b/javatests/google/registry/monitoring/whitebox/BUILD
@ -16,7 +16,6 @@ java_library(
        "//java/google/registry/monitoring/whitebox",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_apis_google_api_services_bigquery",
        "@com_google_appengine_api_1_0_sdk",
@ -29,6 +28,7 @@ java_library(
        "@com_google_truth_extensions_truth_java8_extension",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/proxy/BUILD
+++ b/javatests/google/registry/proxy/BUILD
@ -21,7 +21,6 @@ java_library(
        "//java/google/registry/proxy",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_beust_jcommander",
        "@com_google_dagger",
        "@com_google_guava",
@ -39,6 +38,7 @@ java_library(
        "@joda_time",
        "@junit",
        "@org_bouncycastle_bcpkix_jdk15on",
+        "@org_mockito_core",
        "@org_yaml_snakeyaml",
    ],
 )
--- a/javatests/google/registry/rdap/BUILD
+++ b/javatests/google/registry/rdap/BUILD
@ -20,7 +20,6 @@ java_library(
        "//java/google/registry/ui/server/registrar",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_code_findbugs_jsr305",
@ -33,6 +32,7 @@ java_library(
        "@javax_servlet_api",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/rde/BUILD
+++ b/javatests/google/registry/rde/BUILD
@ -25,7 +25,6 @@ java_library(
        "//javatests/google/registry/testing/mapreduce",
        "//javatests/google/registry/testing/sftp",
        "//javatests/google/registry/xml",
-        "//third_party/java/mockito",
        "//third_party/jaxb",
        "//third_party/jsch/v0_1_53",
        "//third_party/objectify:objectify-v4_1",
@ -44,6 +43,7 @@ java_library(
        "@org_bouncycastle_bcpg_jdk15on",
        "@org_bouncycastle_bcpkix_jdk15on",
        "@org_joda_money",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/reporting/BUILD
+++ b/javatests/google/registry/reporting/BUILD
@ -16,7 +16,6 @@ java_library(
        "//java/google/registry/request",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_apis_google_api_services_bigquery",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_appengine_tools_appengine_gcs_client",
@ -27,6 +26,7 @@ java_library(
        "@javax_servlet_api",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/reporting/billing/BUILD
+++ b/javatests/google/registry/reporting/billing/BUILD
@ -16,7 +16,6 @@ java_library(
        "//java/google/registry/storage/drive",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_apis_google_api_services_dataflow",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_appengine_tools_appengine_gcs_client",
@ -31,6 +30,7 @@ java_library(
        "@org_apache_beam_runners_google_cloud_dataflow_java",
        "@org_apache_beam_sdks_java_core",
        "@org_apache_beam_sdks_java_io_google_cloud_platform",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/reporting/icann/BUILD
+++ b/javatests/google/registry/reporting/icann/BUILD
@ -18,7 +18,6 @@ java_library(
        "//java/google/registry/request",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_apis_google_api_services_bigquery",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_appengine_tools_appengine_gcs_client",
@ -30,6 +29,7 @@ java_library(
        "@javax_servlet_api",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/reporting/spec11/BUILD
+++ b/javatests/google/registry/reporting/spec11/BUILD
@ -18,7 +18,6 @@ java_library(
        "//java/google/registry/reporting/spec11/soy:soy_java_wrappers",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_apis_google_api_services_dataflow",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_appengine_tools_appengine_gcs_client",
@ -35,6 +34,7 @@ java_library(
        "@org_apache_beam_sdks_java_core",
        "@org_apache_beam_sdks_java_io_google_cloud_platform",
        "@org_json",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/request/BUILD
+++ b/javatests/google/registry/request/BUILD
@ -14,7 +14,6 @@ java_library(
        "//java/google/registry/request",
        "//java/google/registry/request/auth",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_guava",
        "@com_google_guava_testlib",
@ -25,6 +24,7 @@ java_library(
        "@javax_servlet_api",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/request/auth/BUILD
+++ b/javatests/google/registry/request/auth/BUILD
@ -17,7 +17,6 @@ java_library(
        "//java/google/registry/request/auth",
        "//java/google/registry/security",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_appengine_tools_appengine_gcs_client",
@ -31,6 +30,7 @@ java_library(
        "@com_google_truth_extensions_truth_java8_extension",
        "@javax_servlet_api",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/request/lock/BUILD
+++ b/javatests/google/registry/request/lock/BUILD
@ -16,7 +16,6 @@ java_library(
        "//java/google/registry/request/lock",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_appengine_tools_appengine_gcs_client",
@ -26,6 +25,7 @@ java_library(
        "@com_google_truth_extensions_truth_java8_extension",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/security/BUILD
+++ b/javatests/google/registry/security/BUILD
@ -17,7 +17,6 @@ java_library(
        "//java/google/registry/security",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_appengine_testing",
        "@com_google_guava",
@ -27,6 +26,7 @@ java_library(
        "@javax_servlet_api",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/storage/drive/BUILD
+++ b/javatests/google/registry/storage/drive/BUILD
@ -13,13 +13,13 @@ java_library(
    deps = [
        "//java/google/registry/storage/drive",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_apis_google_api_services_drive",
        "@com_google_guava",
        "@com_google_http_client",
        "@com_google_truth",
        "@com_google_truth_extensions_truth_java8_extension",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/storage/drive/DriveConnectionTest.java
+++ b/javatests/google/registry/storage/drive/DriveConnectionTest.java
@ -17,8 +17,9 @@ package google.registry.storage.drive;
 import static com.google.common.io.ByteStreams.toByteArray;
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.testing.JUnitBackports.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
 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;
@ -59,14 +60,11 @@ public class DriveConnectionTest {
  List<String> allChildren;

  private ArgumentMatcher<ByteArrayContent> hasByteArrayContent(final byte[] data) {
-    return new ArgumentMatcher<ByteArrayContent>() {
-      @Override
-      public boolean matches(Object arg) {
-        try {
-          return Arrays.equals(data, toByteArray(((ByteArrayContent) arg).getInputStream()));
-        } catch (Exception e) {
-          return false;
-        }
+    return arg -> {
+      try {
+        return Arrays.equals(data, toByteArray(arg.getInputStream()));
+      } catch (Exception e) {
+        return false;
      }
    };
  }
@ -97,28 +95,29 @@ public class DriveConnectionTest {
    when(childrenList.execute()).thenReturn(childList1, childList2);
    when(childrenList.setQ(anyString())).thenReturn(childrenList);
    when(childrenList.getPageToken()).thenCallRealMethod();
-    when(childrenList.setPageToken(anyString())).thenCallRealMethod();
+    when(childrenList.setPageToken(any())).thenCallRealMethod();
    when(children.list("driveFolderId")).thenReturn(childrenList);
  }

  @Test
  public void testCreateFileAtRoot() throws Exception {
    when(files.insert(
-        eq(new File().setTitle("title").setMimeType("image/gif")),
-        argThat(hasByteArrayContent(DATA))))
-            .thenReturn(insert);
+            eq(new File().setTitle("title").setMimeType("image/gif")),
+            argThat(hasByteArrayContent(DATA))))
+        .thenReturn(insert);
    assertThat(driveConnection.createFile("title", MediaType.GIF, null, DATA)).isEqualTo("id");
  }

  @Test
  public void testCreateFileInFolder() throws Exception {
    when(files.insert(
-        eq(new File()
-            .setTitle("title")
-            .setMimeType("image/gif")
-            .setParents(ImmutableList.of(new ParentReference().setId("parent")))),
-        argThat(hasByteArrayContent(DATA))))
-            .thenReturn(insert);
+            eq(
+                new File()
+                    .setTitle("title")
+                    .setMimeType("image/gif")
+                    .setParents(ImmutableList.of(new ParentReference().setId("parent")))),
+            argThat(hasByteArrayContent(DATA))))
+        .thenReturn(insert);
    assertThat(driveConnection.createFile("title", MediaType.GIF, "parent", DATA)).isEqualTo("id");
  }

@ -164,12 +163,13 @@ public class DriveConnectionTest {
  @Test
  public void testCreateOrUpdateFile_succeedsForNewFile() throws Exception {
    when(files.insert(
-        eq(new File()
-            .setTitle("title")
-            .setMimeType("video/webm")
-            .setParents(ImmutableList.of(new ParentReference().setId("driveFolderId")))),
-        argThat(hasByteArrayContent(DATA))))
-            .thenReturn(insert);
+            eq(
+                new File()
+                    .setTitle("title")
+                    .setMimeType("video/webm")
+                    .setParents(ImmutableList.of(new ParentReference().setId("driveFolderId")))),
+            argThat(hasByteArrayContent(DATA))))
+        .thenReturn(insert);
    ChildList emptyChildList = new ChildList().setItems(ImmutableList.of()).setNextPageToken(null);
    when(childrenList.execute()).thenReturn(emptyChildList);
    assertThat(driveConnection.createOrUpdateFile(
@ -183,10 +183,8 @@ public class DriveConnectionTest {
  @Test
  public void testCreateOrUpdateFile_succeedsForUpdatingFile() throws Exception {
    when(files.update(
-        eq("id"),
-        eq(new File().setTitle("title")),
-        argThat(hasByteArrayContent(DATA))))
-            .thenReturn(update);
+            eq("id"), eq(new File().setTitle("title")), argThat(hasByteArrayContent(DATA))))
+        .thenReturn(update);
    ChildList childList = new ChildList()
        .setItems(ImmutableList.of(new ChildReference().setId("id")))
        .setNextPageToken(null);
@ -224,10 +222,8 @@ public class DriveConnectionTest {
  @Test
  public void testUpdateFile_succeeds() throws Exception {
    when(files.update(
-        eq("id"),
-        eq(new File().setTitle("title")),
-        argThat(hasByteArrayContent(DATA))))
-            .thenReturn(update);
+            eq("id"), eq(new File().setTitle("title")), argThat(hasByteArrayContent(DATA))))
+        .thenReturn(update);
    assertThat(driveConnection.updateFile("id", "title", MediaType.WEBM_VIDEO, DATA))
        .isEqualTo("id");
  }
--- a/javatests/google/registry/testing/BUILD
+++ b/javatests/google/registry/testing/BUILD
@ -35,7 +35,6 @@ java_library(
        "//java/google/registry/tmch",
        "//java/google/registry/util",
        "//java/google/registry/xml",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_apis_google_api_services_appengine",
        "@com_google_appengine_api_1_0_sdk",
@ -60,6 +59,7 @@ java_library(
        "@org_bouncycastle_bcpkix_jdk15on",
        "@org_joda_money",
        "@org_json",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/testing/mapreduce/BUILD
+++ b/javatests/google/registry/testing/mapreduce/BUILD
@ -16,7 +16,6 @@ java_library(
        "//java/google/registry/model",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_appengine_api_stubs",
        "@com_google_appengine_testing",
@ -30,6 +29,7 @@ java_library(
        "@com_google_truth_extensions_truth_java8_extension",
        "@javax_servlet_api",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/tmch/BUILD
+++ b/javatests/google/registry/tmch/BUILD
@ -21,7 +21,6 @@ java_library(
        "//java/google/registry/tmch",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_flogger",
@ -32,6 +31,7 @@ java_library(
        "@javax_servlet_api",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/tools/BUILD
+++ b/javatests/google/registry/tools/BUILD
@ -38,7 +38,6 @@ java_library(
        "//javatests/google/registry/tmch",
        "//javatests/google/registry/tools/server",
        "//javatests/google/registry/xml",
-        "//third_party/java/mockito",
        "//third_party/jaxb",
        "//third_party/objectify:objectify-v4_1",
        "@com_beust_jcommander",
@ -61,6 +60,7 @@ java_library(
        "@joda_time",
        "@junit",
        "@org_joda_money",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/tools/server/BUILD
+++ b/javatests/google/registry/tools/server/BUILD
@ -21,7 +21,6 @@ java_library(
        "//javatests/google/registry/model",
        "//javatests/google/registry/testing",
        "//javatests/google/registry/testing/mapreduce",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_appengine_tools_appengine_gcs_client",
@ -34,6 +33,7 @@ java_library(
        "@joda_time",
        "@junit",
        "@org_joda_money",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/ui/forms/BUILD
+++ b/javatests/google/registry/ui/forms/BUILD
@ -13,13 +13,13 @@ java_library(
    deps = [
        "//java/google/registry/ui/forms",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_guava",
        "@com_google_guava_testlib",
        "@com_google_re2j",
        "@com_google_truth",
        "@com_google_truth_extensions_truth_java8_extension",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/ui/server/BUILD
+++ b/javatests/google/registry/ui/server/BUILD
@ -15,13 +15,13 @@ java_library(
        "//java/google/registry/ui/server",
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_guava",
        "@com_google_truth",
        "@com_google_truth_extensions_truth_java8_extension",
        "@junit",
        "@org_hamcrest_library",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/ui/server/registrar/BUILD
+++ b/javatests/google/registry/ui/server/registrar/BUILD
@ -25,7 +25,6 @@ java_library(
        "//javatests/google/registry/model",
        "//javatests/google/registry/security",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_flogger",
@ -40,6 +39,7 @@ java_library(
        "@joda_time",
        "@junit",
        "@org_joda_money",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/util/BUILD
+++ b/javatests/google/registry/util/BUILD
@ -13,7 +13,6 @@ java_library(
    deps = [
        "//java/google/registry/util",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_code_findbugs_jsr305",
        "@com_google_flogger",
@ -24,6 +23,7 @@ java_library(
        "@com_google_truth_extensions_truth_java8_extension",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )

--- a/javatests/google/registry/util/RequestStatusCheckerImplTest.java
+++ b/javatests/google/registry/util/RequestStatusCheckerImplTest.java
@ -16,7 +16,7 @@ package google.registry.util;

 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.testing.LogsSubject.assertAboutLogs;
-import static org.mockito.Matchers.argThat;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

@ -35,7 +35,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.mockito.ArgumentMatcher;

 /** Unit tests for {@link RequestStatusCheckerImpl}. */
@RunWith(JUnit4.class)
@ -53,16 +52,12 @@ public final class RequestStatusCheckerImplTest {
   */
  private static LogQuery expectedLogQuery(final String requestLogId) {
    return argThat(
-        new ArgumentMatcher<LogQuery>() {
-          @Override
-          public boolean matches(Object object) {
-            assertThat(object).isInstanceOf(LogQuery.class);
-            LogQuery logQuery = (LogQuery) object;
-            assertThat(logQuery.getRequestIds()).containsExactly(requestLogId);
-            assertThat(logQuery.getIncludeAppLogs()).isFalse();
-            assertThat(logQuery.getIncludeIncomplete()).isTrue();
-            return true;
-          }
+        object -> {
+          assertThat(object).isInstanceOf(LogQuery.class);
+          assertThat(object.getRequestIds()).containsExactly(requestLogId);
+          assertThat(object.getIncludeAppLogs()).isFalse();
+          assertThat(object.getIncludeIncomplete()).isTrue();
+          return true;
        });
  }

--- a/javatests/google/registry/whois/BUILD
+++ b/javatests/google/registry/whois/BUILD
@ -18,7 +18,6 @@ java_library(
        "//java/google/registry/util",
        "//java/google/registry/whois",
        "//javatests/google/registry/testing",
-        "//third_party/java/mockito",
        "//third_party/objectify:objectify-v4_1",
        "@com_google_appengine_api_1_0_sdk",
        "@com_google_appengine_testing",
@ -33,6 +32,7 @@ java_library(
        "@javax_servlet_api",
        "@joda_time",
        "@junit",
+        "@org_mockito_core",
    ],
 )