zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-08-05 17:28:25 +02:00
Code Issues Projects Releases Packages 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 12:15:16 -08:00
parent 5056e48363
commit b573b10ae1
38 changed files with 85 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

5
javatests/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java
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();

5
javatests/google/registry/ui/server/registrar/ConsoleRegistrarCreatorActionTest.java
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();

5
javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java
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;