[jbpm-commits] JBoss JBPM SVN: r6343 - in jbpm4/trunk/modules/jpdl/src: test/java/org/jbpm/jpdl/parsing and 1 other directory.

Author: rebody Date: 2010-05-15 05:22:08 -0400 (Sat, 15 May 2010) New Revision: 6343 Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java Log: JBPM-2785 correct parsing description of activity. 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-15 09:11:28 UTC (rev 6342) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2010-05-15 09:22:08 UTC (rev 6343) @@ -282,7 +282,8 @@ if ("on".equals(tagName) || "timer".equals(tagName) || "swimlane".equals(tagName) - || "migrate-instances".equals(tagName)) continue; + || "migrate-instances".equals(tagName) + || "description".equals(tagName)) continue; JpdlBinding activityBinding = (JpdlBinding) getBinding(nestedElement, CATEGORY_ACTIVITY); if (activityBinding == null) { @@ -298,7 +299,7 @@ parseTransitions(nestedElement, activity, parse); parseVariableDefinitions(nestedElement, parse, activity); - Element descriptionElement = XmlUtil.element(documentElement, "description"); + Element descriptionElement = XmlUtil.element(nestedElement, "description"); if (descriptionElement!=null) { String description = XmlUtil.getContentText(descriptionElement); activity.setDescription(description); Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java 2010-05-15 09:11:28 UTC (rev 6342) +++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ActivityParsingTest.java 2010-05-15 09:22:08 UTC (rev 6343) @@ -23,6 +23,9 @@ import java.util.List; +import org.jbpm.pvm.internal.client.ClientProcessDefinition; +import org.jbpm.pvm.internal.model.ActivityImpl; +import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.internal.xml.Problem; @@ -48,4 +51,20 @@ ); assertTextPresent("attribute <state name=\"\" is empty", problems.get(0).getMsg()); } + + public void testDescription() { + ClientProcessDefinition processDefinition = parse( + "<process name='p'>" + + " <description>process definition description</description>" + + " <start name='start'>" + + " <description>start description</description>" + + " </start>" + + "</process>" + ); + assertEquals("process definition description", processDefinition.getDescription()); + + ProcessDefinitionImpl processDefinitionImpl = (ProcessDefinitionImpl) processDefinition; + ActivityImpl activity = processDefinitionImpl.getInitial(); + assertEquals("start description", activity.getDescription()); + } }