[jboss-svn-commits] JBL Code SVN: r35807 - in labs/jbossrules/trunk/drools-process/drools-bpmn2/src: test/java/org/drools/bpmn2 and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: atoulme
Date: 2010-10-30 22:44:42 -0400 (Sat, 30 Oct 2010)
New Revision: 35807

Added:
   labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/BPMN2-userTaskWithDataStore.xml
Modified:
   labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/AssociationHandler.java
   labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/java/org/drools/bpmn2/SimpleBPMNProcessTest.java
Log:
make sure a simple workflow process can be parsed with associations and a data store present

Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/AssociationHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/AssociationHandler.java	2010-10-29 22:41:19 UTC (rev 35806)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/AssociationHandler.java	2010-10-31 02:44:42 UTC (rev 35807)
@@ -48,7 +48,8 @@
 	        this.validPeers.add(Variable.class);
 	        this.validPeers.add(Node.class);
 	        this.validPeers.add(SequenceFlow.class);
-
+	        this.validPeers.add(Lane.class);
+	        this.validPeers.add(Association.class);
 			this.allowNesting = false;
 		}
 	}

Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/java/org/drools/bpmn2/SimpleBPMNProcessTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/java/org/drools/bpmn2/SimpleBPMNProcessTest.java	2010-10-29 22:41:19 UTC (rev 35806)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/java/org/drools/bpmn2/SimpleBPMNProcessTest.java	2010-10-31 02:44:42 UTC (rev 35807)
@@ -150,6 +150,13 @@
         assertTrue(processInstance.getState() == ProcessInstance.STATE_COMPLETED);
     }
     
+    public void testUserTaskWithDataStoreScenario() throws Exception {
+        KnowledgeBase kbase = createKnowledgeBase("BPMN2-userTaskWithDataStore.xml");
+		StatefulKnowledgeSession ksession = createKnowledgeSession(kbase);
+        ksession.startProcess("UserProcess");
+        // we can't test further as user tasks are asynchronous.
+    }
+    
     public void testDataStore() throws Exception {
         KnowledgeBase kbase = createKnowledgeBase("BPMN2-DataStore.xml");
 		StatefulKnowledgeSession ksession = createKnowledgeSession(kbase);

Added: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/BPMN2-userTaskWithDataStore.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/BPMN2-userTaskWithDataStore.xml	                        (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/BPMN2-userTaskWithDataStore.xml	2010-10-31 02:44:42 UTC (rev 35807)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn2:definitions id="582149941146176592" name=""
+  targetNamespace="http://www.omg.org/bpmn20"
+  xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:data="http://www.example.com/proxydata">
+  <bpmn2:import importType="data" namespace="http://www.example.com/proxydata"/>
+  <bpmn2:itemDefinition id="_642F1C24-40EE-4F9B-9562-F3A419DB49D1item" structureRef="data:user"/>
+  <bpmn2:dataStore id="_642F1C24-40EE-4F9B-9562-F3A419DB49D1"
+    itemSubjectRef="_642F1C24-40EE-4F9B-9562-F3A419DB49D1item" name=""/>
+  <bpmn2:process id="UserProcess" name="">
+    <bpmn2:userTask id="_64D3D89E-4738-46A0-A5C5-33596B0FA087" name="">
+      <bpmn2:humanPerformer id="79f69fda-565e-4650-b3ac-23753cccd763">
+        <bpmn2:resourceAssignmentExpression>
+          <bpmn2:expression id="b220ecdb-03ea-41a3-9541-d940a57943bf">
+            <bpmn2:documentation id="f0486809-f13b-475b-be22-efe43794b601">Joe</bpmn2:documentation>
+          </bpmn2:expression>
+        </bpmn2:resourceAssignmentExpression>
+      </bpmn2:humanPerformer>
+    </bpmn2:userTask>
+    <bpmn2:startEvent id="_D5163F2D-3D54-477F-8928-9DD4BCB71D9B" name=""/>
+    <bpmn2:sequenceFlow id="_B2AA549E-4A7E-44EA-84F7-81CCFE936FE7"
+      sourceRef="_D5163F2D-3D54-477F-8928-9DD4BCB71D9B" targetRef="_64D3D89E-4738-46A0-A5C5-33596B0FA087"/>
+    <bpmn2:userTask id="_4D157129-E208-4296-9706-C029C1C76743" name="">
+      <bpmn2:humanPerformer id="5b3b334c-74ff-44d6-bd34-ee477e4645ad">
+        <bpmn2:resourceAssignmentExpression>
+          <bpmn2:expression id="2bd3fc41-2f3f-4d35-b32c-862474d4caf7">
+            <bpmn2:documentation id="2859467b-c1eb-4f36-8dbd-54171909ed4a">Barney</bpmn2:documentation>
+          </bpmn2:expression>
+        </bpmn2:resourceAssignmentExpression>
+      </bpmn2:humanPerformer>
+    </bpmn2:userTask>
+    <bpmn2:sequenceFlow id="_257EA4A9-63A8-4447-B0B3-0780DCEA6B4D"
+      sourceRef="_64D3D89E-4738-46A0-A5C5-33596B0FA087" targetRef="_4D157129-E208-4296-9706-C029C1C76743"/>
+    <bpmn2:endEvent id="_96DF26DA-F87E-4901-A303-833550A6CCFD" name=""/>
+    <bpmn2:sequenceFlow id="_BB00A235-EE17-4C0B-8B98-1E4B939E88D9"
+      sourceRef="_4D157129-E208-4296-9706-C029C1C76743" targetRef="_96DF26DA-F87E-4901-A303-833550A6CCFD"/>
+    <bpmn2:association associationDirection="none"
+      id="_8EFA0BCB-1530-4869-907A-E2872EC7831A"
+      sourceRef="_64D3D89E-4738-46A0-A5C5-33596B0FA087" targetRef="_642F1C24-40EE-4F9B-9562-F3A419DB49D1"/>
+    <bpmn2:association associationDirection="none"
+      id="_554267E5-32DE-466F-94F8-2CD8EE289270"
+      sourceRef="_642F1C24-40EE-4F9B-9562-F3A419DB49D1" targetRef="_4D157129-E208-4296-9706-C029C1C76743"/>
+  </bpmn2:process>
+</bpmn2:definitions>