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 HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
59278: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59275: MNT-10109 (and MNT-10237): Permissions are not restored when a deleted site is recovered from the trashcan
      Fix InvitationCleanupTest failure by purging archived test site from trashcan so that sitename can be reused


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62128 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 01:26:31 +00:00
parent 0144810a6d
commit 7b2773da9c
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/test-java/org/alfresco/repo/invitation/InvitationCleanupTest.java
View File

@@ -24,6 +24,7 @@ import static org.junit.Assert.assertEquals;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.site.SiteModel; import org.alfresco.repo.site.SiteModel;
@@ -31,6 +32,8 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.invitation.Invitation.ResourceType; import org.alfresco.service.cmr.invitation.Invitation.ResourceType;
import org.alfresco.service.cmr.invitation.InvitationService; import org.alfresco.service.cmr.invitation.InvitationService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.cmr.workflow.WorkflowService; import org.alfresco.service.cmr.workflow.WorkflowService;
@@ -73,6 +76,7 @@ public class InvitationCleanupTest
private static SiteService SITE_SERVICE; private static SiteService SITE_SERVICE;
private static RetryingTransactionHelper TRANSACTION_HELPER; private static RetryingTransactionHelper TRANSACTION_HELPER;
private static WorkflowService WORKFLOW_SERVICE; private static WorkflowService WORKFLOW_SERVICE;
private static NodeArchiveService NODE_ARCHIVE_SERVICE;
@BeforeClass public static void initStaticData() throws Exception @BeforeClass public static void initStaticData() throws Exception
{ {
@@ -80,6 +84,7 @@ public class InvitationCleanupTest
SITE_SERVICE = APP_CONTEXT_INIT.getApplicationContext().getBean("SiteService", SiteService.class); SITE_SERVICE = APP_CONTEXT_INIT.getApplicationContext().getBean("SiteService", SiteService.class);
TRANSACTION_HELPER = APP_CONTEXT_INIT.getApplicationContext().getBean("retryingTransactionHelper", RetryingTransactionHelper.class); TRANSACTION_HELPER = APP_CONTEXT_INIT.getApplicationContext().getBean("retryingTransactionHelper", RetryingTransactionHelper.class);
WORKFLOW_SERVICE = APP_CONTEXT_INIT.getApplicationContext().getBean("WorkflowService", WorkflowService.class); WORKFLOW_SERVICE = APP_CONTEXT_INIT.getApplicationContext().getBean("WorkflowService", WorkflowService.class);
NODE_ARCHIVE_SERVICE = APP_CONTEXT_INIT.getApplicationContext().getBean("nodeArchiveService", NodeArchiveService.class);
} }
/** See CLOUD-1824 for details on bug & ALF-11872 for details on a related, older bug. */ /** See CLOUD-1824 for details on bug & ALF-11872 for details on a related, older bug. */
@@ -125,17 +130,21 @@ public class InvitationCleanupTest
} }
}); });
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>() NodeRef archivedNodeRef = TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<NodeRef>()
{ {
public Void execute() throws Throwable public NodeRef execute() throws Throwable
{ {
SiteInfo siteInfo = SITE_SERVICE.getSite(siteShortName);
// UserOne ignores the task and instead deletes the site. // UserOne ignores the task and instead deletes the site.
SITE_SERVICE.deleteSite(siteShortName); SITE_SERVICE.deleteSite(siteShortName);
return null; return NODE_ARCHIVE_SERVICE.getArchivedNode(siteInfo.getNodeRef());
} }
}); });
// Purge deleted site from trashcan so that sitename can be reused
NODE_ARCHIVE_SERVICE.purgeArchivedNode(archivedNodeRef);
// The pending inviations are deleted asynchronously and so we must wait for that deletion to complete. // The pending inviations are deleted asynchronously and so we must wait for that deletion to complete.
// TODO Obviously Thread.sleep is not the best way to do this. // TODO Obviously Thread.sleep is not the best way to do this.
Thread.sleep(1000); Thread.sleep(1000);