mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Unit test fix for r6399
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -49,6 +49,7 @@ import net.sf.acegisecurity.providers.dao.SaltSource;
|
|||||||
import org.alfresco.model.ContentModel;
|
import org.alfresco.model.ContentModel;
|
||||||
import org.alfresco.repo.cache.SimpleCache;
|
import org.alfresco.repo.cache.SimpleCache;
|
||||||
import org.alfresco.repo.security.authentication.InMemoryTicketComponentImpl.Ticket;
|
import org.alfresco.repo.security.authentication.InMemoryTicketComponentImpl.Ticket;
|
||||||
|
import org.alfresco.repo.tenant.TenantService;
|
||||||
import org.alfresco.service.ServiceRegistry;
|
import org.alfresco.service.ServiceRegistry;
|
||||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||||
import org.alfresco.service.cmr.repository.NodeRef;
|
import org.alfresco.service.cmr.repository.NodeRef;
|
||||||
@@ -71,6 +72,8 @@ public class AuthenticationTest extends TestCase
|
|||||||
|
|
||||||
private NodeService nodeService;
|
private NodeService nodeService;
|
||||||
|
|
||||||
|
private TenantService tenantService;
|
||||||
|
|
||||||
private SearchService searchService;
|
private SearchService searchService;
|
||||||
|
|
||||||
private NodeRef rootNodeRef;
|
private NodeRef rootNodeRef;
|
||||||
@@ -119,6 +122,7 @@ public class AuthenticationTest extends TestCase
|
|||||||
{
|
{
|
||||||
|
|
||||||
nodeService = (NodeService) ctx.getBean("nodeService");
|
nodeService = (NodeService) ctx.getBean("nodeService");
|
||||||
|
tenantService = (TenantService) ctx.getBean("tenantService");
|
||||||
searchService = (SearchService) ctx.getBean("searchService");
|
searchService = (SearchService) ctx.getBean("searchService");
|
||||||
dictionaryService = (DictionaryService) ctx.getBean("dictionaryService");
|
dictionaryService = (DictionaryService) ctx.getBean("dictionaryService");
|
||||||
passwordEncoder = (MD4PasswordEncoder) ctx.getBean("passwordEncoder");
|
passwordEncoder = (MD4PasswordEncoder) ctx.getBean("passwordEncoder");
|
||||||
@@ -162,6 +166,7 @@ public class AuthenticationTest extends TestCase
|
|||||||
private void deleteAndy()
|
private void deleteAndy()
|
||||||
{
|
{
|
||||||
RepositoryAuthenticationDao dao = new RepositoryAuthenticationDao();
|
RepositoryAuthenticationDao dao = new RepositoryAuthenticationDao();
|
||||||
|
dao.setTenantService(tenantService);
|
||||||
dao.setNodeService(nodeService);
|
dao.setNodeService(nodeService);
|
||||||
dao.setSearchService(searchService);
|
dao.setSearchService(searchService);
|
||||||
dao.setDictionaryService(dictionaryService);
|
dao.setDictionaryService(dictionaryService);
|
||||||
@@ -241,9 +246,16 @@ public class AuthenticationTest extends TestCase
|
|||||||
authenticationService.authenticate("Andy", "".toCharArray());
|
authenticationService.authenticate("Andy", "".toCharArray());
|
||||||
assertEquals("Andy", authenticationService.getCurrentUserName());
|
assertEquals("Andy", authenticationService.getCurrentUserName());
|
||||||
|
|
||||||
authenticationService.createAuthentication("Mr.Woof.Banana@chocolate.chip.cookie.com", "".toCharArray());
|
if (! tenantService.isEnabled())
|
||||||
authenticationService.authenticate("Mr.Woof.Banana@chocolate.chip.cookie.com", "".toCharArray());
|
{
|
||||||
assertEquals("Mr.Woof.Banana@chocolate.chip.cookie.com", authenticationService.getCurrentUserName());
|
authenticationService.createAuthentication("Mr.Woof.Banana@chocolate.chip.cookie.com", "".toCharArray());
|
||||||
|
authenticationService.authenticate("Mr.Woof.Banana@chocolate.chip.cookie.com", "".toCharArray());
|
||||||
|
assertEquals("Mr.Woof.Banana@chocolate.chip.cookie.com", authenticationService.getCurrentUserName());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// TODO - could create tenant domain 'chocolate.chip.cookie.com'
|
||||||
|
}
|
||||||
|
|
||||||
authenticationService.createAuthentication("Andy_Woof/Domain", "".toCharArray());
|
authenticationService.createAuthentication("Andy_Woof/Domain", "".toCharArray());
|
||||||
authenticationService.authenticate("Andy_Woof/Domain", "".toCharArray());
|
authenticationService.authenticate("Andy_Woof/Domain", "".toCharArray());
|
||||||
@@ -253,16 +265,22 @@ public class AuthenticationTest extends TestCase
|
|||||||
authenticationService.authenticate("Andy_ Woof/Domain", "".toCharArray());
|
authenticationService.authenticate("Andy_ Woof/Domain", "".toCharArray());
|
||||||
assertEquals("Andy_ Woof/Domain", authenticationService.getCurrentUserName());
|
assertEquals("Andy_ Woof/Domain", authenticationService.getCurrentUserName());
|
||||||
|
|
||||||
|
if (! tenantService.isEnabled())
|
||||||
authenticationService.createAuthentication("Andy `\u00ac\u00a6!\u00a3$%^&*()-_=+\t\n\u0000[]{};'#:@~,./<>?\\|", "".toCharArray());
|
{
|
||||||
authenticationService.authenticate("Andy `\u00ac\u00a6!\u00a3$%^&*()-_=+\t\n\u0000[]{};'#:@~,./<>?\\|", "".toCharArray());
|
authenticationService.createAuthentication("Andy `\u00ac\u00a6!\u00a3$%^&*()-_=+\t\n\u0000[]{};'#:@~,./<>?\\|", "".toCharArray());
|
||||||
assertEquals("Andy `\u00ac\u00a6!\u00a3$%^&*()-_=+\t\n\u0000[]{};'#:@~,./<>?\\|", authenticationService.getCurrentUserName());
|
authenticationService.authenticate("Andy `\u00ac\u00a6!\u00a3$%^&*()-_=+\t\n\u0000[]{};'#:@~,./<>?\\|", "".toCharArray());
|
||||||
|
assertEquals("Andy `\u00ac\u00a6!\u00a3$%^&*()-_=+\t\n\u0000[]{};'#:@~,./<>?\\|", authenticationService.getCurrentUserName());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// tenant domain ~,./<>?\\| is not valid format"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testCreateAndyUserAndOtherCRUD() throws NoSuchAlgorithmException, UnsupportedEncodingException
|
public void testCreateAndyUserAndOtherCRUD() throws NoSuchAlgorithmException, UnsupportedEncodingException
|
||||||
{
|
{
|
||||||
RepositoryAuthenticationDao dao = new RepositoryAuthenticationDao();
|
RepositoryAuthenticationDao dao = new RepositoryAuthenticationDao();
|
||||||
|
dao.setTenantService(tenantService);
|
||||||
dao.setNodeService(nodeService);
|
dao.setNodeService(nodeService);
|
||||||
dao.setSearchService(searchService);
|
dao.setSearchService(searchService);
|
||||||
dao.setDictionaryService(dictionaryService);
|
dao.setDictionaryService(dictionaryService);
|
||||||
|
Reference in New Issue
Block a user