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

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

Browse Source 
108044: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud)
      107731: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         107679: MNT-13820 "Model can be deactivated with a node referencing the model is in trashcan"
         Use the database to check if model is in use, rather than Search
         Fix up existing tests in light of these changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108075 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-07-09 22:12:29 +00:00
parent 0b09d68864
commit 62d972f622
20 changed files with 1055 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/test-java/org/alfresco/repo/usage/UserUsageTest.java
View File

@@ -22,6 +22,8 @@ package org.alfresco.repo.usage;
import java.io.InputStream;
import java.io.Serializable;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import javax.transaction.UserTransaction;
@@ -34,6 +36,7 @@ import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.admin.RepoAdminService;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileNotFoundException;
@@ -90,7 +93,8 @@ public class UserUsageTest extends TestCase
protected NodeRef personNodeRef2;
private static final QName customType = QName.createQName("{my.new.model}sop"); // from exampleModel.xml
private List<NodeRef> nodesToDelete = new LinkedList<>();
protected void setUp() throws Exception
{
if (AlfrescoTransactionSupport.isActualTransactionActive())
@@ -206,6 +210,22 @@ public class UserUsageTest extends TestCase
}
}
}
// Make sure we remove all nodes created with the example model so that the model can be
// removed.
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
{
@Override
public Void execute() throws Throwable
{
for(NodeRef nodeRef : nodesToDelete)
{
nodeService.addAspect(nodeRef, ContentModel.ASPECT_TEMPORARY, null);
nodeService.deleteNode(nodeRef);
}
return null;
}
}, true, true);
}
protected void runAs(String userName)
@@ -982,7 +1002,8 @@ public class UserUsageTest extends TestCase
contentProps);
NodeRef content = association.getChildRef();
nodesToDelete.add(content);
ContentWriter writer = contentService.getWriter(content, ContentModel.PROP_CONTENT, true);
writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);