inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-22 15:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.1) to 5.1.N (5.1.1)

Browse Source 
120953 jkaabimofrad: An attempt to fix build failure in Bamboo which appeared by r120912.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-01-18 09:36:54 +00:00
parent 1de7d64a22
commit 2dd522eb64
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/test-java/org/alfresco/repo/tenant/MultiTDemoTest.java
View File

@@ -413,21 +413,29 @@ public class MultiTDemoTest extends TestCase
String tenantDomain = tenantService.getUserDomain(userName);
// Create groups for tenant
TenantUtil.runAsUserTenant(new TenantRunAsWork<Object>()
TenantUtil.runAsUserTenant(new TenantRunAsWork<Void>()
{
public Object doWork() throws Exception
public Void doWork() throws Exception
{
// find person
NodeRef personNodeRef = personService.getPerson(userName);
NodeRef homeSpaceRef = (NodeRef)nodeService.getProperty(personNodeRef, ContentModel.PROP_HOMEFOLDER);
assertNotNull(homeSpaceRef);
for (int i = 0; i < uniqueGroupNames.length; i++)
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
{
authorityService.createAuthority(AuthorityType.GROUP, uniqueGroupNames[i]);
permissionService.setPermission(homeSpaceRef, "GROUP_" + uniqueGroupNames[i], "Consumer", true);
}
@Override
public Void execute() throws Throwable
{
// find person
NodeRef personNodeRef = personService.getPerson(userName);
NodeRef homeSpaceRef = (NodeRef) nodeService.getProperty(personNodeRef, ContentModel.PROP_HOMEFOLDER);
assertNotNull(homeSpaceRef);
for (int i = 0; i < uniqueGroupNames.length; i++)
{
authorityService.createAuthority(AuthorityType.GROUP, uniqueGroupNames[i]);
permissionService.setPermission(homeSpaceRef, "GROUP_" + uniqueGroupNames[i], "Consumer", true);
}
return null;
}
}, false);
return null;
}
}, userName, tenantDomain);