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

Inject PostLoginActivities and refactor

Browse Source
This commit is contained in:
Sankaranarayanan Viswanathan
2014-10-08 22:18:16 -04:00
parent 67d7315003
commit 64b5d64709
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/test/java/com/commafeed/backend/service/UserServiceTest.java
View File

@@ -2,20 +2,19 @@ package com.commafeed.backend.service;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.doNothing;
import org.junit.Assert;
import org.junit.Test;
import com.commafeed.backend.dao.UserDAO;
import com.commafeed.backend.model.User;
import com.commafeed.backend.service.internal.PostLoginActivities;
import com.google.common.base.Optional;
public class UserServiceTest {
@Test public void
@@ -99,7 +98,7 @@ public class UserServiceTest {
when(encryptionService.authenticate(anyString(), any(byte[].class), any(byte[].class))).thenReturn(false);
// Create service with mocks
UserService service = new UserService(null, dao, null, null, encryptionService, null);
UserService service = new UserService(null, dao, null, encryptionService, null, null);
// Try to login as the user
service.login("test", "password");
@@ -130,7 +129,7 @@ public class UserServiceTest {
when(encryptionService.authenticate(anyString(), any(byte[].class), any(byte[].class))).thenReturn(false);
// Create service with mocks
UserService service = new UserService(null, dao, null, null, encryptionService, null);
UserService service = new UserService(null, dao, null, encryptionService, null, null);
// Try to login as the user
Optional<User> authenticatedUser = service.login("test", "password");
@@ -160,15 +159,15 @@ public class UserServiceTest {
PasswordEncryptionService encryptionService = mock(PasswordEncryptionService.class);
when(encryptionService.authenticate(anyString(), any(byte[].class), any(byte[].class))).thenReturn(true);
// Create service with mocks
UserService service = new UserService(null, dao, null, null, encryptionService, null);
// Mock PostLoginActivities to do nothing
PostLoginActivities postLoginActivities = mock(PostLoginActivities.class);
doNothing().when(postLoginActivities).executeFor(any(User.class));
// Skip afterLogin activities
UserService spy = spy(service);
doNothing().when(spy).afterLogin(any(User.class));
// Create service with mocks
UserService service = new UserService(null, dao, null, encryptionService, null, postLoginActivities);
// Try to login as the user
Optional<User> authenticatedUser = spy.login("test", "password");
Optional<User> authenticatedUser = service.login("test", "password");
Assert.assertTrue(authenticatedUser.isPresent());
Assert.assertEquals(user, authenticatedUser.get());