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
This commit is contained in:
Alan Davis
2014-02-11 23:35:21 +00:00
parent 954920bf7d
commit 03b22967cc
46 changed files with 127 additions and 79 deletions

View File

@@ -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")