[jbpm-commits] JBoss JBPM SVN: r6228 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm: jbpm2787 and 1 other directory.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-03-17 11:44:07 -0400 (Wed, 17 Mar 2010)
New Revision: 6228

Modified:
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2787/JBPM2787Test.java
Log:
JBPM-2787: close transaction before test ends to prevent occasional lock timeouts during teardown

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java	2010-03-17 14:31:17 UTC (rev 6227)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java	2010-03-17 15:44:07 UTC (rev 6228)
@@ -49,6 +49,7 @@
 
     processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/jbpm2094/processdefinition.xml");
     jbpmContext.deployProcessDefinition(processDefinition);
+    newTransaction();
   }
 
   protected void tearDown() throws Exception {
@@ -61,12 +62,12 @@
   public void testJobExecutorDeadlock() {
     long[] processInstanceIds = new long[INSTANCE_COUNT];
     for (int i = 0; i < INSTANCE_COUNT; i++) {
-      newTransaction();
       ProcessInstance processInstance = new ProcessInstance(processDefinition);
       processInstance.getContextInstance().setVariable("theBody", getName().getBytes());
       processInstance.signal();
+      jbpmContext.save(processInstance);
 
-      jbpmContext.save(processInstance);
+      newTransaction();
       processInstanceIds[i] = processInstance.getId();
     }
 
@@ -76,6 +77,9 @@
       ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceIds[i]);
       assertTrue("expected " + processInstance + " to have ended", processInstance.hasEnded());
     }
+
+    // close transaction before test ends to prevent occasional lock timeouts during teardown
+    newTransaction();
   }
 
 }

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2787/JBPM2787Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2787/JBPM2787Test.java	2010-03-17 14:31:17 UTC (rev 6227)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2787/JBPM2787Test.java	2010-03-17 15:44:07 UTC (rev 6228)
@@ -33,7 +33,7 @@
  */
 public class JBPM2787Test extends AbstractDbTestCase {
 
-  private long processDefinitionId;
+  private ProcessDefinition processDefinition;
 
   private static final int TIMEOUT = 60 * 1000;
   private static final int INSTANCE_COUNT = 10;
@@ -47,14 +47,13 @@
       jbpmConfiguration.getJobExecutor().setNbrOfThreads(4);
     }
 
-    ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/jbpm2787/processdefinition.xml");
+    processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/jbpm2787/processdefinition.xml");
     jbpmContext.deployProcessDefinition(processDefinition);
-    processDefinitionId = processDefinition.getId();
     newTransaction();
   }
 
   protected void tearDown() throws Exception {
-    graphSession.deleteProcessDefinition(processDefinitionId);
+    graphSession.deleteProcessDefinition(processDefinition.getId());
 
     jbpmConfiguration.getJobExecutor().setNbrOfThreads(1);
     super.tearDown();
@@ -63,7 +62,7 @@
   public void testJobExecutorDeadlock() {
     long[] processInstanceIds = new long[INSTANCE_COUNT];
     for (int i = 0; i < INSTANCE_COUNT; i++) {
-      ProcessInstance processInstance = jbpmContext.newProcessInstance("prequalification");
+      ProcessInstance processInstance = new ProcessInstance(processDefinition);
       processInstance.signal();
       jbpmContext.save(processInstance);
 
@@ -77,6 +76,9 @@
       ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceIds[i]);
       assertTrue("expected " + processInstance + " to have ended", processInstance.hasEnded());
     }
+
+    // close transaction before test ends to prevent occasional lock timeouts during teardown
+    newTransaction();
   }
-  
+
 }