inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undo fix for REPO-1022: MNT-16271. Tests working locally but race conditions are possible.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2016-11-24 21:05:13 +00:00
parent b6358642e4
commit 5682ef0c34
2 changed files with 192 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/repo/site/SiteServiceImpl.java
View File

@@ -1662,14 +1662,6 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
final QName siteType = this.directNodeService.getType(nodeRef); final QName siteType = this.directNodeService.getType(nodeRef);
final String shortName = getSite(nodeRef).getShortName(); final String shortName = getSite(nodeRef).getShortName();
// If there is a live site, we must not wipe out the authority data.
// Authority data for sites is associated by a naming convention.
if (hasSite(shortName))
{
// A live site exists, so leave the authority data alone
return;
}
// Delete the associated groups // Delete the associated groups
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>() AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
{ {

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

@@ -1229,7 +1229,7 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
}, AuthenticationUtil.getAdminUserName()); }, AuthenticationUtil.getAdminUserName());
// Create a test site // Create a test site
String siteShortName = "testDeleteSite-" + GUID.generate(); String siteShortName = "testUpdateSite";
this.siteService.createSite(TEST_SITE_PRESET, siteShortName, TEST_TITLE, TEST_DESCRIPTION, SiteVisibility.PUBLIC); this.siteService.createSite(TEST_SITE_PRESET, siteShortName, TEST_TITLE, TEST_DESCRIPTION, SiteVisibility.PUBLIC);
SiteInfo siteInfo = this.siteService.getSite(siteShortName); SiteInfo siteInfo = this.siteService.getSite(siteShortName);
assertNotNull(siteInfo); assertNotNull(siteInfo);
@@ -1258,122 +1258,6 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
assertTrue(authorityService.authorityExists(testGroup)); assertTrue(authorityService.authorityExists(testGroup));
} }
@SuppressWarnings("deprecation")
public void testPurgeSiteSimple()
{
SiteService smallSiteService = (SiteService)this.applicationContext.getBean("siteService");
// Create a test group
final String testGroupName = "siteServiceImplTestGroup_" + GUID.generate();
String testGroup = AuthenticationUtil.runAs(
new AuthenticationUtil.RunAsWork<String>()
{
public String doWork() throws Exception
{
return authorityService.createAuthority(AuthorityType.GROUP, testGroupName);
}
}, AuthenticationUtil.getAdminUserName());
// Create a test site
String siteShortName = "testPurgeSite-" + GUID.generate();
this.siteService.createSite(TEST_SITE_PRESET, siteShortName, TEST_TITLE, TEST_DESCRIPTION, SiteVisibility.PUBLIC);
SiteInfo siteInfo = this.siteService.getSite(siteShortName);
assertNotNull(siteInfo);
// Add the test group as a member of the site
this.siteService.setMembership(siteShortName, testGroup, SiteModel.SITE_CONTRIBUTOR);
// Delete the site
this.siteService.deleteSite(siteShortName);
assertNull(this.siteService.getSite(siteShortName));
NodeRef archivedNodeRef = nodeArchiveService.getArchivedNode(siteInfo.getNodeRef());
assertTrue("Deleted sites can be recovered from the Trash.", nodeService.exists(archivedNodeRef));
// Commit these site structures
setComplete();
endTransaction();
// We now do two transactions that will be thrown away to handle the purge use cases
// Now purge the site.
RetryingTransactionCallback<Void> purgeWork = new RetryingTransactionCallback<Void>()
{
@Override
public Void execute() throws Throwable
{
// We already check that the authorities remain alive.
nodeArchiveService.purgeArchivedNode(archivedNodeRef); // service call starts a new txn
// Site-related groups should be wiped
assertFalse(authorityService.authorityExists(((SiteServiceImpl)smallSiteService).getSiteGroup(siteShortName, true)));
assertFalse(authorityService.authorityExists(((SiteServiceImpl) smallSiteService).getSiteGroup(siteShortName)));
Set<String> permissions = permissionService.getSettablePermissions(SiteModel.TYPE_SITE);
for (String permission : permissions)
{
String siteRoleGroup = ((SiteServiceImpl)smallSiteService).getSiteRoleGroup(siteShortName, permission, true);
assertFalse(authorityService.authorityExists(siteRoleGroup));
}
// Ensure that the added "normal" groups have not been deleted
assertTrue(authorityService.authorityExists(testGroup));
throw new RuntimeException("Expected $$");
}
};
try
{
transactionService.getRetryingTransactionHelper().doInTransaction(purgeWork);
}
catch (Exception e)
{
if (!e.getMessage().contains("$$"))
{
throw e;
}
}
// Create a new site and ensure that the purge does NOT wipe out the authorities ... but still works otherwise (MNT-16271)
RetryingTransactionCallback<Void> purgeWithExistingWork = new RetryingTransactionCallback<Void>()
{
@Override
public Void execute() throws Throwable
{
siteService.createSite(TEST_SITE_PRESET, siteShortName, TEST_TITLE, TEST_DESCRIPTION, SiteVisibility.PUBLIC);
// We already check that the authorities remain alive.
nodeArchiveService.purgeArchivedNode(archivedNodeRef); // service call starts a new txn
// Site-related groups should still exist
assertTrue(authorityService.authorityExists(((SiteServiceImpl)smallSiteService).getSiteGroup(siteShortName, true)));
assertTrue(authorityService.authorityExists(((SiteServiceImpl) smallSiteService).getSiteGroup(siteShortName)));
Set<String> permissions = permissionService.getSettablePermissions(SiteModel.TYPE_SITE);
for (String permission : permissions)
{
String siteRoleGroup = ((SiteServiceImpl)smallSiteService).getSiteRoleGroup(siteShortName, permission, true);
assertTrue(authorityService.authorityExists(siteRoleGroup));
}
// Ensure that the added "normal" groups have not been deleted
assertTrue(authorityService.authorityExists(testGroup));
throw new RuntimeException("Expected $$");
}
};
try
{
transactionService.getRetryingTransactionHelper().doInTransaction(purgeWithExistingWork);
}
catch (Exception e)
{
if (!e.getMessage().contains("$$"))
{
throw e;
}
}
// Start a new transaction to keep Spring's sequencing happy
startNewTransaction();
}
public void testIsPublic() public void testIsPublic()
{ {
RetryingTransactionCallback<Object> work = new RetryingTransactionCallback<Object>() RetryingTransactionCallback<Object> work = new RetryingTransactionCallback<Object>()