Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

73693: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73621: MNT-10165: CMIS 1.1 API: Impossible to remove ACL through Atom binding
      Fix test failure - fix CMISTest to not affect on AuthorityServiceTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 16:08:01 +00:00
parent 110275a785
commit 30007f936d

View File

@@ -2040,13 +2040,14 @@ public class CMISTest
{ {
AuthenticationUtil.pushAuthentication(); AuthenticationUtil.pushAuthentication();
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
final String groupName = "group" + GUID.generate();
final String testGroup = PermissionService.GROUP_PREFIX + groupName;
try try
{ {
// preconditions: create test document // preconditions: create test document
final String testGroup = PermissionService.GROUP_PREFIX + "group1";
if (!authorityService.authorityExists(testGroup)) if (!authorityService.authorityExists(testGroup))
{ {
authorityService.createAuthority(AuthorityType.GROUP, "group1"); authorityService.createAuthority(AuthorityType.GROUP, groupName);
} }
final FileInfo document = transactionService.getRetryingTransactionHelper().doInTransaction( final FileInfo document = transactionService.getRetryingTransactionHelper().doInTransaction(
@@ -2141,6 +2142,10 @@ public class CMISTest
} }
finally finally
{ {
if (authorityService.authorityExists(testGroup))
{
authorityService.deleteAuthority(testGroup);
}
AuthenticationUtil.popAuthentication(); AuthenticationUtil.popAuthentication();
} }
} }