test: Controller- und Service-Test angepasst

Thomas Ziemer
1 parent 668dfe4b
Showing 2 changed files with 20 additions and 3 deletions
src/test/java/net/ziemers/swxercise/lg/user/service/UserServiceTest.java
src/test/java/net/ziemers/swxercise/ui/UserViewControllerTest.java
@@ -311,8 +311,10 @@ public class UserServiceTest extends JpaTestUtils {
     }
     private UserServiceTest loginUser(final String password) {
+        final String SESSION_ID = "testSessionId";
+
         userDto.withPassword(password);
-        actual = underTest.loginUser(userDto);
+        actual = underTest.loginUser(userDto, SESSION_ID);
         return this;
     }
@@ -17,6 +17,9 @@ import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.slf4j.Logger;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
@@ -44,6 +47,12 @@ public class UserViewControllerTest {
     @Mock
     private UserService userService;
+    @Mock
+    private HttpServletRequest request;
+
+    @Mock
+    private HttpSession session;
+
     private UserDto userDto;
     private RestResponse actual;
@@ -256,9 +265,15 @@ public class UserViewControllerTest {
     }
     private void loginUser(final boolean result) {
-        when(userService.loginUser(userDto)).thenReturn(result);
+        final String SESSION_ID = "testSessionId";
+
+        when(userService.loginUser(userDto, SESSION_ID)).thenReturn(result);
+
+        // während der Tests besitzen wir keinen HTTP-Request, also mocken wir ihn weg
+        when(request.getSession(false)).thenReturn(session);
+        when(session.getId()).thenReturn(SESSION_ID);
-        actual = underTest.loginUser(userDto);
+        actual = underTest.loginUser(request, userDto);
     }
     private void logoutUser() {