[jbpm-commits] JBoss JBPM SVN: r5077 - in jbpm4/trunk/modules: test-db/src/test/java/org/jbpm/test/activities and 1 other directory.

[do-not-reply at jboss.org]

Author: jbarrez
Date: 2009-06-22 10:23:38 -0400 (Mon, 22 Jun 2009)
New Revision: 5077

Modified:
   jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/ForkJoinInSameTransactionTest.java
Log:
Added convience method: assertProcessInstanceEnded

Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java	2009-06-22 13:50:05 UTC (rev 5076)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java	2009-06-22 14:23:38 UTC (rev 5077)
@@ -23,14 +23,17 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.jbpm.api.Configuration;
+import org.jbpm.api.Execution;
 import org.jbpm.api.ExecutionService;
 import org.jbpm.api.HistoryService;
 import org.jbpm.api.IdentityService;
 import org.jbpm.api.JbpmException;
 import org.jbpm.api.ManagementService;
 import org.jbpm.api.ProcessEngine;
+import org.jbpm.api.ProcessInstance;
 import org.jbpm.api.RepositoryService;
 import org.jbpm.api.TaskService;
 import org.jbpm.api.cmd.CommandService;
@@ -183,9 +186,29 @@
   
   // execution helper methods //////////////////////////////////////////
   
-  public void assertProcessInstanceEnded(String processInstanceId) {
+  public void assertExecutionEnded(String processInstanceId) {
     assertNull("Error: a process instance with id " + processInstanceId + " was found",
             executionService.findProcessInstanceById(processInstanceId));
   }
   
+  public void assertProcessInstanceEnded(ProcessInstance processInstance) {
+    assertExecutionEnded(processInstance.getId());
+  }
+  
+  public void assertIsActiveActivity(String activityName, Execution execution) {
+    assertTrue("The given execution (or any child execution) isn't in the activity '" + activityName 
+            + "' (current activities : " + listAllActiveActivites(execution) + ")", 
+            execution.isActive(activityName));
+  }
+  
+  private String listAllActiveActivites(Execution execution) {
+    Set<String> activeActivities = execution.findActiveActivityNames();
+    StringBuilder result = new StringBuilder();
+    for (String activeActivity : activeActivities) {
+      result.append(activeActivity + ", ");
+    }
+    result.setLength(result.length() - 2); // remove the last ', '
+    return result.toString();
+  }
+  
 }

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/ForkJoinInSameTransactionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/ForkJoinInSameTransactionTest.java	2009-06-22 13:50:05 UTC (rev 5076)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/ForkJoinInSameTransactionTest.java	2009-06-22 14:23:38 UTC (rev 5077)
@@ -59,7 +59,7 @@
           );
     
     ProcessInstance processInstance = executionService.startProcessInstanceByKey("ForkJoinInOneTransaction");
-    assertProcessInstanceEnded(processInstance.getId());
+    assertProcessInstanceEnded(processInstance);
   }
   
   /**
@@ -87,7 +87,7 @@
     
     ProcessInstance processInstance = executionService.startProcessInstanceByKey("ForkJoinInOneTransaction");
     executionService.signalExecutionById(processInstance.getId(), "go on");
-    assertProcessInstanceEnded(processInstance.getId());
+    assertProcessInstanceEnded(processInstance);
   }
   
   /**
@@ -118,7 +118,7 @@
 
     
     ProcessInstance processInstance = executionService.startProcessInstanceByKey("ForkJoinInOneTransaction");
-    assertProcessInstanceEnded(processInstance.getId());
+    assertProcessInstanceEnded(processInstance);
   }
   
   /**
@@ -159,7 +159,7 @@
     Map<String, Object> vars = new HashMap<String, Object>();
     vars.put("testVar", new Integer(0));
     ProcessInstance processInstance = executionService.startProcessInstanceByKey("ForkJoinInOneTransaction", vars);
-    assertProcessInstanceEnded(processInstance.getId());
+    assertProcessInstanceEnded(processInstance);
   }
 
 }