From 30007f936d35b49de0ca7650ab69644b5dd64ba9 Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 25 Jun 2014 16:08:01 +0000 Subject: [PATCH] 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 --- source/test-java/org/alfresco/opencmis/CMISTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/source/test-java/org/alfresco/opencmis/CMISTest.java b/source/test-java/org/alfresco/opencmis/CMISTest.java index f38fc652ff..8a0e697566 100644 --- a/source/test-java/org/alfresco/opencmis/CMISTest.java +++ b/source/test-java/org/alfresco/opencmis/CMISTest.java @@ -2040,13 +2040,14 @@ public class CMISTest { AuthenticationUtil.pushAuthentication(); AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); + final String groupName = "group" + GUID.generate(); + final String testGroup = PermissionService.GROUP_PREFIX + groupName; try { // preconditions: create test document - final String testGroup = PermissionService.GROUP_PREFIX + "group1"; if (!authorityService.authorityExists(testGroup)) { - authorityService.createAuthority(AuthorityType.GROUP, "group1"); + authorityService.createAuthority(AuthorityType.GROUP, groupName); } final FileInfo document = transactionService.getRetryingTransactionHelper().doInTransaction( @@ -2141,6 +2142,10 @@ public class CMISTest } finally { + if (authorityService.authorityExists(testGroup)) + { + authorityService.deleteAuthority(testGroup); + } AuthenticationUtil.popAuthentication(); } }