[jbpm-commits] JBoss JBPM SVN: r6761 - in jbpm3/branches/jbpm-3.2-soa/core/src: test/java/org/jbpm/jbpm2959 and 1 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-10-15 01:13:50 -0400 (Fri, 15 Oct 2010)
New Revision: 6761

Modified:
   jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/action/Script.java
   jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2959/JBPM2959Test.java
   jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2959/processdefinition.xml
Log:
JBPM-2959 launch multiple process instances to produce the job insertion deadlock more quickly;
trim scripts to economize memory and database storage

Modified: jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/action/Script.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/action/Script.java	2010-10-14 18:09:32 UTC (rev 6760)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/action/Script.java	2010-10-15 05:13:50 UTC (rev 6761)
@@ -53,11 +53,11 @@
 
   public void read(Element scriptElement, JpdlXmlReader jpdlReader) {
     if (scriptElement.isTextOnly()) {
-      expression = scriptElement.getText();
+      expression = scriptElement.getTextTrim();
     }
     else {
       variableAccesses = new HashSet(jpdlReader.readVariableAccesses(scriptElement));
-      expression = scriptElement.element("expression").getText();
+      expression = scriptElement.element("expression").getTextTrim();
     }
   }
 

Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2959/JBPM2959Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2959/JBPM2959Test.java	2010-10-14 18:09:32 UTC (rev 6760)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/java/org/jbpm/jbpm2959/JBPM2959Test.java	2010-10-15 05:13:50 UTC (rev 6761)
@@ -34,6 +34,8 @@
  */
 public class JBPM2959Test extends AbstractDbTestCase {
 
+  private static final int INSTANCE_COUNT = 10;
+
   protected void setUp() throws Exception {
     super.setUp();
 
@@ -54,11 +56,18 @@
   }
 
   public void testDeadlockAtJobInsert() {
-    ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("jbpm2959");
-    processInstance.signal();
+    long[] processInstanceIds = new long[INSTANCE_COUNT];
+    for (int i = 0; i < processInstanceIds.length; i++) {
+      ProcessInstance processInstance = jbpmContext.newProcessInstanceForUpdate("jbpm2959");
+      processInstance.signal();
+      processInstanceIds[i] = processInstance.getId();
+    }
 
     processJobs();
-    processInstance = jbpmContext.loadProcessInstance(processInstance.getId());
-    assert processInstance.hasEnded() : "expected " + processInstance + " to have ended";
+
+    for (int i = 0; i < processInstanceIds.length; i++) {
+      ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceIds[i]);
+      assert processInstance.hasEnded() : "expected " + processInstance + " to have ended";
+    }
   }
 }

Modified: jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2959/processdefinition.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2959/processdefinition.xml	2010-10-14 18:09:32 UTC (rev 6760)
+++ jbpm3/branches/jbpm-3.2-soa/core/src/test/resources/org/jbpm/jbpm2959/processdefinition.xml	2010-10-15 05:13:50 UTC (rev 6761)
@@ -17,7 +17,7 @@
 
   <decision name="Keep Going?">
     <transition to="Sleep" name="Yes">
-			<condition expression="${count &lt; 10}" />
+			<condition expression="${count &lt; 5}" />
 			<script>
 				executionContext.setVariable(&quot;count&quot;, count + 1);
 			</script>