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

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

Author: KrisVerlaenen
Date: 2010-01-28 10:55:14 -0500 (Thu, 28 Jan 2010)
New Revision: 31284

Modified:
   labs/jbossrules/trunk/drools-process/drools-bpmn2/.classpath
   labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/SubProcessHandler.java
   labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/java/org/drools/bpmn2/SimpleBPMNProcessTest.java
Log:
 - fixed failing tests

Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/.classpath	2010-01-28 15:54:53 UTC (rev 31283)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/.classpath	2010-01-28 15:55:14 UTC (rev 31284)
@@ -31,7 +31,7 @@
   <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jmock/jmock-legacy/2.5.1/jmock-legacy-2.5.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.6/junit-4.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.12/mvel2-2.0.12.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>

Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/SubProcessHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/SubProcessHandler.java	2010-01-28 15:54:53 UTC (rev 31283)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/java/org/drools/bpmn2/xml/SubProcessHandler.java	2010-01-28 15:55:14 UTC (rev 31284)
@@ -39,6 +39,7 @@
 		Node node = (Node) parser.getCurrent();
 		// determine type of event definition, so the correct type of node
 		// can be generated
+		boolean found = false;
 		org.w3c.dom.Node xmlNode = element.getFirstChild();
 		while (xmlNode != null) {
 			String nodeName = xmlNode.getNodeName();
@@ -53,10 +54,14 @@
 				forEachNode.setMetaData(ProcessHandler.CONNECTIONS, ((CompositeContextNode) node).getMetaData(ProcessHandler.CONNECTIONS));
 				node = forEachNode;
 				handleForEachNode(node, element, uri, localName, parser);
+				found = true;
 				break;
 			}
 			xmlNode = xmlNode.getNextSibling();
 		}
+		if (!found) {
+			handleCompositeContextNode(node, element, uri, localName, parser);
+		}
 		NodeContainer nodeContainer = (NodeContainer) parser.getParent();
 		nodeContainer.addNode(node);
 		return node;

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-01-28 15:54:53 UTC (rev 31283)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/java/org/drools/bpmn2/SimpleBPMNProcessTest.java	2010-01-28 15:55:14 UTC (rev 31284)
@@ -167,7 +167,7 @@
 		assertEquals("new value", ((WorkflowProcessInstance) processInstance).getVariable("y"));
 	}
 
-	public void FIXMEtestSubProcess() throws Exception {
+	public void testSubProcess() throws Exception {
 		KnowledgeBase kbase = createKnowledgeBase("BPMN2-SubProcess.xml");
 		StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
 		ProcessInstance processInstance = ksession.startProcess("SubProcess");
@@ -186,14 +186,14 @@
 		assertTrue(processInstance.getState() == ProcessInstance.STATE_COMPLETED);
 	}
 
-    public void FIXMEtestEscalationBoundaryEvent() throws Exception {
+    public void testEscalationBoundaryEvent() throws Exception {
         KnowledgeBase kbase = createKnowledgeBase("BPMN2-EscalationBoundaryEvent.xml");
         StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
         ProcessInstance processInstance = ksession.startProcess("EscalationBoundaryEvent");
         assertTrue(processInstance.getState() == ProcessInstance.STATE_COMPLETED);
     }
 
-    public void FIXMEtestEscalationBoundaryEventInterrupting() throws Exception {
+    public void testEscalationBoundaryEventInterrupting() throws Exception {
         KnowledgeBase kbase = createKnowledgeBase("BPMN2-EscalationBoundaryEventInterrupting.xml");
         StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
         ksession.getWorkItemManager().registerWorkItemHandler("MyTask", new DoNothingWorkItemHandler());
@@ -201,7 +201,7 @@
         assertTrue(processInstance.getState() == ProcessInstance.STATE_COMPLETED);
     }
 
-    public void FIXMEtestErrorBoundaryEvent() throws Exception {
+    public void testErrorBoundaryEvent() throws Exception {
         KnowledgeBase kbase = createKnowledgeBase("BPMN2-ErrorBoundaryEventInterrupting.xml");
         StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
         ksession.getWorkItemManager().registerWorkItemHandler("MyTask", new DoNothingWorkItemHandler());
@@ -209,7 +209,7 @@
         assertTrue(processInstance.getState() == ProcessInstance.STATE_COMPLETED);
     }
 
-    public void FIXMEtestTimerBoundaryEvent() throws Exception {
+    public void testTimerBoundaryEvent() throws Exception {
         KnowledgeBase kbase = createKnowledgeBase("BPMN2-TimerBoundaryEvent.xml");
         StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
         ksession.getWorkItemManager().registerWorkItemHandler("MyTask", new DoNothingWorkItemHandler());
@@ -221,7 +221,7 @@
         assertTrue(processInstance.getState() == ProcessInstance.STATE_COMPLETED);
     }
 
-    public void FIXMEtestTimerBoundaryEventInterrupting() throws Exception {
+    public void testTimerBoundaryEventInterrupting() throws Exception {
         KnowledgeBase kbase = createKnowledgeBase("BPMN2-TimerBoundaryEventInterrupting.xml");
         StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
         ksession.getWorkItemManager().registerWorkItemHandler("MyTask", new DoNothingWorkItemHandler());