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

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

Browse Source 
73990: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      73920: MNT-11653 : Content Model <override> doesnt allow overriding "enforcement"
      Added clean up for the test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74855 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 16:18:24 +00:00
parent 2cbb29e38c
commit 8d6d4e9e88
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/test-java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2015 Alfresco Software Limited. * Copyright (C) 2005-2014 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -935,6 +935,7 @@ public class DictionaryModelTypeTest extends BaseAlfrescoSpringTest
/** /**
* Test for MNT-11653 * Test for MNT-11653
*/ */
@SuppressWarnings("deprecation")
public void testOverrideMandatoryProperty() public void testOverrideMandatoryProperty()
{ {
try try
@@ -991,5 +992,25 @@ public class DictionaryModelTypeTest extends BaseAlfrescoSpringTest
return node; return node;
} }
}); });
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>()
{
public Object execute() throws Exception
{
// Delete the node
DictionaryModelTypeTest.this.nodeService.deleteNode(node1);
return null;
}
});
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>()
{
public Object execute() throws Exception
{
// Delete the model
DictionaryModelTypeTest.this.nodeService.deleteNode(modelNode);
return null;
}
});
} }
} }