BroadleafCommerce#1127 Removed TESTCONTEXTTYPE's behavior of collecting web.xml listed Contexts and updated BaseTest to include them explicitly to fit the new Integration Test design.

Author: AustinMRooke

common/src/main/java/org/broadleafcommerce/common/extensibility/context/StandardConfigLocations.java

@@ -82,7 +82,7 @@ private static void addContextFile(int contextType, ArrayList<String> items, Str
                     ((contextType == WEBCONTEXTTYPE || contextType == APPCONTEXTTYPE) && temp.indexOf("-web-") >= 0) ||
                     ((contextType == SERVICECONTEXTTYPE || contextType == TESTCONTEXTTYPE || contextType == APPCONTEXTTYPE) && temp.indexOf("-web-") < 0 && temp.indexOf("-test") < 0 && temp.indexOf("-admin-") < 0) ||
                     ((contextType == SERVICECONTEXTTYPE || contextType == TESTCONTEXTTYPE || contextType == APPCONTEXTTYPE) && temp.indexOf("-admin-applicationContext-persistence") >= 0) ||
-                    (contextType == TESTCONTEXTTYPE && (temp.indexOf("-test") >= 0 || temp.indexOf("-admin-") >= 0 || temp.indexOf("-web-") >= 0))
+                    (contextType == TESTCONTEXTTYPE && (temp.indexOf("-test") >= 0 || temp.indexOf("-web-") >= 0))
             ){
                 items.add(temp.trim());
             }

integration/src/test/java/org/broadleafcommerce/test/BaseTest.java

@@ -58,6 +58,11 @@ public static MergeClassPathXMLApplicationContext getContext() {
                 // After the framework applicationContexts are loaded, we want the module ones
                 List<String> additionalContexts = new ArrayList<String>(moduleContexts);
 
+                // We need the content applicationContexts and admin applicationContexts
+                additionalContexts.add("bl-open-admin-contentClient-applicationContext.xml");
+                additionalContexts.add("bl-open-admin-contentCreator-applicationContext.xml");
+                additionalContexts.add("bl-admin-applicationContext.xml");
+                
                 // Lastly, we want the test applicationContext
                 additionalContexts.add("bl-applicationContext-test.xml");