RM: Move workaround into base script and adjust action test suite to work with gradle

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@49384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

rm-server/build.gradle

@@ -80,7 +80,8 @@ test {
 		dependsOn resetDatabase
 	}
 
-	include '**/*CreateRecordActionTest.class'
+	scanForTestClasses = false
+	include '**/*ActionTestSuite.class'
 
 	testLogging.showStandardStreams = true
 	jvmArgs '-Xms256M', '-Xmx1024M', '-XX:MaxPermSize=256M'
@@ -98,18 +99,3 @@ test {
 	}
 }
 
-task localTest << {   
-   test
-   {
-	   include '**/*CreateRecordActionTest.class'
-
-	  testLogging.showStandardStreams = true
-
-	  jvmArgs '-Xms256M', '-Xmx1024M', '-XX:MaxPermSize=256M'
-
-	  beforeTest { descriptor ->
-		 logger.lifecycle("Running test: " + descriptor)
-	  }
-   }
-}
-

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ActionTestSuite.java

@@ -18,15 +18,15 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.test;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.alfresco.module.org_alfresco_module_rm.test.action.CreateRecordActionTest;
 import org.alfresco.module.org_alfresco_module_rm.test.action.FileToActionTest;
 import org.alfresco.module.org_alfresco_module_rm.test.action.HideRecordActionTest;
 import org.alfresco.module.org_alfresco_module_rm.test.action.RejectActionTest;
 import org.alfresco.module.org_alfresco_module_rm.test.service.ExtendedActionServiceTest;
 import org.alfresco.module.org_alfresco_module_rm.test.service.RecordsManagementActionServiceImplTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
 
 
 /**
@@ -35,22 +35,16 @@ import org.alfresco.module.org_alfresco_module_rm.test.service.RecordsManagement
  * @author Roy Wetherall
  * @since 2.1
  */
-public class ActionTestSuite extends TestSuite
+@RunWith(Suite.class)
+@SuiteClasses(
+{
+    RecordsManagementActionServiceImplTest.class,
+    ExtendedActionServiceTest.class,
+    CreateRecordActionTest.class,
+    HideRecordActionTest.class,
+    RejectActionTest.class,
+    FileToActionTest.class
+})
+public class ActionTestSuite
 {
-    /**
-     * Creates the test suite
-     *
-     * @return  the test suite
-     */
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite();
-        suite.addTestSuite(RecordsManagementActionServiceImplTest.class);
-        suite.addTestSuite(ExtendedActionServiceTest.class);
-        suite.addTestSuite(CreateRecordActionTest.class);
-        suite.addTestSuite(HideRecordActionTest.class);
-        suite.addTestSuite(RejectActionTest.class);
-        suite.addTestSuite(FileToActionTest.class);
-        return suite;
-    }
 }

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java

@@ -21,8 +21,6 @@ package org.alfresco.module.org_alfresco_module_rm.test.action;
 import org.alfresco.module.org_alfresco_module_rm.action.dm.CreateRecordAction;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
-import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.alfresco.repo.security.authority.AuthorityDAO;
 import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.action.ActionService;
 import org.alfresco.service.cmr.security.AccessStatus;
@@ -60,20 +58,6 @@ public class CreateRecordActionTest extends BaseRMTestCase
         return true;
     }
     
-    @Override
-    protected void setupTestDataImpl()
-    {
-        // Testing
-        AuthorityDAO authDao = (AuthorityDAO)applicationContext.getBean("authorityDAO");
-        if (authDao.authorityExists(AuthenticationUtil.getSystemUserName()) == false)
-        {
-            createPerson(AuthenticationUtil.getSystemUserName(), false);
-        }
-        assertTrue("No person object for System available.", authDao.authorityExists(AuthenticationUtil.getSystemUserName()));
-        
-        super.setupTestDataImpl();
-    }
-    
     public void testCreateRecordAction()
     {
         doTestInTransaction(new Test<Void>()

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java

@@ -44,6 +44,7 @@ import org.alfresco.module.org_alfresco_module_rm.security.FilePlanPermissionSer
 import org.alfresco.module.org_alfresco_module_rm.vital.VitalRecordService;
 import org.alfresco.repo.policy.PolicyComponent;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authority.AuthorityDAO;
 import org.alfresco.repo.site.SiteModel;
 import org.alfresco.repo.site.SiteServiceImpl;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
@@ -462,6 +463,13 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
      */
     protected void setupTestDataImpl()
     {
+        AuthorityDAO authDao = (AuthorityDAO)applicationContext.getBean("authorityDAO");
+        if (authDao.authorityExists(AuthenticationUtil.getSystemUserName()) == false)
+        {
+            createPerson(AuthenticationUtil.getSystemUserName(), false);
+        }
+        assertTrue("No person object for System available.", authDao.authorityExists(AuthenticationUtil.getSystemUserName()));
+        
         storeRef = StoreRef.STORE_REF_WORKSPACE_SPACESSTORE;
         rootNodeRef = nodeService.getRootNode(storeRef);