Reorganisation of RM lecacy and integration tests.

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

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

@@ -19,7 +19,7 @@
 package org.alfresco.module.org_alfresco_module_rm.test;
 
 import org.alfresco.module.org_alfresco_module_rm.test.integration.IntegrationTestSuite;
-import org.alfresco.repo.ParameterProcessorTestSuite;
+import org.alfresco.module.org_alfresco_module_rm.test.legacy.LegacyTestSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
@@ -34,11 +34,7 @@ import org.junit.runners.Suite.SuiteClasses;
 @RunWith(Suite.class)
 @SuiteClasses(
 {    
-    ActionTestSuite.class,
+    LegacyTestSuite.class,
-    CapabilitiesTestSuite.class,
-    ServicesTestSuite.class,
-    WebScriptTestSuite.class,
-    ParameterProcessorTestSuite.class,
     IntegrationTestSuite.class
 })
 public class AllTestSuite

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

@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2005-2014 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.module.org_alfresco_module_rm.test;
-
-import org.alfresco.module.org_alfresco_module_rm.test.service.CapabilityServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.DataSetServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.DispositionServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.ExtendedActionServiceTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.ExtendedSecurityServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.FilePlanPermissionServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.FilePlanRoleServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.FilePlanServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.FreezeServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.HoldServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.ModelSecurityServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.RecordServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.RecordsManagementActionServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.RecordsManagementAdminServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.RecordsManagementAuditServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.RecordsManagementQueryDAOImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.RecordsManagementSearchServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.ReportServiceImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.ServiceBaseImplTest;
-import org.alfresco.module.org_alfresco_module_rm.test.service.VitalRecordServiceImplTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-
-/**
- * RM test suite
- *
- * @author Roy Wetherall
- */
-@RunWith(Suite.class)
-@SuiteClasses(
-{
-    ServiceBaseImplTest.class,
-    ExtendedSecurityServiceImplTest.class,
-    ModelSecurityServiceImplTest.class,
-    RecordsManagementActionServiceImplTest.class,
-    ExtendedActionServiceTest.class,
-    DispositionServiceImplTest.class,
-    RecordsManagementActionServiceImplTest.class,
-    RecordsManagementAdminServiceImplTest.class,
-    RecordsManagementAuditServiceImplTest.class,
-    //RecordsManagementEventServiceImplTest.class,
-    RecordsManagementSearchServiceImplTest.class,
-    VitalRecordServiceImplTest.class,
-    DataSetServiceImplTest.class,
-    FreezeServiceImplTest.class,
-    RecordServiceImplTest.class,
-    CapabilityServiceImplTest.class,
-    FilePlanRoleServiceImplTest.class,
-    FilePlanServiceImplTest.class,
-    FilePlanPermissionServiceImplTest.class,
-    ReportServiceImplTest.class,
-    RecordsManagementQueryDAOImplTest.class,
-    HoldServiceImplTest.class
-})
-public class ServicesTestSuite 
-{
-}

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1424Test.java

@@ -23,7 +23,7 @@ import java.util.List;
 
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
-import org.alfresco.module.org_alfresco_module_rm.test.service.HoldServiceImplTest;
+import org.alfresco.module.org_alfresco_module_rm.test.legacy.service.HoldServiceImplTest;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1429Test.java

@@ -20,7 +20,7 @@ package org.alfresco.module.org_alfresco_module_rm.test.integration.issue;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
-import org.alfresco.module.org_alfresco_module_rm.test.service.HoldServiceImplTest;
+import org.alfresco.module.org_alfresco_module_rm.test.legacy.service.HoldServiceImplTest;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1463Test.java

@@ -20,7 +20,7 @@ package org.alfresco.module.org_alfresco_module_rm.test.integration.issue;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
-import org.alfresco.module.org_alfresco_module_rm.test.service.HoldServiceImplTest;
+import org.alfresco.module.org_alfresco_module_rm.test.legacy.service.HoldServiceImplTest;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1464Test.java

@@ -20,7 +20,7 @@ package org.alfresco.module.org_alfresco_module_rm.test.integration.issue;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
-import org.alfresco.module.org_alfresco_module_rm.test.service.HoldServiceImplTest;
+import org.alfresco.module.org_alfresco_module_rm.test.legacy.service.HoldServiceImplTest;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 /**

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/LegacyTestSuite.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm.test.legacy;
+
+import org.alfresco.module.org_alfresco_module_rm.test.legacy.action.ActionTestSuite;
+import org.alfresco.module.org_alfresco_module_rm.test.legacy.capabilities.CapabilitiesTestSuite;
+import org.alfresco.module.org_alfresco_module_rm.test.legacy.jscript.JScriptTestSuite;
+import org.alfresco.module.org_alfresco_module_rm.test.legacy.security.SecurityTestSuite;
+import org.alfresco.module.org_alfresco_module_rm.test.legacy.service.ServicesTestSuite;
+import org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript.WebScriptTestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+/**
+ * Convenience test suite that runs all the tests.
+ *
+ * @author Roy Wetherall
+ * @since 2.1
+ */
+@RunWith(Suite.class)
+@SuiteClasses(
+{
+    ActionTestSuite.class,
+    CapabilitiesTestSuite.class,
+    ServicesTestSuite.class,
+    WebScriptTestSuite.class,
+    JScriptTestSuite.class,
+    SecurityTestSuite.class
+})
+public class LegacyTestSuite
+{
+}

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

@@ -16,12 +16,8 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.action;
 
-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.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;

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

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.action;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.action;
 
 import org.alfresco.module.org_alfresco_module_rm.action.dm.CreateRecordAction;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;

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

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.action;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.action;
 
 import java.io.Serializable;
 import java.util.ArrayList;

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

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.action;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.action;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.action.dm.CreateRecordAction;

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

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.action;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.action;
 
 import org.alfresco.module.org_alfresco_module_rm.action.dm.CreateRecordAction;
 import org.alfresco.module.org_alfresco_module_rm.action.impl.RejectAction;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/CapabilitiesTestSuite.java

@@ -16,10 +16,8 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.capabilities;
 
-import org.alfresco.module.org_alfresco_module_rm.test.capabilities.CompositeCapabilityTest;
-import org.alfresco.module.org_alfresco_module_rm.test.capabilities.DeclarativeCapabilityTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/CompositeCapabilityTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.capabilities;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.capabilities;
 
 import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/DeclarativeCapabilityTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.capabilities;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.capabilities;
 
 import java.util.ArrayList;
 import java.util.List;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/jscript/JSONConversionComponentTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.jscript;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.jscript;
 
 import java.io.Serializable;
 

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/jscript/JScriptTestSuite.java

@@ -16,24 +16,24 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.repo;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.jscript;
 
-import org.alfresco.repo.action.parameter.DateParameterProcessorTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 
 /**
- * RM parameter processor test suite
+ * JScript Test Suite
  *
- * @author Mark Hibbins
+ * @author Roy Wetherall
+ * @since 2.2
  */
 @RunWith(Suite.class)
 @SuiteClasses(
 {
-    DateParameterProcessorTest.class
+    JSONConversionComponentTest.class
 })
-public class ParameterProcessorTestSuite 
+public class JScriptTestSuite
 {
 }

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/security/MethodSecurityTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.security;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.security;
 
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/security/SecurityTestSuite.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.security;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+/**
+ * Security Test Suite
+ *
+ * @author Roy Wetherall
+ * @since 2.2
+ */
+@RunWith(Suite.class)
+@SuiteClasses(
+{
+    MethodSecurityTest.class
+})
+public class SecurityTestSuite
+{
+}

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CapabilityServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.util.List;
 

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CustomEMailMappingServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.email.CustomEmailMappingService;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DataSetServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.io.Serializable;
 import java.util.ArrayList;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.io.Serializable;
 import java.util.ArrayList;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedActionServiceTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.util.List;
 

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedSecurityServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.util.HashMap;
 import java.util.HashSet;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanPermissionServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
 import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanRoleServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.util.HashSet;
 import java.util.Set;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.util.List;
 

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FreezeServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.util.ArrayList;
 import java.util.Arrays;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/HoldServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.util.ArrayList;
 import java.util.List;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ModelSecurityServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.util.Set;
 

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RMCaveatConfigServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.util.ArrayList;
 import java.util.List;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -643,7 +643,7 @@ public class RecordServiceImplTest extends BaseRMTestCase
             }
         });
 
-        // test admin
+        // test rmadmin
         doTestInTransaction(new VoidTest()
         {
             @Override
@@ -738,7 +738,7 @@ public class RecordServiceImplTest extends BaseRMTestCase
             }
         });
 
-        // test admin
+        // test rmadmin
         canEditProperty(recordOne, ContentModel.PROP_DESCRIPTION, ADMIN_USER);
         canEditProperty(recordOne, RecordsManagementModel.PROP_LOCATION, ADMIN_USER);
         cantEditProperty(recordDeclaredOne, ContentModel.PROP_DESCRIPTION, ADMIN_USER);

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementActionServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.io.Serializable;
 import java.util.ArrayList;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAdminServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.io.Serializable;
 import java.util.ArrayList;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.io.Serializable;
 import java.util.Date;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementEventServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.util.List;
 

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementQueryDAOImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAO;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementSearchServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.util.List;
 

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.util.ArrayList;
 import java.util.List;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ReportServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.io.Serializable;
 import java.util.HashMap;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ServiceBaseImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.util.Set;
 

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ServicesTestSuite.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2005-2014 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+/**
+ * RM test suite
+ *
+ * @author Roy Wetherall
+ */
+@RunWith(Suite.class)
+@SuiteClasses(
+{
+    ServiceBaseImplTest.class,
+    ExtendedSecurityServiceImplTest.class,
+    ModelSecurityServiceImplTest.class,
+    RecordsManagementActionServiceImplTest.class,
+    ExtendedActionServiceTest.class,
+    DispositionServiceImplTest.class,
+    RecordsManagementActionServiceImplTest.class,
+    RecordsManagementAdminServiceImplTest.class,
+    RecordsManagementAuditServiceImplTest.class,
+    //RecordsManagementEventServiceImplTest.class,
+    RecordsManagementSearchServiceImplTest.class,
+    VitalRecordServiceImplTest.class,
+    DataSetServiceImplTest.class,
+    FreezeServiceImplTest.class,
+    RecordServiceImplTest.class,
+    CapabilityServiceImplTest.class,
+    FilePlanRoleServiceImplTest.class,
+    FilePlanServiceImplTest.class,
+    FilePlanPermissionServiceImplTest.class,
+    ReportServiceImplTest.class,
+    RecordsManagementQueryDAOImplTest.class,
+    HoldServiceImplTest.class
+})
+public class ServicesTestSuite 
+{
+}

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/VitalRecordServiceImplTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.service;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
 
 import java.util.Date;
 

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ActionDefinitionsRestApiTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
 import java.io.IOException;
 import java.util.ArrayList;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/CapabilitiesRestApiTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
 import java.io.IOException;
 import java.text.MessageFormat;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/DataSetRestApiTest.java

@@ -1,4 +1,4 @@
-package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
 import java.io.IOException;
 

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/DispositionRestApiTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
 import java.text.MessageFormat;
 

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/EmailMapKeysRestApiTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
 import java.io.IOException;
 

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/EmailMapScriptTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
 import java.io.IOException;
 

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/EventRestApiTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMWebScriptTestCase;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMCaveatConfigScriptTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
 import java.util.ArrayList;
 import java.util.List;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMConstraintScriptTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
 import java.util.ArrayList;
 import java.util.List;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmAuthoritiesRestApiTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmClassesRestApiTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
 import java.io.IOException;
 import java.util.ArrayList;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmPropertiesRestApiTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
 import java.io.IOException;
 import java.util.ArrayList;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmRestApiTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
 import java.io.IOException;
 import java.io.Serializable;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RoleRestApiTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test.webscript;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
 import java.text.MessageFormat;
 import java.util.HashSet;
@@ -71,7 +71,7 @@ public class RoleRestApiTest extends BaseRMWebScriptTestCase
         filePlanRoleService.createRole(filePlan, role2, "My Test Role Too", getListOfCapabilities(5));
         
         //The user can either enter a plain text label or a key to look up in a property file.
-        filePlanRoleService.createRole(filePlan, role3, "System Administrator", getListOfCapabilities(5));
+        filePlanRoleService.createRole(filePlan, role3, "bootstrap.rmadmin.lastName", getListOfCapabilities(5));
 
         // create test group
         String groupName = GUID.generate();

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/SubstitutionSuggestionsRestApiTest.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.repo.web.scripts;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
 import java.io.IOException;
 import java.util.ArrayList;

rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/WebScriptTestSuite.java

@@ -16,22 +16,8 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.module.org_alfresco_module_rm.test;
+package org.alfresco.module.org_alfresco_module_rm.test.legacy.webscript;
 
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.ActionDefinitionsRestApiTest;
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.CapabilitiesRestApiTest;
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.DataSetRestApiTest;
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.DispositionRestApiTest;
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.EmailMapKeysRestApiTest;
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.EmailMapScriptTest;
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.EventRestApiTest;
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.RMCaveatConfigScriptTest;
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.RMConstraintScriptTest;
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.RmAuthoritiesRestApiTest;
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.RmClassesRestApiTest;
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.RmPropertiesRestApiTest;
-import org.alfresco.module.org_alfresco_module_rm.test.webscript.RoleRestApiTest;
-import org.alfresco.repo.web.scripts.SubstitutionSuggestionsRestApiTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;

rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/AllUnitTestSuite.java

@@ -34,6 +34,7 @@ import org.alfresco.module.org_alfresco_module_rm.script.hold.HoldPutUnitTest;
 import org.alfresco.module.org_alfresco_module_rm.script.hold.HoldsGetUnitTest;
 import org.alfresco.module.org_alfresco_module_rm.security.FilePlanPermissionServiceImplUnitTest;
 import org.alfresco.module.org_alfresco_module_rm.util.BeanExtenderUnitTest;
+import org.alfresco.repo.action.parameter.DateParameterProcessorUnitTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
@@ -52,6 +53,7 @@ import org.junit.runners.Suite.SuiteClasses;
     DispositionLifecycleJobExecuterUnitTest.class,
     DictionaryBootstrapPostProcessorUnitTest.class,
     BeanExtenderUnitTest.class,
+    DateParameterProcessorUnitTest.class,
     
     // services
     RecordServiceImplUnitTest.class,

rm-server/unit-test/java/org/alfresco/repo/action/parameter/DateParameterProcessorUnitTest.java

@@ -29,10 +29,10 @@ import org.junit.Test;
  * Tests for the DateParameterProcessor
  *
  * @author Mark Hibbins
+ * @since 2.2
  */
-public class DateParameterProcessorTest
+public class DateParameterProcessorUnitTest
 {
-
     private DateParameterProcessor dateParameterProcessor;
 
     @Before