From cb145e0721a51b1baa428a5149778d46985d6b1d Mon Sep 17 00:00:00 2001 From: mountford Date: Tue, 25 Apr 2017 11:59:23 -0700 Subject: [PATCH] Remove some unnecessary uses of MockitoJUnitRunner, which is discouraged ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=154202151 --- javatests/google/registry/dns/writer/clouddns/BUILD | 1 + .../registry/dns/writer/clouddns/CloudDnsWriterTest.java | 8 ++++++-- javatests/google/registry/dns/writer/dnsupdate/BUILD | 1 + .../dns/writer/dnsupdate/DnsUpdateWriterTest.java | 8 ++++++-- javatests/google/registry/export/sheet/BUILD | 1 + .../registry/export/sheet/SyncRegistrarsSheetTest.java | 8 ++++++-- 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/javatests/google/registry/dns/writer/clouddns/BUILD b/javatests/google/registry/dns/writer/clouddns/BUILD index 460000831..2b422269b 100644 --- a/javatests/google/registry/dns/writer/clouddns/BUILD +++ b/javatests/google/registry/dns/writer/clouddns/BUILD @@ -11,6 +11,7 @@ java_library( name = "clouddns", srcs = glob(["*Test.java"]), deps = [ + "//java/com/google/testing/mockito", "//java/google/registry/dns/writer/clouddns", "//java/google/registry/model", "//java/google/registry/util", diff --git a/javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java b/javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java index 710fba45b..6c08c9193 100644 --- a/javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java +++ b/javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java @@ -38,6 +38,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.common.net.InetAddresses; import com.google.common.util.concurrent.RateLimiter; +import com.google.testing.mockito.Mocks; import com.googlecode.objectify.Key; import google.registry.dns.writer.clouddns.CloudDnsWriter.ZoneStateException; import google.registry.model.domain.DomainResource; @@ -60,18 +61,21 @@ 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.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; -import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; /** Test case for {@link CloudDnsWriter}. */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public class CloudDnsWriterTest { + @Rule + public final Mocks mocks = new Mocks(this); + private static final Inet4Address IPv4 = (Inet4Address) InetAddresses.forString("127.0.0.1"); private static final Inet6Address IPv6 = (Inet6Address) InetAddresses.forString("::1"); private static final DelegationSignerData DS_DATA = diff --git a/javatests/google/registry/dns/writer/dnsupdate/BUILD b/javatests/google/registry/dns/writer/dnsupdate/BUILD index ab87bf0a0..91e0661fd 100644 --- a/javatests/google/registry/dns/writer/dnsupdate/BUILD +++ b/javatests/google/registry/dns/writer/dnsupdate/BUILD @@ -11,6 +11,7 @@ java_library( name = "dnsupdate", srcs = glob(["*.java"]), deps = [ + "//java/com/google/testing/mockito", "//java/google/registry/dns/writer/dnsupdate", "//java/google/registry/model", "//javatests/google/registry/testing", diff --git a/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java b/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java index 9e21a07ab..eeae019b3 100644 --- a/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java +++ b/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java @@ -34,6 +34,7 @@ import com.google.common.base.VerifyException; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; +import com.google.testing.mockito.Mocks; import com.googlecode.objectify.Key; import google.registry.model.domain.DomainResource; import google.registry.model.domain.secdns.DelegationSignerData; @@ -52,10 +53,10 @@ 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.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; import org.xbill.DNS.Flags; import org.xbill.DNS.Message; import org.xbill.DNS.Opcode; @@ -67,7 +68,7 @@ import org.xbill.DNS.Type; import org.xbill.DNS.Update; /** Unit tests for {@link DnsUpdateWriter}. */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public class DnsUpdateWriterTest { @Rule @@ -80,6 +81,9 @@ public class DnsUpdateWriterTest { @Rule public final InjectRule inject = new InjectRule(); + @Rule + public final Mocks mocks = new Mocks(this); + @Mock private DnsMessageTransport mockResolver; diff --git a/javatests/google/registry/export/sheet/BUILD b/javatests/google/registry/export/sheet/BUILD index c060cdfac..4c927be5b 100644 --- a/javatests/google/registry/export/sheet/BUILD +++ b/javatests/google/registry/export/sheet/BUILD @@ -9,6 +9,7 @@ java_library( name = "sheet", srcs = glob(["*.java"]), deps = [ + "//java/com/google/testing/mockito", "//java/google/registry/config", "//java/google/registry/export/sheet", "//java/google/registry/model", diff --git a/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java b/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java index ea01ee9f2..88aabacba 100644 --- a/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java +++ b/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java @@ -32,6 +32,7 @@ import static org.mockito.Mockito.verify; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import com.google.testing.mockito.Mocks; import google.registry.model.common.Cursor; import google.registry.model.ofy.Ofy; import google.registry.model.registrar.Registrar; @@ -45,13 +46,13 @@ 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.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; /** Unit tests for {@link SyncRegistrarsSheet}. */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public class SyncRegistrarsSheetTest { @Rule @@ -62,6 +63,9 @@ public class SyncRegistrarsSheetTest { @Rule public final InjectRule inject = new InjectRule(); + @Rule + public final Mocks mocks = new Mocks(this); + @Captor private ArgumentCaptor>> rowsCaptor;