[jbpm-commits] JBoss JBPM SVN: r2435 - in jbpm3/trunk/modules/examples/src/test: resources/websale/jpdl and 1 other directory.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Sep 29 07:01:34 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-09-29 07:01:34 -0400 (Mon, 29 Sep 2008)
New Revision: 2435

Modified:
   jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/websale/WebsaleTest.java
   jbpm3/trunk/modules/examples/src/test/resources/websale/jpdl/processdefinition.xml
Log:
[JBPM-1751] Fix examples/websale

Modified: jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/websale/WebsaleTest.java
===================================================================
--- jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/websale/WebsaleTest.java	2008-09-29 10:55:21 UTC (rev 2434)
+++ jbpm3/trunk/modules/examples/src/test/java/org/jbpm/examples/websale/WebsaleTest.java	2008-09-29 11:01:34 UTC (rev 2435)
@@ -40,80 +40,95 @@
 import org.jbpm.taskmgmt.exe.TaskInstance;
 import org.jbpm.taskmgmt.exe.TaskMgmtInstance;
 
-public class WebsaleTest extends TestCase {
-  
+public class WebsaleTest extends TestCase
+{
   JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
-  DbPersistenceServiceFactory dbPersistenceServiceFactory = (DbPersistenceServiceFactory) jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE);
+  DbPersistenceServiceFactory dbPersistenceServiceFactory = (DbPersistenceServiceFactory)jbpmConfiguration.getServiceFactory(Services.SERVICENAME_PERSISTENCE);
 
   JbpmContext jbpmContext;
 
-  ProcessInstance processInstance = null;
-  ContextInstance contextInstance = null;
-  TaskMgmtInstance taskMgmtInstance = null;
+  ProcessInstance processInstance;
+  ContextInstance contextInstance;
+  TaskMgmtInstance taskMgmtInstance;
   long processInstanceId = -1;
 
-  public void setUp() {
+  public void setUp()
+  {
     dbPersistenceServiceFactory.createSchema();
     deployProcess();
     jbpmContext = jbpmConfiguration.createJbpmContext();
   }
 
-  public void tearDown() {
+  public void tearDown()
+  {
     jbpmContext.close();
     dbPersistenceServiceFactory.dropSchema();
     jbpmContext = null;
   }
 
-  public void newTransaction() {
+  public void newTransaction()
+  {
     jbpmContext.close();
     jbpmContext = jbpmConfiguration.createJbpmContext();
   }
-  
-  public void deployProcess() {
+
+  public void deployProcess()
+  {
     JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
-    try {
-      ProcessDefinition processDefinition = 
-        ProcessDefinition.parseXmlResource("processdefinition.xml");
+    try
+    {
+      ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("websale/jpdl/processdefinition.xml");
       jbpmContext.deployProcessDefinition(processDefinition);
-    } finally {
+    }
+    finally
+    {
       jbpmContext.close();
     }
   }
 
-  public void loadIdentities() {
+  public void loadIdentities()
+  {
     JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
-    try {
-      Entity[] entities = IdentityXmlParser.parseEntitiesResource("hsqldb/identity.db.xml");
+    try
+    {
+      Entity[] entities = IdentityXmlParser.parseEntitiesResource("assignment/identity.db.xml");
       IdentitySession identitySession = new IdentitySession(jbpmContext.getSession());
-      for (int i=0; i<entities.length; i++) {
+      for (int i = 0; i < entities.length; i++)
+      {
         identitySession.saveEntity(entities[i]);
       }
-    } finally {
+    }
+    finally
+    {
       jbpmContext.close();
     }
   }
 
-  public TaskInstance createNewProcessInstance() {
+  public TaskInstance createNewProcessInstance()
+  {
     processInstance = jbpmContext.newProcessInstanceForUpdate("websale");
     processInstanceId = processInstance.getId();
     contextInstance = processInstance.getContextInstance();
     taskMgmtInstance = processInstance.getTaskMgmtInstance();
     return processInstance.getTaskMgmtInstance().createStartTaskInstance();
   }
-  
-  public void reloadProcessInstance() {
+
+  public void reloadProcessInstance()
+  {
     processInstance = jbpmContext.loadProcessInstanceForUpdate(processInstanceId);
     contextInstance = processInstance.getContextInstance();
     taskMgmtInstance = processInstance.getTaskMgmtInstance();
   }
-  
-  public void testWebSaleOrderTaskParameters() {
+
+  public void testWebSaleOrderTaskParameters()
+  {
     TaskInstance taskInstance = createNewProcessInstance();
     assertEquals("Create new web sale order", taskInstance.getName());
     assertEquals(0, taskInstance.getVariables().size());
   }
 
-  public void testPerformWebSaleOrderTask() {
+  public void testPerformWebSaleOrderTask()
+  {
     jbpmContext.setActorId("user");
     // create a task to start the websale process
     TaskInstance taskInstance = createNewProcessInstance();
@@ -122,17 +137,18 @@
     taskVariables.put("item", "cookies");
     taskVariables.put("quantity", "lots of them");
     taskVariables.put("address", "46 Main St.");
-    
+
     taskInstance.addVariables(taskVariables);
     taskInstance.end();
-    
+
     assertEquals("cookies", contextInstance.getVariable("item"));
     assertEquals("lots of them", contextInstance.getVariable("quantity"));
     assertEquals("46 Main St.", contextInstance.getVariable("address"));
     assertEquals("user", taskMgmtInstance.getSwimlaneInstance("buyer").getActorId());
   }
 
-  public void testEvaluateAssignment() {
+  public void testEvaluateAssignment()
+  {
     jbpmContext.setActorId("user");
     // create a task to start the websale process
     TaskInstance taskInstance = createNewProcessInstance();
@@ -140,13 +156,13 @@
     taskInstance.end();
     jbpmContext.save(processInstance);
     processInstanceId = processInstance.getId();
-    
+
     newTransaction();
-    
+
     List sampleManagersTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("manager");
     assertEquals(1, sampleManagersTasks.size());
 
-    TaskInstance evaluateTaskInstance = (TaskInstance) sampleManagersTasks.get(0);
+    TaskInstance evaluateTaskInstance = (TaskInstance)sampleManagersTasks.get(0);
     assertEquals("manager", evaluateTaskInstance.getActorId());
     assertEquals("Evaluate web order", evaluateTaskInstance.getName());
     assertNotNull(evaluateTaskInstance.getToken());
@@ -155,23 +171,24 @@
     assertNull(evaluateTaskInstance.getEnd());
   }
 
-  public void testEvaluateOk() {
+  public void testEvaluateOk()
+  {
     TaskInstance taskInstance = createNewProcessInstance();
     taskInstance.end();
     jbpmContext.save(processInstance);
-    
+
     newTransaction();
-    
-    TaskInstance evaluateTaskInstance = (TaskInstance) jbpmContext.getTaskMgmtSession().findTaskInstances("manager").get(0);
+
+    TaskInstance evaluateTaskInstance = (TaskInstance)jbpmContext.getTaskMgmtSession().findTaskInstances("manager").get(0);
     evaluateTaskInstance.end("OK");
     jbpmContext.save(evaluateTaskInstance);
 
     newTransaction();
-    
+
     List sampleShippersTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("shipper");
     assertEquals(1, sampleShippersTasks.size());
 
-    TaskInstance waitForMoneyTaskInstance = (TaskInstance) sampleShippersTasks.get(0);
+    TaskInstance waitForMoneyTaskInstance = (TaskInstance)sampleShippersTasks.get(0);
     assertEquals("shipper", waitForMoneyTaskInstance.getActorId());
     assertEquals("Wait for money", waitForMoneyTaskInstance.getName());
     assertNotNull(waitForMoneyTaskInstance.getToken());
@@ -180,60 +197,63 @@
     assertNull(waitForMoneyTaskInstance.getEnd());
   }
 
-  public void testUnwritableVariableException() {
+  public void testUnwritableVariableException()
+  {
     testEvaluateAssignment();
     newTransaction();
     List sampleManagersTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("manager");
-    TaskInstance evaluateTaskInstance = (TaskInstance) sampleManagersTasks.get(0);
+    TaskInstance evaluateTaskInstance = (TaskInstance)sampleManagersTasks.get(0);
     evaluateTaskInstance.end();
 
     newTransaction();
-    
+
     processInstance = jbpmContext.getGraphSession().loadProcessInstance(processInstanceId);
     contextInstance = processInstance.getContextInstance();
     // so the cookies should still be in the item process variable.
     assertEquals("cookies", contextInstance.getVariable("item"));
   }
 
-  public void testEvaluateNok() {
+  public void testEvaluateNok()
+  {
     testEvaluateAssignment();
     newTransaction();
-    
+
     List sampleManagersTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("manager");
-    TaskInstance evaluateTaskInstance = (TaskInstance) sampleManagersTasks.get(0);
+    TaskInstance evaluateTaskInstance = (TaskInstance)sampleManagersTasks.get(0);
     evaluateTaskInstance.setVariable("comment", "wtf");
     evaluateTaskInstance.end("More info needed");
     jbpmContext.save(evaluateTaskInstance);
-    
+
     newTransaction();
 
     List sampleUserTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("user");
     assertEquals(1, sampleUserTasks.size());
-    TaskInstance fixWebOrderDataTaskInstance = (TaskInstance) sampleUserTasks.get(0);
+    TaskInstance fixWebOrderDataTaskInstance = (TaskInstance)sampleUserTasks.get(0);
     assertEquals("user", fixWebOrderDataTaskInstance.getActorId());
     assertEquals("wtf", fixWebOrderDataTaskInstance.getVariable("comment"));
   }
 
-  public void testMoreInfoNeeded() {
+  public void testMoreInfoNeeded()
+  {
     jbpmContext.setActorId("user");
-      
+
     // create a task to start the websale process
     TaskInstance taskInstance = createNewProcessInstance();
     taskInstance.end();
     jbpmContext.save(processInstance);
-    
+
     newTransaction();
-    
-    TaskInstance evaluateTaskInstance = (TaskInstance) jbpmContext.getTaskMgmtSession().findTaskInstances("manager").get(0);
+
+    TaskInstance evaluateTaskInstance = (TaskInstance)jbpmContext.getTaskMgmtSession().findTaskInstances("manager").get(0);
     evaluateTaskInstance.end("More info needed");
     jbpmContext.save(evaluateTaskInstance);
 
     newTransaction();
-    
+
     List sampleUserTasks = jbpmContext.getTaskMgmtSession().findTaskInstances("user");
     assertEquals(1, sampleUserTasks.size());
 
-    TaskInstance fixWebOrderDataTaskInstance = (TaskInstance) sampleUserTasks.get(0);
+    TaskInstance fixWebOrderDataTaskInstance = (TaskInstance)sampleUserTasks.get(0);
     assertEquals("user", fixWebOrderDataTaskInstance.getActorId());
     assertEquals("Fix web order data", fixWebOrderDataTaskInstance.getName());
     assertNotNull(fixWebOrderDataTaskInstance.getToken());

Modified: jbpm3/trunk/modules/examples/src/test/resources/websale/jpdl/processdefinition.xml
===================================================================
--- jbpm3/trunk/modules/examples/src/test/resources/websale/jpdl/processdefinition.xml	2008-09-29 10:55:21 UTC (rev 2434)
+++ jbpm3/trunk/modules/examples/src/test/resources/websale/jpdl/processdefinition.xml	2008-09-29 11:01:34 UTC (rev 2435)
@@ -29,7 +29,7 @@
   <task-node name="Evaluate web order">
     <task swimlane="salesman">
       <timer duedate="20 seconds" repeat="10 seconds">
-        <action class="org.jbpm.websale.RemindActor">
+        <action class="org.jbpm.examples.websale.RemindActor">
           <swimlaneName>salesman</swimlaneName>
         </action>
       </timer>
@@ -54,14 +54,14 @@
   </task-node>
   
   <node name="update books">
-    <action class="org.jbpm.websale.UpdateBooks">
+    <action class="org.jbpm.examples.websale.UpdateBooks">
       <msg>accountancy application is now informed of the payment</msg>
     </action>
     <transition to="salejoin" />
   </node>
   
   <node name="ship item">
-    <action class="org.jbpm.websale.ShipItem">
+    <action class="org.jbpm.examples.websale.ShipItem">
       <swimlaneName>shipper</swimlaneName>
       <msg>${shipper} now ships ${item} to ${address}</msg>
     </action>




More information about the jbpm-commits mailing list