zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-08-04 08:52:12 +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/request/auth/AuthenticatedRegistrarAccessorTest.java
View file

@ -38,7 +38,6 @@ import google.registry.model.registrar.Registrar;
import google.registry.request.auth.AuthenticatedRegistrarAccessor.RegistrarAccessDeniedException;
import google.registry.testing.AppEngineRule;
import google.registry.testing.InjectRule;
import google.registry.testing.MockitoJUnitRule;
import java.util.Optional;
import java.util.logging.Level;
import javax.servlet.http.HttpServletRequest;
@ -50,6 +49,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;
/** Unit tests for {@link AuthenticatedRegistrarAccessor}. */
@RunWith(JUnit4.class)
@ -57,7 +58,7 @@ public class AuthenticatedRegistrarAccessorTest {
@Rule public final AppEngineRule appEngine = AppEngineRule.builder().withDatastore().build();
@Rule public final InjectRule inject = new InjectRule();
@Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
@Rule public final MockitoRule mocks = MockitoJUnit.rule();
@Mock private HttpServletRequest req;
@Mock private HttpServletResponse rsp;

5
javatests/google/registry/request/auth/LegacyAuthenticationMechanismTest.java
View file

@ -27,7 +27,6 @@ import com.google.appengine.api.users.UserService;
import google.registry.security.XsrfTokenManager;
import google.registry.testing.AppEngineRule;
import google.registry.testing.FakeClock;
import google.registry.testing.MockitoJUnitRule;
import javax.servlet.http.HttpServletRequest;
import org.junit.After;
import org.junit.Before;
@ -36,6 +35,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 LegacyAuthenticationMechanismTest {
@ -46,7 +47,7 @@ public final class LegacyAuthenticationMechanismTest {
.withDatastore()
.build();
@Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
@Rule public final MockitoRule mocks = MockitoJUnit.rule();
@Mock private UserService userService;
@Mock private HttpServletRequest req;