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

[do-not-reply at jboss.org]

Author: rebody
Date: 2010-05-13 01:11:53 -0400 (Thu, 13 May 2010)
New Revision: 6336

Modified:
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
   jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskPropertiesTest.java
Log:
JBPM-2755 let description of task provide el

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java	2010-05-13 00:59:27 UTC (rev 6335)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java	2010-05-13 05:11:53 UTC (rev 6336)
@@ -489,7 +489,7 @@
     Element descriptionElement = XmlUtil.element(element, "description");
     if (descriptionElement!=null) {
       String descriptionText = XmlUtil.getContentText(descriptionElement);
-      Expression descriptionExpression = Expression.create(descriptionText, Expression.LANGUAGE_UEL);
+      Expression descriptionExpression = Expression.create(descriptionText, Expression.LANGUAGE_UEL_VALUE);
       assignableDefinition.setDescription(descriptionExpression);
     }
   

Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskPropertiesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskPropertiesTest.java	2010-05-13 00:59:27 UTC (rev 6335)
+++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskPropertiesTest.java	2010-05-13 05:11:53 UTC (rev 6336)
@@ -24,6 +24,9 @@
  */
 package org.jbpm.test.task;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.jbpm.api.ProcessDefinition;
 import org.jbpm.api.task.Task;
 import org.jbpm.test.JbpmTestCase;
@@ -33,6 +36,7 @@
  * Testcase to check if properties can be resolved through a {@link Task}.
  * 
  * @author Joram Barrez
+ * @author Ronald van Kuijk
  */
 public class TaskPropertiesTest extends JbpmTestCase {
   
@@ -50,6 +54,7 @@
     "    <transition to='work hard for the money' />" +
     "  </fork>" +
     "  <task name='select destination' assignee='" + ACTOR + "'>" +
+    " <description>Description for 'select destination' with #{timeframe}</description>" +
     "    <transition to='wait' />" +
     "  </task>" +
     "  <task name='work hard for the money' assignee='" + ACTOR2 + "_not_the_same'>" +
@@ -62,6 +67,11 @@
     Task task = startProcessInstanceAndReturnTaskFor(ACTOR);
     assertEquals("select destination", task.getActivityName()); 
   }
+   
+  public void testGetDescription() {
+    Task task = startProcessInstanceAndReturnTaskFor(ACTOR);
+    assertEquals("Description for 'select destination' with Springbreak", task.getDescription());
+  }
   
   public void testGetProcessDefinitionThroughTask() {
     Task task = startProcessInstanceAndReturnTaskFor(ACTOR);
@@ -75,7 +85,10 @@
   
   private Task startProcessInstanceAndReturnTaskFor(String actor) {
     deployJpdlXmlString(PROCESS);
-    executionService.startProcessInstanceByKey("VacationTrip");
+    Map<String, String> vars = new HashMap<String, String>();
+    vars.put("timeframe", "Springbreak");
+    executionService.startProcessInstanceByKey("VacationTrip", vars);
+ 
     return taskService.findPersonalTasks(actor).get(0);
   }