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

57852: BDE-195 Try to fix remote-api tests in Maven build: do not run rest API twice, and use JUnit category to run some tests in their own JVM


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 22:19:28 +00:00
parent eb7349094a
commit e2b3f25e25
7 changed files with 44 additions and 1 deletions

View File

@@ -47,9 +47,11 @@ import org.alfresco.rest.workflow.api.model.Variable;
import org.alfresco.rest.workflow.api.tests.WorkflowApiClient.ProcessesClient;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.ISO8601DateFormat;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.junit.experimental.categories.Category;
import org.junit.Test;
import org.springframework.http.HttpStatus;
/**
@@ -58,6 +60,7 @@ import org.springframework.http.HttpStatus;
* @author Tijs Rademakers
*
*/
@Category(OwnJVMTestsCategory.class)
public class ProcessWorkflowApiTest extends EnterpriseWorkflowTestApi
{
@Test

View File

@@ -56,11 +56,13 @@ import org.alfresco.rest.api.tests.client.data.MemberOfSite;
import org.alfresco.rest.workflow.api.model.ProcessInfo;
import org.alfresco.rest.workflow.api.tests.WorkflowApiClient.TasksClient;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.ISO8601DateFormat;
import org.apache.commons.lang.StringUtils;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.springframework.http.HttpStatus;
/**
@@ -70,6 +72,7 @@ import org.springframework.http.HttpStatus;
* @author Frederik Heremans
*
*/
@Category(OwnJVMTestsCategory.class)
public class TaskWorkflowApiTest extends EnterpriseWorkflowTestApi
{
@Test