From 8fbde8d254d5357a8a03792b38a697442e67bc99 Mon Sep 17 00:00:00 2001
From: Mark Rogers <mark.rogers@alfresco.com>
Date: Wed, 23 Jul 2014 15:36:03 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    77125:
 Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)       73446:
 ACE-1685: added transaction usage to failing test
 (SOLRWebScriptTest.testAclReadersGet()) and added to TestSuite (test wasn't
 being run in CI)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/web/scripts/WebScriptTestSuite.java       |  4 +++-
 .../repo/web/scripts/solr/SOLRWebScriptTest.java   | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/source/test-java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java b/source/test-java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java
index 9d481d0d6c..9a16dfafbb 100644
--- a/source/test-java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java
+++ b/source/test-java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java
@@ -33,15 +33,16 @@ import org.alfresco.repo.web.scripts.forms.FormRestApiJsonPost_Test;
 import org.alfresco.repo.web.scripts.groups.GroupsTest;
 import org.alfresco.repo.web.scripts.invitation.InvitationWebScriptTest;
 import org.alfresco.repo.web.scripts.invite.InviteServiceTest;
-import org.alfresco.repo.web.scripts.publishing.PublishingRestApiTest;
 import org.alfresco.repo.web.scripts.person.PersonServiceTest;
 import org.alfresco.repo.web.scripts.preference.PreferenceServiceTest;
+import org.alfresco.repo.web.scripts.publishing.PublishingRestApiTest;
 import org.alfresco.repo.web.scripts.quickshare.QuickShareRestApiTest;
 import org.alfresco.repo.web.scripts.rating.RatingRestApiTest;
 import org.alfresco.repo.web.scripts.replication.ReplicationRestApiTest;
 import org.alfresco.repo.web.scripts.rule.RuleServiceTest;
 import org.alfresco.repo.web.scripts.search.PersonSearchTest;
 import org.alfresco.repo.web.scripts.site.SiteServiceTest;
+import org.alfresco.repo.web.scripts.solr.SOLRWebScriptTest;
 import org.alfresco.repo.web.scripts.tagging.TaggingServiceTest;
 import org.alfresco.repo.web.scripts.thumbnail.ThumbnailServiceTest;
 import org.alfresco.repo.web.scripts.transfer.TransferWebScriptTest;
@@ -91,6 +92,7 @@ public class WebScriptTestSuite extends TestSuite
         suite.addTestSuite( ActivitiWorkflowRestApiTest.class );
         suite.addTestSuite( JBPMWorkflowRestApiTest.class );
         suite.addTestSuite( PublishingRestApiTest.class );
+        suite.addTestSuite( SOLRWebScriptTest.class );
         
         // This uses a slightly different context
         // As such, we can't run it in the same suite as the others,
diff --git a/source/test-java/org/alfresco/repo/web/scripts/solr/SOLRWebScriptTest.java b/source/test-java/org/alfresco/repo/web/scripts/solr/SOLRWebScriptTest.java
index 375add40b2..28e6d96bd8 100644
--- a/source/test-java/org/alfresco/repo/web/scripts/solr/SOLRWebScriptTest.java
+++ b/source/test-java/org/alfresco/repo/web/scripts/solr/SOLRWebScriptTest.java
@@ -201,6 +201,20 @@ public class SOLRWebScriptTest extends BaseWebScriptTest
     }
     
     public void testAclReadersGet() throws Exception
+    {
+        txnHelper.doInTransaction(
+            new RetryingTransactionCallback<Void>()
+            {
+                public Void execute() throws Throwable
+                {
+                    aclReadersGetImpl();
+                    return null;
+                }
+            }
+        );
+    }
+    
+    public void aclReadersGetImpl() throws Exception
     {
         List<AclChangeSet> aclChangeSets = solrTrackingComponent.getAclChangeSets(null, null, null, null, 1024);
         List<Long> aclChangeSetIds = new ArrayList<Long>(50);