diff --git a/rm-server/pom.xml b/rm-server/pom.xml index d09a19de0f..2115a712cf 100644 --- a/rm-server/pom.xml +++ b/rm-server/pom.xml @@ -403,6 +403,12 @@ alfresco-remote-api + + io.takari.junit + takari-cpsuite + 1.2.7 + test + junit junit 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 eefca5f1c4..af8d4b4ae6 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 @@ -18,12 +18,11 @@ */ package org.alfresco.module.org_alfresco_module_rm.test; -import org.alfresco.module.org_alfresco_module_rm.test.integration.IntegrationTestSuite; -import org.alfresco.module.org_alfresco_module_rm.test.legacy.LegacyTestSuite; +import org.junit.extensions.cpsuite.ClasspathSuite; +import org.junit.extensions.cpsuite.ClasspathSuite.ClassnameFilters; +import org.junit.extensions.cpsuite.ClasspathSuite.SuiteTypes; +import org.junit.extensions.cpsuite.SuiteType; import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - /** * Convenience test suite that runs all the tests. @@ -31,12 +30,24 @@ import org.junit.runners.Suite.SuiteClasses; * @author Roy Wetherall * @since 2.1 */ -@RunWith(Suite.class) -@SuiteClasses( -{ - LegacyTestSuite.class, - IntegrationTestSuite.class +@RunWith(ClasspathSuite.class) +@SuiteTypes({SuiteType.TEST_CLASSES, SuiteType.RUN_WITH_CLASSES, SuiteType.JUNIT38_TEST_CLASSES}) +@ClassnameFilters({ + // Execute all tests classes ending with "Test" + ".*Test" + // Exclude the ones ending with "UnitTest" + ,"!.*UnitTest" + // Put the test classes you want to exclude here + ,"!.*DataLoadSystemTest" + ,"!.*RM2072Test" + ,"!.*RM2190Test" + ,"!.*RM981SystemTest" + ,"!.*RecordsManagementEventServiceImplTest" + ,"!.*RmRestApiTest" + ,"!.*NotificationServiceHelperSystemTest" + ,"!.*RetryingTransactionHelperBaseTest" + ,"!.*RMCaveatConfigServiceImplTest" }) public class AllTestSuite { -} +} \ No newline at end of file diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/IntegrationTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/IntegrationTestSuite.java deleted file mode 100755 index 69a7cbd8ae..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/IntegrationTestSuite.java +++ /dev/null @@ -1,64 +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.integration; - -import org.alfresco.module.org_alfresco_module_rm.test.integration.classification.ClassificationTestSuite; -import org.alfresco.module.org_alfresco_module_rm.test.integration.disposition.DispositionTestSuite; -import org.alfresco.module.org_alfresco_module_rm.test.integration.dod.DoD5015TestSuite; -import org.alfresco.module.org_alfresco_module_rm.test.integration.event.EventTestSuite; -import org.alfresco.module.org_alfresco_module_rm.test.integration.hold.HoldTestSuite; -import org.alfresco.module.org_alfresco_module_rm.test.integration.issue.IssueTestSuite; -import org.alfresco.module.org_alfresco_module_rm.test.integration.job.JobTestSuite; -import org.alfresco.module.org_alfresco_module_rm.test.integration.record.RecordTestSuite; -import org.alfresco.module.org_alfresco_module_rm.test.integration.recordfolder.RecordFolderTestSuite; -import org.alfresco.module.org_alfresco_module_rm.test.integration.relationship.RelationshipTestSuite; -import org.alfresco.module.org_alfresco_module_rm.test.integration.report.ReportTestSuite; -import org.alfresco.module.org_alfresco_module_rm.test.integration.transfer.TransferTestSuite; -import org.alfresco.module.org_alfresco_module_rm.test.integration.version.VersionTestSuite; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - - -/** - * RM Integration Test Suite - * - * @author Roy Wetherall - * @since 2.2 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - DoD5015TestSuite.class, - IssueTestSuite.class, - EventTestSuite.class, - ReportTestSuite.class, - DispositionTestSuite.class, - RecordTestSuite.class, - RecordFolderTestSuite.class, - JobTestSuite.class, - HoldTestSuite.class, - VersionTestSuite.class, - RelationshipTestSuite.class, - TransferTestSuite.class, - ClassificationTestSuite.class -}) -public class IntegrationTestSuite -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationTestSuite.java deleted file mode 100644 index 591163c79e..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/classification/ClassificationTestSuite.java +++ /dev/null @@ -1,40 +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.integration.classification; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Record integration test suite - * - * @author tpage - * @since 3.0 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - ClassificationReasonsTest.class, - ClassificationLevelsTest.class, - ClassifyTest.class -}) -public class ClassificationTestSuite -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/DispositionTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/DispositionTestSuite.java deleted file mode 100644 index 6d5fc61f83..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/DispositionTestSuite.java +++ /dev/null @@ -1,38 +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.integration.disposition; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Disposition integration test suite - * - * @author Roy Wetherall - * @since 2.2 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - CutOffTest.class -}) -public class DispositionTestSuite -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/dod/DoD5015TestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/dod/DoD5015TestSuite.java deleted file mode 100755 index aa049ab276..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/dod/DoD5015TestSuite.java +++ /dev/null @@ -1,39 +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.integration.dod; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * DoD 5015 integration test suite - * - * @author Roy Wetherall - * @since 2.2 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - RM1147DODRMSiteTest.class, - RM1194ExcludeDoDRecordTypesTest.class -}) -public class DoD5015TestSuite -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/event/EventTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/event/EventTestSuite.java deleted file mode 100755 index f379874344..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/event/EventTestSuite.java +++ /dev/null @@ -1,38 +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.integration.event; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Event integration test suite - * - * @author Roy Wetherall - * @since 2.2 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - CompleteEventsTest.class -}) -public class EventTestSuite -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/HoldTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/HoldTestSuite.java deleted file mode 100644 index fc81361be2..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/HoldTestSuite.java +++ /dev/null @@ -1,40 +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.integration.hold; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Hold test suite - * - * @author Roy Wetherall - * @since 2.2 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - DeleteHoldTest.class, - AddRemoveFromHoldTest.class, - CreateHoldTest.class -}) -public class HoldTestSuite -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java deleted file mode 100755 index 93cd1e55a8..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java +++ /dev/null @@ -1,56 +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.integration.issue; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Issue test suite - * - * @author Roy Wetherall - * @since 2.1 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - RM1008Test.class, - RM1027Test.class, - RM1030Test.class, - RM1424Test.class, - RM1429Test.class, - RM1463Test.class, - RM1464Test.class, - RM452Test.class, - RM804Test.class, - RM994Test.class, - RM1039Test.class, - RM1727Test.class, - RM1799Test.class, - RM1814Test.class, - RM978Test.class, - RM1887Test.class, - RM1914Test.class, - //RM2190Test.class, - RM2192Test.class -}) -public class IssueTestSuite -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/JobTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/JobTestSuite.java deleted file mode 100644 index 12022f2cf2..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/job/JobTestSuite.java +++ /dev/null @@ -1,38 +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.integration.job; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Job integration test suite - * - * @author Roy Wetherall - * @since 2.2 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - AutomaticDispositionTest.class -}) -public class JobTestSuite -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java deleted file mode 100644 index d2b3b8e498..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/record/RecordTestSuite.java +++ /dev/null @@ -1,44 +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.integration.record; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Record integration test suite - * - * @author Roy Wetherall - * @since 2.2 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - RejectRecordTest.class, - CreateRecordTest.class, - MoveRecordTest.class, - HideInplaceRecordTest.class, - MoveInplaceRecordTest.class, - ViewRecordTest.class, - LinkRecordTest.class -}) -public class RecordTestSuite -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/RecordFolderTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/RecordFolderTestSuite.java deleted file mode 100644 index 0dd120ab7a..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/recordfolder/RecordFolderTestSuite.java +++ /dev/null @@ -1,39 +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.integration.recordfolder; - -import org.alfresco.module.org_alfresco_module_rm.test.integration.recordfolder.MoveRecordFolderTest; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Record folder integration test suite - * - * @author Roy Wetherall - * @since 2.2 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - MoveRecordFolderTest.class -}) -public class RecordFolderTestSuite -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/relationship/RelationshipTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/relationship/RelationshipTestSuite.java deleted file mode 100755 index fd06625cfb..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/relationship/RelationshipTestSuite.java +++ /dev/null @@ -1,39 +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.integration.relationship; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Relationship integration test suite - * - * @author Roy Wetherall - * @since 2.3 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - CreateRelationshipTest.class, - DeleteRelationshipTest.class -}) -public class RelationshipTestSuite -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/report/ReportTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/report/ReportTestSuite.java deleted file mode 100644 index e32531429b..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/report/ReportTestSuite.java +++ /dev/null @@ -1,38 +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.integration.report; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Report integration test suite - * - * @author Roy Wetherall - * @since 2.2 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - HoldReportTest.class -}) -public class ReportTestSuite -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/CreateTransferFolderAsNonAdminUser.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/CreateTransferFolderAsNonAdminUserTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/CreateTransferFolderAsNonAdminUser.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/CreateTransferFolderAsNonAdminUserTest.java index 4409db99e8..ae005288d5 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/CreateTransferFolderAsNonAdminUser.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/CreateTransferFolderAsNonAdminUserTest.java @@ -46,7 +46,7 @@ import org.alfresco.service.cmr.repository.NodeRef; * @author Tuna Aksoy * @since 2.3 */ -public class CreateTransferFolderAsNonAdminUser extends BaseRMTestCase +public class CreateTransferFolderAsNonAdminUserTest extends BaseRMTestCase { // Test user private String testUser = null; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/FilingPermissionsOnTransferFolder.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/FilingPermissionsOnTransferFolderTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/FilingPermissionsOnTransferFolder.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/FilingPermissionsOnTransferFolderTest.java index 7d4cb377c6..a23b353f1f 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/FilingPermissionsOnTransferFolder.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/FilingPermissionsOnTransferFolderTest.java @@ -47,7 +47,7 @@ import org.alfresco.service.cmr.repository.NodeRef; * @author Tuna Aksoy * @since 2.3 */ -public class FilingPermissionsOnTransferFolder extends BaseRMTestCase +public class FilingPermissionsOnTransferFolderTest extends BaseRMTestCase { // Test users private String testUser1 = null; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/NoPermissionsOnTransferFolder.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/NoPermissionsOnTransferFolderTest.java similarity index 96% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/NoPermissionsOnTransferFolder.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/NoPermissionsOnTransferFolderTest.java index 4ac4cf4fba..e23904fea1 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/NoPermissionsOnTransferFolder.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/NoPermissionsOnTransferFolderTest.java @@ -47,7 +47,7 @@ import org.alfresco.service.cmr.repository.NodeRef; * @author Tuna Aksoy * @since 2.3 */ -public class NoPermissionsOnTransferFolder extends BaseRMTestCase +public class NoPermissionsOnTransferFolderTest extends BaseRMTestCase { // Test users private String testUser1 = null; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/ReadPermissionsOnTransferFolder.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/ReadPermissionsOnTransferFolderTest.java similarity index 97% rename from rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/ReadPermissionsOnTransferFolder.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/ReadPermissionsOnTransferFolderTest.java index 2ad2e58d49..f8801aaeac 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/ReadPermissionsOnTransferFolder.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/ReadPermissionsOnTransferFolderTest.java @@ -51,7 +51,7 @@ import org.alfresco.service.cmr.repository.NodeRef; * @author Tuna Aksoy * @since 2.3 */ -public class ReadPermissionsOnTransferFolder extends BaseRMTestCase +public class ReadPermissionsOnTransferFolderTest extends BaseRMTestCase { // Test users private String testUser1 = null; diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/TransferTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/TransferTestSuite.java deleted file mode 100644 index ceb1a8dedb..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/transfer/TransferTestSuite.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2005-2015 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.integration.transfer; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Transfer test suite - * - * @author Tuna Aksoy - * @since 2.3 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - CreateTransferFolderAsNonAdminUser.class, - FilingPermissionsOnTransferFolder.class, - NoPermissionsOnTransferFolder.class, - ReadPermissionsOnTransferFolder.class -}) -public class TransferTestSuite -{ - -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/VersionTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/VersionTestSuite.java deleted file mode 100644 index c2d39cf2b6..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/VersionTestSuite.java +++ /dev/null @@ -1,40 +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.integration.version; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * Recordable Version Test Suite - * - * @author Roy Wetherall - * @since 2.3 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - AdHocRecordableVersionsTest.class, - AutoRecordableVersionsTest.class, - DeclareAsRecordVersionTest.class -}) -public class VersionTestSuite -{ -} 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 deleted file mode 100644 index f3157d9ffa..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/LegacyTestSuite.java +++ /dev/null @@ -1,50 +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.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/legacy/action/ActionTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/ActionTestSuite.java deleted file mode 100644 index 47b44bcab7..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/action/ActionTestSuite.java +++ /dev/null @@ -1,44 +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.legacy.action; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - - -/** - * RM test suite - * - * @author Roy Wetherall - * @since 2.1 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - CreateRecordActionTest.class, - HideRecordActionTest.class, - RejectActionTest.class, - FileToActionTest.class, - FileReportActionTest.class, - RecordableVersionConfigActionTest.class -}) -public class ActionTestSuite -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/CapabilitiesTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/CapabilitiesTestSuite.java deleted file mode 100644 index c325ad13d3..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/capabilities/CapabilitiesTestSuite.java +++ /dev/null @@ -1,39 +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.legacy.capabilities; - -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( -{ - DeclarativeCapabilityTest.class, - CompositeCapabilityTest.class -}) -public class CapabilitiesTestSuite -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/jscript/JScriptTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/jscript/JScriptTestSuite.java deleted file mode 100644 index fb16ad9b49..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/jscript/JScriptTestSuite.java +++ /dev/null @@ -1,39 +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.legacy.jscript; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - - -/** - * JScript Test Suite - * - * @author Roy Wetherall - * @since 2.2 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - JSONConversionComponentTest.class -}) -public class JScriptTestSuite -{ -} 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 deleted file mode 100644 index 30d676bd1b..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/security/SecurityTestSuite.java +++ /dev/null @@ -1,39 +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.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/legacy/service/ServicesTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ServicesTestSuite.java deleted file mode 100644 index b981f08c25..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/ServicesTestSuite.java +++ /dev/null @@ -1,60 +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.legacy.service; - -import org.alfresco.module.org_alfresco_module_rm.test.integration.hold.DeleteHoldTest; -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, - DeleteHoldTest.class -}) -public class ServicesTestSuite -{ -} diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/WebScriptTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/WebScriptTestSuite.java deleted file mode 100644 index d1581e74d5..0000000000 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/WebScriptTestSuite.java +++ /dev/null @@ -1,51 +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.legacy.webscript; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * RM WebScript test suite - * - * @author Roy Wetherall - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - DispositionRestApiTest.class, - EventRestApiTest.class, - RMCaveatConfigScriptTest.class, - RMConstraintScriptTest.class, - //RmRestApiTest.class, - RoleRestApiTest.class, - DataSetRestApiTest.class, - EmailMapScriptTest.class, - EmailMapKeysRestApiTest.class, - CapabilitiesRestApiTest.class, - ActionDefinitionsRestApiTest.class, - RmClassesRestApiTest.class, - RmPropertiesRestApiTest.class, - RmAuthoritiesRestApiTest.class, - SubstitutionSuggestionsRestApiTest.class -}) -public class WebScriptTestSuite -{ -} diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/CapabilityDeclarativeConditionSuite.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/CapabilityDeclarativeConditionSuite.java deleted file mode 100644 index b27a9ba6b3..0000000000 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/CapabilityDeclarativeConditionSuite.java +++ /dev/null @@ -1,40 +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.capability.declarative.condition; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * capability.declarative.condition unit test suite - * - * @author Roy Wetherall - * @since 2.3 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - HoldCapabilityConditionUnitTest.class, - FillingOnHoldContainerCapabilityConditionUnitTest.class, - FrozenCapabilityConditionUnitTest.class -}) -public class CapabilityDeclarativeConditionSuite -{ -} diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSuite.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSuite.java deleted file mode 100644 index d25a46d67d..0000000000 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationSuite.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2005-2015 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.classification; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -/** - * @author Neil Mc Erlean - * @since 3.0 - */ -@RunWith(Suite.class) -@Suite.SuiteClasses( -{ - ClassificationLevelConstraintUnitTest.class, - ClassificationLevelManagerUnitTest.class, - ClassificationReasonManagerUnitTest.class, - ClassificationServiceDAOUnitTest.class, - ClassificationServiceImplUnitTest.class, - SecurityClearanceServiceImplUnitTest.class -}) -public class ClassificationSuite -{ - // Intentionally empty. -} diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClearanceLevelManagerTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClearanceLevelManagerUnitTest.java similarity index 96% rename from rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClearanceLevelManagerTest.java rename to rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClearanceLevelManagerUnitTest.java index 28212810bd..e8f74e987c 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClearanceLevelManagerTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClearanceLevelManagerUnitTest.java @@ -32,7 +32,7 @@ import org.junit.Test; * * @author tpage */ -public class ClearanceLevelManagerTest +public class ClearanceLevelManagerUnitTest { static final ClassificationLevel TOP_SECRET = new ClassificationLevel("TS", "Top Secret Classification"); static final ClassificationLevel SECRET = new ClassificationLevel("S", "Secret Classification"); diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/PatchV22Suite.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/PatchV22Suite.java deleted file mode 100755 index 186ae0876e..0000000000 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v22/PatchV22Suite.java +++ /dev/null @@ -1,39 +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.patch.v22; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -/** - * patch.v22 unit test suite - * - * @author Roy Wetherall - * @since 2.3 - */ -@RunWith(Suite.class) -@SuiteClasses( -{ - RMv22RemoveInPlaceRolesFromAllPatchUnitTest.class, - RMv22CapabilityPatchUnitTest.class -}) -public class PatchV22Suite -{ -} diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigGetTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigGetUnitTest.java similarity index 95% rename from rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigGetTest.java rename to rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigGetUnitTest.java index 60a404e8e1..6304d30840 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigGetTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigGetUnitTest.java @@ -46,7 +46,7 @@ import org.springframework.extensions.webscripts.DeclarativeWebScript; * @author Tuna Aksoy * @since 2.3 */ -public class RecordedVersionConfigGetTest extends BaseRecordedVersionConfigTest +public class RecordedVersionConfigGetUnitTest extends BaseRecordedVersionConfigTest { /** RecordedVersionConfigGet webscript instance */ protected @InjectMocks RecordedVersionConfigGet webScript; diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigPostTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigPostUnitTest.java similarity index 94% rename from rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigPostTest.java rename to rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigPostUnitTest.java index 969666ab75..b9ca5591ce 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigPostTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/recorded/version/config/RecordedVersionConfigPostUnitTest.java @@ -39,7 +39,7 @@ import org.springframework.extensions.webscripts.DeclarativeWebScript; * @author Tuna Aksoy * @since 2.3 */ -public class RecordedVersionConfigPostTest extends BaseRecordedVersionConfigTest +public class RecordedVersionConfigPostUnitTest extends BaseRecordedVersionConfigTest { /** RecordedVersionConfigPost webscript instance */ protected @InjectMocks RecordedVersionConfigPost webScript; diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassificationLevelsGetTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassificationLevelsGetUnitTest.java similarity index 97% rename from rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassificationLevelsGetTest.java rename to rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassificationLevelsGetUnitTest.java index b9b66ec498..83f1089818 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassificationLevelsGetTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassificationLevelsGetUnitTest.java @@ -46,7 +46,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; * @author Tuna Aksoy * @since 3.0 */ -public class ClassificationLevelsGetTest extends BaseWebScriptUnitTest +public class ClassificationLevelsGetUnitTest extends BaseWebScriptUnitTest { /** Classpath location of ftl template for web script */ private static final String WEBSCRIPT_TEMPLATE = WEBSCRIPT_ROOT_RM + "classification/classificationlevels.get.json.ftl"; diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentPostTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentPostUnitTest.java similarity index 98% rename from rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentPostTest.java rename to rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentPostUnitTest.java index e3dbc979c8..bc9d0cc2ba 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentPostTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ClassifyContentPostUnitTest.java @@ -50,7 +50,7 @@ import org.springframework.extensions.webscripts.DeclarativeWebScript; * @author Tuna Aksoy * @since 3.0 */ -public class ClassifyContentPostTest extends BaseWebScriptUnitTest +public class ClassifyContentPostUnitTest extends BaseWebScriptUnitTest { /** Classpath location of ftl template for web script */ private static final String WEBSCRIPT_TEMPLATE = WEBSCRIPT_ROOT_RM + "classification/classifycontent.post.json.ftl"; diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ReasonsGetTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ReasonsGetUnitTest.java similarity index 98% rename from rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ReasonsGetTest.java rename to rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ReasonsGetUnitTest.java index 0a3ee9bb16..1dfc94d603 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ReasonsGetTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/ReasonsGetUnitTest.java @@ -46,7 +46,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; * * @author tpage */ -public class ReasonsGetTest extends BaseWebScriptUnitTest +public class ReasonsGetUnitTest extends BaseWebScriptUnitTest { /** Classpath location of ftl template for web script */ private static final String WEBSCRIPT_TEMPLATE = WEBSCRIPT_ROOT_RM + "classification/reasons.get.json.ftl"; diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearanceGetTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearanceGetUnitTest.java similarity index 99% rename from rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearanceGetTest.java rename to rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearanceGetUnitTest.java index f14d4b5b8e..769412e3e2 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearanceGetTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearanceGetUnitTest.java @@ -54,7 +54,7 @@ import org.springframework.extensions.webscripts.DeclarativeWebScript; * @author Tuna Aksoy * @since 3.0 */ -public class UserSecurityClearanceGetTest extends BaseWebScriptUnitTest +public class UserSecurityClearanceGetUnitTest extends BaseWebScriptUnitTest { /** Classpath location of ftl template for web script */ private static final String WEBSCRIPT_TEMPLATE = WEBSCRIPT_ROOT_RM + "classification/usersecurityclearance.get.json.ftl"; diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearancePutTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearancePutUnitTest.java similarity index 98% rename from rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearancePutTest.java rename to rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearancePutUnitTest.java index 767b206f1c..b85b4dc2b5 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearancePutTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearancePutUnitTest.java @@ -23,7 +23,7 @@ import org.mockito.Spy; import org.springframework.extensions.webscripts.DeclarativeWebScript; import org.springframework.extensions.webscripts.WebScriptException; -public class UserSecurityClearancePutTest extends BaseWebScriptUnitTest +public class UserSecurityClearancePutUnitTest extends BaseWebScriptUnitTest { /** * Classpath location of ftl template for web script 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 a643224a76..bc239924d4 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 @@ -18,40 +18,9 @@ */ package org.alfresco.module.org_alfresco_module_rm.test; -import org.alfresco.module.org_alfresco_module_rm.action.dm.DeclareAsVersionRecordActionUnitTest; -import org.alfresco.module.org_alfresco_module_rm.action.impl.FileReportActionUnitTest; -import org.alfresco.module.org_alfresco_module_rm.action.impl.UnlinkFromActionUnitTest; -import org.alfresco.module.org_alfresco_module_rm.bootstrap.BootstrapImporterModuleComponentUnitTest; -import org.alfresco.module.org_alfresco_module_rm.bootstrap.RecordContributorsGroupBootstrapComponentUnitTest; -import org.alfresco.module.org_alfresco_module_rm.capability.RMEntryVoterUnitTest; -import org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.CapabilityDeclarativeConditionSuite; -import org.alfresco.module.org_alfresco_module_rm.capability.impl.EditNonRecordsMetadataCapabilityUnitTest; -import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationSuite; -import org.alfresco.module.org_alfresco_module_rm.forms.RecordsManagementTypeFormFilterUnitTest; -import org.alfresco.module.org_alfresco_module_rm.hold.HoldServiceImplUnitTest; -import org.alfresco.module.org_alfresco_module_rm.job.DispositionLifecycleJobExecuterUnitTest; -import org.alfresco.module.org_alfresco_module_rm.jscript.app.evaluator.FrozenEvaluatorUnitTest; -import org.alfresco.module.org_alfresco_module_rm.jscript.app.evaluator.TransferEvaluatorUnitTest; -import org.alfresco.module.org_alfresco_module_rm.model.compatibility.DictionaryBootstrapPostProcessorUnitTest; -import org.alfresco.module.org_alfresco_module_rm.patch.v22.PatchV22Suite; -import org.alfresco.module.org_alfresco_module_rm.record.RecordMetadataBootstrapUnitTest; -import org.alfresco.module.org_alfresco_module_rm.record.RecordServiceImplUnitTest; -import org.alfresco.module.org_alfresco_module_rm.recorded.version.config.RecordedVersionConfigGetTest; -import org.alfresco.module.org_alfresco_module_rm.recorded.version.config.RecordedVersionConfigPostTest; -import org.alfresco.module.org_alfresco_module_rm.script.classification.ClassificationLevelsGetTest; -import org.alfresco.module.org_alfresco_module_rm.script.classification.ClassifyContentPostTest; -import org.alfresco.module.org_alfresco_module_rm.script.classification.ReasonsGetTest; -import org.alfresco.module.org_alfresco_module_rm.script.classification.UserSecurityClearanceGetTest; -import org.alfresco.module.org_alfresco_module_rm.script.classification.UserSecurityClearancePutTest; -import org.alfresco.module.org_alfresco_module_rm.script.hold.HoldPostUnitTest; -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.test.util.ExceptionUtilsUsageExamplesTest; -import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionServiceImplUnitTest; -import org.alfresco.repo.action.parameter.DateParameterProcessorUnitTest; +import org.junit.extensions.cpsuite.ClasspathSuite; +import org.junit.extensions.cpsuite.ClasspathSuite.ClassnameFilters; import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; /** * All unit test suite. @@ -59,61 +28,13 @@ import org.junit.runners.Suite.SuiteClasses; * @author Roy Wetherall * @since 2.2 */ -@RunWith(Suite.class) -@SuiteClasses( -{ - RecordMetadataBootstrapUnitTest.class, - RecordsManagementTypeFormFilterUnitTest.class, - DispositionLifecycleJobExecuterUnitTest.class, - DictionaryBootstrapPostProcessorUnitTest.class, - DateParameterProcessorUnitTest.class, - RMEntryVoterUnitTest.class, - - // services - RecordServiceImplUnitTest.class, - HoldServiceImplUnitTest.class, - // FilePlanPermissionServiceImplUnitTest.class, // removed because test unreliable on Bamboo - RecordableVersionServiceImplUnitTest.class, - - // evaluators - TransferEvaluatorUnitTest.class, - FrozenEvaluatorUnitTest.class, - - // capabilities - EditNonRecordsMetadataCapabilityUnitTest.class, - - // web scripts - HoldsGetUnitTest.class, - HoldPostUnitTest.class, - HoldPutUnitTest.class, - ReasonsGetTest.class, - ClassificationLevelsGetTest.class, - ClassifyContentPostTest.class, - UserSecurityClearanceGetTest.class, - UserSecurityClearancePutTest.class, - - // action implementations - FileReportActionUnitTest.class, - UnlinkFromActionUnitTest.class, - DeclareAsVersionRecordActionUnitTest.class, - - // recorded version config - RecordedVersionConfigGetTest.class, - RecordedVersionConfigPostTest.class, - - // bootstrap - BootstrapImporterModuleComponentUnitTest.class, - RecordContributorsGroupBootstrapComponentUnitTest.class, - - // suites by package - CapabilityDeclarativeConditionSuite.class, - PatchV22Suite.class, - ClassificationSuite.class, - - // Utilities - ExceptionUtilsUsageExamplesTest.class - +@RunWith(ClasspathSuite.class) +@ClassnameFilters({ + // Execute all tests classes ending with "UnitTest" + ".*UnitTest" + // Put the test classes you want to exclude here + ,"!.*FilePlanPermissionServiceImplUnitTest" }) public class AllUnitTestSuite { -} +} \ No newline at end of file diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesUnitTest.java similarity index 95% rename from rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesTest.java rename to rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesUnitTest.java index a7f4592a4a..8d5dcde3b1 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/ExceptionUtilsUsageExamplesUnitTest.java @@ -33,7 +33,7 @@ import static org.junit.Assert.*; * @since 3.0 * @author Neil Mc Erlean */ -public class ExceptionUtilsUsageExamplesTest +public class ExceptionUtilsUsageExamplesUnitTest { private String goodMethod() { return "hello"; } diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/RMParameterCheckTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/RMParameterCheckUnitTest.java similarity index 98% rename from rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/RMParameterCheckTest.java rename to rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/RMParameterCheckUnitTest.java index bf5e872939..9642c9a22f 100644 --- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/RMParameterCheckTest.java +++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/util/RMParameterCheckUnitTest.java @@ -27,7 +27,7 @@ import org.junit.Test; * * @author tpage */ -public class RMParameterCheckTest +public class RMParameterCheckUnitTest { @Test public void checkNotBlank()