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 5.1-MNT1 (5.1.0) to HEAD (5.1)

Browse Source 
115456 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      113249 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113035 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112991 pyurkevich: MNT-11220 : Access Denied thrown if model is missing
               - Fixed build failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-10-30 00:09:55 +00:00
parent 4948a79966
commit 3114f75a0d
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/test-java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java
View File

@@ -33,6 +33,7 @@ import junit.framework.TestCase;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.dictionary.DictionaryDAO;
import org.alfresco.repo.dictionary.NamespaceDAO;
import org.alfresco.repo.node.db.DbNodeServiceImpl;
import org.alfresco.repo.policy.BehaviourFilter;
@@ -78,6 +79,7 @@ public class RepoAdminServiceImplTest extends TestCase
private SearchService searchService;
private NamespaceService namespaceService;
private BehaviourFilter behaviourFilter;
private DictionaryDAO dictionaryDAO;
final String modelPrefix = "model-";
final static String MKR = "{MKR}";
@@ -129,6 +131,7 @@ public class RepoAdminServiceImplTest extends TestCase
searchService = (SearchService) ctx.getBean("SearchService");
namespaceService = (NamespaceService) ctx.getBean("NamespaceService");
behaviourFilter = (BehaviourFilter)ctx.getBean("policyBehaviourFilter");
dictionaryDAO = (DictionaryDAO) ctx.getBean("dictionaryDAO");
DbNodeServiceImpl dbNodeService = (DbNodeServiceImpl)ctx.getBean("dbNodeService");
dbNodeService.setEnableTimestampPropagation(false);
@@ -615,26 +618,23 @@ public class RepoAdminServiceImplTest extends TestCase
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>()
{
public Object execute() throws Exception
{
// try to delete the model
try
{
public Object execute() throws Exception
{
// try to delete the model
try
{
behaviourFilter.disableBehaviour(model1, ContentModel.TYPE_DICTIONARY_MODEL);
nodeService.deleteNode(model1);
behaviourFilter.enableBehaviour(model1, ContentModel.TYPE_DICTIONARY_MODEL);
}
catch (AlfrescoRuntimeException are)
{
// expected
assertTrue(
"Incorrect exception message: " + are.getMessage(),
are.getMessage().contains("Failed to validate model delete"));
}
return null;
};
});
behaviourFilter.disableBehaviour(ContentModel.TYPE_DICTIONARY_MODEL);
nodeService.deleteNode(model1);
dictionaryDAO.destroy();
}
finally
{
behaviourFilter.enableBehaviour(ContentModel.TYPE_DICTIONARY_MODEL);
}
return null;
};
});
assertFalse(nodeService.exists(model1));