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 
59269: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59268: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59264: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8) AGAIN!
            58707: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
               58676: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
                  - Delete associated groups on callback when archived site is purged. Add unit test for case.
            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@62125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 01:24:08 +00:00
parent dd04a7ebfa
commit 0144810a6d
16 changed files with 339 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/test-java/org/alfresco/repo/activities/AbstractSiteActivityTest.java
View File

@@ -28,6 +28,7 @@ import org.alfresco.repo.activities.feed.FeedGenerator;
import org.alfresco.repo.activities.feed.local.LocalFeedTaskProcessor;
import org.alfresco.repo.activities.post.lookup.PostLookup;
import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.repo.site.SiteModel;
@@ -35,6 +36,7 @@ import org.alfresco.service.cmr.activities.ActivityService;
import org.alfresco.service.cmr.activities.FeedControl;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.util.ApplicationContextHelper;
@@ -65,6 +67,7 @@ public abstract class AbstractSiteActivityTest
private PersonService personService;
private PostLookup postLookup;
private FeedGenerator feedGenerator;
private NodeArchiveService nodeArchiveService;
//
// Test config & data
@@ -116,6 +119,7 @@ public abstract class AbstractSiteActivityTest
this.siteService = (SiteService)applicationContext.getBean("SiteService");
this.authenticationService = (MutableAuthenticationService)applicationContext.getBean("AuthenticationService");
this.personService = (PersonService)applicationContext.getBean("PersonService");
this.nodeArchiveService = (NodeArchiveService)applicationContext.getBean("nodeArchiveService");
LocalFeedTaskProcessor feedProcessor = null;
@@ -196,8 +200,13 @@ public abstract class AbstractSiteActivityTest
protected void deleteSite(String siteId) throws Exception
{
// delete site (and site's associated groups)
siteService.deleteSite(siteId);
SiteInfo siteInfo = siteService.getSite(siteId);
if (siteInfo != null)
{
// delete site (and site's associated groups)
siteService.deleteSite(siteId);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
}
}
@Test

6
source/test-java/org/alfresco/repo/activities/ActivityServiceImplTest.java
View File

@@ -27,6 +27,7 @@ import junit.framework.TestCase;
import org.alfresco.repo.domain.activities.ActivityPostDAO;
import org.alfresco.repo.domain.activities.ActivityPostEntity;
import org.alfresco.repo.jscript.ClasspathScriptLocation;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.activities.ActivityService;
import org.alfresco.service.cmr.activities.FeedControl;
@@ -34,6 +35,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.ScriptLocation;
import org.alfresco.service.cmr.repository.ScriptService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.test_category.OwnJVMTestsCategory;
@@ -57,6 +59,7 @@ public class ActivityServiceImplTest extends TestCase
private MutableAuthenticationService authenticationService;
private SiteService siteService;
private ActivityPostDAO postDAO;
private NodeArchiveService nodeArchiveService;
private static final String ADMIN_PW = "admin";
@@ -71,6 +74,7 @@ public class ActivityServiceImplTest extends TestCase
activityService = (ActivityService)ctx.getBean("activityService");
scriptService = (ScriptService)ctx.getBean("ScriptService");
siteService = (SiteService)ctx.getBean("SiteService");
nodeArchiveService = (NodeArchiveService)ctx.getBean("nodeArchiveService");
postDAO = (ActivityPostDAO)ctx.getBean("postDAO");
@@ -145,7 +149,9 @@ public class ActivityServiceImplTest extends TestCase
assertNotNull(siteFeedEntries);
assertTrue(siteFeedEntries.isEmpty());
SiteInfo siteInfo = siteService.getSite(siteId);
siteService.deleteSite(siteId);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
}
public void testGetEmptyUserFeed() throws Exception

14
source/test-java/org/alfresco/repo/activities/feed/cleanup/AbstractFeedCleanerTest.java
View File

@@ -30,11 +30,13 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.domain.activities.ActivityFeedDAO;
import org.alfresco.repo.domain.activities.ActivityFeedEntity;
import org.alfresco.repo.lock.JobLockService;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.util.ApplicationContextHelper;
@@ -61,7 +63,8 @@ public abstract class AbstractFeedCleanerTest
private SiteService siteService;
private PersonService personService;
protected RetryingTransactionHelper transactionHelper;
private NodeArchiveService nodeArchiveService;
private static final String TEST_SITE = "testSite";
private static final String TEST_SITE_1 = TEST_SITE+"1";
@@ -91,7 +94,8 @@ public abstract class AbstractFeedCleanerTest
personService = (PersonService) ctx.getBean("PersonService");
feedDAO = (ActivityFeedDAO) ctx.getBean("feedDAO");
transactionHelper = (RetryingTransactionHelper)ctx.getBean("retryingTransactionHelper");
nodeArchiveService = (NodeArchiveService)ctx.getBean("nodeArchiveService");
// Let's shut down the scheduler so that we aren't competing with the scheduled versions of jobs (ie. feed cleaner)
Scheduler scheduler = (Scheduler) ctx.getBean("schedulerFactory");
scheduler.shutdown();
@@ -124,9 +128,11 @@ public abstract class AbstractFeedCleanerTest
for (int i = 1; i <= 7; i++)
{
if (siteService.getSite("testSite"+i) != null)
SiteInfo site = siteService.getSite("testSite"+i);
if (site != null)
{
siteService.deleteSite("testSite"+i);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(site.getNodeRef()));
}
}
@@ -372,8 +378,10 @@ public abstract class AbstractFeedCleanerTest
assertEquals(site4FeedCnt, feedDAO.selectSiteFeedEntries(TEST_SITE_4, -1).size());
assertEquals(site4FeedCnt+site5FeedCnt, feedDAO.selectUserFeedEntries(TEST_USER_D, null, false, false,-1L, -1).size());
SiteInfo site = siteService.getSite(TEST_SITE_4);
// delete the site
siteService.deleteSite(TEST_SITE_4);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(site.getNodeRef()));
// note: site feed cleanup is done in separate txn after commit
transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()

6
source/test-java/org/alfresco/repo/googledocs/GoogleDocumentServiceSystemTest.java
View File

@@ -32,6 +32,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.content.transform.AbstractContentTransformerTest;
import org.alfresco.repo.management.subsystems.ApplicationContextFactory;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.rendition.executer.AbstractRenderingEngine;
import org.alfresco.repo.rendition.executer.ReformatRenderingEngine;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -47,6 +48,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.namespace.NamespaceService;
@@ -73,6 +75,7 @@ public class GoogleDocumentServiceSystemTest extends TestCase implements GoogleD
private PersonService personService;
private ApplicationContextFactory subsystem;
private RenditionService renditionService;
private NodeArchiveService nodeArchiveService;
private static final String USER_ONE = "GoogleDocUserOne";
private static final String USER_TWO = "GoogleDocUserTwo";
@@ -105,6 +108,7 @@ public class GoogleDocumentServiceSystemTest extends TestCase implements GoogleD
authenticationService = (MutableAuthenticationService)appContext.getBean("authenticationService");
personService = (PersonService)appContext.getBean("personService");
renditionService = (RenditionService)appContext.getBean("renditionService");
nodeArchiveService = (NodeArchiveService)appContext.getBean("nodeArchiveService");
// Start the user transaction
userTransaction = transactionService.getUserTransaction();
@@ -206,12 +210,14 @@ public class GoogleDocumentServiceSystemTest extends TestCase implements GoogleD
@Override
protected void tearDown() throws Exception
{
SiteInfo siteInfo = siteService.getSite(siteId);
siteService.deleteSite(siteId);
if (userTransaction != null)
{
userTransaction.commit();
}
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
}
private boolean isGoogleServiceAvailable()

11
source/test-java/org/alfresco/repo/publishing/flickr/FlickrTest.java
View File

@@ -25,6 +25,7 @@ import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.publishing.Environment;
import org.alfresco.repo.publishing.PublishingModel;
import org.alfresco.repo.publishing.PublishingQueueImpl;
@@ -39,6 +40,7 @@ import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.namespace.NamespaceService;
@@ -67,6 +69,7 @@ public class FlickrTest extends BaseSpringTest
protected PublishingQueueImpl queue;
protected Environment environment;
protected NodeRef docLib;
protected NodeArchiveService nodeArchiveService;
private ChannelService channelService;
@@ -76,6 +79,7 @@ public class FlickrTest extends BaseSpringTest
{
serviceRegistry = (ServiceRegistry) getApplicationContext().getBean("ServiceRegistry");
channelService = (ChannelService) getApplicationContext().getBean("channelService");
nodeArchiveService = (NodeArchiveService) getApplicationContext().getBean("nodeArchiveService");
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
siteService = serviceRegistry.getSiteService();
fileFolderService = serviceRegistry.getFileFolderService();
@@ -90,7 +94,12 @@ public class FlickrTest extends BaseSpringTest
public void onTearDown()
{
siteService.deleteSite(siteId);
SiteInfo siteInfo = siteService.getSite(siteId);
if (siteInfo != null)
{
siteService.deleteSite(siteId);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
}
}
public void testBlank()

11
source/test-java/org/alfresco/repo/publishing/slideshare/SlideShareTest.java
View File

@@ -29,6 +29,7 @@ import java.util.TreeMap;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.publishing.Environment;
import org.alfresco.repo.publishing.PublishingModel;
import org.alfresco.repo.publishing.PublishingQueueImpl;
@@ -44,6 +45,7 @@ import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.namespace.NamespaceService;
@@ -75,6 +77,7 @@ public class SlideShareTest extends BaseSpringTest
protected NodeRef docLib;
protected Map<String, String> testFiles = new TreeMap<String, String>();
protected Map<NodeRef, String> testNodeMap = new HashMap<NodeRef, String>();
protected NodeArchiveService nodeArchiveService;
private ChannelService channelService;
@@ -84,6 +87,7 @@ public class SlideShareTest extends BaseSpringTest
{
serviceRegistry = (ServiceRegistry) getApplicationContext().getBean("ServiceRegistry");
channelService = (ChannelService) getApplicationContext().getBean("channelService");
nodeArchiveService = (NodeArchiveService) getApplicationContext().getBean("nodeArchiveService");
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
siteService = serviceRegistry.getSiteService();
fileFolderService = serviceRegistry.getFileFolderService();
@@ -103,7 +107,12 @@ public class SlideShareTest extends BaseSpringTest
public void onTearDown()
{
siteService.deleteSite(siteId);
SiteInfo siteInfo = siteService.getSite(siteId);
if (siteInfo != null)
{
siteService.deleteSite(siteId);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
}
}
public void testBlank()

11
source/test-java/org/alfresco/repo/publishing/youtube/YouTubeTest.java
View File

@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.publishing.Environment;
import org.alfresco.repo.publishing.PublishingModel;
import org.alfresco.repo.publishing.PublishingQueueImpl;
@@ -38,6 +39,7 @@ import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.namespace.NamespaceService;
@@ -66,6 +68,7 @@ public class YouTubeTest extends BaseSpringTest
protected PublishingQueueImpl queue;
protected Environment environment;
protected NodeRef docLib;
protected NodeArchiveService nodeArchiveService;
private ChannelService channelService;
@@ -75,6 +78,7 @@ public class YouTubeTest extends BaseSpringTest
{
serviceRegistry = (ServiceRegistry) getApplicationContext().getBean("ServiceRegistry");
channelService = (ChannelService) getApplicationContext().getBean("channelService");
nodeArchiveService = (NodeArchiveService) getApplicationContext().getBean("nodeArchiveService");
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
siteService = serviceRegistry.getSiteService();
fileFolderService = serviceRegistry.getFileFolderService();
@@ -89,7 +93,12 @@ public class YouTubeTest extends BaseSpringTest
public void onTearDown()
{
siteService.deleteSite(siteId);
SiteInfo siteInfo = siteService.getSite(siteId);
if (siteInfo != null)
{
siteService.deleteSite(siteId);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
}
}
public void testBlank()

7
source/test-java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
View File

@@ -39,6 +39,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.query.PagingRequest;
import org.alfresco.query.PagingResults;
import org.alfresco.repo.domain.permissions.AclDAO;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
@@ -48,6 +49,7 @@ import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType;
@@ -78,6 +80,7 @@ public class AuthorityServiceTest extends TestCase
private AclDAO aclDaoComponent;
private NodeService nodeService;
private AuthorityBridgeTableAsynchronouslyRefreshedCache authorityBridgeTableCache;
private NodeArchiveService nodeArchiveService;
public AuthorityServiceTest()
{
@@ -110,10 +113,14 @@ public class AuthorityServiceTest extends TestCase
aclDaoComponent = (AclDAO) ctx.getBean("aclDAO");
nodeService = (NodeService) ctx.getBean("nodeService");
authorityBridgeTableCache = (AuthorityBridgeTableAsynchronouslyRefreshedCache) ctx.getBean("authorityBridgeTableCache");
nodeArchiveService = (NodeArchiveService) ctx.getBean("nodeArchiveService");
String defaultAdminUser = AuthenticationUtil.getAdminUserName();
AuthenticationUtil.setFullyAuthenticatedUser(defaultAdminUser);
// cleanup trashcan
nodeArchiveService.purgeAllArchivedNodes(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
// note: currently depends on any existing (and/or bootstrap) group data - eg. default site "swsdp" (Sample Web Site Design Project)
SiteService siteService = (SiteService) ctx.getBean("SiteService");
SITE_CNT = siteService.listSites(defaultAdminUser).size();

106
source/test-java/org/alfresco/repo/site/SiteServiceImplMoreTest.java
View File

@@ -23,9 +23,12 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import org.alfresco.model.ContentModel;
import org.alfresco.query.PagingRequest;
import org.alfresco.query.PagingResults;
import org.alfresco.repo.node.archive.NodeArchiveService;
@@ -35,10 +38,14 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.AccessPermission;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
@@ -105,6 +112,7 @@ public class SiteServiceImplMoreTest
private static NodeArchiveService NODE_ARCHIVE_SERVICE;
private static SiteService SITE_SERVICE;
private static RetryingTransactionHelper TRANSACTION_HELPER;
private static PermissionService PERMISSION_SERVICE;
private static String TEST_SITE_NAME, TEST_SUB_SITE_NAME;
private static TestSiteAndMemberInfo TEST_SITE_WITH_MEMBERS;
@@ -117,6 +125,8 @@ public class SiteServiceImplMoreTest
NODE_ARCHIVE_SERVICE = APP_CONTEXT_INIT.getApplicationContext().getBean("nodeArchiveService", NodeArchiveService.class);
SITE_SERVICE = APP_CONTEXT_INIT.getApplicationContext().getBean("siteService", SiteService.class);
TRANSACTION_HELPER = APP_CONTEXT_INIT.getApplicationContext().getBean("retryingTransactionHelper", RetryingTransactionHelper.class);
PERMISSION_SERVICE = APP_CONTEXT_INIT.getApplicationContext().getBean("permissionServiceImpl", PermissionService.class);
// We'll create this test content as admin.
final String admin = AuthenticationUtil.getAdminUserName();
@@ -207,11 +217,31 @@ public class SiteServiceImplMoreTest
final TestSiteAndMemberInfo testSiteAndMemberInfo = perMethodTestSites.createTestSiteWithUserPerRole(siteShortName, "sitePreset", SiteVisibility.PUBLIC, AuthenticationUtil.getAdminUserName());
// Now get the various site-related data that we want to examine after deletion & restoration
final Map<String, String> userNameToRoleMap =
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Map<String, String>>()
final TestData testData =
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<TestData>()
{
public Map<String, String> execute() throws Throwable
public TestData execute() throws Throwable
{
Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
properties.put(ContentModel.PROP_NAME, "testcontent");
properties.put(ContentModel.PROP_DESCRIPTION, "content - test doc for test");
ChildAssociationRef testDoc = NODE_SERVICE.createNode(testSiteAndMemberInfo.doclib, ContentModel.ASSOC_CONTAINS,
QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "testcontent"),
ContentModel.TYPE_CONTENT, properties);
NodeRef testDocNodeRef = testDoc.getChildRef();
// change all groups to have the permissions from a contributor
PERMISSION_SERVICE.deletePermissions(testDocNodeRef);
PERMISSION_SERVICE.setInheritParentPermissions(testDocNodeRef, false);
assertTrue("Permissions should be cleared", PERMISSION_SERVICE.getAllSetPermissions(testDocNodeRef).isEmpty());
Set<String> permissions = PERMISSION_SERVICE.getSettablePermissions(SiteModel.TYPE_SITE);
for (String permission : permissions)
{
String siteRoleGroup = SITE_SERVICE.getSiteRoleGroup(siteShortName, permission);
PERMISSION_SERVICE.setPermission(testDocNodeRef, siteRoleGroup, "SiteContributor", true);
}
final Map<String, String> userNameToRoleMap = new HashMap<String, String>();
// Which users are members of which groups?
@@ -232,7 +262,7 @@ public class SiteServiceImplMoreTest
SITE_SERVICE.deleteSite(siteShortName);
log.debug("Site deleted.");
return userNameToRoleMap;
return new TestData(userNameToRoleMap, testDocNodeRef);
}
});
@@ -257,9 +287,9 @@ public class SiteServiceImplMoreTest
}
});
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
final Map<String, String> associatedGroups = TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Map<String, String>>()
{
public Void execute() throws Throwable
public Map<String, String> execute() throws Throwable
{
// The site itself should have been restored, of course...
assertTrue("The site noderef was not restored as expected", NODE_SERVICE.exists(testSiteAndMemberInfo.siteInfo.getNodeRef()));
@@ -276,16 +306,66 @@ public class SiteServiceImplMoreTest
for (Map.Entry<String, String> entry : SITE_SERVICE.listMembers(siteShortName, null, null, 0, true).entrySet()) { log.debug(entry); }
// And finally, the original members of the site should have been given the same membership that they had before.
for (Map.Entry<String, String> entry : userNameToRoleMap.entrySet())
for (Map.Entry<String, String> entry : testData.userNameToRoleMap.entrySet())
{
assertEquals("Unexpected role for site user: " + entry.getKey(),
entry.getValue(),
SITE_SERVICE.getMembersRole(siteShortName, entry.getKey()));
}
// When the site is restored custom permissions on contents should be also restored
Set<AccessPermission> accessPermissions = PERMISSION_SERVICE.getAllSetPermissions(testData.testDocNodeRef);
Map<String, String> associatedGroups = new HashMap<String, String>();
for(AccessPermission access : accessPermissions)
{
associatedGroups.put(access.getAuthority(), access.getPermission());
}
Set<String> permissions = PERMISSION_SERVICE.getSettablePermissions(SiteModel.TYPE_SITE);
for (String permission : permissions)
{
String siteRoleGroup = SITE_SERVICE.getSiteRoleGroup(siteShortName, permission);
assertTrue("all groups should have the permissions from a contributor on test content", "SiteContributor".equals(associatedGroups.get(siteRoleGroup)));
}
return associatedGroups;
}
});
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
{
public Void execute() throws Throwable
{
log.debug("About to delete site completely.");
SITE_SERVICE.deleteSite(siteShortName);
for (String authority : associatedGroups.keySet())
{
assertTrue("Associated groups should remain after site delete", AUTHORITY_SERVICE.authorityExists(authority));
}
return null;
}
});
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionCallback<Void>()
{
public Void execute() throws Throwable
{
log.debug("About to purge site from trashcan.");
// get archive node reference
String storePath = "archive://SpacesStore";
StoreRef storeRef = new StoreRef(storePath);
NodeRef archivedNodeRef = new NodeRef(storeRef, testSiteAndMemberInfo.siteInfo.getNodeRef().getId());
NODE_ARCHIVE_SERVICE.purgeArchivedNode(archivedNodeRef);
for (String authority : associatedGroups.keySet())
{
assertTrue("Associated groups should be deleted on site purge", !AUTHORITY_SERVICE.authorityExists(authority));
}
return null;
}
});
}
private void assertThatArchivedNodeExists(NodeRef originalNodeRef, String failureMsg)
@@ -293,4 +373,16 @@ public class SiteServiceImplMoreTest
final NodeRef archivedNodeRef = NODE_ARCHIVE_SERVICE.getArchivedNode(originalNodeRef);
assertTrue(failureMsg, NODE_SERVICE.exists(archivedNodeRef));
}
public static class TestData
{
public final Map<String, String> userNameToRoleMap;
public final NodeRef testDocNodeRef;
public TestData(Map<String, String> userNameToRoleMap, NodeRef testDocNodeRef)
{
this.userNameToRoleMap = userNameToRoleMap;
this.testDocNodeRef = testDocNodeRef;
}
}
}

12
source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java
View File

@@ -800,9 +800,8 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
{
return authorityService.createAuthority(AuthorityType.GROUP, testGroupName);
}
}, AuthenticationUtil.getAdminUserName());
// Create a test site
String siteShortName = "testUpdateSite";
this.siteService.createSite(TEST_SITE_PRESET, siteShortName, TEST_TITLE, TEST_DESCRIPTION, SiteVisibility.PUBLIC);
@@ -817,14 +816,15 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
assertNull(this.siteService.getSite(siteShortName));
NodeRef archivedNodeRef = nodeArchiveService.getArchivedNode(siteInfo.getNodeRef());
assertTrue("Deleted sites can be recovered from the Trash.", nodeService.exists(archivedNodeRef));
// Ensure that all the related site groups are deleted
assertFalse(authorityService.authorityExists(((SiteServiceImpl)smallSiteService).getSiteGroup(siteShortName, true)));
// related site groups should remain after site delete but should be deleted on site purge from trashcan.
// Such case is tested in SiteServiceImplMoreTest.deleteSiteAndRestoreEnsuringSiteGroupsAreRecovered
assertTrue(authorityService.authorityExists(((SiteServiceImpl)smallSiteService).getSiteGroup(siteShortName, true)));
Set<String> permissions = permissionService.getSettablePermissions(SiteModel.TYPE_SITE);
for (String permission : permissions)
{
String siteRoleGroup = ((SiteServiceImpl)smallSiteService).getSiteRoleGroup(siteShortName, permission, true);
assertFalse(authorityService.authorityExists(siteRoleGroup));
assertTrue(authorityService.authorityExists(siteRoleGroup));
}
// Ensure that the added "normal" groups have not been deleted

7
source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java
View File

@@ -32,6 +32,7 @@ import org.alfresco.repo.activities.feed.local.LocalFeedTaskProcessor;
import org.alfresco.repo.activities.post.lookup.PostLookup;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
@@ -112,6 +113,7 @@ public class SubscriptionServiceActivitiesTest
protected static PostLookup postLookup;
protected static FeedGenerator feedGenerator;
protected static RetryingTransactionHelper transactionHelper;
protected static NodeArchiveService nodeArchiveService;
private static Scheduler QUARTZ_SCHEDULER;
@@ -139,6 +141,7 @@ public class SubscriptionServiceActivitiesTest
activityService = (ActivityService) ctx.getBean("activityService");
nodeService = (NodeService) ctx.getBean("NodeService");
contentService = (ContentService) ctx.getBean("ContentService");
nodeArchiveService = (NodeArchiveService)ctx.getBean("nodeArchiveService");
transactionHelper = (RetryingTransactionHelper) ctx.getBean("retryingTransactionHelper");
ChildApplicationContextFactory activitiesFeed = (ChildApplicationContextFactory) ctx.getBean("ActivitiesFeed");
@@ -473,10 +476,12 @@ public class SubscriptionServiceActivitiesTest
private void deleteSite(String siteShortName)
{
if (siteService.getSite(siteShortName) != null)
SiteInfo siteInfo = siteService.getSite(siteShortName);
if (siteInfo != null)
{
log.debug("Deleting site: " + siteShortName);
siteService.deleteSite(siteShortName);
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(siteInfo.getNodeRef()));
}
else
{

16
source/test-java/org/alfresco/util/test/junitrules/TemporarySites.java
View File

@@ -26,6 +26,7 @@ import java.util.List;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.domain.activities.ActivityPostDAO;
import org.alfresco.repo.domain.activities.ActivityPostEntity;
import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.site.SiteModel;
@@ -74,6 +75,7 @@ public class TemporarySites extends AbstractPersonRule
final RetryingTransactionHelper transactionHelper = (RetryingTransactionHelper) appContextRule.getApplicationContext().getBean("retryingTransactionHelper");
final SiteService siteService = appContextRule.getApplicationContext().getBean("siteService", SiteService.class);
final ActivityPostDAO postDAO = appContextRule.getApplicationContext().getBean("postDAO", ActivityPostDAO.class);
final NodeArchiveService nodeArchiveService = (NodeArchiveService)appContextRule.getApplicationContext().getBean("nodeArchiveService");
// Run as admin to ensure all sites can be deleted irrespective of which user created them.
AuthenticationUtil.runAs(new RunAsWork<Void>()
@@ -112,6 +114,20 @@ public class TemporarySites extends AbstractPersonRule
return null;
}
});
transactionHelper.doInTransaction(new RetryingTransactionCallback<Void>()
{
@Override public Void execute() throws Throwable
{
for (SiteInfo site : temporarySites)
{
log.debug("Purging temporary site from trashcan: " + site.getShortName());
nodeArchiveService.purgeArchivedNode(nodeArchiveService.getArchivedNode(site.getNodeRef()));
}
return null;
}
});
return null;
}
}, AuthenticationUtil.getAdminUserName());