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

Provide a SessionHelper to manage the session

Browse Source
This commit is contained in:
Sankaranarayanan Viswanathan
2014-10-22 01:17:33 -04:00
parent 8d5c3bdec8
commit 12030f6ce9
12 changed files with 148 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/test/java/com/commafeed/frontend/auth/SecurityCheckInjectableTest.java
View File

@@ -14,11 +14,12 @@ import com.commafeed.backend.model.User;
import com.commafeed.backend.service.UserService;
import com.commafeed.backend.service.internal.PostLoginActivities;
import com.commafeed.frontend.auth.SecurityCheckProvider.SecurityCheckInjectable;
import com.commafeed.frontend.resource.UserREST;
import com.google.common.base.Optional;
public class SecurityCheckInjectableTest {
private static String SESSION_KEY_USER = "user";
@Test public void
cookie_login_does_not_create_a_session_if_not_present() {
HttpServletRequest request = mock(HttpServletRequest.class);
@@ -46,7 +47,7 @@ public class SecurityCheckInjectableTest {
@Test public void
cookie_login_should_not_return_user_if_user_not_present_in_http_session() {
HttpSession session = mock(HttpSession.class);
when(session.getAttribute(UserREST.SESSION_KEY_USER)).thenReturn(null);
when(session.getAttribute(SESSION_KEY_USER)).thenReturn(null);
HttpServletRequest request = mock(HttpServletRequest.class);
when(request.getSession(false)).thenReturn(session);
@@ -64,7 +65,7 @@ public class SecurityCheckInjectableTest {
User userInSession = new User();
HttpSession session = mock(HttpSession.class);
when(session.getAttribute(UserREST.SESSION_KEY_USER)).thenReturn(userInSession);
when(session.getAttribute(SESSION_KEY_USER)).thenReturn(userInSession);
HttpServletRequest request = mock(HttpServletRequest.class);
when(request.getSession(false)).thenReturn(session);
@@ -84,7 +85,7 @@ public class SecurityCheckInjectableTest {
User userInSession = new User();
HttpSession session = mock(HttpSession.class);
when(session.getAttribute(UserREST.SESSION_KEY_USER)).thenReturn(userInSession);
when(session.getAttribute(SESSION_KEY_USER)).thenReturn(userInSession);
HttpServletRequest request = mock(HttpServletRequest.class);
when(request.getSession(false)).thenReturn(session);

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

@@ -3,14 +3,12 @@ package com.commafeed.frontend.resource;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import java.util.Arrays;
import javax.servlet.http.HttpSession;
import org.junit.Test;
import org.mockito.InOrder;
import org.mockito.Matchers;
@@ -18,6 +16,7 @@ import org.mockito.Matchers;
import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.backend.service.UserService;
import com.commafeed.frontend.SessionHelper;
import com.commafeed.frontend.model.request.LoginRequest;
import com.commafeed.frontend.model.request.RegistrationRequest;
import com.google.common.base.Optional;
@@ -33,16 +32,16 @@ public class UserRestTest {
UserService service = mock(UserService.class);
when(service.login("user", "password")).thenReturn(absentUser);
HttpSession session = mock(HttpSession.class);
UserREST userREST = new UserREST(null, null, null, service, null, null, null);
SessionHelper sessionHelper = mock(SessionHelper.class);
LoginRequest req = new LoginRequest();
req.setName("user");
req.setPassword("password");
userREST.login(req, session);
userREST.login(req, sessionHelper);
verifyZeroInteractions(session);
verify(sessionHelper, never()).setLoggedInUser(any(User.class));
}
@Test public void
@@ -54,16 +53,16 @@ public class UserRestTest {
UserService service = mock(UserService.class);
when(service.login("user", "password")).thenReturn(Optional.of(user));
HttpSession session = mock(HttpSession.class);
UserREST userREST = new UserREST(null, null, null, service, null, null, null);
LoginRequest req = new LoginRequest();
req.setName("user");
req.setPassword("password");
userREST.login(req, session);
UserREST userREST = new UserREST(null, null, null, service, null, null, null);
SessionHelper sessionHelper = mock(SessionHelper.class);
verify(session).setAttribute(UserREST.SESSION_KEY_USER, user);
userREST.login(req, sessionHelper);
verify(sessionHelper).setLoggedInUser(user);
}
@Test public void
@@ -76,12 +75,12 @@ public class UserRestTest {
req.setPassword("password");
req.setEmail("test@test.com");
HttpSession session = mock(HttpSession.class);
InOrder inOrder = inOrder(service);
SessionHelper sessionHelper = mock(SessionHelper.class);
UserREST userREST = new UserREST(null, null, null, service, null, null, null);
userREST.register(req, session);
userREST.register(req, sessionHelper);
inOrder.verify(service).register("user", "password", "test@test.com", Arrays.asList(Role.USER));
inOrder.verify(service).login("user", "password");
@@ -92,7 +91,7 @@ public class UserRestTest {
// Create a user
User user = new User();
// Create UserService partial mock
// Create UserService mock
UserService service = mock(UserService.class);
when(service.register(any(String.class), any(String.class), any(String.class), Matchers.anyListOf(Role.class))).thenReturn(user);
when(service.login(any(String.class), any(String.class))).thenReturn(Optional.of(user));
@@ -102,12 +101,12 @@ public class UserRestTest {
req.setPassword("password");
req.setEmail("test@test.com");
HttpSession session = mock(HttpSession.class);
SessionHelper sessionHelper = mock(SessionHelper.class);
UserREST userREST = new UserREST(null, null, null, service, null, null, null);
userREST.register(req, session);
verify(session).setAttribute(UserREST.SESSION_KEY_USER, user);
userREST.register(req, sessionHelper);
verify(sessionHelper).setLoggedInUser(user);
}
}