[jbpm-commits] JBoss JBPM SVN: r3848 - jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Feb 12 04:19:18 EST 2009


Author: alex.guizar at jboss.com
Date: 2009-02-12 04:19:18 -0500 (Thu, 12 Feb 2009)
New Revision: 3848

Modified:
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskVariablesDbTest.java
Log:
clean up TaskVariablesDbTest

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskVariablesDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskVariablesDbTest.java	2009-02-12 07:33:12 UTC (rev 3847)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskVariablesDbTest.java	2009-02-12 09:19:18 UTC (rev 3848)
@@ -22,25 +22,30 @@
 package org.jbpm.taskmgmt.exe;
 
 import java.util.HashMap;
+import java.util.Map;
 
 import org.jbpm.context.exe.ContextInstance;
 import org.jbpm.db.AbstractDbTestCase;
 import org.jbpm.graph.def.ProcessDefinition;
 import org.jbpm.graph.exe.ProcessInstance;
 
-public class TaskVariablesDbTest extends AbstractDbTestCase {
-
-  public void testDefaultVariablePersistence() {
+public class TaskVariablesDbTest extends AbstractDbTestCase
+{
+  public void testDefaultVariablePersistence()
+  {
     ProcessDefinition processDefinition = ProcessDefinition.createNewProcessDefinition();
-    processDefinition = saveAndReload(processDefinition);
+    processDefinition.setName("default variable persistence");
+    jbpmContext.deployProcessDefinition(processDefinition);
+
+    newTransaction();
     try
     {
       ProcessInstance processInstance = new ProcessInstance(processDefinition);
-      TaskInstance taskInstance = processInstance.getTaskMgmtInstance().createTaskInstance(processInstance.getRootToken());
+      TaskInstance taskInstance = processInstance.getTaskMgmtInstance().createTaskInstance(
+          processInstance.getRootToken());
       taskInstance.setVariable("key", "value");
 
       taskInstance = saveAndReload(taskInstance);
-      
       assertNotNull(taskInstance);
       assertEquals("value", taskInstance.getVariable("key"));
     }
@@ -49,46 +54,44 @@
       jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId());
     }
   }
-  
-  public void testSetOnTaskInstanceGetOnProcess() {
-    
-    ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
-      "<process-definition>" +
-      "  <start-state>" +
-      "    <transition to='t' />" +
-      "  </start-state>" +
-      "  <task-node name='t'>" +
-      "    <task name='vartask' />" +
-      "  </task-node>" +
-      "</process-definition>"
-    );
-    processDefinition = saveAndReload(processDefinition);
+
+  public void testSetOnTaskInstanceGetOnProcess()
+  {
+    ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition name='set on task get on process'>"
+        + "  <start-state>"
+        + "    <transition to='t' />"
+        + "  </start-state>"
+        + "  <task-node name='t'>"
+        + "    <task name='vartask' />"
+        + "  </task-node>"
+        + "</process-definition>");
+    jbpmContext.deployProcessDefinition(processDefinition);
+
+    newTransaction();
     try
     {
       ProcessInstance processInstance = new ProcessInstance(processDefinition);
       processInstance.signal();
-      
+
       processInstance = saveAndReload(processInstance);
       ContextInstance contextInstance = processInstance.getContextInstance();
-      TaskMgmtInstance taskMgmtInstance = processInstance.getTaskMgmtInstance();
-      TaskInstance taskInstance = (TaskInstance) taskMgmtInstance.getTaskInstances().iterator().next();
-      
-      HashMap expectedVariables = new HashMap();
+      TaskInstance taskInstance = processInstance.getTaskMgmtInstance()
+          .getTaskInstances()
+          .iterator()
+          .next();
+
+      Map<String, Object> expectedVariables = new HashMap<String, Object>();
       assertEquals(expectedVariables, taskInstance.getVariables());
+
       assertFalse(taskInstance.hasVariable("a"));
       assertNull(taskInstance.getVariable("a"));
-      
       assertNull(contextInstance.getVariable("a"));
-      
+
       taskInstance.setVariable("a", "1");
-      jbpmContext.save(taskInstance);
-      newTransaction();
-      
-      processInstance = jbpmContext.loadProcessInstance(processInstance.getId());
-      contextInstance = processInstance.getContextInstance();
-      taskMgmtInstance = processInstance.getTaskMgmtInstance();
-      taskInstance = (TaskInstance) taskMgmtInstance.getTaskInstances().iterator().next();
-      
+
+      taskInstance = saveAndReload(taskInstance);
+      contextInstance = taskInstance.getContextInstance();
+
       expectedVariables.put("a", "1");
       assertEquals(expectedVariables, taskInstance.getVariables());
 
@@ -100,58 +103,41 @@
     {
       jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId());
     }
-
   }
 
-  public void testSetOnProcessGetOnTaskInstance() {
-    ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
-      "<process-definition>" +
-      "  <start-state>" +
-      "    <transition to='t' />" +
-      "  </start-state>" +
-      "  <task-node name='t'>" +
-      "    <task name='vartask' />" +
-      "  </task-node>" +
-      "</process-definition>"
-    );
-    processDefinition = saveAndReload(processDefinition);
+  public void testSetOnProcessGetOnTaskInstance()
+  {
+    ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition name='set on process get on task'>"
+        + "  <start-state>"
+        + "    <transition to='t' />"
+        + "  </start-state>"
+        + "  <task-node name='t'>"
+        + "    <task name='vartask' />"
+        + "  </task-node>"
+        + "</process-definition>");
+    jbpmContext.deployProcessDefinition(processDefinition);
+
+    newTransaction();
     try
     {
       ProcessInstance processInstance = new ProcessInstance(processDefinition);
-      ContextInstance contextInstance = processInstance.getContextInstance();
-      TaskMgmtInstance taskMgmtInstance = processInstance.getTaskMgmtInstance();
       processInstance.signal();
-      TaskInstance taskInstance = (TaskInstance) taskMgmtInstance.getTaskInstances().iterator().next();
-      HashMap expectedVariables = new HashMap();
-      jbpmContext.save(processInstance);
-      
-      newTransaction();
-      
-      processInstance = jbpmContext.loadProcessInstance(processInstance.getId());
-      long taskInstanceId = taskInstance.getId();
-      taskInstance = jbpmContext.loadTaskInstance(taskInstanceId);
-      contextInstance = processInstance.getContextInstance();
-      taskMgmtInstance = processInstance.getTaskMgmtInstance();
-      
+
+      processInstance = saveAndReload(processInstance);
+      ContextInstance contextInstance = processInstance.getContextInstance();
       contextInstance.setVariable("a", "1");
-      jbpmContext.save(processInstance);
-      
-      newTransaction();
-      
-      processInstance = jbpmContext.loadProcessInstance(processInstance.getId());
-      taskInstance = jbpmContext.loadTaskInstance(taskInstanceId);
-      contextInstance = processInstance.getContextInstance();
-      taskMgmtInstance = processInstance.getTaskMgmtInstance();
-      
+      TaskInstance taskInstance = processInstance.getTaskMgmtInstance()
+          .getTaskInstances()
+          .iterator()
+          .next();
+
+      taskInstance = saveAndReload(taskInstance);
+      Map<String, Object> expectedVariables = new HashMap<String, Object>();
       expectedVariables.put("a", "1");
       assertEquals(expectedVariables, taskInstance.getVariables());
 
-      newTransaction();
-      
-      processInstance = jbpmContext.loadProcessInstance(processInstance.getId());
-      taskInstance = jbpmContext.loadTaskInstance(taskInstanceId);
-      contextInstance = processInstance.getContextInstance();
-      taskMgmtInstance = processInstance.getTaskMgmtInstance();
+      taskInstance = saveAndReload(taskInstance);
+      contextInstance = taskInstance.getContextInstance();
 
       assertTrue(taskInstance.hasVariable("a"));
       assertEquals("1", taskInstance.getVariable("a"));
@@ -161,54 +147,43 @@
     {
       jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId());
     }
-    
   }
 
-  public void testSetLocally() {
-    ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
-      "<process-definition>" +
-      "  <start-state>" +
-      "    <transition to='t' />" +
-      "  </start-state>" +
-      "  <task-node name='t'>" +
-      "    <task name='vartask' />" +
-      "  </task-node>" +
-      "</process-definition>"
-    );
-    processDefinition = saveAndReload(processDefinition);
+  public void testSetLocally()
+  {
+    ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition name='set locally'>"
+        + "  <start-state>"
+        + "    <transition to='t' />"
+        + "  </start-state>"
+        + "  <task-node name='t'>"
+        + "    <task name='vartask' />"
+        + "  </task-node>"
+        + "</process-definition>");
+    jbpmContext.deployProcessDefinition(processDefinition);
+
+    newTransaction();
     try
     {
       ProcessInstance processInstance = new ProcessInstance(processDefinition);
-      ContextInstance contextInstance = processInstance.getContextInstance();
-      TaskMgmtInstance taskMgmtInstance = processInstance.getTaskMgmtInstance();
       processInstance.signal();
-      TaskInstance taskInstance = (TaskInstance) taskMgmtInstance.getTaskInstances().iterator().next();
+      TaskInstance taskInstance = processInstance.getTaskMgmtInstance()
+          .getTaskInstances()
+          .iterator()
+          .next();
 
-      jbpmContext.save(processInstance);
-      
-      newTransaction();
-      
-      processInstance = jbpmContext.loadProcessInstance(processInstance.getId());
-      taskInstance = jbpmContext.loadTaskInstance(taskInstance.getId());
-      contextInstance = processInstance.getContextInstance();
-      taskMgmtInstance = processInstance.getTaskMgmtInstance();
+      taskInstance = saveAndReload(taskInstance);
+      ContextInstance contextInstance = taskInstance.getContextInstance();
 
-      HashMap expectedVariables = new HashMap();
+      Map<String, Object> expectedVariables = new HashMap<String, Object>();
       assertEquals(expectedVariables, taskInstance.getVariables());
       assertFalse(taskInstance.hasVariable("a"));
       assertNull(taskInstance.getVariable("a"));
       assertNull(contextInstance.getVariable("a"));
-      
+
       taskInstance.setVariableLocally("a", "1");
-      
-      jbpmContext.save(taskInstance);
 
-      newTransaction();
-      
-      processInstance = jbpmContext.loadProcessInstance(processInstance.getId());
-      taskInstance = jbpmContext.loadTaskInstance(taskInstance.getId());
-      contextInstance = processInstance.getContextInstance();
-      taskMgmtInstance = processInstance.getTaskMgmtInstance();
+      taskInstance = saveAndReload(taskInstance);
+      contextInstance = taskInstance.getContextInstance();
 
       expectedVariables.put("a", "1");
       assertEquals(expectedVariables, taskInstance.getVariables());
@@ -222,79 +197,63 @@
       jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId());
     }
   }
-  
-  public void testCopyWithController() {
-    ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
-      "<process-definition>" +
-      "  <start-state>" +
-      "    <transition to='t' />" +
-      "  </start-state>" +
-      "  <task-node name='t'>" +
-      "    <task name='vartask'>" +
-      "      <controller>" +
-      "        <variable name='a' />" +
-      "        <variable name='b' />" +
-      "      </controller>" +
-      "    </task>" +
-      "  </task-node>" +
-      "</process-definition>"
-    );
-    processDefinition = saveAndReload(processDefinition);
+
+  public void testCopyWithController()
+  {
+    ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition name='copy with controller'>"
+        + "  <start-state>"
+        + "    <transition to='t' />"
+        + "  </start-state>"
+        + "  <task-node name='t'>"
+        + "    <task name='vartask'>"
+        + "      <controller>"
+        + "        <variable name='a' />"
+        + "        <variable name='b' />"
+        + "      </controller>"
+        + "    </task>"
+        + "  </task-node>"
+        + "</process-definition>");
+    jbpmContext.deployProcessDefinition(processDefinition);
+
+    newTransaction();
     try
     {
       ProcessInstance processInstance = new ProcessInstance(processDefinition);
       ContextInstance contextInstance = processInstance.getContextInstance();
-      TaskMgmtInstance taskMgmtInstance = processInstance.getTaskMgmtInstance();
-      
       contextInstance.setVariable("a", "1");
       contextInstance.setVariable("b", "2");
       contextInstance.setVariable("c", "3");
-      
+
       processInstance.signal();
-      TaskInstance taskInstance = (TaskInstance) taskMgmtInstance.getTaskInstances().iterator().next();
+      TaskInstance taskInstance = processInstance.getTaskMgmtInstance()
+          .getTaskInstances()
+          .iterator()
+          .next();
 
-      jbpmContext.save(processInstance);
-      
-      newTransaction();
-      
-      processInstance = jbpmContext.loadProcessInstance(processInstance.getId());
-      taskInstance = jbpmContext.loadTaskInstance(taskInstance.getId());
-      contextInstance = processInstance.getContextInstance();
-      taskMgmtInstance = processInstance.getTaskMgmtInstance();
+      taskInstance = saveAndReload(taskInstance);
 
-      HashMap expectedVariables = new HashMap();
+      Map<String, Object> expectedVariables = new HashMap<String, Object>();
       expectedVariables.put("a", "1");
       expectedVariables.put("b", "2");
       expectedVariables.put("c", "3");
       assertEquals(expectedVariables, taskInstance.getVariables());
-      
+
       taskInstance.setVariable("a", "1 modified");
       taskInstance.setVariable("b", "2 modified");
       taskInstance.setVariable("c", "3 modified");
-      
-      jbpmContext.save(processInstance);
 
-      newTransaction();
-      
-      processInstance = jbpmContext.loadProcessInstance(processInstance.getId());
-      taskInstance = jbpmContext.loadTaskInstance(taskInstance.getId());
-      contextInstance = processInstance.getContextInstance();
-      taskMgmtInstance = processInstance.getTaskMgmtInstance();
+      taskInstance = saveAndReload(taskInstance);
 
-      expectedVariables = new HashMap();
+      expectedVariables.clear();
       expectedVariables.put("a", "1 modified");
       expectedVariables.put("b", "2 modified");
       expectedVariables.put("c", "3 modified");
       assertEquals(expectedVariables, taskInstance.getVariables());
 
-      newTransaction();
-      
-      processInstance = jbpmContext.loadProcessInstance(processInstance.getId());
-      taskInstance = jbpmContext.loadTaskInstance(taskInstance.getId());
-      contextInstance = processInstance.getContextInstance();
-      taskMgmtInstance = processInstance.getTaskMgmtInstance();
+      taskInstance = saveAndReload(taskInstance);
+      contextInstance = taskInstance.getContextInstance();
 
-      expectedVariables = new HashMap();
+      expectedVariables.clear();
       expectedVariables.put("a", "1"); // task instance had local copy for var a
       expectedVariables.put("b", "2"); // task instance had local copy for var b
       expectedVariables.put("c", "3 modified");
@@ -306,94 +265,90 @@
     }
   }
 
-  public void testOverwriteNullValue() {
-    ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
-      "<process-definition>" +
-      "  <start-state>" +
-      "    <transition to='t' />" +
-      "  </start-state>" +
-      "  <task-node name='t'>" +
-      "    <task name='vartask'>" +
-      "      <controller>" +
-      "        <variable name='v' />" +
-      "      </controller>" +
-      "    </task>" +
-      "  </task-node>" +
-      "</process-definition>"
-    );
-    processDefinition = saveAndReload(processDefinition);
+  public void testOverwriteNullValue()
+  {
+    ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition name='overwrite-null-value'>"
+        + "  <start-state>"
+        + "    <transition to='t' />"
+        + "  </start-state>"
+        + "  <task-node name='t'>"
+        + "    <task name='vartask'>"
+        + "      <controller>"
+        + "        <variable name='v' />"
+        + "      </controller>"
+        + "    </task>"
+        + "  </task-node>"
+        + "</process-definition>");
+    jbpmContext.deployProcessDefinition(processDefinition);
+
+    newTransaction();
     try
     {
       ProcessInstance processInstance = new ProcessInstance(processDefinition);
       processInstance.signal();
-      
+
       processInstance = saveAndReload(processInstance);
-      TaskMgmtInstance taskMgmtInstance = processInstance.getTaskMgmtInstance();
-      TaskInstance taskInstance = (TaskInstance) taskMgmtInstance.getTaskInstances().iterator().next();
-      
+      TaskInstance taskInstance = processInstance.getTaskMgmtInstance()
+          .getTaskInstances()
+          .iterator()
+          .next();
+
       assertNull(taskInstance.getVariable("v"));
       taskInstance.setVariable("v", "facelets is great");
-      jbpmContext.save(taskInstance);
-      
-      newTransaction();
-      
-      taskInstance = jbpmContext.loadTaskInstance(taskInstance.getId());
+
+      taskInstance = saveAndReload(taskInstance);
       assertEquals("facelets is great", taskInstance.getVariable("v"));
     }
     finally
     {
       jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId());
     }
-
   }
 
-  public void testNewTaskInstanceVariablesWithoutController() {
-    ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
-      "<process-definition>" +
-      "  <start-state>" +
-      "    <transition to='t' />" +
-      "  </start-state>" +
-      "  <task-node name='t'>" +
-      "    <task name='vartask'>" +
-      "    </task>" +
-      "    <transition to='u' />" +
-      "  </task-node>" +
-      "  <state name='u' />" +
-      "</process-definition>"
-    );
-    processDefinition = saveAndReload(processDefinition);
+  public void testNewTaskInstanceVariablesWithoutController()
+  {
+    ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition name='task variables without controller'>"
+        + "  <start-state>"
+        + "    <transition to='t' />"
+        + "  </start-state>"
+        + "  <task-node name='t'>"
+        + "    <task name='vartask' />"
+        + "    <transition to='u' />"
+        + "  </task-node>"
+        + "  <state name='u' />"
+        + "</process-definition>");
+    jbpmContext.deployProcessDefinition(processDefinition);
+
+    newTransaction();
     try
     {
       ProcessInstance processInstance = new ProcessInstance(processDefinition);
-      TaskMgmtInstance taskMgmtInstance = processInstance.getTaskMgmtInstance();
       processInstance.signal();
 
-      TaskInstance taskInstance = (TaskInstance) taskMgmtInstance.getTaskInstances().iterator().next();
-
+      TaskInstance taskInstance = processInstance.getTaskMgmtInstance()
+          .getTaskInstances()
+          .iterator()
+          .next();
       taskInstance.setVariableLocally("a", "value-a");
       taskInstance.setVariableLocally("b", "value-b");
-      
-      jbpmContext.save(processInstance);
-      
-      processInstance = saveAndReload(processInstance);
-      ContextInstance contextInstance = processInstance.getContextInstance();
-      taskMgmtInstance = processInstance.getTaskMgmtInstance();
-      taskInstance = (TaskInstance) taskMgmtInstance.getTaskInstances().iterator().next();
-      
-      assertFalse( contextInstance.hasVariable("a") );
-      assertFalse( contextInstance.hasVariable("b") );
-      
+
+      taskInstance = saveAndReload(taskInstance);
+      ContextInstance contextInstance = taskInstance.getContextInstance();
+
+      assertFalse(contextInstance.hasVariable("a"));
+      assertFalse(contextInstance.hasVariable("b"));
+
       assertEquals("value-a", taskInstance.getVariable("a"));
       assertEquals("value-b", taskInstance.getVariable("b"));
-      
+
       taskInstance.end();
-      
+
       assertEquals("value-a", contextInstance.getVariable("a"));
       assertEquals("value-b", contextInstance.getVariable("b"));
-      
-      processInstance = saveAndReload(processInstance);
-      contextInstance = processInstance.getContextInstance();
-      
+
+      taskInstance = saveAndReload(taskInstance);
+      contextInstance = taskInstance.getContextInstance();
+
       assertEquals("value-a", contextInstance.getVariable("a"));
       assertEquals("value-b", contextInstance.getVariable("b"));
     }
@@ -401,6 +356,5 @@
     {
       jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId());
     }
-
   }
 }




More information about the jbpm-commits mailing list