From 89b3e9c55baa1944af4e526c096f7c10b5e7ce64 Mon Sep 17 00:00:00 2001 From: mountford Date: Thu, 20 Apr 2017 09:40:08 -0700 Subject: [PATCH] Remove some unnecessary uses of MockitoJUnitRunner, which is discouraged ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=153719402 --- .../google/registry/flows/FlowTestCase.java | 4 +- .../groups/DirectoryGroupsConnectionTest.java | 50 ++++++------------- .../whitebox/BigQueryMetricsEnqueuerTest.java | 8 +-- .../whitebox/MetricsExportActionTest.java | 17 ++----- .../registry/rde/RdeUploadActionTest.java | 4 +- .../imports/RdeContactImportActionTest.java | 4 +- .../rde/imports/RdeContactInputTest.java | 4 +- .../rde/imports/RdeContactReaderTest.java | 4 +- .../imports/RdeDomainImportActionTest.java | 4 +- .../rde/imports/RdeHostImportActionTest.java | 4 +- .../rde/imports/RdeHostReaderTest.java | 4 +- .../rde/imports/RdeImportUtilsTest.java | 9 ++-- .../registry/request/RequestHandlerTest.java | 29 ++++------- .../request/RequestParametersTest.java | 9 ++-- .../registry/request/ResponseImplTest.java | 9 ++-- 15 files changed, 61 insertions(+), 102 deletions(-) diff --git a/javatests/google/registry/flows/FlowTestCase.java b/javatests/google/registry/flows/FlowTestCase.java index c3f16dc2b..99ac8012b 100644 --- a/javatests/google/registry/flows/FlowTestCase.java +++ b/javatests/google/registry/flows/FlowTestCase.java @@ -64,14 +64,14 @@ import org.joda.time.DateTime; import org.junit.Before; import org.junit.Rule; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.runners.JUnit4; /** * Base class for resource flow unit tests. * * @param the flow type */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public abstract class FlowTestCase extends ShardableTestCase { /** Whether to actually write to Datastore or just simulate. */ diff --git a/javatests/google/registry/groups/DirectoryGroupsConnectionTest.java b/javatests/google/registry/groups/DirectoryGroupsConnectionTest.java index 9d251bb34..83fbea313 100644 --- a/javatests/google/registry/groups/DirectoryGroupsConnectionTest.java +++ b/javatests/google/registry/groups/DirectoryGroupsConnectionTest.java @@ -22,6 +22,7 @@ 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.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -53,50 +54,29 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.runners.JUnit4; /** * Unit tests for {@link DirectoryGroupsConnection}. */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public class DirectoryGroupsConnectionTest { @Rule public final ExceptionRule thrown = new ExceptionRule(); - @Mock - private Directory directory; - - @Mock - private Groupssettings groupsSettings; - - @Mock - private Directory.Members members; - - @Mock - private Directory.Groups directoryGroups; - - @Mock - private Groupssettings.Groups settingsGroups; - - @Mock - private Directory.Members.Insert membersInsert; - - @Mock - private Directory.Groups.Insert groupsInsert; - - @Mock - private Directory.Groups.Get groupsGet; - - @Mock - private Directory.Members.Get membersGet; - - @Mock - private Directory.Members.List membersList; - - @Mock - private Groupssettings.Groups.Patch groupsSettingsPatch; + private final Directory directory = mock(Directory.class); + private final Groupssettings groupsSettings = mock(Groupssettings.class); + private final Directory.Members members = mock(Directory.Members.class); + private final Directory.Groups directoryGroups = mock(Directory.Groups.class); + private final Groupssettings.Groups settingsGroups = mock(Groupssettings.Groups.class); + private final Directory.Members.Insert membersInsert = mock(Directory.Members.Insert.class); + private final Directory.Groups.Insert groupsInsert = mock(Directory.Groups.Insert.class); + private final Directory.Groups.Get groupsGet = mock(Directory.Groups.Get.class); + private final Directory.Members.Get membersGet = mock(Directory.Members.Get.class); + private final Directory.Members.List membersList = mock(Directory.Members.List.class); + private final Groupssettings.Groups.Patch groupsSettingsPatch = + mock(Groupssettings.Groups.Patch.class); private DirectoryGroupsConnection connection; private Member expectedOwner = new Member(); diff --git a/javatests/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuerTest.java b/javatests/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuerTest.java index cccd0d5e0..19a533793 100644 --- a/javatests/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuerTest.java +++ b/javatests/google/registry/monitoring/whitebox/BigQueryMetricsEnqueuerTest.java @@ -18,6 +18,7 @@ import static com.google.appengine.api.taskqueue.QueueFactory.getQueue; import static google.registry.bigquery.BigqueryUtils.toBigqueryTimestamp; import static google.registry.monitoring.whitebox.BigQueryMetricsEnqueuer.QUEUE_BIGQUERY_STREAMING_METRICS; import static google.registry.testing.TaskQueueHelper.assertTasksEnqueued; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.google.api.services.bigquery.model.TableFieldSchema; @@ -34,12 +35,11 @@ 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.Matchers; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; /** Unit tests for {@link BigQueryMetricsEnqueuer}. */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public class BigQueryMetricsEnqueuerTest { @Rule @@ -52,7 +52,7 @@ public class BigQueryMetricsEnqueuerTest { .withTaskQueue() .build(); - @Mock ModulesService modulesService; + private final ModulesService modulesService = mock(ModulesService.class); private BigQueryMetricsEnqueuer enqueuer; diff --git a/javatests/google/registry/monitoring/whitebox/MetricsExportActionTest.java b/javatests/google/registry/monitoring/whitebox/MetricsExportActionTest.java index 90df59a66..85bbcd9c0 100644 --- a/javatests/google/registry/monitoring/whitebox/MetricsExportActionTest.java +++ b/javatests/google/registry/monitoring/whitebox/MetricsExportActionTest.java @@ -16,6 +16,7 @@ package google.registry.monitoring.whitebox; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -37,7 +38,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Matchers; -import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; /** Unit tests for {@link MetricsExportAction}. */ @@ -50,17 +50,10 @@ public class MetricsExportActionTest { .withTaskQueue() .build(); - @Mock - BigqueryFactory bigqueryFactory; - - @Mock - Bigquery bigquery; - - @Mock - Tabledata tabledata; - - @Mock - InsertAll insertAll; + private final BigqueryFactory bigqueryFactory = mock(BigqueryFactory.class); + private final Bigquery bigquery = mock(Bigquery.class); + private final Tabledata tabledata = mock(Tabledata.class); + private final InsertAll insertAll = mock(InsertAll.class); private TableDataInsertAllResponse response = new TableDataInsertAllResponse(); private long currentTimeMillis = 1000000000000L; diff --git a/javatests/google/registry/rde/RdeUploadActionTest.java b/javatests/google/registry/rde/RdeUploadActionTest.java index 8f5a5ce41..40d561c6c 100644 --- a/javatests/google/registry/rde/RdeUploadActionTest.java +++ b/javatests/google/registry/rde/RdeUploadActionTest.java @@ -89,11 +89,11 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.runners.JUnit4; import org.mockito.stubbing.OngoingStubbing; /** Unit tests for {@link RdeUploadAction}. */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public class RdeUploadActionTest { private static final int BUFFER_SIZE = 64 * 1024; diff --git a/javatests/google/registry/rde/imports/RdeContactImportActionTest.java b/javatests/google/registry/rde/imports/RdeContactImportActionTest.java index 5a74edf9e..7ac0d2a85 100644 --- a/javatests/google/registry/rde/imports/RdeContactImportActionTest.java +++ b/javatests/google/registry/rde/imports/RdeContactImportActionTest.java @@ -46,10 +46,10 @@ import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.runners.JUnit4; /** Unit tests for {@link RdeContactImportAction}. */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public class RdeContactImportActionTest extends MapreduceTestCase { private static final ByteSource DEPOSIT_1_CONTACT = diff --git a/javatests/google/registry/rde/imports/RdeContactInputTest.java b/javatests/google/registry/rde/imports/RdeContactInputTest.java index 06700688f..cbc2a0f34 100644 --- a/javatests/google/registry/rde/imports/RdeContactInputTest.java +++ b/javatests/google/registry/rde/imports/RdeContactInputTest.java @@ -33,10 +33,10 @@ import java.util.List; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.runners.JUnit4; /** Unit tests for {@link RdeContactInput} */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public class RdeContactInputTest { private static final ByteSource DEPOSIT_0_CONTACT = diff --git a/javatests/google/registry/rde/imports/RdeContactReaderTest.java b/javatests/google/registry/rde/imports/RdeContactReaderTest.java index 802326282..a4fa20bc6 100644 --- a/javatests/google/registry/rde/imports/RdeContactReaderTest.java +++ b/javatests/google/registry/rde/imports/RdeContactReaderTest.java @@ -40,10 +40,10 @@ import java.util.NoSuchElementException; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.runners.JUnit4; /** Unit tests for {@link RdeContactReader} */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public class RdeContactReaderTest { private static final ByteSource DEPOSIT_1_CONTACT = diff --git a/javatests/google/registry/rde/imports/RdeDomainImportActionTest.java b/javatests/google/registry/rde/imports/RdeDomainImportActionTest.java index aee84fad9..f4cdb7d7f 100644 --- a/javatests/google/registry/rde/imports/RdeDomainImportActionTest.java +++ b/javatests/google/registry/rde/imports/RdeDomainImportActionTest.java @@ -60,10 +60,10 @@ import org.joda.time.Seconds; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.runners.JUnit4; /** Unit tests for {@link RdeDomainImportAction}. */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public class RdeDomainImportActionTest extends MapreduceTestCase { private static final ByteSource DEPOSIT_1_DOMAIN = RdeImportsTestData.get("deposit_1_domain.xml"); diff --git a/javatests/google/registry/rde/imports/RdeHostImportActionTest.java b/javatests/google/registry/rde/imports/RdeHostImportActionTest.java index 4edc3746f..2f837be9f 100644 --- a/javatests/google/registry/rde/imports/RdeHostImportActionTest.java +++ b/javatests/google/registry/rde/imports/RdeHostImportActionTest.java @@ -46,10 +46,10 @@ import org.joda.time.DateTime; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.runners.JUnit4; /** Unit tests for {@link RdeHostImportAction}. */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public class RdeHostImportActionTest extends MapreduceTestCase { private static final ByteSource DEPOSIT_1_HOST = RdeImportsTestData.get("deposit_1_host.xml"); diff --git a/javatests/google/registry/rde/imports/RdeHostReaderTest.java b/javatests/google/registry/rde/imports/RdeHostReaderTest.java index e30668104..6a83c9f68 100644 --- a/javatests/google/registry/rde/imports/RdeHostReaderTest.java +++ b/javatests/google/registry/rde/imports/RdeHostReaderTest.java @@ -40,10 +40,10 @@ import java.util.NoSuchElementException; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.runners.JUnit4; /** Unit tests for {@link RdeHostReader} */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public class RdeHostReaderTest { private static final ByteSource DEPOSIT_1_HOST = RdeImportsTestData.get("deposit_1_host.xml"); diff --git a/javatests/google/registry/rde/imports/RdeImportUtilsTest.java b/javatests/google/registry/rde/imports/RdeImportUtilsTest.java index a527d5263..2e59b3f90 100644 --- a/javatests/google/registry/rde/imports/RdeImportUtilsTest.java +++ b/javatests/google/registry/rde/imports/RdeImportUtilsTest.java @@ -23,6 +23,7 @@ import static google.registry.testing.DatastoreHelper.persistResource; import static org.joda.time.DateTimeZone.UTC; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -61,11 +62,10 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.runners.JUnit4; /** Unit tests for {@link RdeImportUtils} */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public class RdeImportUtilsTest extends ShardableTestCase { private static final ByteSource DEPOSIT_XML = RdeImportsTestData.get("deposit_full.xml"); @@ -84,8 +84,7 @@ public class RdeImportUtilsTest extends ShardableTestCase { @Rule public final ExceptionRule thrown = new ExceptionRule(); - @Mock - private GcsUtils gcsUtils; + private final GcsUtils gcsUtils = mock(GcsUtils.class); private RdeImportUtils rdeImportUtils; private FakeClock clock; diff --git a/javatests/google/registry/request/RequestHandlerTest.java b/javatests/google/registry/request/RequestHandlerTest.java index 6f65e20b4..4600c580b 100644 --- a/javatests/google/registry/request/RequestHandlerTest.java +++ b/javatests/google/registry/request/RequestHandlerTest.java @@ -17,6 +17,7 @@ package google.registry.request; import static com.google.common.truth.Truth.assertThat; import static google.registry.request.Action.Method.GET; import static google.registry.request.Action.Method.POST; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; @@ -51,11 +52,10 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.runners.JUnit4; /** Unit tests for {@link RequestHandler}. */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public final class RequestHandlerTest { @Rule @@ -221,23 +221,12 @@ public final class RequestHandlerTest { } } - @Mock - private HttpServletRequest req; - - @Mock - private HttpServletResponse rsp; - - @Mock - private BumblebeeTask bumblebeeTask; - - @Mock - private SlothTask slothTask; - - @Mock - private UsersOnlyAction usersOnlyAction; - - @Mock - private SafeSlothTask safeSlothTask; + private final HttpServletRequest req = mock(HttpServletRequest.class); + private final HttpServletResponse rsp = mock(HttpServletResponse.class); + private final BumblebeeTask bumblebeeTask = mock(BumblebeeTask.class); + private final SlothTask slothTask = mock(SlothTask.class); + private final UsersOnlyAction usersOnlyAction = mock(UsersOnlyAction.class); + private final SafeSlothTask safeSlothTask = mock(SafeSlothTask.class); private final Component component = new Component(); private final StringWriter httpOutput = new StringWriter(); diff --git a/javatests/google/registry/request/RequestParametersTest.java b/javatests/google/registry/request/RequestParametersTest.java index 52b33a74b..68e8fc0c2 100644 --- a/javatests/google/registry/request/RequestParametersTest.java +++ b/javatests/google/registry/request/RequestParametersTest.java @@ -21,6 +21,7 @@ import static google.registry.request.RequestParameters.extractOptionalDatetimeP import static google.registry.request.RequestParameters.extractOptionalParameter; import static google.registry.request.RequestParameters.extractRequiredDatetimeParameter; import static google.registry.request.RequestParameters.extractRequiredParameter; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; @@ -31,18 +32,16 @@ import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.runners.JUnit4; /** Unit tests for {@link RequestParameters}. */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public class RequestParametersTest { @Rule public final ExceptionRule thrown = new ExceptionRule(); - @Mock - private HttpServletRequest req; + private final HttpServletRequest req = mock(HttpServletRequest.class); @Test public void testExtractRequiredParameter_valuePresent_returnsValue() throws Exception { diff --git a/javatests/google/registry/request/ResponseImplTest.java b/javatests/google/registry/request/ResponseImplTest.java index 274f33410..001423bcd 100644 --- a/javatests/google/registry/request/ResponseImplTest.java +++ b/javatests/google/registry/request/ResponseImplTest.java @@ -16,6 +16,7 @@ package google.registry.request; import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -27,18 +28,16 @@ import javax.servlet.http.HttpServletResponse; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.junit.runners.JUnit4; /** Unit tests for {@link ResponseImpl}. */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(JUnit4.class) public class ResponseImplTest { @Rule public final ExceptionRule thrown = new ExceptionRule(); - @Mock - private HttpServletResponse rsp; + private final HttpServletResponse rsp = mock(HttpServletResponse.class); @Test public void testSetStatus() throws Exception {