zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-21 18:26:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove some unnecessary uses of MockitoJUnitRunner, which is discouraged

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=153711358
This commit is contained in:
mountford 2017-04-20 08:20:40 -07:00 • committed by Ben McIlwain
parent 8f05ca466f
commit a259b42b26
16 changed files with 65 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

23
javatests/google/registry/ui/server/registrar/SessionUtilsTest.java
View file

@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.AppEngineRule.THE_REGISTRAR_GAE_USER_ID;
import static google.registry.testing.DatastoreHelper.deleteResource;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
@ -37,11 +38,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 SessionUtils}. */
@RunWith(MockitoJUnitRunner.class)
@RunWith(JUnit4.class)
public class SessionUtilsTest {
@Rule
@ -55,17 +55,10 @@ public class SessionUtilsTest {
@Rule
public final InjectRule inject = new InjectRule();
@Mock
private UserService userService;
@Mock
private HttpServletRequest req;
@Mock
private HttpServletResponse rsp;
@Mock
private HttpSession session;
private final UserService userService = mock(UserService.class);
private final HttpServletRequest req = mock(HttpServletRequest.class);
private final HttpServletResponse rsp = mock(HttpServletResponse.class);
private final HttpSession session = mock(HttpSession.class);
private SessionUtils sessionUtils;
private final User jart = new User("jart@google.com", "google.com", THE_REGISTRAR_GAE_USER_ID);
@ -112,7 +105,7 @@ public class SessionUtilsTest {
}
@Test
public void testCheckRegistrarConsoleLogin_notLoggedIn_throwsIllegalStateException()
public void testCheckRegistrarConsoleLogin_notLoggedIn_throwsIllegalStateException()
throws Exception {
thrown.expect(IllegalStateException.class);
@SuppressWarnings("unused")