mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.1 to HEAD
13256: Fix ETHREEOH-1221 Hard-coded use of "admin" username ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.1:r13256 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -52,6 +52,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
|
|||||||
import org.springframework.context.ConfigurableApplicationContext;
|
import org.springframework.context.ConfigurableApplicationContext;
|
||||||
import org.alfresco.service.cmr.security.AuthenticationService;
|
import org.alfresco.service.cmr.security.AuthenticationService;
|
||||||
import org.alfresco.service.cmr.model.*;
|
import org.alfresco.service.cmr.model.*;
|
||||||
|
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||||
import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
|
import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
|
||||||
import org.alfresco.util.TestWithUserUtils;
|
import org.alfresco.util.TestWithUserUtils;
|
||||||
import org.apache.shale.test.mock.*;
|
import org.apache.shale.test.mock.*;
|
||||||
@@ -123,12 +124,12 @@ public class FormsTest
|
|||||||
final NodeRef rootNodeRef = this.nodeService.getRootNode(testStoreRef);
|
final NodeRef rootNodeRef = this.nodeService.getRootNode(testStoreRef);
|
||||||
|
|
||||||
// Create an authenticate the user
|
// Create an authenticate the user
|
||||||
if(!authenticationDAO.userExists("admin"))
|
if(!authenticationDAO.userExists(AuthenticationUtil.getAdminUserName()))
|
||||||
{
|
{
|
||||||
authenticationService.createAuthentication("admin", "admin".toCharArray());
|
authenticationService.createAuthentication(AuthenticationUtil.getAdminUserName(), "admin".toCharArray());
|
||||||
}
|
}
|
||||||
|
|
||||||
TestWithUserUtils.authenticateUser("admin",
|
TestWithUserUtils.authenticateUser(AuthenticationUtil.getAdminUserName(),
|
||||||
"admin",
|
"admin",
|
||||||
rootNodeRef,
|
rootNodeRef,
|
||||||
authenticationService);
|
authenticationService);
|
||||||
|
Reference in New Issue
Block a user