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
This commit is contained in:
Alan Davis
2014-02-11 23:52:28 +00:00
parent ebb8773e00
commit 0f52c6a51d
3 changed files with 9 additions and 1 deletions

View File

@@ -24,9 +24,11 @@ import javax.jcr.Session;
import javax.jcr.SimpleCredentials; import javax.jcr.SimpleCredentials;
import org.alfresco.jcr.test.BaseJCRTest; import org.alfresco.jcr.test.BaseJCRTest;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.junit.experimental.categories.Category;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
@Category(OwnJVMTestsCategory.class)
public class ImportTest extends BaseJCRTest public class ImportTest extends BaseJCRTest
{ {
protected Session superuserSession; protected Session superuserSession;

View File

@@ -30,14 +30,17 @@ import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.BaseSpringTest; import org.alfresco.util.BaseSpringTest;
import org.alfresco.util.GUID; import org.alfresco.util.GUID;
import org.junit.experimental.categories.Category;
/** /**
* Start Advanced Workflow action execution test * Start Advanced Workflow action execution test
* *
* @author David Caruana * @author David Caruana
*/ */
@Category(OwnJVMTestsCategory.class)
public class StartWorkflowActionExecuterTest extends BaseSpringTest public class StartWorkflowActionExecuterTest extends BaseSpringTest
{ {
private NodeService nodeService; private NodeService nodeService;

View File

@@ -43,7 +43,9 @@ import org.alfresco.service.cmr.workflow.WorkflowPath;
import org.alfresco.service.cmr.workflow.WorkflowTask; import org.alfresco.service.cmr.workflow.WorkflowTask;
import org.alfresco.service.cmr.workflow.WorkflowTaskState; import org.alfresco.service.cmr.workflow.WorkflowTaskState;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.BaseSpringTest; import org.alfresco.util.BaseSpringTest;
import org.junit.experimental.categories.Category;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
@@ -52,6 +54,7 @@ import org.springframework.core.io.ClassPathResource;
* *
* @author davidc * @author davidc
*/ */
@Category(OwnJVMTestsCategory.class)
public class ReviewAndApproveTest extends BaseSpringTest public class ReviewAndApproveTest extends BaseSpringTest
{ {
AuthenticationComponent authenticationComponent; AuthenticationComponent authenticationComponent;