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

fix build

Browse Source
This commit is contained in:
Athou
2015-03-29 21:34:47 +02:00
parent 74d4c18c4c
commit fb2add305e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ import org.mockito.MockitoAnnotations;
import com.commafeed.CommaFeedConfiguration; import com.commafeed.CommaFeedConfiguration;
import com.commafeed.backend.dao.FeedCategoryDAO; import com.commafeed.backend.dao.FeedCategoryDAO;
import com.commafeed.backend.dao.UserDAO; import com.commafeed.backend.dao.UserDAO;
import com.commafeed.backend.dao.UserRoleDAO;
import com.commafeed.backend.dao.UserSettingsDAO; import com.commafeed.backend.dao.UserSettingsDAO;
import com.commafeed.backend.model.User; import com.commafeed.backend.model.User;
import com.commafeed.backend.service.internal.PostLoginActivities; import com.commafeed.backend.service.internal.PostLoginActivities;
@@ -37,6 +38,8 @@ public class UserServiceTest {
@Mock @Mock
private UserSettingsDAO userSettingsDAO; private UserSettingsDAO userSettingsDAO;
@Mock @Mock
private UserRoleDAO userRoleDAO;
@Mock
private PasswordEncryptionService passwordEncryptionService; private PasswordEncryptionService passwordEncryptionService;
@Mock @Mock
private PostLoginActivities postLoginActivities; private PostLoginActivities postLoginActivities;
@@ -50,8 +53,8 @@ public class UserServiceTest {
public void before_each_test() { public void before_each_test() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
userService = new UserService(feedCategoryDAO, userDAO, userSettingsDAO, passwordEncryptionService, commaFeedConfiguration, userService = new UserService(feedCategoryDAO, userDAO, userRoleDAO, userSettingsDAO, passwordEncryptionService,
postLoginActivities); commaFeedConfiguration, postLoginActivities);
disabledUser = new User(); disabledUser = new User();
disabledUser.setDisabled(true); disabledUser.setDisabled(true);

2
src/test/java/com/commafeed/frontend/auth/SecurityCheckFactoryTest.java
View File

@@ -24,7 +24,7 @@ public class SecurityCheckFactoryTest {
PostLoginActivities postLoginActivities = mock(PostLoginActivities.class); PostLoginActivities postLoginActivities = mock(PostLoginActivities.class);
UserService service = new UserService(null, null, null, null, null, postLoginActivities); UserService service = new UserService(null, null, null, null, null, null, postLoginActivities);
SecurityCheckFactory factory = new SecurityCheckFactory(null, false); SecurityCheckFactory factory = new SecurityCheckFactory(null, false);
factory.userService = service; factory.userService = service;