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

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

Browse Source 
59256: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
            58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
               58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Return beforePurgeNode callback binding to Site class.
            58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
            58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
               58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 01:19:54 +00:00
parent 07eb61ba0f
commit fd8771e7aa
10 changed files with 128 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/test-java/org/alfresco/repo/web/scripts/ReadOnlyTransactionInGetRestApiTest.java
View File

@@ -21,6 +21,7 @@ package org.alfresco.repo.web.scripts;
import java.text.MessageFormat;
import java.util.List;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -71,6 +72,7 @@ public class ReadOnlyTransactionInGetRestApiTest extends BaseWebScriptTest
private SiteService siteService;
private NodeService nodeService;
private TransactionService transactionService;
private NodeArchiveService nodeArchiveService;
private NodeRef testSiteNodeRef;
private String testSiteNodeRefString;
@@ -86,14 +88,17 @@ public class ReadOnlyTransactionInGetRestApiTest extends BaseWebScriptTest
this.siteService = (SiteService)appContext.getBean("SiteService");
this.nodeService = (NodeService)appContext.getBean("NodeService");
this.transactionService = (TransactionService)appContext.getBean("TransactionService");
this.nodeArchiveService = (NodeArchiveService)getServer().getApplicationContext().getBean("nodeArchiveService");
// set admin as current user
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
// delete the test site if it's still hanging around from previous runs
if (siteService.getSite(TEST_SITE_NAME) != null)
SiteInfo site = siteService.getSite(TEST_SITE_NAME);
if (site != null)
{
siteService.deleteSite(TEST_SITE_NAME);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(site.getNodeRef()));
}
// create the test site, this should create a site but it won't have any containers created
@@ -115,6 +120,7 @@ public class ReadOnlyTransactionInGetRestApiTest extends BaseWebScriptTest
{
super.tearDown();
SiteInfo site = siteService.getSite(TEST_SITE_NAME);
// use retrying transaction to delete the site
this.transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
{
@@ -127,6 +133,7 @@ public class ReadOnlyTransactionInGetRestApiTest extends BaseWebScriptTest
return null;
}
});
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(site.getNodeRef()));
AuthenticationUtil.clearCurrentSecurityContext();
}