Revision d7aa17fe
Added by Katja Luther about 5 years ago
| eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/RemotingSessionAwareTest.java | ||
|---|---|---|
| 13 | 13 |
import org.apache.log4j.Logger; |
| 14 | 14 |
import org.junit.After; |
| 15 | 15 |
import org.junit.Before; |
| 16 |
import org.springframework.security.core.userdetails.UserDetails; |
|
| 16 | 17 |
import org.springframework.security.core.userdetails.UsernameNotFoundException; |
| 17 | 18 |
|
| 18 | 19 |
import eu.etaxonomy.cdm.api.application.CdmApplicationState; |
| 19 | 20 |
import eu.etaxonomy.cdm.api.service.IUserService; |
| 20 | 21 |
import eu.etaxonomy.cdm.model.common.Group; |
| 21 | 22 |
import eu.etaxonomy.cdm.model.common.User; |
| 22 |
import eu.etaxonomy.cdm.persistence.dto.MergeResult; |
|
| 23 | 23 |
import eu.etaxonomy.taxeditor.remoting.cache.ConversationalTransientEntityCacher; |
| 24 | 24 |
import eu.etaxonomy.taxeditor.session.ICdmEntitySession; |
| 25 | 25 |
import eu.etaxonomy.taxeditor.session.MockSessionOwner; |
| ... | ... | |
| 53 | 53 |
sessionOwner.setCdmEntitySession(cdmEntitySession); |
| 54 | 54 |
cacher = getCacher(sessionOwner); |
| 55 | 55 |
|
| 56 |
User extraUser = null; |
|
| 56 |
UserDetails extraUser = null;
|
|
| 57 | 57 |
|
| 58 | 58 |
try {
|
| 59 |
extraUser = (User) userService.loadUserByUsername(extraUsername);
|
|
| 59 |
extraUser = userService.loadUserByUsername(extraUsername); |
|
| 60 | 60 |
Group editorGroup = getRemoteApplicationController().getGroupService().find(editorGroupUuid); |
| 61 |
if (!extraUser.getGroups().contains(editorGroup)){
|
|
| 62 |
extraUser.getGroups().add(editorGroup); |
|
| 63 |
userService.merge(extraUser, true); |
|
| 61 |
if (!((User)extraUser).getGroups().contains(editorGroup)){
|
|
| 62 |
((User)extraUser).getGroups().add(editorGroup); |
|
| 63 |
userService.merge(((User)extraUser), true); |
|
| 64 |
|
|
| 64 | 65 |
} |
| 65 | 66 |
} catch (UsernameNotFoundException unfe) {
|
| 66 |
User user = User.NewInstance(extraUsername, extraPassword); |
|
| 67 |
UserDetails user = User.NewInstance(extraUsername, extraPassword);
|
|
| 67 | 68 |
userService.createUser(user); |
| 69 |
user = userService.load(((User)user).getUuid()); |
|
| 68 | 70 |
Group editorGroup = getRemoteApplicationController().getGroupService().find(editorGroupUuid); |
| 69 |
user = userService.load(user.getUuid());
|
|
| 70 |
user.getGroups().add(editorGroup);
|
|
| 71 |
MergeResult<User> result = userService.merge(user, true); |
|
| 72 |
user = result.getMergedEntity(); |
|
| 71 |
((User)user).getGroups().add(editorGroup);
|
|
| 72 |
userService.merge(((User)user), true);
|
|
| 73 |
|
|
| 74 |
|
|
| 73 | 75 |
} |
| 74 | 76 |
|
| 75 | 77 |
|
| ... | ... | |
| 84 | 86 |
|
| 85 | 87 |
|
| 86 | 88 |
protected static void authenticateExtraUser() {
|
| 89 |
|
|
| 87 | 90 |
authenticate(extraUsername, extraPassword); |
| 88 | 91 |
} |
| 89 | 92 |
|
Also available in: Unified diff
fix test in ProgressMonitorServiceTest, extraUser needs to be in group editor