Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

58467: Categorized some spring tests so they run in the same vm successfully git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-10-15 15:02:20 +00:00 · 2014-02-11 23:35:21 +00:00
parent 954920bf7d
commit 03b22967cc
46 changed files with 127 additions and 79 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -877,6 +877,21 @@
                                    <excludes combine.self="override"/>
                                    <failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
                                </configuration>
+                            </execution>
+                             <!-- Execution for tests which use BaseSpring test -->
+                            <execution>
+                                 <id>base-spring-troublesome-tests</id>
+                                 <goals>
+                                     <goal>test</goal>
+                                 </goals>
+                                 <configuration>
+                                     <!-- These are the default fork options -->
+                                     <forkCount>1</forkCount>
+                                     <reuseForks>true</reuseForks>
+                                     <!-- end of default fork options -->
+                                     <groups>org.alfresco.test_category.BaseSpringTestsCategory</groups>
+                                     <excludedGroups>org.alfresco.test_category.OwnJVMTestsCategory</excludedGroups>        
+                                 </configuration>
                            </execution>
                            <!-- Execution for tests which require their own JVM -->
                            <execution>
@@ -892,14 +907,16 @@
                                     <groups>org.alfresco.test_category.OwnJVMTestsCategory</groups>
                                 </configuration>
                            </execution>
+                            <execution>
+                                 <id>default-test</id>
+                                 <configuration>
+                                     <excludedGroups>org.alfresco.test_category.OwnJVMTestsCategory, org.alfresco.test_category.BaseSpringTestsCategory</excludedGroups>                                 
+                                 </configuration>
+                             </execution>
                        </executions>

                        <!-- Default configuration, specifying which tests to pass -->
                        <configuration>
-                            <!-- These are the default fork options -->
-                            <forkCount>1</forkCount>
-                            <reuseForks>true</reuseForks>
-                            <!-- end of default fork options -->
                            <includes>
                                <!-- Standard test names -->
                                <include>**/*Test.*</include>
@@ -908,9 +925,6 @@
                                <include>**/org/alfresco/repo/avm/*TestP.*</include>
                                <include>**/org/alfresco/repo/avm/AVMServiceTestBase.*</include>
                            </includes>
-                            <excludedGroups>
-                                org.alfresco.test_category.OwnJVMTestsCategory
-                            </excludedGroups>
                            <excludes>
                                <exclude>**/org/alfresco/RepositoryStartupTest.*</exclude>

--- a/source/test-java/org/alfresco/repo/action/ActionServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/action/ActionServiceImplTest.java
@@ -66,10 +66,12 @@ import org.alfresco.service.cmr.security.PersonService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
 import org.alfresco.util.PropertyMap;
+import org.junit.experimental.categories.Category;
 import org.springframework.context.ConfigurableApplicationContext;

 /**
@@ -77,6 +79,7 @@ import org.springframework.context.ConfigurableApplicationContext;
 * 
 * @author Roy Wetherall
 */
+@Category(BaseSpringTestsCategory.class)
 public class ActionServiceImplTest extends BaseAlfrescoSpringTest
 {
    private static final String BAD_NAME = "badName";
--- a/source/test-java/org/alfresco/repo/action/executer/CheckOutActionExecuterTest.java
+++ b/source/test-java/org/alfresco/repo/action/executer/CheckOutActionExecuterTest.java
@@ -26,12 +26,15 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.alfresco.util.GUID;
+import org.junit.experimental.categories.Category;

 /**
 * Tests checkout using action executer
 */
+@Category(BaseSpringTestsCategory.class)
 public class CheckOutActionExecuterTest extends BaseSpringTest
 {
    private NodeService nodeService;
--- a/source/test-java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuterTest.java
+++ b/source/test-java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuterTest.java
@@ -40,6 +40,7 @@ import org.alfresco.service.cmr.rule.RuleType;
 import org.alfresco.service.cmr.version.Version;
 import org.alfresco.service.cmr.version.VersionType;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.alfresco.util.GUID;
@@ -50,7 +51,7 @@ import org.junit.experimental.categories.Category;
 * 
 * @author Roy Wetherall
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class ExecuteAllRulesActionExecuterTest extends BaseSpringTest
 {
    /** The node service */
--- a/source/test-java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuterTest.java
+++ b/source/test-java/org/alfresco/repo/action/executer/RemoveFeaturesActionExecuterTest.java
@@ -25,7 +25,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.alfresco.util.GUID;
 import org.junit.experimental.categories.Category;
@@ -35,7 +35,7 @@ import org.junit.experimental.categories.Category;
 * 
 * @author Roy Wetherall
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class RemoveFeaturesActionExecuterTest extends BaseSpringTest
 {
    /**
--- a/source/test-java/org/alfresco/repo/action/executer/SetPropertyValueActionExecuterTest.java
+++ b/source/test-java/org/alfresco/repo/action/executer/SetPropertyValueActionExecuterTest.java
@@ -25,7 +25,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.alfresco.util.GUID;
 import org.junit.experimental.categories.Category;
@@ -35,7 +35,7 @@ import org.junit.experimental.categories.Category;
 * 
 * @author Roy Wetherall
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class SetPropertyValueActionExecuterTest extends BaseSpringTest
 {
    private NodeService nodeService;
--- a/source/test-java/org/alfresco/repo/action/executer/SpecialiseTypeActionExecuterTest.java
+++ b/source/test-java/org/alfresco/repo/action/executer/SpecialiseTypeActionExecuterTest.java
@@ -22,6 +22,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.ActionImpl;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
@@ -32,7 +33,7 @@ import org.junit.experimental.categories.Category;
 * 
 * @author Roy Wetherall
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class SpecialiseTypeActionExecuterTest extends BaseAlfrescoSpringTest
 {    
    /**
--- a/source/test-java/org/alfresco/repo/action/executer/TransitionSimpleWorkflowActionExecuterTest.java
+++ b/source/test-java/org/alfresco/repo/action/executer/TransitionSimpleWorkflowActionExecuterTest.java
@@ -28,7 +28,7 @@ import org.alfresco.repo.action.ActionImpl;
 import org.alfresco.service.cmr.model.FileFolderService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
 import org.junit.experimental.categories.Category;
@@ -38,7 +38,7 @@ import org.junit.experimental.categories.Category;
 * 
 * @author Roy Wetherall
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class TransitionSimpleWorkflowActionExecuterTest extends BaseAlfrescoSpringTest
 {    
    private FileFolderService fileFolderService;
--- a/source/test-java/org/alfresco/repo/blog/BlogIntegrationServiceSystemTest.java
+++ b/source/test-java/org/alfresco/repo/blog/BlogIntegrationServiceSystemTest.java
@@ -37,11 +37,14 @@ import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
+import org.junit.experimental.categories.Category;

 /**
 * @author Roy Wetherall
 */
+@Category(BaseSpringTestsCategory.class)
 public class BlogIntegrationServiceSystemTest extends BaseAlfrescoSpringTest implements BlogIntegrationModel
 {
    /**
--- a/source/test-java/org/alfresco/repo/coci/CheckOutCheckInServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/coci/CheckOutCheckInServiceImplTest.java
@@ -62,6 +62,7 @@ import org.alfresco.service.cmr.version.VersionType;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.alfresco.util.GUID;
@@ -75,7 +76,7 @@ import org.springframework.extensions.surf.util.I18NUtil;
 * 
 * @author Roy Wetherall
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class CheckOutCheckInServiceImplTest extends BaseSpringTest 
 {
    /**
--- a/source/test-java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/configuration/ConfigurableServiceImplTest.java
@@ -28,7 +28,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.RegexQNamePattern;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.junit.experimental.categories.Category;

@@ -38,7 +38,7 @@ import org.junit.experimental.categories.Category;
 * @author Roy Wetherall
 */
@SuppressWarnings("unused")
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class ConfigurableServiceImplTest extends BaseSpringTest
 {
 	public NodeService nodeService;
--- a/source/test-java/org/alfresco/repo/descriptor/DescriptorServiceTest.java
+++ b/source/test-java/org/alfresco/repo/descriptor/DescriptorServiceTest.java
@@ -27,11 +27,11 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.descriptor.Descriptor;
 import org.alfresco.service.descriptor.DescriptorService;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.junit.experimental.categories.Category;

-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class DescriptorServiceTest extends BaseSpringTest
 {
    private NodeService nodeService;
--- a/source/test-java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java
+++ b/source/test-java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java
@@ -38,6 +38,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.PropertyMap;
@@ -48,7 +49,7 @@ import org.junit.experimental.categories.Category;
 * 
 * @author Roy Wetherall, janv
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class DictionaryModelTypeTest extends BaseAlfrescoSpringTest
 {
    /** QNames of the test models */
--- a/source/test-java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java
+++ b/source/test-java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java
@@ -34,11 +34,12 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.junit.experimental.categories.Category;

-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class DictionaryRepositoryBootstrapTest extends BaseAlfrescoSpringTest
 {
    public static final String TEMPLATE_MODEL_XML = 
--- a/source/test-java/org/alfresco/repo/forms/FormServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/forms/FormServiceImplTest.java
@@ -61,6 +61,7 @@ import org.alfresco.service.cmr.workflow.WorkflowTaskState;
 import org.alfresco.service.namespace.NamespaceException;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
@@ -73,7 +74,7 @@ import org.springframework.util.StringUtils;
 * @author Gavin Cornwell
 * @author Nick Smith
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class FormServiceImplTest extends BaseAlfrescoSpringTest 
 {
    private FormService formService;
--- a/source/test-java/org/alfresco/repo/jscript/ScriptBehaviourTest.java
+++ b/source/test-java/org/alfresco/repo/jscript/ScriptBehaviourTest.java
@@ -35,13 +35,16 @@ import org.alfresco.service.cmr.repository.ScriptLocation;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseSpringTest;
+import org.junit.experimental.categories.Category;

 /**
 * 
 * 
 * @author Roy Wetherall
 */
+@Category(OwnJVMTestsCategory.class)
 public class ScriptBehaviourTest extends BaseSpringTest 
 {
 	private ServiceRegistry serviceRegistry;
--- a/source/test-java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptorTest.java
+++ b/source/test-java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptorTest.java
@@ -32,11 +32,12 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.junit.experimental.categories.Category;

-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class NodeRefPropertyMethodInterceptorTest extends BaseSpringTest
 {

--- a/source/test-java/org/alfresco/repo/publishing/ChannelServiceImplIntegratedTest.java
+++ b/source/test-java/org/alfresco/repo/publishing/ChannelServiceImplIntegratedTest.java
@@ -38,6 +38,7 @@ import org.alfresco.service.cmr.publishing.channels.ChannelType;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.GUID;
 import org.junit.Before;
@@ -49,7 +50,7 @@ import org.junit.experimental.categories.Category;
 * @author Nick Smith
 * @since 4.0
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class ChannelServiceImplIntegratedTest extends AbstractPublishingIntegrationTest
 {
    private static final String channelName = GUID.generate();
--- a/source/test-java/org/alfresco/repo/publishing/PublishEventActionTest.java
+++ b/source/test-java/org/alfresco/repo/publishing/PublishEventActionTest.java
@@ -60,13 +60,16 @@ import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.springframework.beans.factory.annotation.Autowired;

 /**
 * @author Nick Smith
 * @since 4.0
 */
+@Category(BaseSpringTestsCategory.class)
 public class PublishEventActionTest extends AbstractPublishingIntegrationTest
 {
    private static final String contentNodeName = "TheName";
--- a/source/test-java/org/alfresco/repo/publishing/PublishingQueueImplTest.java
+++ b/source/test-java/org/alfresco/repo/publishing/PublishingQueueImplTest.java
@@ -48,6 +48,7 @@ import org.alfresco.service.cmr.workflow.WorkflowInstance;
 import org.alfresco.service.cmr.workflow.WorkflowPath;
 import org.alfresco.service.cmr.workflow.WorkflowService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.GUID;
 import org.junit.Test;
@@ -57,7 +58,7 @@ import org.junit.experimental.categories.Category;
 * @author Nick Smith
 * @since 4.0
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class PublishingQueueImplTest extends AbstractPublishingIntegrationTest
 {
    private static final String channelId = "test://channel/node";
--- a/source/test-java/org/alfresco/repo/publishing/PublishingRootObjectTest.java
+++ b/source/test-java/org/alfresco/repo/publishing/PublishingRootObjectTest.java
@@ -24,6 +24,7 @@ import javax.annotation.Resource;
 import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -32,7 +33,7 @@ import org.junit.experimental.categories.Category;
 * @author Nick Smith
 * @since 4.0
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class PublishingRootObjectTest extends AbstractPublishingIntegrationTest
 {
    @Resource(name="publishingRootObject")
--- a/source/test-java/org/alfresco/repo/publishing/flickr/FlickrTest.java
+++ b/source/test-java/org/alfresco/repo/publishing/flickr/FlickrTest.java
@@ -43,6 +43,7 @@ import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.service.cmr.site.SiteVisibility;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.alfresco.util.GUID;
@@ -55,7 +56,7 @@ import org.springframework.core.io.Resource;
 * @author Brian
 * @since 4.0
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class FlickrTest extends BaseSpringTest
 {
    protected ServiceRegistry serviceRegistry;
--- a/source/test-java/org/alfresco/repo/publishing/slideshare/SlideShareTest.java
+++ b/source/test-java/org/alfresco/repo/publishing/slideshare/SlideShareTest.java
@@ -48,6 +48,7 @@ import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.service.cmr.site.SiteVisibility;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.alfresco.util.GUID;
@@ -61,7 +62,7 @@ import org.springframework.core.io.Resource;
 * @author Brian
 * @since 4.0
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class SlideShareTest extends BaseSpringTest
 {
    protected ServiceRegistry serviceRegistry;
--- a/source/test-java/org/alfresco/repo/publishing/youtube/YouTubeTest.java
+++ b/source/test-java/org/alfresco/repo/publishing/youtube/YouTubeTest.java
@@ -42,7 +42,7 @@ import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.service.cmr.site.SiteVisibility;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.alfresco.util.GUID;
 import org.junit.Assert;
@@ -55,7 +55,7 @@ import org.springframework.core.io.Resource;
 * @author Brian
 * @since 4.0
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class YouTubeTest extends BaseSpringTest
 {
    protected ServiceRegistry serviceRegistry;
--- a/source/test-java/org/alfresco/repo/rendition/StandardRenditionLocationResolverTest.java
+++ b/source/test-java/org/alfresco/repo/rendition/StandardRenditionLocationResolverTest.java
@@ -33,13 +33,16 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
+import org.junit.experimental.categories.Category;

 /**
 * @author Brian Remmington
 * @author Nick Smith
 */
+@Category(BaseSpringTestsCategory.class)
 public class StandardRenditionLocationResolverTest extends BaseAlfrescoSpringTest
 {
    private ServiceRegistry serviceRegistry;
--- a/source/test-java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java
+++ b/source/test-java/org/alfresco/repo/rendition/executer/HTMLRenderingEngineTest.java
@@ -40,6 +40,7 @@ import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.apache.commons.logging.Log;
@@ -51,7 +52,7 @@ import org.junit.experimental.categories.Category;
 * 
 * @author Nick Burch
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class HTMLRenderingEngineTest extends BaseAlfrescoSpringTest
 {
    private final static Log log = LogFactory.getLog(HTMLRenderingEngineTest.class);
--- a/source/test-java/org/alfresco/repo/rendition/executer/XSLTFunctionsTest.java
+++ b/source/test-java/org/alfresco/repo/rendition/executer/XSLTFunctionsTest.java
@@ -36,7 +36,7 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.SearchService;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
 import org.apache.commons.logging.Log;
@@ -49,7 +49,7 @@ import org.w3c.dom.NodeList;
 * @author Brian
 *
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class XSLTFunctionsTest extends BaseAlfrescoSpringTest
 {
    private final static Log log = LogFactory.getLog(XSLTFunctionsTest.class);
--- a/source/test-java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java
+++ b/source/test-java/org/alfresco/repo/rendition/executer/XSLTRenderingEngineTest.java
@@ -38,7 +38,7 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.TemplateProcessor;
 import org.alfresco.service.cmr.repository.TemplateService;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
 import org.apache.commons.logging.Log;
@@ -50,7 +50,7 @@ import org.junit.experimental.categories.Category;
 * @author Brian
 * 
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class XSLTRenderingEngineTest extends BaseAlfrescoSpringTest
 {
    private final static Log log = LogFactory.getLog(XSLTRenderingEngineTest.class);
--- a/source/test-java/org/alfresco/repo/rule/RuleLinkTest.java
+++ b/source/test-java/org/alfresco/repo/rule/RuleLinkTest.java
@@ -42,7 +42,7 @@ import org.alfresco.service.cmr.rule.RuleService;
 import org.alfresco.service.cmr.rule.RuleServiceException;
 import org.alfresco.service.cmr.rule.RuleType;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.junit.experimental.categories.Category;

@@ -51,7 +51,7 @@ import org.junit.experimental.categories.Category;
 * 
 * @author Roy Wetherall
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class RuleLinkTest extends BaseSpringTest
 {
    protected static final String RULE_TYPE_NAME = RuleType.INBOUND;
--- a/source/test-java/org/alfresco/repo/rule/RuleServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/rule/RuleServiceImplTest.java
@@ -51,6 +51,7 @@ import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.GUID;
 import org.junit.experimental.categories.Category;
@@ -61,7 +62,7 @@ import org.junit.experimental.categories.Category;
 * 
 * @author Roy Wetherall
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class RuleServiceImplTest extends BaseRuleTest
 {    
    private String ASSOC_NAME_RULES_PREFIX = "rules";
--- a/source/test-java/org/alfresco/repo/rule/RuleTypeImplTest.java
+++ b/source/test-java/org/alfresco/repo/rule/RuleTypeImplTest.java
@@ -29,7 +29,7 @@ import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.junit.experimental.categories.Category;

@@ -38,7 +38,7 @@ import org.junit.experimental.categories.Category;
 * 
 * @author Roy Wetherall
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class RuleTypeImplTest extends BaseSpringTest
 {
    private static final String NAME = "name";
--- a/source/test-java/org/alfresco/repo/rule/ruletrigger/RuleTriggerTest.java
+++ b/source/test-java/org/alfresco/repo/rule/ruletrigger/RuleTriggerTest.java
@@ -28,7 +28,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.rule.RuleType;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.junit.experimental.categories.Category;

@@ -37,7 +37,7 @@ import org.junit.experimental.categories.Category;
 * 
 * @author Roy Wetherall
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class RuleTriggerTest extends BaseSpringTest
 {
    private static final String ON_CREATE_NODE_TRIGGER = "on-create-node-trigger";
--- a/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java
@@ -68,6 +68,7 @@ import org.alfresco.service.cmr.site.SiteVisibility;
 import org.alfresco.service.cmr.tagging.TaggingService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
@@ -79,7 +80,7 @@ import org.junit.experimental.categories.Category;
 * 
 * @author Roy Wetherall
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class SiteServiceImplTest extends BaseAlfrescoSpringTest 
 {
    private static final String TEST_SITE_PRESET = "testSitePreset";
--- a/source/test-java/org/alfresco/repo/template/XSLTProcessorTest.java
+++ b/source/test-java/org/alfresco/repo/template/XSLTProcessorTest.java
@@ -35,7 +35,7 @@ import org.alfresco.service.cmr.repository.TemplateProcessor;
 import org.alfresco.service.cmr.repository.TemplateService;
 import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.SearchService;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
 import org.alfresco.util.XMLUtil;
@@ -47,7 +47,7 @@ import org.junit.experimental.categories.Category;
 * @author Brian
 * 
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class XSLTProcessorTest extends BaseAlfrescoSpringTest
 {
    private final static Log log = LogFactory.getLog(XSLTProcessorTest.class);
--- a/source/test-java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java
@@ -60,9 +60,11 @@ import org.alfresco.service.cmr.thumbnail.ThumbnailService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.TempFileProvider;
+import org.junit.experimental.categories.Category;

 /**
 * Thumbnail service implementation unit test
@@ -70,6 +72,7 @@ import org.alfresco.util.TempFileProvider;
 * @author Roy Wetherall
 * @author Neil McErlean
 */
+@Category(BaseSpringTestsCategory.class)
 public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
 {
    private NodeService secureNodeService;
--- a/source/test-java/org/alfresco/repo/transfer/NodeCrawlerTest.java
+++ b/source/test-java/org/alfresco/repo/transfer/NodeCrawlerTest.java
@@ -37,6 +37,7 @@ import org.alfresco.service.cmr.transfer.NodeCrawler;
 import org.alfresco.service.cmr.transfer.NodeCrawlerFactory;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
@@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category;
 * 
 * @author Brian Remmington
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class NodeCrawlerTest extends BaseAlfrescoSpringTest
 {
    private ServiceRegistry serviceRegistry;
--- a/source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java
+++ b/source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java
@@ -63,6 +63,7 @@ import org.alfresco.service.cmr.transfer.TransferServicePolicies;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
@@ -79,7 +80,7 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
 * @author Brian Remmington
 */
@SuppressWarnings("deprecation")
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
 {
    private static int fileCount = 0;
--- a/source/test-java/org/alfresco/repo/transfer/TransferServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/transfer/TransferServiceImplTest.java
@@ -91,6 +91,7 @@ import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
@@ -108,7 +109,7 @@ import org.springframework.util.ResourceUtils;
 * @author Mark Rogers
 */
@SuppressWarnings("deprecation")
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class TransferServiceImplTest extends BaseAlfrescoSpringTest 
 {
    private TransferService transferService;
--- a/source/test-java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java
+++ b/source/test-java/org/alfresco/repo/transfer/TransferServiceToBeRefactoredTest.java
@@ -79,6 +79,7 @@ import org.alfresco.service.descriptor.DescriptorService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.GUID;
@@ -100,7 +101,7 @@ import org.springframework.util.ResourceUtils;
 * @author Mark Rogers
 */
@SuppressWarnings("deprecation")
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class TransferServiceToBeRefactoredTest extends BaseAlfrescoSpringTest 
 {
    private TransferService transferService;
--- a/source/test-java/org/alfresco/repo/transfer/TransferVersionCheckerImplTest.java
+++ b/source/test-java/org/alfresco/repo/transfer/TransferVersionCheckerImplTest.java
@@ -1,7 +1,7 @@
 package org.alfresco.repo.transfer;

 import org.alfresco.service.cmr.transfer.TransferVersion;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.junit.experimental.categories.Category;

@@ -9,7 +9,7 @@ import org.junit.experimental.categories.Category;
 * Unit test for TransferVersionChecker
 * @author mrogers
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class TransferVersionCheckerImplTest extends BaseAlfrescoSpringTest 
 {
    /**
--- a/source/test-java/org/alfresco/repo/transfer/manifest/ManifestIntegrationTest.java
+++ b/source/test-java/org/alfresco/repo/transfer/manifest/ManifestIntegrationTest.java
@@ -49,6 +49,7 @@ import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.cmr.transfer.TransferService;
 import org.alfresco.service.cmr.transfer.TransferTarget;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.TempFileProvider;
@@ -59,7 +60,7 @@ import org.junit.experimental.categories.Category;
 *
 * @author Mark Rogers
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class ManifestIntegrationTest extends BaseAlfrescoSpringTest
 {
    private TransferService transferService;
--- a/source/test-java/org/alfresco/repo/transfer/script/ScriptTransferServiceTest.java
+++ b/source/test-java/org/alfresco/repo/transfer/script/ScriptTransferServiceTest.java
@@ -33,6 +33,7 @@ import org.alfresco.service.cmr.transfer.TransferDefinition;
 import org.alfresco.service.cmr.transfer.TransferException;
 import org.alfresco.service.cmr.transfer.TransferService;
 import org.alfresco.service.cmr.transfer.TransferTarget;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.test_category.OwnJVMTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.junit.experimental.categories.Category;
@@ -44,7 +45,7 @@ import org.mockito.Mockito;
 * 
 * @author Mark Rogers
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class ScriptTransferServiceTest extends BaseAlfrescoSpringTest 
 {
    
--- a/source/test-java/org/alfresco/repo/workflow/jbpm/JBPMEngineTest.java
+++ b/source/test-java/org/alfresco/repo/workflow/jbpm/JBPMEngineTest.java
@@ -46,8 +46,10 @@ import org.alfresco.service.cmr.workflow.WorkflowTask;
 import org.alfresco.service.cmr.workflow.WorkflowTaskState;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.PropertyMap;
+import org.junit.experimental.categories.Category;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.extensions.surf.util.I18NUtil;

@@ -57,6 +59,7 @@ import org.springframework.extensions.surf.util.I18NUtil;
 * 
 * @author davidc
 */
+@Category(BaseSpringTestsCategory.class)
 public class JBPMEngineTest extends BaseAlfrescoSpringTest
 {
    private static final String USER1 = "JbpmEngineTestJohn";
--- a/source/test-java/org/alfresco/test_category/BaseSpringTestsCategory.java
+++ b/source/test-java/org/alfresco/test_category/BaseSpringTestsCategory.java
@@ -0,0 +1,11 @@
+package org.alfresco.test_category;
+
+/**
+ * Marker interface to group tests which use the BaseSpring class.
+ *
+ * @author Gethin James
+ */
+public interface BaseSpringTestsCategory
+{
+
+}
--- a/source/test-java/org/alfresco/util/BaseSpringTest.java
+++ b/source/test-java/org/alfresco/util/BaseSpringTest.java
@@ -20,8 +20,6 @@ package org.alfresco.util;

 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.orm.hibernate3.SessionFactoryUtils;
 import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;

@@ -39,7 +37,6 @@ public abstract class BaseSpringTest extends AbstractTransactionalDataSourceSpri
 {
    /** protected so that it gets populated if autowiring is done by variable name **/
    protected SessionFactory sessionFactory;
-    private boolean defaultContext;

 	/**
 	 * Constructor
@@ -50,7 +47,6 @@ public abstract class BaseSpringTest extends AbstractTransactionalDataSourceSpri
        this.setAutowireMode(AUTOWIRE_BY_NAME);
        //this.setDependencyCheck(false);
        
-        defaultContext = false;
    }
    
    /**
@@ -91,8 +87,6 @@ public abstract class BaseSpringTest extends AbstractTransactionalDataSourceSpri
    @Override
    protected String[] getConfigLocations()
    {
-        // The derived class is using the default context
-        defaultContext = true;
        
        if (logger.isDebugEnabled())
        {
@@ -101,20 +95,4 @@ public abstract class BaseSpringTest extends AbstractTransactionalDataSourceSpri
        return ApplicationContextHelper.CONFIG_LOCATIONS;
    }

-    /**
-     * Ignores the key and loads the {@link ApplicationContextHelper application context}.
-     */
-    @Override
-    protected ConfigurableApplicationContext loadContext(Object key) throws Exception
-    {
-        if (defaultContext)
-        {
-            return (ConfigurableApplicationContext) ApplicationContextHelper.getApplicationContext();
-        }
-        else
-        {
-            String[] configLocations = (String[]) key;
-            return new ClassPathXmlApplicationContext(configLocations);
-        }
-    }
 }
--- a/source/test-java/org/alfresco/util/debug/OutputSpacesStoreSystemTest.java
+++ b/source/test-java/org/alfresco/util/debug/OutputSpacesStoreSystemTest.java
@@ -20,14 +20,14 @@ package org.alfresco.util.debug;

 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.test_category.OwnJVMTestsCategory;
+import org.alfresco.test_category.BaseSpringTestsCategory;
 import org.alfresco.util.BaseSpringTest;
 import org.junit.experimental.categories.Category;

 /**
 * @author Roy Wetherall
 */
-@Category(OwnJVMTestsCategory.class)
+@Category(BaseSpringTestsCategory.class)
 public class OutputSpacesStoreSystemTest extends BaseSpringTest
 {
    /**