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
google · Mar 8, 2019 · f681ec2 · f681ec2
1 parent c7be138
commit f681ec2
Show file tree

Hide file tree

Showing 38 changed files with 85 additions and 107 deletions.
diff --git a/gradle/core/gradle/dependency-locks/testCompile.lockfile b/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

diff --git a/gradle/core/gradle/dependency-locks/testCompileClasspath.lockfile b/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

diff --git a/gradle/core/gradle/dependency-locks/testRuntime.lockfile b/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

diff --git a/gradle/core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/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

diff --git a/gradle/dependencies.gradle b/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',

diff --git a/gradle/proxy/gradle/dependency-locks/testCompile.lockfile b/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

diff --git a/gradle/proxy/gradle/dependency-locks/testCompileClasspath.lockfile b/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

diff --git a/gradle/proxy/gradle/dependency-locks/testRuntime.lockfile b/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

diff --git a/gradle/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile b/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

diff --git a/gradle/util/gradle/dependency-locks/testCompile.lockfile b/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

diff --git a/gradle/util/gradle/dependency-locks/testCompileClasspath.lockfile b/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

diff --git a/gradle/util/gradle/dependency-locks/testRuntime.lockfile b/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

diff --git a/gradle/util/gradle/dependency-locks/testRuntimeClasspath.lockfile b/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

diff --git a/java/google/registry/repositories.bzl b/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://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.9.5/mockito-all-1.9.5.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,

diff --git a/javatests/google/registry/batch/AsyncTaskEnqueuerTest.java b/javatests/google/registry/batch/AsyncTaskEnqueuerTest.java
@@ -39,7 +39,6 @@
 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.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;
 

diff --git a/javatests/google/registry/batch/ResaveEntityActionTest.java b/javatests/google/registry/batch/ResaveEntityActionTest.java
@@ -49,7 +49,6 @@
 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.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;

diff --git a/javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java b/javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java
@@ -45,7 +45,6 @@
 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.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");

diff --git a/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java b/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java
@@ -45,7 +45,6 @@
 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.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;

diff --git a/javatests/google/registry/export/BackupDatastoreActionTest.java b/javatests/google/registry/export/BackupDatastoreActionTest.java
@@ -26,21 +26,22 @@
 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;
 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;

diff --git a/javatests/google/registry/export/CheckBackupActionTest.java b/javatests/google/registry/export/CheckBackupActionTest.java
@@ -38,7 +38,6 @@
 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.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;

diff --git a/javatests/google/registry/export/datastore/DatastoreAdminTest.java b/javatests/google/registry/export/datastore/DatastoreAdminTest.java
@@ -24,7 +24,6 @@
 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.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;

diff --git a/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java b/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java
@@ -42,7 +42,6 @@
 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.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;

diff --git a/javatests/google/registry/flows/CheckApiActionTest.java b/javatests/google/registry/flows/CheckApiActionTest.java
@@ -36,7 +36,6 @@
 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.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;

diff --git a/javatests/google/registry/flows/EppControllerTest.java b/javatests/google/registry/flows/EppControllerTest.java
@@ -42,7 +42,6 @@
 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.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;