From 0f52c6a51d80f93dfce4efce412c8ec352f0b122 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 23:52:28 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 58657: Added some tests to the "own Jvm" category, they mess with Spring. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/test-java/org/alfresco/jcr/importer/ImportTest.java | 4 +++- .../repo/workflow/StartWorkflowActionExecuterTest.java | 3 +++ .../org/alfresco/repo/workflow/jbpm/ReviewAndApproveTest.java | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/source/test-java/org/alfresco/jcr/importer/ImportTest.java b/source/test-java/org/alfresco/jcr/importer/ImportTest.java index c3b049d05d..3bda20afca 100644 --- a/source/test-java/org/alfresco/jcr/importer/ImportTest.java +++ b/source/test-java/org/alfresco/jcr/importer/ImportTest.java @@ -24,9 +24,11 @@ import javax.jcr.Session; import javax.jcr.SimpleCredentials; import org.alfresco.jcr.test.BaseJCRTest; +import org.alfresco.test_category.OwnJVMTestsCategory; +import org.junit.experimental.categories.Category; import org.springframework.core.io.ClassPathResource; - +@Category(OwnJVMTestsCategory.class) public class ImportTest extends BaseJCRTest { protected Session superuserSession; diff --git a/source/test-java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java b/source/test-java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java index a1ac9e9c7d..337b9524a0 100644 --- a/source/test-java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java +++ b/source/test-java/org/alfresco/repo/workflow/StartWorkflowActionExecuterTest.java @@ -30,14 +30,17 @@ import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.security.PersonService; 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.alfresco.util.GUID; +import org.junit.experimental.categories.Category; /** * Start Advanced Workflow action execution test * * @author David Caruana */ +@Category(OwnJVMTestsCategory.class) public class StartWorkflowActionExecuterTest extends BaseSpringTest { private NodeService nodeService; diff --git a/source/test-java/org/alfresco/repo/workflow/jbpm/ReviewAndApproveTest.java b/source/test-java/org/alfresco/repo/workflow/jbpm/ReviewAndApproveTest.java index c4dbfcdb0e..a92dfc60b2 100644 --- a/source/test-java/org/alfresco/repo/workflow/jbpm/ReviewAndApproveTest.java +++ b/source/test-java/org/alfresco/repo/workflow/jbpm/ReviewAndApproveTest.java @@ -43,7 +43,9 @@ import org.alfresco.service.cmr.workflow.WorkflowPath; import org.alfresco.service.cmr.workflow.WorkflowTask; import org.alfresco.service.cmr.workflow.WorkflowTaskState; import org.alfresco.service.namespace.QName; +import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.util.BaseSpringTest; +import org.junit.experimental.categories.Category; import org.springframework.core.io.ClassPathResource; @@ -52,6 +54,7 @@ import org.springframework.core.io.ClassPathResource; * * @author davidc */ +@Category(OwnJVMTestsCategory.class) public class ReviewAndApproveTest extends BaseSpringTest { AuthenticationComponent authenticationComponent;