[jbpm-commits] JBoss JBPM SVN: r2567 - jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2008-10-21 09:03:44 -0400 (Tue, 21 Oct 2008)
New Revision: 2567

Modified:
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java
Log:
[JBPM-1721] added cleanup and verified exception mentioned in issue.

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java	2008-10-21 12:43:40 UTC (rev 2566)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java	2008-10-21 13:03:44 UTC (rev 2567)
@@ -45,29 +45,6 @@
     int processes = 20;
     int maxWait = 20000;
 
-    deployProcess();
-
-    getJbpmConfiguration().startJobExecutor();
-
-    Set expectedProcesses = new HashSet();
-    for (int i = 0; i < processes; i++)
-    {
-      Integer number = new Integer(i);
-      expectedProcesses.add(number);
-      Thread thread = new StartNewExecutionThread(getJbpmConfiguration(), number);
-      thread.start();
-    }
-
-    while (!expectedProcesses.equals(finishedProcesses) && !timeout(maxWait))
-    {
-      Thread.sleep(200);
-    }
-    log.info("number of finished processes: " + finishedProcesses);
-    log.info("number of expected processes: " + expectedProcesses);
-    assertEquals(expectedProcesses, finishedProcesses);
-  }
-  
-  public void deployProcess() {
     ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
       "<process-definition name='asyncjoin' initial='yenom'>" +
       "  <node name='yenom' async='true'>" +
@@ -96,17 +73,40 @@
       "</process-definition>"
     );
     
-    JbpmContext jbpmContext = getJbpmConfiguration().createJbpmContext();
-    try
-    {
-      jbpmContext.deployProcessDefinition(processDefinition);
+    jbpmContext.deployProcessDefinition(processDefinition);
+    long processDefinitionId = processDefinition.getId();
+    
+    commitAndCloseSession();
+    
+    try {
+      getJbpmConfiguration().startJobExecutor();
+
+      Set expectedProcesses = new HashSet();
+      for (int i = 0; i < processes; i++)
+      {
+        Integer number = new Integer(i);
+        expectedProcesses.add(number);
+        Thread thread = new StartNewExecutionThread(getJbpmConfiguration(), number);
+        thread.start();
+      }
+
+      while (!expectedProcesses.equals(finishedProcesses) && !timeout(maxWait))
+      {
+        Thread.sleep(200);
+      }
+      log.info("number of finished processes: " + finishedProcesses);
+      log.info("number of expected processes: " + expectedProcesses);
+      assertEquals(expectedProcesses, finishedProcesses);
+      
+    } catch (Exception e) {
+      e.printStackTrace();
+      
+    } finally {
+      beginSessionTransaction();
+      graphSession.deleteProcessDefinition(processDefinitionId);
     }
-    finally
-    {
-      jbpmContext.close();
-    }
   }
-
+  
   public static class StartNewExecutionThread extends Thread
   {
     Integer number;