From 99aeedc598fead104d3a051d24e181f2a6f61919 Mon Sep 17 00:00:00 2001 From: weiminyu Date: Wed, 1 May 2019 08:32:21 -0700 Subject: [PATCH] Replace deprecated Mockito Matchers class Part of the attempt to remove or suppress warnings for deprecated API use, which will make the Gradle project usable with Intellij. Currently in the Intellij/Gradle setup, deprecation warnings cause Intellij build process to fail. Passing -Werror:none flags to javac\ does not have any effect. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=246135737 --- .../batch/DeleteContactsAndHostsActionTest.java | 2 +- .../batch/RefreshDnsOnHostRenameActionTest.java | 2 +- .../beam/invoicing/InvoicingUtilsTest.java | 2 +- .../registry/beam/spec11/Spec11PipelineTest.java | 2 +- .../registry/bigquery/CheckedBigqueryTest.java | 4 ++-- .../registry/dns/PublishDnsUpdatesActionTest.java | 2 +- .../dns/writer/clouddns/CloudDnsWriterTest.java | 2 +- .../dns/writer/dnsupdate/DnsUpdateWriterTest.java | 2 +- .../registry/export/CheckBackupActionTest.java | 2 +- .../export/ExportDomainListsActionTest.java | 2 +- .../export/ExportPremiumTermsActionTest.java | 6 +++--- .../export/ExportReservedTermsActionTest.java | 4 ++-- .../export/SyncGroupMembersActionTest.java | 4 ++-- .../export/UpdateSnapshotViewActionTest.java | 6 +++--- .../export/UploadDatastoreBackupActionTest.java | 4 ++-- .../export/sheet/SheetSynchronizerTest.java | 2 +- .../sheet/SyncRegistrarsSheetActionTest.java | 2 +- .../export/sheet/SyncRegistrarsSheetTest.java | 2 +- .../google/registry/flows/EppControllerTest.java | 2 +- .../google/registry/flows/EppTlsActionTest.java | 4 ++-- .../groups/DirectoryGroupsConnectionTest.java | 6 +++--- .../keyring/kms/KmsConnectionImplTest.java | 4 ++-- .../proxy/metric/MetricParametersTest.java | 4 ++-- .../registry/proxy/quota/QuotaManagerTest.java | 2 +- .../registry/proxy/quota/TokenStoreTest.java | 2 +- .../google/registry/rde/RdeReportActionTest.java | 2 +- .../google/registry/rde/RdeUploadActionTest.java | 4 ++-- .../billing/CopyDetailReportsActionTest.java | 2 +- .../billing/GenerateInvoicesActionTest.java | 2 +- .../reporting/icann/IcannReportingStagerTest.java | 2 +- .../spec11/GenerateSpec11ReportActionTest.java | 2 +- .../registry/request/RequestHandlerTest.java | 4 ++-- .../auth/AuthenticatedRegistrarAccessorTest.java | 2 +- .../auth/LegacyAuthenticationMechanismTest.java | 2 +- .../storage/drive/DriveConnectionTest.java | 4 ++-- .../registry/tmch/NordnUploadActionTest.java | 2 +- .../registry/tmch/NordnVerifyActionTest.java | 2 +- .../google/registry/tmch/TmchActionTestCase.java | 2 +- .../CreateOrUpdatePremiumListCommandTestCase.java | 2 +- .../tools/CreatePremiumListCommandTest.java | 14 ++++++-------- .../registry/tools/CreateRegistrarCommandTest.java | 4 ++-- .../tools/CreateRegistrarGroupsCommandTest.java | 2 +- .../google/registry/tools/CurlCommandTest.java | 4 ++-- .../google/registry/tools/EppToolVerifier.java | 2 +- .../registry/tools/ImportDatastoreCommandTest.java | 2 +- .../registry/tools/ListDomainsCommandTest.java | 2 +- .../registry/tools/ListObjectsCommandTestCase.java | 11 ++++------- .../google/registry/tools/LoadTestCommandTest.java | 2 +- .../tools/UpdatePremiumListCommandTest.java | 11 ++++------- .../registry/tools/VerifyOteCommandTest.java | 8 ++++---- .../registry/ui/server/SendEmailUtilsTest.java | 2 +- .../registrar/RegistrarSettingsActionTest.java | 2 +- .../util/AppEngineServiceUtilsImplTest.java | 8 ++++---- .../google/registry/util/SendEmailServiceTest.java | 2 +- .../google/registry/util/UrlFetchUtilsTest.java | 2 +- .../google/registry/whois/WhoisActionTest.java | 4 ++-- .../google/registry/whois/WhoisHttpActionTest.java | 4 ++-- 57 files changed, 94 insertions(+), 102 deletions(-) diff --git a/javatests/google/registry/batch/DeleteContactsAndHostsActionTest.java b/javatests/google/registry/batch/DeleteContactsAndHostsActionTest.java index 3d0904f69..ede9dcc78 100644 --- a/javatests/google/registry/batch/DeleteContactsAndHostsActionTest.java +++ b/javatests/google/registry/batch/DeleteContactsAndHostsActionTest.java @@ -55,7 +55,7 @@ import static org.joda.time.Duration.millis; import static org.joda.time.Duration.standardDays; import static org.joda.time.Duration.standardHours; import static org.joda.time.Duration.standardSeconds; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/javatests/google/registry/batch/RefreshDnsOnHostRenameActionTest.java b/javatests/google/registry/batch/RefreshDnsOnHostRenameActionTest.java index 53df05881..22e90b697 100644 --- a/javatests/google/registry/batch/RefreshDnsOnHostRenameActionTest.java +++ b/javatests/google/registry/batch/RefreshDnsOnHostRenameActionTest.java @@ -37,7 +37,7 @@ import static org.joda.time.Duration.millis; import static org.joda.time.Duration.standardDays; import static org.joda.time.Duration.standardHours; import static org.joda.time.Duration.standardSeconds; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/beam/invoicing/InvoicingUtilsTest.java b/javatests/google/registry/beam/invoicing/InvoicingUtilsTest.java index e041aa7a6..226476afc 100644 --- a/javatests/google/registry/beam/invoicing/InvoicingUtilsTest.java +++ b/javatests/google/registry/beam/invoicing/InvoicingUtilsTest.java @@ -15,7 +15,7 @@ package google.registry.beam.invoicing; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/beam/spec11/Spec11PipelineTest.java b/javatests/google/registry/beam/spec11/Spec11PipelineTest.java index b639c59d0..ca8ea6bde 100644 --- a/javatests/google/registry/beam/spec11/Spec11PipelineTest.java +++ b/javatests/google/registry/beam/spec11/Spec11PipelineTest.java @@ -16,7 +16,7 @@ package google.registry.beam.spec11; import static com.google.common.truth.Truth.assertThat; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.mockito.Mockito.withSettings; diff --git a/javatests/google/registry/bigquery/CheckedBigqueryTest.java b/javatests/google/registry/bigquery/CheckedBigqueryTest.java index 3fb4d8295..161511a7c 100644 --- a/javatests/google/registry/bigquery/CheckedBigqueryTest.java +++ b/javatests/google/registry/bigquery/CheckedBigqueryTest.java @@ -16,8 +16,8 @@ package google.registry.bigquery; import static com.google.common.truth.Truth.assertThat; import static google.registry.bigquery.BigqueryUtils.FieldType.STRING; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/dns/PublishDnsUpdatesActionTest.java b/javatests/google/registry/dns/PublishDnsUpdatesActionTest.java index e9c9d2b49..748141324 100644 --- a/javatests/google/registry/dns/PublishDnsUpdatesActionTest.java +++ b/javatests/google/registry/dns/PublishDnsUpdatesActionTest.java @@ -20,7 +20,7 @@ import static google.registry.testing.DatastoreHelper.persistActiveDomain; import static google.registry.testing.DatastoreHelper.persistActiveSubordinateHost; import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.JUnitBackports.assertThrows; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java b/javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java index e2490efa7..f109462da 100644 --- a/javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java +++ b/javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java @@ -21,7 +21,7 @@ import static google.registry.testing.DatastoreHelper.createTld; import static google.registry.testing.DatastoreHelper.newDomainBase; import static google.registry.testing.DatastoreHelper.newHostResource; import static google.registry.testing.DatastoreHelper.persistResource; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java b/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java index 5750b9f9f..e207b1f57 100644 --- a/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java +++ b/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java @@ -27,7 +27,7 @@ import static google.registry.testing.DatastoreHelper.persistDeletedDomain; import static google.registry.testing.DatastoreHelper.persistDeletedHost; import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.JUnitBackports.assertThrows; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/export/CheckBackupActionTest.java b/javatests/google/registry/export/CheckBackupActionTest.java index b0fb7f59f..50bc0fbe4 100644 --- a/javatests/google/registry/export/CheckBackupActionTest.java +++ b/javatests/google/registry/export/CheckBackupActionTest.java @@ -20,7 +20,7 @@ import static google.registry.export.CheckBackupAction.CHECK_BACKUP_NAME_PARAM; import static google.registry.testing.JUnitBackports.assertThrows; import static google.registry.testing.TaskQueueHelper.assertNoTasksEnqueued; import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import com.google.api.client.googleapis.json.GoogleJsonResponseException; diff --git a/javatests/google/registry/export/ExportDomainListsActionTest.java b/javatests/google/registry/export/ExportDomainListsActionTest.java index 94b4059c6..6b33b292d 100644 --- a/javatests/google/registry/export/ExportDomainListsActionTest.java +++ b/javatests/google/registry/export/ExportDomainListsActionTest.java @@ -25,7 +25,7 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.GcsTestingUtils.readGcsFile; import static google.registry.testing.JUnitBackports.assertThrows; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/javatests/google/registry/export/ExportPremiumTermsActionTest.java b/javatests/google/registry/export/ExportPremiumTermsActionTest.java index 819039676..1181a7e58 100644 --- a/javatests/google/registry/export/ExportPremiumTermsActionTest.java +++ b/javatests/google/registry/export/ExportPremiumTermsActionTest.java @@ -26,9 +26,9 @@ import static google.registry.testing.JUnitBackports.assertThrows; import static java.nio.charset.StandardCharsets.UTF_8; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_OK; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/javatests/google/registry/export/ExportReservedTermsActionTest.java b/javatests/google/registry/export/ExportReservedTermsActionTest.java index ce8722a24..a4f93da24 100644 --- a/javatests/google/registry/export/ExportReservedTermsActionTest.java +++ b/javatests/google/registry/export/ExportReservedTermsActionTest.java @@ -24,8 +24,8 @@ import static google.registry.testing.JUnitBackports.assertThrows; import static java.nio.charset.StandardCharsets.UTF_8; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_OK; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/export/SyncGroupMembersActionTest.java b/javatests/google/registry/export/SyncGroupMembersActionTest.java index 8b301f249..56c373ea8 100644 --- a/javatests/google/registry/export/SyncGroupMembersActionTest.java +++ b/javatests/google/registry/export/SyncGroupMembersActionTest.java @@ -24,8 +24,8 @@ import static google.registry.testing.DatastoreHelper.loadRegistrar; import static google.registry.testing.DatastoreHelper.persistResource; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_OK; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/javatests/google/registry/export/UpdateSnapshotViewActionTest.java b/javatests/google/registry/export/UpdateSnapshotViewActionTest.java index b511d3543..345f0876b 100644 --- a/javatests/google/registry/export/UpdateSnapshotViewActionTest.java +++ b/javatests/google/registry/export/UpdateSnapshotViewActionTest.java @@ -24,9 +24,9 @@ import static google.registry.export.UpdateSnapshotViewAction.UPDATE_SNAPSHOT_VI import static google.registry.export.UpdateSnapshotViewAction.createViewUpdateTask; import static google.registry.testing.JUnitBackports.assertThrows; import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/export/UploadDatastoreBackupActionTest.java b/javatests/google/registry/export/UploadDatastoreBackupActionTest.java index fd2634c72..bfffa36a0 100644 --- a/javatests/google/registry/export/UploadDatastoreBackupActionTest.java +++ b/javatests/google/registry/export/UploadDatastoreBackupActionTest.java @@ -27,8 +27,8 @@ import static google.registry.export.UploadDatastoreBackupAction.enqueueUploadBa import static google.registry.export.UploadDatastoreBackupAction.getBackupInfoFileForKind; import static google.registry.testing.JUnitBackports.assertThrows; import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/export/sheet/SheetSynchronizerTest.java b/javatests/google/registry/export/sheet/SheetSynchronizerTest.java index 394553e89..f24ca8af6 100644 --- a/javatests/google/registry/export/sheet/SheetSynchronizerTest.java +++ b/javatests/google/registry/export/sheet/SheetSynchronizerTest.java @@ -15,7 +15,7 @@ package google.registry.export.sheet; import static com.google.common.collect.Lists.newArrayList; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; diff --git a/javatests/google/registry/export/sheet/SyncRegistrarsSheetActionTest.java b/javatests/google/registry/export/sheet/SyncRegistrarsSheetActionTest.java index 2da31a274..7c539484e 100644 --- a/javatests/google/registry/export/sheet/SyncRegistrarsSheetActionTest.java +++ b/javatests/google/registry/export/sheet/SyncRegistrarsSheetActionTest.java @@ -16,7 +16,7 @@ package google.registry.export.sheet; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java b/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java index 7980d4b59..11a1da10c 100644 --- a/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java +++ b/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java @@ -27,7 +27,7 @@ import static org.joda.money.CurrencyUnit.JPY; import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; import static org.joda.time.Duration.standardMinutes; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import com.google.common.collect.ImmutableList; diff --git a/javatests/google/registry/flows/EppControllerTest.java b/javatests/google/registry/flows/EppControllerTest.java index fc746e83a..ea55bbd69 100644 --- a/javatests/google/registry/flows/EppControllerTest.java +++ b/javatests/google/registry/flows/EppControllerTest.java @@ -24,7 +24,7 @@ import static google.registry.testing.TestLogHandlerUtils.findFirstLogRecordWith import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.logging.Level.INFO; import static java.util.logging.Level.SEVERE; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/flows/EppTlsActionTest.java b/javatests/google/registry/flows/EppTlsActionTest.java index a1dabc5aa..999fab271 100644 --- a/javatests/google/registry/flows/EppTlsActionTest.java +++ b/javatests/google/registry/flows/EppTlsActionTest.java @@ -17,8 +17,8 @@ package google.registry.flows; import static com.google.common.truth.Truth.assertThat; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/groups/DirectoryGroupsConnectionTest.java b/javatests/google/registry/groups/DirectoryGroupsConnectionTest.java index efe06cfb4..e9b3c1375 100644 --- a/javatests/google/registry/groups/DirectoryGroupsConnectionTest.java +++ b/javatests/google/registry/groups/DirectoryGroupsConnectionTest.java @@ -20,9 +20,9 @@ import static google.registry.testing.JUnitBackports.assertThrows; import static javax.servlet.http.HttpServletResponse.SC_CONFLICT; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; 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.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/keyring/kms/KmsConnectionImplTest.java b/javatests/google/registry/keyring/kms/KmsConnectionImplTest.java index 2a8c3bdeb..dd63838d7 100644 --- a/javatests/google/registry/keyring/kms/KmsConnectionImplTest.java +++ b/javatests/google/registry/keyring/kms/KmsConnectionImplTest.java @@ -16,8 +16,8 @@ package google.registry.keyring.kms; import static com.google.common.truth.Truth.assertThat; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/proxy/metric/MetricParametersTest.java b/javatests/google/registry/proxy/metric/MetricParametersTest.java index ec83ceda1..cd40bda37 100644 --- a/javatests/google/registry/proxy/metric/MetricParametersTest.java +++ b/javatests/google/registry/proxy/metric/MetricParametersTest.java @@ -23,8 +23,8 @@ import static google.registry.proxy.metric.MetricParameters.POD_ID_ENV; import static google.registry.proxy.metric.MetricParameters.PROJECT_ID_PATH; import static google.registry.proxy.metric.MetricParameters.ZONE_PATH; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/proxy/quota/QuotaManagerTest.java b/javatests/google/registry/proxy/quota/QuotaManagerTest.java index 9bf3e870c..104d0a1ed 100644 --- a/javatests/google/registry/proxy/quota/QuotaManagerTest.java +++ b/javatests/google/registry/proxy/quota/QuotaManagerTest.java @@ -15,7 +15,7 @@ package google.registry.proxy.quota; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/javatests/google/registry/proxy/quota/TokenStoreTest.java b/javatests/google/registry/proxy/quota/TokenStoreTest.java index b7daf263a..6d8023003 100644 --- a/javatests/google/registry/proxy/quota/TokenStoreTest.java +++ b/javatests/google/registry/proxy/quota/TokenStoreTest.java @@ -16,7 +16,7 @@ package google.registry.proxy.quota; import static com.google.common.truth.Truth.assertThat; import static google.registry.proxy.quota.QuotaConfig.SENTINEL_UNLIMITED_TOKENS; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/rde/RdeReportActionTest.java b/javatests/google/registry/rde/RdeReportActionTest.java index e4fe37f4f..a4b45e7d3 100644 --- a/javatests/google/registry/rde/RdeReportActionTest.java +++ b/javatests/google/registry/rde/RdeReportActionTest.java @@ -28,7 +28,7 @@ import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_OK; import static org.joda.time.Duration.standardDays; import static org.joda.time.Duration.standardSeconds; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/javatests/google/registry/rde/RdeUploadActionTest.java b/javatests/google/registry/rde/RdeUploadActionTest.java index 2b35eb434..6b0cdd577 100644 --- a/javatests/google/registry/rde/RdeUploadActionTest.java +++ b/javatests/google/registry/rde/RdeUploadActionTest.java @@ -35,8 +35,8 @@ import static org.joda.time.Duration.standardDays; import static org.joda.time.Duration.standardHours; import static org.joda.time.Duration.standardSeconds; import static org.junit.Assume.assumeTrue; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/reporting/billing/CopyDetailReportsActionTest.java b/javatests/google/registry/reporting/billing/CopyDetailReportsActionTest.java index bcc74f66e..20f30b5ff 100644 --- a/javatests/google/registry/reporting/billing/CopyDetailReportsActionTest.java +++ b/javatests/google/registry/reporting/billing/CopyDetailReportsActionTest.java @@ -21,7 +21,7 @@ import static google.registry.testing.GcsTestingUtils.writeGcsFile; import static google.registry.testing.JUnitBackports.assertThrows; import static java.nio.charset.StandardCharsets.UTF_8; import static javax.servlet.http.HttpServletResponse.SC_OK; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/reporting/billing/GenerateInvoicesActionTest.java b/javatests/google/registry/reporting/billing/GenerateInvoicesActionTest.java index 7d9ab3393..d63330df9 100644 --- a/javatests/google/registry/reporting/billing/GenerateInvoicesActionTest.java +++ b/javatests/google/registry/reporting/billing/GenerateInvoicesActionTest.java @@ -17,7 +17,7 @@ package google.registry.reporting.billing; import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.TaskQueueHelper.assertNoTasksEnqueued; import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/reporting/icann/IcannReportingStagerTest.java b/javatests/google/registry/reporting/icann/IcannReportingStagerTest.java index 779927c50..9d99b9a87 100644 --- a/javatests/google/registry/reporting/icann/IcannReportingStagerTest.java +++ b/javatests/google/registry/reporting/icann/IcannReportingStagerTest.java @@ -17,7 +17,7 @@ package google.registry.reporting.icann; import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.GcsTestingUtils.readGcsFile; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/reporting/spec11/GenerateSpec11ReportActionTest.java b/javatests/google/registry/reporting/spec11/GenerateSpec11ReportActionTest.java index b9896e469..f68542b68 100644 --- a/javatests/google/registry/reporting/spec11/GenerateSpec11ReportActionTest.java +++ b/javatests/google/registry/reporting/spec11/GenerateSpec11ReportActionTest.java @@ -16,7 +16,7 @@ package google.registry.reporting.spec11; import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/request/RequestHandlerTest.java b/javatests/google/registry/request/RequestHandlerTest.java index 579d8882d..1e657de21 100644 --- a/javatests/google/registry/request/RequestHandlerTest.java +++ b/javatests/google/registry/request/RequestHandlerTest.java @@ -20,8 +20,8 @@ import static google.registry.request.Action.Method.GET; import static google.registry.request.Action.Method.POST; import static google.registry.request.auth.Auth.AUTH_INTERNAL_OR_ADMIN; import static google.registry.request.auth.Auth.AUTH_PUBLIC; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/javatests/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java b/javatests/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java index 293e004a9..4d8e2c111 100644 --- a/javatests/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java +++ b/javatests/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java @@ -22,7 +22,7 @@ import static google.registry.testing.DatastoreHelper.loadRegistrar; import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.JUnitBackports.assertThrows; import static google.registry.testing.LogsSubject.assertAboutLogs; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/request/auth/LegacyAuthenticationMechanismTest.java b/javatests/google/registry/request/auth/LegacyAuthenticationMechanismTest.java index acde397af..9ce3dcdaf 100644 --- a/javatests/google/registry/request/auth/LegacyAuthenticationMechanismTest.java +++ b/javatests/google/registry/request/auth/LegacyAuthenticationMechanismTest.java @@ -15,7 +15,7 @@ package google.registry.request.auth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/storage/drive/DriveConnectionTest.java b/javatests/google/registry/storage/drive/DriveConnectionTest.java index be2e1c750..c8bfba7f1 100644 --- a/javatests/google/registry/storage/drive/DriveConnectionTest.java +++ b/javatests/google/registry/storage/drive/DriveConnectionTest.java @@ -18,9 +18,9 @@ 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.anyString; import static org.mockito.ArgumentMatchers.argThat; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/tmch/NordnUploadActionTest.java b/javatests/google/registry/tmch/NordnUploadActionTest.java index 8a5739890..72a5c0c9a 100644 --- a/javatests/google/registry/tmch/NordnUploadActionTest.java +++ b/javatests/google/registry/tmch/NordnUploadActionTest.java @@ -32,7 +32,7 @@ import static java.nio.charset.StandardCharsets.US_ASCII; import static java.nio.charset.StandardCharsets.UTF_8; import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/tmch/NordnVerifyActionTest.java b/javatests/google/registry/tmch/NordnVerifyActionTest.java index b25fb4588..bf5667cc7 100644 --- a/javatests/google/registry/tmch/NordnVerifyActionTest.java +++ b/javatests/google/registry/tmch/NordnVerifyActionTest.java @@ -25,7 +25,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; import static javax.servlet.http.HttpServletResponse.SC_OK; import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/tmch/TmchActionTestCase.java b/javatests/google/registry/tmch/TmchActionTestCase.java index da3a29f82..97308c24e 100644 --- a/javatests/google/registry/tmch/TmchActionTestCase.java +++ b/javatests/google/registry/tmch/TmchActionTestCase.java @@ -15,7 +15,7 @@ package google.registry.tmch; import static javax.servlet.http.HttpServletResponse.SC_OK; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import com.google.appengine.api.urlfetch.HTTPRequest; diff --git a/javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java b/javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java index cb8f1a7ad..a046c5fe1 100644 --- a/javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java +++ b/javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java @@ -16,7 +16,7 @@ package google.registry.tools; import static com.google.common.truth.Truth.assertThat; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import com.google.common.collect.ImmutableMap; diff --git a/javatests/google/registry/tools/CreatePremiumListCommandTest.java b/javatests/google/registry/tools/CreatePremiumListCommandTest.java index 3a3b136b0..0f587c8a0 100644 --- a/javatests/google/registry/tools/CreatePremiumListCommandTest.java +++ b/javatests/google/registry/tools/CreatePremiumListCommandTest.java @@ -18,9 +18,9 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.request.JsonResponse.JSON_SAFETY_PREFIX; import static google.registry.testing.JUnitBackports.assertThrows; import static google.registry.testing.TestDataHelper.loadFile; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyMapOf; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyMap; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.when; @@ -31,6 +31,7 @@ import com.google.common.net.MediaType; import google.registry.tools.server.CreatePremiumListAction; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; /** Unit tests for {@link CreatePremiumListCommand}. */ @@ -53,7 +54,7 @@ public class CreatePremiumListCommandTest servletPath = "/_dr/admin/createPremiumList"; when(connection.sendPostRequest( eq(CreatePremiumListAction.PATH), - anyMapOf(String.class, String.class), + ArgumentMatchers.anyMap(), any(MediaType.class), any(byte[].class))) .thenReturn(JSON_SAFETY_PREFIX + "{\"status\":\"success\",\"lines\":[]}"); @@ -85,10 +86,7 @@ public class CreatePremiumListCommandTest reset(connection); command.setConnection(connection); when(connection.sendPostRequest( - eq(CreatePremiumListAction.PATH), - anyMapOf(String.class, String.class), - any(MediaType.class), - any(byte[].class))) + eq(CreatePremiumListAction.PATH), anyMap(), any(MediaType.class), any(byte[].class))) .thenReturn(JSON_SAFETY_PREFIX + "{\"status\":\"error\",\"error\":\"foo already exists\"}"); VerifyException thrown = assertThrows( diff --git a/javatests/google/registry/tools/CreateRegistrarCommandTest.java b/javatests/google/registry/tools/CreateRegistrarCommandTest.java index 73cc0af1c..c5db41f79 100644 --- a/javatests/google/registry/tools/CreateRegistrarCommandTest.java +++ b/javatests/google/registry/tools/CreateRegistrarCommandTest.java @@ -23,7 +23,7 @@ import static google.registry.testing.DatastoreHelper.createTlds; import static google.registry.testing.DatastoreHelper.persistNewRegistrar; import static google.registry.testing.JUnitBackports.assertThrows; import static org.joda.time.DateTimeZone.UTC; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; @@ -239,7 +239,7 @@ public class CreateRegistrarCommandTest extends CommandTestCase } command.setConnection(connection); when(connection.sendPostRequest( - eq(getTaskPath()), - anyMapOf(String.class, Object.class), - eq(MediaType.PLAIN_TEXT_UTF_8), - any(byte[].class))) + eq(getTaskPath()), anyMap(), eq(MediaType.PLAIN_TEXT_UTF_8), any(byte[].class))) .thenReturn(JSON_SAFETY_PREFIX + "{\"status\":\"success\",\"lines\":[]}"); } diff --git a/javatests/google/registry/tools/LoadTestCommandTest.java b/javatests/google/registry/tools/LoadTestCommandTest.java index 914939d90..13922f362 100644 --- a/javatests/google/registry/tools/LoadTestCommandTest.java +++ b/javatests/google/registry/tools/LoadTestCommandTest.java @@ -16,7 +16,7 @@ package google.registry.tools; import static google.registry.testing.DatastoreHelper.createTld; import static google.registry.testing.DatastoreHelper.persistNewRegistrar; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; diff --git a/javatests/google/registry/tools/UpdatePremiumListCommandTest.java b/javatests/google/registry/tools/UpdatePremiumListCommandTest.java index 2a8b0ba8d..376b96239 100644 --- a/javatests/google/registry/tools/UpdatePremiumListCommandTest.java +++ b/javatests/google/registry/tools/UpdatePremiumListCommandTest.java @@ -16,9 +16,9 @@ package google.registry.tools; import static google.registry.request.JsonResponse.JSON_SAFETY_PREFIX; import static google.registry.testing.TestDataHelper.loadFile; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyMapOf; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyMap; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; @@ -47,10 +47,7 @@ public class UpdatePremiumListCommandTest "example_premium_terms.csv", loadFile(UpdatePremiumListCommandTest.class, "example_premium_terms.csv")); when(connection.sendPostRequest( - eq(UpdatePremiumListAction.PATH), - anyMapOf(String.class, String.class), - any(MediaType.class), - any(byte[].class))) + eq(UpdatePremiumListAction.PATH), anyMap(), any(MediaType.class), any(byte[].class))) .thenReturn(JSON_SAFETY_PREFIX + "{\"status\":\"success\",\"lines\":[]}"); } diff --git a/javatests/google/registry/tools/VerifyOteCommandTest.java b/javatests/google/registry/tools/VerifyOteCommandTest.java index 39ed997f1..a01cbd9e1 100644 --- a/javatests/google/registry/tools/VerifyOteCommandTest.java +++ b/javatests/google/registry/tools/VerifyOteCommandTest.java @@ -18,9 +18,9 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.DatastoreHelper.loadRegistrar; import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.JUnitBackports.assertThrows; -import static org.mockito.Matchers.anyMapOf; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyMap; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -41,7 +41,7 @@ public class VerifyOteCommandTest extends CommandTestCase { command.setConnection(connection); ImmutableMap response = ImmutableMap.of("blobio", "Num actions: 19 - Reqs passed: 19/19 - Overall: PASS"); - when(connection.sendJson(anyString(), anyMapOf(String.class, Object.class))) + when(connection.sendJson(anyString(), anyMap())) .thenReturn(ImmutableMap.of("blobio", response)); } diff --git a/javatests/google/registry/ui/server/SendEmailUtilsTest.java b/javatests/google/registry/ui/server/SendEmailUtilsTest.java index 7593caaf6..e54cea540 100644 --- a/javatests/google/registry/ui/server/SendEmailUtilsTest.java +++ b/javatests/google/registry/ui/server/SendEmailUtilsTest.java @@ -15,7 +15,7 @@ package google.registry.ui.server; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java b/javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java index 7476943e8..c6c71ecbf 100644 --- a/javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java +++ b/javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java @@ -20,7 +20,7 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static google.registry.testing.TaskQueueHelper.assertNoTasksEnqueued; import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; import static google.registry.testing.TestDataHelper.loadFile; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/util/AppEngineServiceUtilsImplTest.java b/javatests/google/registry/util/AppEngineServiceUtilsImplTest.java index 7e37ed474..d6edbc51a 100644 --- a/javatests/google/registry/util/AppEngineServiceUtilsImplTest.java +++ b/javatests/google/registry/util/AppEngineServiceUtilsImplTest.java @@ -16,9 +16,9 @@ package google.registry.util; import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.JUnitBackports.assertThrows; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isNull; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -46,7 +46,7 @@ public class AppEngineServiceUtilsImplTest { @Before public void before() { appEngineServiceUtils = new AppEngineServiceUtilsImpl(modulesService); - when(modulesService.getVersionHostname(anyString(), isNull(String.class))) + when(modulesService.getVersionHostname(anyString(), isNull())) .thenReturn("1234.servicename.projectid.appspot.fake"); when(modulesService.getVersionHostname(anyString(), eq("2345"))) .thenReturn("2345.servicename.projectid.appspot.fake"); diff --git a/javatests/google/registry/util/SendEmailServiceTest.java b/javatests/google/registry/util/SendEmailServiceTest.java index 342f15dca..4123f23e8 100644 --- a/javatests/google/registry/util/SendEmailServiceTest.java +++ b/javatests/google/registry/util/SendEmailServiceTest.java @@ -16,7 +16,7 @@ package google.registry.util; import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.JUnitBackports.assertThrows; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/javatests/google/registry/util/UrlFetchUtilsTest.java b/javatests/google/registry/util/UrlFetchUtilsTest.java index 5983524f7..30eaf75ac 100644 --- a/javatests/google/registry/util/UrlFetchUtilsTest.java +++ b/javatests/google/registry/util/UrlFetchUtilsTest.java @@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.JUnitBackports.assertThrows; import static google.registry.util.UrlFetchUtils.setPayloadMultipart; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; diff --git a/javatests/google/registry/whois/WhoisActionTest.java b/javatests/google/registry/whois/WhoisActionTest.java index fc5df1eae..fd63dfdf1 100644 --- a/javatests/google/registry/whois/WhoisActionTest.java +++ b/javatests/google/registry/whois/WhoisActionTest.java @@ -34,8 +34,8 @@ import static google.registry.whois.WhoisTestData.loadFile; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import static javax.servlet.http.HttpServletResponse.SC_OK; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/javatests/google/registry/whois/WhoisHttpActionTest.java b/javatests/google/registry/whois/WhoisHttpActionTest.java index 801e87ace..021fc06e0 100644 --- a/javatests/google/registry/whois/WhoisHttpActionTest.java +++ b/javatests/google/registry/whois/WhoisHttpActionTest.java @@ -30,8 +30,8 @@ import static google.registry.whois.WhoisTestData.loadFile; import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; import static javax.servlet.http.HttpServletResponse.SC_OK; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when;