inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:

Browse Source 
41642: MT: fix unit test/build (ALF-12732)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41643 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2012-09-17 08:44:22 +00:00
parent 2b8870c772
commit 2a30f9b22f
1 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source/java/org/alfresco/repo/tenant/MultiTDemoTest.java
View File

@@ -1257,27 +1257,37 @@ public class MultiTDemoTest extends TestCase
createTenant(tenantDomain1); createTenant(tenantDomain1);
String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain1); String tenantAdminName = tenantService.getDomainUser(AuthenticationUtil.getAdminUserName(), tenantDomain1);
AuthenticationUtil.runAs(new RunAsWork<Object>()
try
{ {
public Object doWork() throws Exception AuthenticationUtil.setFullyAuthenticatedUser(tenantAdminName); // note: since SiteServiceImpl.setupSitePermissions currently uses getCurrentUserName (rather than runAs)
AuthenticationUtil.runAs(new RunAsWork<Object>()
{ {
createSite("site1"); public Object doWork() throws Exception
{
NodeRef docLib1Ref = siteService.getContainer("site1", SiteService.DOCUMENT_LIBRARY); createSite("site1");
NodeRef contentRef = addContent(docLib1Ref, "tqbfjotld.txt", "The quick brown fox jumps over the lazy dog", MimetypeMap.MIMETYPE_TEXT_PLAIN);
NodeRef docLib1Ref = siteService.getContainer("site1", SiteService.DOCUMENT_LIBRARY);
createSite("site2"); NodeRef contentRef = addContent(docLib1Ref, "tqbfjotld.txt", "The quick brown fox jumps over the lazy dog", MimetypeMap.MIMETYPE_TEXT_PLAIN);
NodeRef docLib2Ref = siteService.getContainer("site2", SiteService.DOCUMENT_LIBRARY); createSite("site2");
nodeService.moveNode(contentRef, docLib2Ref, ContentModel.ASSOC_CONTAINS, QName.createQName("tqbfjotld.txt")); NodeRef docLib2Ref = siteService.getContainer("site2", SiteService.DOCUMENT_LIBRARY);
// for Share, called via "move-to.post.json.js" -> ScriptSiteService.cleanSitePermissions nodeService.moveNode(contentRef, docLib2Ref, ContentModel.ASSOC_CONTAINS, QName.createQName("tqbfjotld.txt"));
siteService.cleanSitePermissions(contentRef, null);
// for Share, called via "move-to.post.json.js" -> ScriptSiteService.cleanSitePermissions
return null; siteService.cleanSitePermissions(contentRef, null);
}
}, tenantAdminName); return null;
}
}, tenantAdminName);
}
finally
{
AuthenticationUtil.clearCurrentSecurityContext();
}
} }
public void test_ALF_14354() public void test_ALF_14354()