Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored UserREST login to populate session itself

Browse Source
This commit is contained in:
Sankaranarayanan Viswanathan
2014-10-09 08:38:50 -04:00
parent e38778b4d0
commit 54cc265ee6
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/java/com/commafeed/frontend/resource/UserRestTest.java
View File

@@ -1,6 +1,5 @@
package com.commafeed.frontend.resource;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
@@ -25,7 +24,6 @@ public class UserRestTest {
// Create UserService partial mock
UserService service = mock(UserService.class);
when(service.login("user", "password")).thenReturn(absentUser);
when(service.login(any(String.class), any(String.class), any(HttpSession.class))).thenCallRealMethod();
HttpSession session = mock(HttpSession.class);
UserREST userREST = new UserREST(null, null, null, service, null, null, null);
@@ -47,7 +45,6 @@ public class UserRestTest {
// Create UserService partial mock
UserService service = mock(UserService.class);
when(service.login("user", "password")).thenReturn(Optional.of(user));
when(service.login(any(String.class), any(String.class), any(HttpSession.class))).thenCallRealMethod();
HttpSession session = mock(HttpSession.class);
UserREST userREST = new UserREST(null, null, null, service, null, null, null);