From 3adf7558299315bbe8d3c66f76b6374b5731a94f Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Tue, 12 May 2015 19:16:04 +0000
Subject: [PATCH] RM-2206 (Dynamic test suite configuration)

+review RM-49

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@104044 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../test/AllTestSuite.java                    | 24 ++++++++++---------
 .../test/AllUnitTestSuite.java                |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

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 af8d4b4ae6..2c939d09ec 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
@@ -34,19 +34,21 @@ import org.junit.runner.RunWith;
 @SuiteTypes({SuiteType.TEST_CLASSES, SuiteType.RUN_WITH_CLASSES, SuiteType.JUNIT38_TEST_CLASSES})
 @ClassnameFilters({
     // Execute all tests classes ending with "Test"
-    ".*Test"
+    ".*Test",
     // Exclude the ones ending with "UnitTest"
-    ,"!.*UnitTest"
+    "!.*UnitTest",
     // Put the test classes you want to exclude here
-    ,"!.*DataLoadSystemTest"
-    ,"!.*RM2072Test"
-    ,"!.*RM2190Test"
-    ,"!.*RM981SystemTest"
-    ,"!.*RecordsManagementEventServiceImplTest"
-    ,"!.*RmRestApiTest"
-    ,"!.*NotificationServiceHelperSystemTest"
-    ,"!.*RetryingTransactionHelperBaseTest"
-    ,"!.*RMCaveatConfigServiceImplTest"
+    "!.*DataLoadSystemTest",
+    "!.*RM2072Test",
+    "!.*RM2190Test",
+    "!.*RM981SystemTest",
+    "!.*RecordsManagementEventServiceImplTest",
+    "!.*RmRestApiTest",
+    "!.*NotificationServiceHelperSystemTest",
+    "!.*RetryingTransactionHelperBaseTest",
+    "!.*RMCaveatConfigServiceImplTest",
+    // This test is running successfully locally but not on bamboo
+    "!.*EmailMapScriptTest"
 })
 public class AllTestSuite
 {
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 bc239924d4..c2b437ab0f 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
@@ -31,9 +31,9 @@ import org.junit.runner.RunWith;
 @RunWith(ClasspathSuite.class)
 @ClassnameFilters({
     // Execute all tests classes ending with "UnitTest"
-    ".*UnitTest"
+    ".*UnitTest",
     // Put the test classes you want to exclude here
-    ,"!.*FilePlanPermissionServiceImplUnitTest"
+    "!.*FilePlanPermissionServiceImplUnitTest"
 })
 public class AllUnitTestSuite
 {