diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java index da62923da2..eefca5f1c4 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/AllTestSuite.java +++ b/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; @@ -33,12 +33,8 @@ import org.junit.runners.Suite.SuiteClasses; */ @RunWith(Suite.class) @SuiteClasses( -{ - ActionTestSuite.class, - CapabilitiesTestSuite.class, - ServicesTestSuite.class, - WebScriptTestSuite.class, - ParameterProcessorTestSuite.class, +{ + LegacyTestSuite.class, IntegrationTestSuite.class }) public class AllTestSuite diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java deleted file mode 100644 index 50fb4d5ed0..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java +++ /dev/null @@ -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 . - */ -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 -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1424Test.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1424Test.java index d38f28f694..92d6bab538 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1424Test.java +++ b/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; /** diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1429Test.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1429Test.java index 61e432a34f..fc06895e22 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1429Test.java +++ b/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; /** diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1463Test.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1463Test.java index c202070f67..c5abdc8c83 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1463Test.java +++ b/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; /** diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1464Test.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1464Test.java index 1a6fbe96a3..54da243835 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/RM1464Test.java +++ b/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; /** diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/LegacyTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/LegacyTestSuite.java new file mode 100644 index 0000000000..f3157d9ffa --- /dev/null +++ b/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 . + */ +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 +{ +} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ActionTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/ActionTestSuite.java similarity index 72% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ActionTestSuite.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/ActionTestSuite.java index 2f65f0cf02..73bc7e9388 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ActionTestSuite.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/CreateRecordActionTest.java similarity index 94% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/CreateRecordActionTest.java index ad58742837..cde723fbc6 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/CreateRecordActionTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/FileToActionTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/FileToActionTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/FileToActionTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/FileToActionTest.java index 472aae4de1..f1d3c9d8a9 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/FileToActionTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/HideRecordActionTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/HideRecordActionTest.java similarity index 95% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/HideRecordActionTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/HideRecordActionTest.java index a5aba733fc..db2d00e3d4 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/HideRecordActionTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/RejectActionTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/RejectActionTest.java similarity index 95% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/RejectActionTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/RejectActionTest.java index f12cb4795c..9b84cd3876 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/action/RejectActionTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/CapabilitiesTestSuite.java similarity index 78% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/CapabilitiesTestSuite.java index e8f3950c6d..c325ad13d3 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CompositeCapabilityTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/CompositeCapabilityTest.java similarity index 95% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CompositeCapabilityTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/CompositeCapabilityTest.java index cd8cc91d24..f00308cfd2 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CompositeCapabilityTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/DeclarativeCapabilityTest.java similarity index 97% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/DeclarativeCapabilityTest.java index a73d5b8b46..1a922cbea0 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java +++ b/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 . */ -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; @@ -60,7 +60,7 @@ public class DeclarativeCapabilityTest extends BaseRMTestCase private NodeRef moveToFolder; private NodeRef moveToCategory; - + private NodeRef hold; @Override @@ -109,9 +109,9 @@ public class DeclarativeCapabilityTest extends BaseRMTestCase utils.declareRecord(declaredRecord); utils.declareRecord(frozenRecord); utils.declareRecord(frozenRecord2); - + hold = holdService.createHold(filePlan, GUID.generate(), "reason", "description"); - + holdService.addToHold(hold, frozenRecord); holdService.addToHold(hold, frozenRecordFolder); holdService.addToHold(hold, frozenRecord2); diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/JSONConversionComponentTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/jscript/JSONConversionComponentTest.java similarity index 95% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/JSONConversionComponentTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/jscript/JSONConversionComponentTest.java index 0d30e16e9f..1af499ba9f 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/JSONConversionComponentTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/repo/ParameterProcessorTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/jscript/JScriptTestSuite.java similarity index 77% rename from rm-server/test/java/org/alfresco/repo/ParameterProcessorTestSuite.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/jscript/JScriptTestSuite.java index 092d4c5d03..fb16ad9b49 100644 --- a/rm-server/test/java/org/alfresco/repo/ParameterProcessorTestSuite.java +++ b/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 . */ -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 { } diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/security/MethodSecurityTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/security/MethodSecurityTest.java similarity index 93% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/security/MethodSecurityTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/security/MethodSecurityTest.java index 1028867dfb..82954749f9 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/security/MethodSecurityTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/security/SecurityTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/security/SecurityTestSuite.java new file mode 100644 index 0000000000..30d676bd1b --- /dev/null +++ b/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 . + */ +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 +{ +} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CapabilityServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CapabilityServiceImplTest.java similarity index 95% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CapabilityServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CapabilityServiceImplTest.java index 86953e6cde..19f894e944 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CapabilityServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CustomEMailMappingServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CustomEMailMappingServiceImplTest.java similarity index 95% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CustomEMailMappingServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/CustomEMailMappingServiceImplTest.java index fd1362a539..9e11507605 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/CustomEMailMappingServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DataSetServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DataSetServiceImplTest.java similarity index 97% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DataSetServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DataSetServiceImplTest.java index 991c424627..668cb5e66c 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DataSetServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java similarity index 97% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/DispositionServiceImplTest.java index 3c104ebfec..9d05b218c3 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedActionServiceTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedActionServiceTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedActionServiceTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedActionServiceTest.java index 0971d66dd5..3d363c78d4 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedActionServiceTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedSecurityServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedSecurityServiceImplTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedSecurityServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ExtendedSecurityServiceImplTest.java index c96bd25679..7c8741b68f 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ExtendedSecurityServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanPermissionServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanPermissionServiceImplTest.java similarity index 97% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanPermissionServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanPermissionServiceImplTest.java index 82d5f12639..732f876e30 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanPermissionServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanRoleServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanRoleServiceImplTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanRoleServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanRoleServiceImplTest.java index 696daa3341..65ada7ee86 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanRoleServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanServiceImplTest.java similarity index 97% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FilePlanServiceImplTest.java index 8408caac0a..bbf38f7b38 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FilePlanServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FreezeServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FreezeServiceImplTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FreezeServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FreezeServiceImplTest.java index 8615c02b5d..8c92e3a047 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/FreezeServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/HoldServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/HoldServiceImplTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/HoldServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/HoldServiceImplTest.java index fd724fa196..2ca46df15b 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/HoldServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ModelSecurityServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ModelSecurityServiceImplTest.java similarity index 86% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ModelSecurityServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ModelSecurityServiceImplTest.java index 1bd3fb6d15..a4247c96e1 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ModelSecurityServiceImplTest.java +++ b/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 . */ -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; @@ -29,7 +29,7 @@ import org.alfresco.service.namespace.QName; /** * Model security service test. - * + * * @author Roy Wetherall * @since 2.1 */ @@ -37,16 +37,16 @@ public class ModelSecurityServiceImplTest extends BaseRMTestCase { private static final QName CUSTOM_ASPECT = QName.createQName("http://www.alfresco.org/model/rmtest/1.0", "customAspect"); private static final QName CUSTOM_PROTECTED_ASPECT = QName.createQName("http://www.alfresco.org/model/rmtest/1.0", "customProtectedAspect"); - + private static final QName CUSTOM_PROPERTY = QName.createQName("http://www.alfresco.org/model/rmtest/1.0", "customProperty"); private static final QName CUSTOM_PROTECTED_PROPERTY = QName.createQName("http://www.alfresco.org/model/rmtest/1.0", "customProtectedProperty"); - - + + /** Model security service */ - private ModelSecurityService modelSecurityService; - + private ModelSecurityService modelSecurityService; + private boolean enabled; - + /** * @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#isUserTest() */ @@ -55,23 +55,23 @@ public class ModelSecurityServiceImplTest extends BaseRMTestCase { return true; } - + @Override protected boolean isFillingForAllUsers() { return true; } - + /** * @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#initServices() */ @Override protected void initServices() { - super.initServices(); + super.initServices(); modelSecurityService = (ModelSecurityService)applicationContext.getBean("ModelSecurityService"); } - + /** * @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#setupTestDataImpl() */ @@ -79,11 +79,11 @@ public class ModelSecurityServiceImplTest extends BaseRMTestCase protected void setupTestDataImpl() { super.setupTestDataImpl(); - + enabled = modelSecurityService.isEnabled(); modelSecurityService.setEnabled(true); } - + /** * @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#tearDownImpl() */ @@ -93,77 +93,77 @@ public class ModelSecurityServiceImplTest extends BaseRMTestCase super.tearDownImpl(); modelSecurityService.setEnabled(enabled); } - + /** * test - getProtectedAspects(), isProtectedAspect(), getProtectedAspect() */ public void testProtectedAspects() throws Exception { doTestInTransaction(new VoidTest() - { + { @Override public void runImpl() throws Exception { Set protectedAspects = modelSecurityService.getProtectedAspects(); - + assertNotNull(protectedAspects); assertFalse(protectedAspects.isEmpty()); assertTrue(protectedAspects.contains(CUSTOM_PROTECTED_ASPECT)); assertFalse(protectedAspects.contains(CUSTOM_ASPECT)); - + assertTrue(modelSecurityService.isProtectedAspect(CUSTOM_PROTECTED_ASPECT)); assertFalse(modelSecurityService.isProtectedAspect(CUSTOM_ASPECT)); - + ProtectedAspect protectedAspect = modelSecurityService.getProtectedAspect(CUSTOM_ASPECT); assertNull(protectedAspect); protectedAspect = modelSecurityService.getProtectedAspect(CUSTOM_PROTECTED_ASPECT); assertNotNull(protectedAspect); assertNotNull(protectedAspect.getQName()); - assertNotNull(protectedAspect.getCapabilities()); + assertNotNull(protectedAspect.getCapabilities()); } - }); - + }); + doTestInTransaction(new VoidTest() - { + { @Override public void runImpl() throws Exception { assertTrue(modelSecurityService.isProtectedAspect(CUSTOM_PROTECTED_ASPECT)); - assertFalse(modelSecurityService.canEditProtectedAspect(rmFolder, CUSTOM_PROTECTED_ASPECT)); + assertFalse(modelSecurityService.canEditProtectedAspect(rmFolder, CUSTOM_PROTECTED_ASPECT)); } }, powerUserName); - + doTestInTransaction(new FailureTest ( - "Normal rm user should not have the permissions to add the protected aspect.", + "Normal rm user should not have the permissions to add the protected aspect.", ModelAccessDeniedException.class ) { @Override public void run() throws Exception { - // try and add the aspect + // try and add the aspect nodeService.addAspect(rmFolder, CUSTOM_PROTECTED_ASPECT, null); - } + } }, powerUserName); - + doTestInTransaction(new VoidTest() - { + { @Override public void runImpl() throws Exception { assertTrue(modelSecurityService.canEditProtectedAspect(rmFolder, CUSTOM_PROTECTED_ASPECT)); - + // try and add the aspect nodeService.addAspect(rmFolder, CUSTOM_PROTECTED_ASPECT, null); assertTrue(nodeService.hasAspect(rmFolder, CUSTOM_PROTECTED_ASPECT)); } }, ADMIN_USER); - + // check protected aspect via removeAspect doTestInTransaction(new FailureTest ( - "Normal rm user should not have the permissions to remove the custom aspect.", + "Normal rm user should not have the permissions to remove the custom aspect.", ModelAccessDeniedException.class ) { @@ -171,11 +171,11 @@ public class ModelSecurityServiceImplTest extends BaseRMTestCase public void run() throws Exception { nodeService.removeAspect(rmFolder, CUSTOM_PROTECTED_ASPECT); - } + } }, powerUserName); - + doTestInTransaction(new VoidTest() - { + { @Override public void runImpl() throws Exception { @@ -184,7 +184,7 @@ public class ModelSecurityServiceImplTest extends BaseRMTestCase } }, ADMIN_USER); } - + /** * test - getProtectedProperties(), isProtectedProperty(), getProtectedProperty() */ @@ -195,55 +195,55 @@ public class ModelSecurityServiceImplTest extends BaseRMTestCase public void runImpl() { Set protectedProperties = modelSecurityService.getProtectedProperties(); - + assertNotNull(protectedProperties); assertFalse(protectedProperties.isEmpty()); assertTrue(protectedProperties.contains(CUSTOM_PROTECTED_PROPERTY)); - assertFalse(protectedProperties.contains(CUSTOM_PROPERTY)); - + assertFalse(protectedProperties.contains(CUSTOM_PROPERTY)); + assertTrue(modelSecurityService.isProtectedProperty(CUSTOM_PROTECTED_PROPERTY)); assertFalse(modelSecurityService.isProtectedProperty(CUSTOM_PROPERTY)); - + ProtectedProperty protectedProperty = modelSecurityService.getProtectedProperty(CUSTOM_PROPERTY); assertNull(protectedProperty); protectedProperty = modelSecurityService.getProtectedProperty(CUSTOM_PROTECTED_PROPERTY); assertNotNull(protectedProperty); assertNotNull(protectedProperty.getQName()); - assertNotNull(protectedProperty.getCapabilities()); + assertNotNull(protectedProperty.getCapabilities()); } - }); - + }); + doTestInTransaction(new VoidTest() - { + { @Override public void runImpl() throws Exception { assertTrue(modelSecurityService.canEditProtectedProperty(rmFolder, CUSTOM_PROTECTED_PROPERTY)); } }, ADMIN_USER); - + doTestInTransaction(new VoidTest() - { + { @Override public void runImpl() throws Exception { - assertFalse(modelSecurityService.canEditProtectedProperty(rmFolder, CUSTOM_PROTECTED_PROPERTY)); + assertFalse(modelSecurityService.canEditProtectedProperty(rmFolder, CUSTOM_PROTECTED_PROPERTY)); } - }, powerUserName); - + }, powerUserName); + doTestInTransaction(new VoidTest() - { + { @Override public void runImpl() throws Exception { assertTrue(modelSecurityService.isProtectedProperty(CUSTOM_PROTECTED_PROPERTY)); - assertFalse(modelSecurityService.canEditProtectedProperty(rmFolder, CUSTOM_PROTECTED_PROPERTY)); + assertFalse(modelSecurityService.canEditProtectedProperty(rmFolder, CUSTOM_PROTECTED_PROPERTY)); } }, powerUserName); - + doTestInTransaction(new FailureTest ( - "Should not have the permissions to edit protected property.", + "Should not have the permissions to edit protected property.", ModelAccessDeniedException.class ) { @@ -251,19 +251,19 @@ public class ModelSecurityServiceImplTest extends BaseRMTestCase public void run() throws Exception { nodeService.setProperty(rmFolder, CUSTOM_PROTECTED_PROPERTY, "hello"); - } + } }, powerUserName); - + doTestInTransaction(new VoidTest() - { + { @Override public void runImpl() throws Exception { assertTrue(modelSecurityService.canEditProtectedProperty(rmFolder, CUSTOM_PROTECTED_PROPERTY)); - + nodeService.setProperty(rmFolder, CUSTOM_PROTECTED_PROPERTY, "hello"); assertEquals("hello", nodeService.getProperty(rmFolder, CUSTOM_PROTECTED_PROPERTY)); } - }, ADMIN_USER); + }, ADMIN_USER); } } diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RMCaveatConfigServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RMCaveatConfigServiceImplTest.java similarity index 99% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RMCaveatConfigServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RMCaveatConfigServiceImplTest.java index 591e23ba1b..1e95b97e55 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RMCaveatConfigServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordServiceImplTest.java similarity index 97% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordServiceImplTest.java index 7e303c1d78..57204a8ea1 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordServiceImplTest.java +++ b/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 . */ -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); diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementActionServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementActionServiceImplTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementActionServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementActionServiceImplTest.java index 54fb9ceb5d..b87e6474ad 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementActionServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAdminServiceImplTest.java similarity index 97% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAdminServiceImplTest.java index 5f058d1980..30602da5b3 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAuditServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAuditServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java index 63d4a67fbd..65b0cede07 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAuditServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementEventServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementEventServiceImplTest.java similarity index 95% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementEventServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementEventServiceImplTest.java index 6b11b955d8..d466871ed2 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementEventServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementQueryDAOImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementQueryDAOImplTest.java similarity index 94% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementQueryDAOImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementQueryDAOImplTest.java index 3019e16878..2c9a53bad7 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementQueryDAOImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSearchServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementSearchServiceImplTest.java similarity index 97% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSearchServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementSearchServiceImplTest.java index 0ab53d3e1d..2fc912f0a1 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSearchServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementServiceImplTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementServiceImplTest.java index a143b8f428..0bee4f7467 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ReportServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ReportServiceImplTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ReportServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ReportServiceImplTest.java index 7999b7290d..d7ffb4606a 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ReportServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ServiceBaseImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ServiceBaseImplTest.java similarity index 94% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ServiceBaseImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ServiceBaseImplTest.java index 79b0a3f825..5a973c43db 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/ServiceBaseImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ServicesTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ServicesTestSuite.java new file mode 100644 index 0000000000..3fe8d68ce6 --- /dev/null +++ b/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 . + */ +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 +{ +} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/VitalRecordServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/VitalRecordServiceImplTest.java similarity index 97% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/VitalRecordServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/VitalRecordServiceImplTest.java index db97af66a5..259066ebee 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/VitalRecordServiceImplTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/ActionDefinitionsRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ActionDefinitionsRestApiTest.java similarity index 95% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/ActionDefinitionsRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/ActionDefinitionsRestApiTest.java index f7aa1bd023..90c27626b2 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/ActionDefinitionsRestApiTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/CapabilitiesRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/CapabilitiesRestApiTest.java similarity index 95% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/CapabilitiesRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/CapabilitiesRestApiTest.java index 7f75d83cfa..99f2ac57bc 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/CapabilitiesRestApiTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DataSetRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/DataSetRestApiTest.java similarity index 95% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DataSetRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/DataSetRestApiTest.java index aea1d82aef..2d9a8a29c6 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DataSetRestApiTest.java +++ b/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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DispositionRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/DispositionRestApiTest.java similarity index 97% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DispositionRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/DispositionRestApiTest.java index d6bc552f73..4667247f39 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DispositionRestApiTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapKeysRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/EmailMapKeysRestApiTest.java similarity index 94% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapKeysRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/EmailMapKeysRestApiTest.java index 26da2f23fa..e377524c32 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapKeysRestApiTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapScriptTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/EmailMapScriptTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapScriptTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/EmailMapScriptTest.java index d0cc79a2f6..3bb58ad5d7 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapScriptTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EventRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/EventRestApiTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EventRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/EventRestApiTest.java index 12231bf969..9dff3ed122 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EventRestApiTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMCaveatConfigScriptTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMCaveatConfigScriptTest.java index 882f80ca42..c2ff562afb 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMConstraintScriptTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMConstraintScriptTest.java similarity index 95% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMConstraintScriptTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RMConstraintScriptTest.java index d3591c0efb..78b35e78d3 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMConstraintScriptTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmAuthoritiesRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmAuthoritiesRestApiTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmAuthoritiesRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmAuthoritiesRestApiTest.java index 19d61dd99b..cbfeb3ae1e 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmAuthoritiesRestApiTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmClassesRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmClassesRestApiTest.java similarity index 95% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmClassesRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmClassesRestApiTest.java index 82661f4a4e..e5021d43a6 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmClassesRestApiTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmPropertiesRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmPropertiesRestApiTest.java similarity index 95% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmPropertiesRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmPropertiesRestApiTest.java index 4c092b0c84..f086c27435 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmPropertiesRestApiTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmRestApiTest.java similarity index 97% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmRestApiTest.java index 236027ca72..cb64ba01bf 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmRestApiTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RoleRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RoleRestApiTest.java similarity index 95% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RoleRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RoleRestApiTest.java index c3e3f17768..2f829d48c9 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RoleRestApiTest.java +++ b/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 . */ -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; @@ -69,9 +69,9 @@ public class RoleRestApiTest extends BaseRMWebScriptTestCase // Create a couple or roles by hand filePlanRoleService.createRole(filePlan, role1, "My Test Role", getListOfCapabilities(5)); 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(); @@ -102,7 +102,7 @@ public class RoleRestApiTest extends BaseRMWebScriptTestCase assertEquals(role2, roleObj.get("name")); assertEquals("My Test Role Too", roleObj.get("displayLabel")); checkCapabilities(roleObj, 5); - + //Custom role with a user entered message key roleObj = roles.getJSONObject(role3); assertNotNull(roleObj); diff --git a/rm-server/test/java/org/alfresco/repo/web/scripts/SubstitutionSuggestionsRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/SubstitutionSuggestionsRestApiTest.java similarity index 95% rename from rm-server/test/java/org/alfresco/repo/web/scripts/SubstitutionSuggestionsRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/SubstitutionSuggestionsRestApiTest.java index f5d5e2e5aa..b90763f442 100644 --- a/rm-server/test/java/org/alfresco/repo/web/scripts/SubstitutionSuggestionsRestApiTest.java +++ b/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 . */ -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; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/WebScriptTestSuite.java similarity index 52% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/WebScriptTestSuite.java index 59de57360e..d1581e74d5 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java +++ b/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 . */ -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; diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/AllUnitTestSuite.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/AllUnitTestSuite.java index b0c633e781..912c1827f9 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/AllUnitTestSuite.java +++ b/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, diff --git a/rm-server/test/java/org/alfresco/repo/action/parameter/DateParameterProcessorTest.java b/rm-server/unit-test/java/org/alfresco/repo/action/parameter/DateParameterProcessorUnitTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/repo/action/parameter/DateParameterProcessorTest.java rename to rm-server/unit-test/java/org/alfresco/repo/action/parameter/DateParameterProcessorUnitTest.java index cc15202b22..d806e81f6a 100644 --- a/rm-server/test/java/org/alfresco/repo/action/parameter/DateParameterProcessorTest.java +++ b/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