From ad3475639329e386c02fd60df847780e1c813ced Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Tue, 11 Feb 2014 23:07:55 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    58214:
 Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)       58197:
 MNT-8886: Unit test added in r57899 should have removed the group it added.
 Caused build error in other tests.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61953 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../AbstractMailActionExecuterTest.java       | 59 +++++++++++--------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/source/test-java/org/alfresco/repo/action/executer/AbstractMailActionExecuterTest.java b/source/test-java/org/alfresco/repo/action/executer/AbstractMailActionExecuterTest.java
index 8aec39236a..371c0427a6 100644
--- a/source/test-java/org/alfresco/repo/action/executer/AbstractMailActionExecuterTest.java
+++ b/source/test-java/org/alfresco/repo/action/executer/AbstractMailActionExecuterTest.java
@@ -318,35 +318,46 @@ public abstract class AbstractMailActionExecuterTest
     @Test
     public void testPrepareEmailForDisabledUsers() throws MessagingException
     {
-        final String USER1 = "test_user1";
-        final String USER2 = "test_user2";
-        createUser(USER1);
-        NodeRef userNode = createUser(USER2);
-        String groupName = AUTHORITY_SERVICE.createAuthority(AuthorityType.GROUP, "testgroup1");
-        AUTHORITY_SERVICE.addAuthority(groupName, USER1);
-        AUTHORITY_SERVICE.addAuthority(groupName, USER2);
-        NODE_SERVICE.addAspect(userNode, ContentModel.ASPECT_PERSON_DISABLED, null);
-        final Action mailAction = ACTION_SERVICE.createAction(MailActionExecuter.NAME);
-        mailAction.setParameterValue(MailActionExecuter.PARAM_FROM, "some.body@example.com");
-        mailAction.setParameterValue(MailActionExecuter.PARAM_TO_MANY, groupName);
+    	String groupName = null;
+    	try
+    	{
+            final String USER1 = "test_user1";
+            final String USER2 = "test_user2";
+            createUser(USER1);
+            NodeRef userNode = createUser(USER2);
+            groupName = AUTHORITY_SERVICE.createAuthority(AuthorityType.GROUP, "testgroup1");
+            AUTHORITY_SERVICE.addAuthority(groupName, USER1);
+            AUTHORITY_SERVICE.addAuthority(groupName, USER2);
+            NODE_SERVICE.addAspect(userNode, ContentModel.ASPECT_PERSON_DISABLED, null);
+            final Action mailAction = ACTION_SERVICE.createAction(MailActionExecuter.NAME);
+            mailAction.setParameterValue(MailActionExecuter.PARAM_FROM, "some.body@example.com");
+            mailAction.setParameterValue(MailActionExecuter.PARAM_TO_MANY, groupName);
 
-        mailAction.setParameterValue(MailActionExecuter.PARAM_SUBJECT, "Testing");
-        mailAction.setParameterValue(MailActionExecuter.PARAM_TEXT, "Testing");
+            mailAction.setParameterValue(MailActionExecuter.PARAM_SUBJECT, "Testing");
+            mailAction.setParameterValue(MailActionExecuter.PARAM_TEXT, "Testing");
 
-        RetryingTransactionHelper txHelper = APP_CONTEXT_INIT.getApplicationContext().getBean("retryingTransactionHelper", RetryingTransactionHelper.class);
+            RetryingTransactionHelper txHelper = APP_CONTEXT_INIT.getApplicationContext().getBean("retryingTransactionHelper", RetryingTransactionHelper.class);
 
-        MimeMessage mm = txHelper.doInTransaction(new RetryingTransactionCallback<MimeMessage>()
-        {
-            @Override
-            public MimeMessage execute() throws Throwable
+            MimeMessage mm = txHelper.doInTransaction(new RetryingTransactionCallback<MimeMessage>()
             {
-                return ACTION_EXECUTER.prepareEmail(mailAction, null, null, null).getMimeMessage();
-            }
-        }, true);
+                @Override
+                public MimeMessage execute() throws Throwable
+                {
+                    return ACTION_EXECUTER.prepareEmail(mailAction, null, null, null).getMimeMessage();
+                }
+            }, true);
 
-        Address[] addresses = mm.getRecipients(Message.RecipientType.TO);
-        Assert.assertEquals(1, addresses.length);
-        Assert.assertEquals(USER1 + "@email.com", addresses[0].toString());
+            Address[] addresses = mm.getRecipients(Message.RecipientType.TO);
+            Assert.assertEquals(1, addresses.length);
+            Assert.assertEquals(USER1 + "@email.com", addresses[0].toString());
+    	}
+    	finally
+    	{
+    		if (groupName != null)
+    		{
+                AUTHORITY_SERVICE.deleteAuthority(groupName, true);
+    		}
+    	}
     }
 
     private NodeRef createUser(String userName)