REPO-2774: further split on test suite AppContextExtra02 because of the max_connection limit on bamboo

src/test/java/org/alfresco/AllRepositoryTestsCatalogue.java

@@ -851,7 +851,7 @@ public class AllRepositoryTestsCatalogue
     }
 
     // [classpath:alfresco/application-context.xml, classpath:tenant/mt-*context.xml]
-    static void applicationContext_mtAllContext_56(TestSuite suite)
+    static void applicationContext_mtAllContext(TestSuite suite)
     {
         // pass - slow 182s -
         // not sure what to say about the context files mt-*-context.xml
@@ -873,7 +873,7 @@ public class AllRepositoryTestsCatalogue
     }
 
     // [classpath:alfresco/application-context.xml, classpath:opencmis/opencmistest-context.xml]
-    static void applicationContext_openCmisContext_07(TestSuite suite)
+    static void applicationContext_openCmisContext(TestSuite suite)
     {
         // this does not want to play nice with the ones above
         // pass - 8 s - fast - no DB -
@@ -885,7 +885,7 @@ public class AllRepositoryTestsCatalogue
 
     // TODO can we remove this? Was it EOLed?
     // [classpath:alfresco/application-context.xml, classpath:test/alfresco/test-subscriptions-context.xml]
-    static void applicationContext_testSubscriptionsContext_52(TestSuite suite)
+    static void applicationContext_testSubscriptionsContext(TestSuite suite)
     {
         // pass - fast 3s - no DB
         // test-subscriptions-context.xml overrides extension.dictionaryBootstrap - with custom models
@@ -908,7 +908,7 @@ public class AllRepositoryTestsCatalogue
      * 
      * various tests that do use context files but do not fit into other main context files patterns
      */
-    static void miscContext_999(TestSuite suite)
+    static void miscContext(TestSuite suite)
     {
         // context files: [classpath:alfresco/node-locator-context.xml, classpath:test-nodeLocatorServiceImpl-context.xml]
         suite.addTest(new JUnit4TestAdapter(org.alfresco.repo.nodelocator.NodeLocatorServiceImplTest.class));
@@ -991,7 +991,7 @@ public class AllRepositoryTestsCatalogue
     }
 
     // [classpath:alfresco/minimal-context.xml]
-    static void minimalContext_16(TestSuite suite)
+    static void minimalContext(TestSuite suite)
     {
         // This has a few failures - not sure what I can do about that. 513 tests in total ~ 100s
         // was 16 (part)
@@ -1002,7 +1002,7 @@ public class AllRepositoryTestsCatalogue
     }
 
     // [classpath:alfresco/application-context.xml, classpath:org/alfresco/repo/thumbnail/test-thumbnail-context.xml]
-    static void applicationContext_testThumnailContext_57(TestSuite suite)
+    static void applicationContext_testThumnailContext(TestSuite suite)
     {
         // fails- 68s
         // test-thumbnail-context.xml - should be fine to merge - only defines some extra test beans

src/test/java/org/alfresco/AppContextExtra02TestSuite.java

@@ -33,14 +33,15 @@ public class AppContextExtra02TestSuite extends TestSuite
     public static Test suite()
     {
         TestSuite suite = new TestSuite();
-        
-        //any other order may lead to failing tests
+
+        // any other order may lead to failing tests
         AllRepositoryTestsCatalogue.virtualizationTestContext_applicationContext(suite);
-        AllRepositoryTestsCatalogue.applicationContext_testSubscriptionsContext_52(suite);
-        AllRepositoryTestsCatalogue.applicationContext_openCmisContext_07(suite);
-        AllRepositoryTestsCatalogue.applicationContext_cacheTestContext(suite);
-        AllRepositoryTestsCatalogue.applicationContext_mtAllContext_56(suite);
-       
+        AllRepositoryTestsCatalogue.applicationContext_testSubscriptionsContext(suite);
+        AllRepositoryTestsCatalogue.applicationContext_openCmisContext(suite);
+        // TODO Uncomment the following 2 lines after REPO-2790 is implemented
+        // AllRepositoryTestsCatalogue.applicationContext_cacheTestContext(suite);
+        // AllRepositoryTestsCatalogue.applicationContext_mtAllContext(suite);
+
         return suite;
     }
 }

src/test/java/org/alfresco/AppContextExtra03TestSuite.java

@@ -0,0 +1,47 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * Temporary class. Please read the comments on {@link AppContextExtra02TestSuite}
+ * 
+ * Tests were split just because the limitation on the bamboo agents DB config see REPO-2790
+ */
+public class AppContextExtra03TestSuite extends TestSuite
+{
+    public static Test suite()
+    {
+        TestSuite suite = new TestSuite();
+
+        AllRepositoryTestsCatalogue.applicationContext_cacheTestContext(suite);
+        AllRepositoryTestsCatalogue.applicationContext_mtAllContext(suite);
+
+        return suite;
+    }
+}

src/test/java/org/alfresco/MinContextTestSuite.java

@@ -33,7 +33,7 @@ public class MinContextTestSuite extends TestSuite
     public static Test suite()
     {
         TestSuite suite = new TestSuite();
-        AllRepositoryTestsCatalogue.minimalContext_16(suite);
+        AllRepositoryTestsCatalogue.minimalContext(suite);
         return suite;
     }
 }

src/test/java/org/alfresco/MiscContextTestSuite.java

@@ -33,7 +33,7 @@ public class MiscContextTestSuite
     public static Test suite()
     {
         TestSuite suite = new TestSuite();
-        AllRepositoryTestsCatalogue.miscContext_999(suite);
+        AllRepositoryTestsCatalogue.miscContext(suite);
         return suite;
     }
 }

src/test/java/org/alfresco/TransformerTestSuite.java

@@ -33,7 +33,7 @@ public class TransformerTestSuite
     public static Test suite()
     {
         TestSuite suite = new TestSuite();
-        AllRepositoryTestsCatalogue.applicationContext_testThumnailContext_57(suite);
+        AllRepositoryTestsCatalogue.applicationContext_testThumnailContext(suite);
         return suite;
     }
 }