mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58542: Explicitly defining the memory requirements and categorising 2 jbpm tests as own vm. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62006 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
3
pom.xml
3
pom.xml
@@ -883,6 +883,7 @@
|
|||||||
<goals>
|
<goals>
|
||||||
<goal>test</goal>
|
<goal>test</goal>
|
||||||
</goals>
|
</goals>
|
||||||
|
<phase>process-test-classes</phase>
|
||||||
<configuration>
|
<configuration>
|
||||||
<!-- These are the default fork options -->
|
<!-- These are the default fork options -->
|
||||||
<forkCount>1</forkCount>
|
<forkCount>1</forkCount>
|
||||||
@@ -932,7 +933,7 @@
|
|||||||
|
|
||||||
<!-- Default configuration, specifying which tests to pass -->
|
<!-- Default configuration, specifying which tests to pass -->
|
||||||
<configuration>
|
<configuration>
|
||||||
<!-- <argLine>-Xmx1280m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine> -->
|
<argLine>-Xmx2560m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
|
||||||
<includes>
|
<includes>
|
||||||
<!-- Standard test names -->
|
<!-- Standard test names -->
|
||||||
<include>**/*Test.*</include>
|
<include>**/*Test.*</include>
|
||||||
|
@@ -20,12 +20,15 @@
|
|||||||
package org.alfresco.repo.workflow.jbpm;
|
package org.alfresco.repo.workflow.jbpm;
|
||||||
|
|
||||||
import org.alfresco.repo.workflow.AbstractMultitenantWorkflowTest;
|
import org.alfresco.repo.workflow.AbstractMultitenantWorkflowTest;
|
||||||
|
import org.alfresco.test_category.OwnJVMTestsCategory;
|
||||||
|
import org.junit.experimental.categories.Category;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Nick Smith
|
* @author Nick Smith
|
||||||
* @since 4.0
|
* @since 4.0
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@Category(OwnJVMTestsCategory.class)
|
||||||
public class JbpmMultitenantWorkflowTest extends AbstractMultitenantWorkflowTest
|
public class JbpmMultitenantWorkflowTest extends AbstractMultitenantWorkflowTest
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
|
@@ -33,6 +33,8 @@ 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.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.junit.experimental.categories.Category;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* JBPM Workflow Service Implementation Tests
|
* JBPM Workflow Service Implementation Tests
|
||||||
@@ -40,6 +42,7 @@ import org.alfresco.service.namespace.QName;
|
|||||||
* @author Nick Smith
|
* @author Nick Smith
|
||||||
* @since 3.4.e
|
* @since 3.4.e
|
||||||
*/
|
*/
|
||||||
|
@Category(OwnJVMTestsCategory.class)
|
||||||
public class JbpmWorkflowServiceIntegrationTest extends AbstractWorkflowServiceIntegrationTest
|
public class JbpmWorkflowServiceIntegrationTest extends AbstractWorkflowServiceIntegrationTest
|
||||||
{
|
{
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user