mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-20 06:54:43 +00:00
Code Issues Releases Wiki Activity

Remove backported MockitoJUnitRule

Browse Source 
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
This commit is contained in:
jianglai
2019-03-08 18:35:00 -05:00
parent c7be1388db
commit f681ec24ff
38 changed files with 85 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
javatests/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java
+3 -2
View File
@@ -39,7 +39,6 @@ import google.registry.testing.AppEngineRule;
import google.registry.testing.DeterministicStringGenerator;
import google.registry.testing.FakeClock;
import google.registry.testing.FakeResponse;
import google.registry.testing.MockitoJUnitRule;
import google.registry.ui.server.SendEmailUtils;
import google.registry.util.SendEmailService;
import java.util.Optional;
@@ -54,6 +53,8 @@ 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;
@RunWith(JUnit4.class)
public final class ConsoleOteSetupActionTest {
@@ -63,7 +64,7 @@ public final class ConsoleOteSetupActionTest {
.withDatastore()
.build();
@Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
@Rule public final MockitoRule mocks = MockitoJUnit.rule();
private final FakeResponse response = new FakeResponse();
private final ConsoleOteSetupAction action = new ConsoleOteSetupAction();
javatests/google/registry/ui/server/registrar/ConsoleRegistrarCreatorActionTest.java
+3 -2
View File
@@ -40,7 +40,6 @@ import google.registry.testing.AppEngineRule;
import google.registry.testing.DeterministicStringGenerator;
import google.registry.testing.FakeClock;
import google.registry.testing.FakeResponse;
import google.registry.testing.MockitoJUnitRule;
import google.registry.ui.server.SendEmailUtils;
import google.registry.util.SendEmailService;
import java.util.Optional;
@@ -56,6 +55,8 @@ 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;
@RunWith(JUnit4.class)
public final class ConsoleRegistrarCreatorActionTest {
@@ -65,7 +66,7 @@ public final class ConsoleRegistrarCreatorActionTest {
.withDatastore()
.build();
@Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
@Rule public final MockitoRule mocks = MockitoJUnit.rule();
private final FakeResponse response = new FakeResponse();
private final ConsoleRegistrarCreatorAction action = new ConsoleRegistrarCreatorAction();
javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java
+3 -2
View File
@@ -40,7 +40,6 @@ import google.registry.request.auth.UserAuthInfo;
import google.registry.testing.AppEngineRule;
import google.registry.testing.FakeClock;
import google.registry.testing.InjectRule;
import google.registry.testing.MockitoJUnitRule;
import google.registry.ui.server.SendEmailUtils;
import google.registry.util.AppEngineServiceUtils;
import google.registry.util.SendEmailService;
@@ -59,6 +58,8 @@ import org.junit.Rule;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
/** Base class for tests using {@link RegistrarSettingsAction}. */
@RunWith(JUnit4.class)
@@ -71,7 +72,7 @@ public class RegistrarSettingsActionTestCase {
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 AppEngineServiceUtils appEngineServiceUtils;
@Mock HttpServletRequest req;