[jbpm-commits] JBoss JBPM SVN: r6724 - in jbpm3/branches/jbpm-3.2-soa/core/src: test/java/org/jbpm/jbpm1755 and 8 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Oct 1 18:45:36 EDT 2010
Author: alex.guizar at jboss.com
Date: 2010-10-01 18:45:35 -0400 (Fri, 01 Oct 2010)
New Revision: 6724
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1755/JBPM1755Test.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2375/JBPM2375Test.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2489/JBPM2489Test.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2787/JBPM2787Test.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/msg/command/AsyncExecutionDbTest.java
jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/perf/PerformanceTest.java
Log:
SOA-2368 increase job timeout back to one minute (or multiples thereof)
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2010-10-01 19:00:32 UTC (rev 6723)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2010-10-01 22:45:35 UTC (rev 6724)
@@ -61,7 +61,7 @@
private List processDefinitionIds;
- protected static final long JOB_TIMEOUT = 30 * 1000;
+ protected static final long JOB_TIMEOUT = 60 * 1000;
protected void setUp() throws Exception {
super.setUp();
@@ -210,6 +210,11 @@
jobExecutor.start();
}
+ /**
+ * Waits until all jobs are processed or a specified amount of time has elapsed. Unlike
+ * {@link #processJobs(long)}, this method does not concern itself with the job executor or
+ * the jBPM context.
+ */
protected void waitForJobs(final long timeout) {
final long startTime = System.currentTimeMillis();
long previousTime = 0;
@@ -286,15 +291,25 @@
return timerCount.intValue();
}
+ /**
+ * Starts the job executor and waits until all jobs are processed or a predefined amount of
+ * time has elapsed. The current jBPM context is closed before waiting and a new one is opened
+ * after processing the jobs.
+ */
protected void processJobs() {
processJobs(JOB_TIMEOUT);
}
- protected void processJobs(long maxWait) {
+ /**
+ * Starts the job executor and waits until all jobs are processed or a specified amount of
+ * time has elapsed. The current jBPM context is closed before waiting and a new one is opened
+ * after processing the jobs.
+ */
+ protected void processJobs(long timeout) {
closeJbpmContext();
try {
startJobExecutor();
- waitForJobs(maxWait);
+ waitForJobs(timeout);
}
finally {
stopJobExecutor();
@@ -310,6 +325,9 @@
catch (InterruptedException e) {
fail("wait for job executor to stop got interrupted");
}
+ finally {
+ jobExecutor = null;
+ }
}
}
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1755/JBPM1755Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1755/JBPM1755Test.java 2010-10-01 19:00:32 UTC (rev 6723)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm1755/JBPM1755Test.java 2010-10-01 22:45:35 UTC (rev 6724)
@@ -19,7 +19,7 @@
private ProcessDefinition processDefinition;
- private static final int processInstanceCount = 5;
+ private static final int INSTANCE_COUNT = 5;
protected void setUp() throws Exception {
super.setUp();
@@ -48,8 +48,8 @@
join.setParentLockMode(lockMode.toString());
deployProcessDefinition(processDefinition);
- long[] processInstanceIds = new long[processInstanceCount];
- for (int i = 0; i < processInstanceCount; i++) {
+ long[] processInstanceIds = new long[INSTANCE_COUNT];
+ for (int i = 0; i < INSTANCE_COUNT; i++) {
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstanceIds[i] = processInstance.getId();
processInstance.getContextInstance().setVariable("eventCallback", new EventCallback());
@@ -59,7 +59,7 @@
processJobs();
- for (int i = 0; i < processInstanceCount; i++) {
+ for (int i = 0; i < INSTANCE_COUNT; i++) {
long processInstanceId = processInstanceIds[i];
assertTrue("expected process instance " + processInstanceId + " to have ended",
jbpmContext.loadProcessInstance(processInstanceId).hasEnded());
@@ -67,7 +67,7 @@
}
protected void waitForJobs(long timeout) {
- EventCallback.waitForEvent(processInstanceCount, Event.EVENTTYPE_PROCESS_END);
+ EventCallback.waitForEvent(INSTANCE_COUNT, Event.EVENTTYPE_PROCESS_END);
}
}
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java 2010-10-01 19:00:32 UTC (rev 6723)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java 2010-10-01 22:45:35 UTC (rev 6724)
@@ -33,7 +33,6 @@
*/
public class JBPM2094Test extends AbstractDbTestCase {
- private static final int TIMEOUT = 60 * 1000;
private static final int INSTANCE_COUNT = 10;
protected void setUp() throws Exception {
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2375/JBPM2375Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2375/JBPM2375Test.java 2010-10-01 19:00:32 UTC (rev 6723)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2375/JBPM2375Test.java 2010-10-01 22:45:35 UTC (rev 6724)
@@ -16,7 +16,6 @@
*/
public class JBPM2375Test extends AbstractDbTestCase {
- private static final int TEST_TIMEOUT = 60 * 1000;
static boolean throwError;
// a process definition with two timers moving the token forward
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2489/JBPM2489Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2489/JBPM2489Test.java 2010-10-01 19:00:32 UTC (rev 6723)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2489/JBPM2489Test.java 2010-10-01 22:45:35 UTC (rev 6724)
@@ -34,8 +34,6 @@
*/
public class JBPM2489Test extends AbstractDbTestCase {
- private static final int TIMEOUT = 60 * 1000;
-
protected void setUp() throws Exception {
super.setUp();
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2787/JBPM2787Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2787/JBPM2787Test.java 2010-10-01 19:00:32 UTC (rev 6723)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2787/JBPM2787Test.java 2010-10-01 22:45:35 UTC (rev 6724)
@@ -33,7 +33,6 @@
*/
public class JBPM2787Test extends AbstractDbTestCase {
- private static final int TIMEOUT = 60 * 1000;
private static final int INSTANCE_COUNT = 10;
protected void setUp() throws Exception {
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java 2010-10-01 19:00:32 UTC (rev 6723)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java 2010-10-01 22:45:35 UTC (rev 6724)
@@ -93,20 +93,20 @@
+ "</end-state>"
+ "</process-definition>";
- static final int PROCESS_COUNT = 10;
+ static final int INSTANCE_COUNT = 10;
public void testConcurrentJobs() throws Exception {
- long[] processInstanceIds = new long[PROCESS_COUNT];
- for (int i = 0; i < PROCESS_COUNT; i++) {
+ long[] processInstanceIds = new long[INSTANCE_COUNT];
+ for (int i = 0; i < INSTANCE_COUNT; i++) {
ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("superprocess");
processInstance.getContextInstance().setVariable("test", "true");
processInstance.signal();
processInstanceIds[i] = processInstance.getId();
}
- processJobs(5 * 60 * 1000);
+ processJobs(5 * JOB_TIMEOUT);
- for (int i = 0; i < PROCESS_COUNT; i++) {
+ for (int i = 0; i < INSTANCE_COUNT; i++) {
long piId = processInstanceIds[i];
ProcessInstance pi = jbpmContext.loadProcessInstance(piId);
assertEquals("end-state-success", pi.getRootToken().getNode().getName());
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java 2010-10-01 19:00:32 UTC (rev 6723)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java 2010-10-01 22:45:35 UTC (rev 6724)
@@ -17,8 +17,7 @@
public class JobExecutorDbTest extends AbstractDbTestCase {
- static final int nbrOfConcurrentProcessExecutions = 20;
- static final int timeout = 5 * 60 * 1000;
+ private static final int INSTANCE_COUNT = 20;
static Set collectedResults = Collections.synchronizedSet(new TreeSet());
static List allocatedProcessIds = new Vector();
@@ -41,7 +40,7 @@
public void testJobExecutor() {
deployProcessDefinition();
startProcessInstances();
- processJobs(timeout);
+ processJobs(5 * JOB_TIMEOUT);
assertEquals(createExpectedResults(), collectedResults);
}
@@ -100,7 +99,7 @@
}
void startProcessInstances() {
- for (int i = 0; i < nbrOfConcurrentProcessExecutions; i++) {
+ for (int i = 0; i < INSTANCE_COUNT; i++) {
ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("bulk messages");
processInstance.signal();
}
@@ -112,12 +111,11 @@
Set expectedResults = new TreeSet();
NumberFormat formatter = NumberFormat.getIntegerInstance();
- formatter.setMinimumIntegerDigits(Integer.toString(nbrOfConcurrentProcessExecutions)
- .length());
+ formatter.setMinimumIntegerDigits(Integer.toString(INSTANCE_COUNT).length());
StringBuffer text = new StringBuffer();
FieldPosition position = new FieldPosition(NumberFormat.INTEGER_FIELD);
- for (int e = 0; e < nbrOfConcurrentProcessExecutions; e++) {
+ for (int e = 0; e < INSTANCE_COUNT; e++) {
text.setLength(0);
formatter.format(e, text, position);
text.append('\0');
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/msg/command/AsyncExecutionDbTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/msg/command/AsyncExecutionDbTest.java 2010-10-01 19:00:32 UTC (rev 6723)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/msg/command/AsyncExecutionDbTest.java 2010-10-01 22:45:35 UTC (rev 6724)
@@ -30,8 +30,6 @@
public class AsyncExecutionDbTest extends AbstractDbTestCase {
- private static int TIMEOUT = 60 * 1000;
-
public static class RecordNode implements ActionHandler {
private static final long serialVersionUID = 1L;
Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/perf/PerformanceTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/perf/PerformanceTest.java 2010-10-01 19:00:32 UTC (rev 6723)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/perf/PerformanceTest.java 2010-10-01 22:45:35 UTC (rev 6724)
@@ -39,7 +39,6 @@
private static final int WARMUP_INSTANCES = 100;
private static final int MEASURED_INSTANCES = 1000;
- private static final long TIMEOUT = 2 * 60 * 1000;
protected void setUp() throws Exception {
super.setUp();
@@ -59,7 +58,7 @@
public void testPerformance() {
long firstTime = System.currentTimeMillis();
launchProcessInstances(WARMUP_INSTANCES);
- processJobs(TIMEOUT);
+ processJobs(2 * JOB_TIMEOUT);
long secondTime = System.currentTimeMillis();
launchProcessInstances(MEASURED_INSTANCES);
More information about the jbpm-commits
mailing list