From 8d6d4e9e881a8f4153750232f0cd24ad85a9612f Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Wed, 25 Jun 2014 16:18:24 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)    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
---
 .../dictionary/DictionaryModelTypeTest.java   | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/source/test-java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java b/source/test-java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java
index 3bd9fed846..bf4d4cdf84 100644
--- a/source/test-java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java
+++ b/source/test-java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2015 Alfresco Software Limited.
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -935,6 +935,7 @@ public class DictionaryModelTypeTest extends BaseAlfrescoSpringTest
     /**
      * Test for MNT-11653
      */
+    @SuppressWarnings("deprecation")
     public void testOverrideMandatoryProperty()
     {
         try
@@ -991,5 +992,25 @@ public class DictionaryModelTypeTest extends BaseAlfrescoSpringTest
                 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;
+            }
+        });
     }
 }