[jboss-svn-commits] JBL Code SVN: r26127 - in labs/jbossrules/trunk/drools-process/drools-jpdl/src/test: resources and 1 other directories.

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

Author: KrisVerlaenen
Date: 2009-04-17 18:30:33 -0400 (Fri, 17 Apr 2009)
New Revision: 26127

Added:
   labs/jbossrules/trunk/drools-process/drools-jpdl/src/test/resources/simple3/
Removed:
   labs/jbossrules/trunk/drools-process/drools-jpdl/src/test/java/org/drools/SimpleProcessTest.java
Modified:
   labs/jbossrules/trunk/drools-process/drools-jpdl/src/test/java/org/drools/ParseSimpleProcessTest.java
Log:
 - updated jPDL test

Modified: labs/jbossrules/trunk/drools-process/drools-jpdl/src/test/java/org/drools/ParseSimpleProcessTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-jpdl/src/test/java/org/drools/ParseSimpleProcessTest.java	2009-04-17 22:28:20 UTC (rev 26126)
+++ labs/jbossrules/trunk/drools-process/drools-jpdl/src/test/java/org/drools/ParseSimpleProcessTest.java	2009-04-17 22:30:33 UTC (rev 26127)
@@ -13,11 +13,11 @@
 
 public class ParseSimpleProcessTest extends TestCase {
 
-	public void testSimpleProcess() throws Exception {
-	    JpdlParser parser = new JpdlParser();
-	    JpdlProcess process = parser.loadJpdlProcess("simple/processdefinition.xml");
-	    ProcessValidationError[] errors = parser.getErrors();
-	    for (ProcessValidationError error: errors) {
+    public void testSimpleProcess2() throws Exception {
+        JpdlParser parser = new JpdlParser();
+        JpdlProcess process = parser.loadJpdlProcess("simple2/processdefinition.xml");
+        ProcessValidationError[] errors = parser.getErrors();
+        for (ProcessValidationError error: errors) {
             System.err.println(error);
         }
         assertEquals(0, errors.length);
@@ -28,15 +28,21 @@
         ruleBase.addPackage( p );
         
         WorkingMemory workingMemory = ruleBase.newStatefulSession();
+        TestWorkItemHandler handler = new TestWorkItemHandler();
+        workingMemory.getWorkItemManager().registerWorkItemHandler(
+            "Email", handler);
+        assertTrue(handler.getWorkItemId() == -1);
         ProcessInstance processInstance = workingMemory.startProcess("simple");
+        assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+        processInstance.signalEvent("signal", null);
         assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
     }
 
-    public void testSimpleProcess2() throws Exception {
-        JpdlParser parser = new JpdlParser();
-        JpdlProcess process = parser.loadJpdlProcess("simple2/processdefinition.xml");
-        ProcessValidationError[] errors = parser.getErrors();
-        for (ProcessValidationError error: errors) {
+	public void testSimpleProcess3() throws Exception {
+	    JpdlParser parser = new JpdlParser();
+	    JpdlProcess process = parser.loadJpdlProcess("simple3/processdefinition.xml");
+	    ProcessValidationError[] errors = parser.getErrors();
+	    for (ProcessValidationError error: errors) {
             System.err.println(error);
         }
         assertEquals(0, errors.length);
@@ -47,11 +53,9 @@
         ruleBase.addPackage( p );
         
         WorkingMemory workingMemory = ruleBase.newStatefulSession();
-        TestWorkItemHandler handler = new TestWorkItemHandler();
-        workingMemory.getWorkItemManager().registerWorkItemHandler(
-            "Email", handler);
-        assertTrue(handler.getWorkItemId() == -1);
         ProcessInstance processInstance = workingMemory.startProcess("simple");
+        assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
+        processInstance.signalEvent("signal", null);
         assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
     }
 

Deleted: labs/jbossrules/trunk/drools-process/drools-jpdl/src/test/java/org/drools/SimpleProcessTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-jpdl/src/test/java/org/drools/SimpleProcessTest.java	2009-04-17 22:28:20 UTC (rev 26126)
+++ labs/jbossrules/trunk/drools-process/drools-jpdl/src/test/java/org/drools/SimpleProcessTest.java	2009-04-17 22:30:33 UTC (rev 26127)
@@ -1,40 +0,0 @@
-package org.drools;
-
-import junit.framework.TestCase;
-
-import org.jbpm.graph.def.ProcessDefinition;
-import org.jbpm.graph.exe.ProcessInstance;
-
-public class SimpleProcessTest extends TestCase {
-
-	public void testSimpleProcess() throws Exception {
-
-		// Extract a process definition from the processdefinition.xml file.
-		ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("simple/processdefinition.xml");
-		assertNotNull("Definition should not be null", processDefinition);
-
-		// Create an instance of the process definition.
-		ProcessInstance instance = new ProcessInstance(processDefinition);
-		assertEquals(
-				"Instance is in start state", 
-				instance.getRootToken().getNode().getName(), 
-				"start");
-		assertNull(
-				"Message variable should not exist yet", 
-				instance.getContextInstance().getVariable("message"));
-
-//		instance.signal();
-//		assertEquals(
-//				"Instance is in node1", 
-//				instance.getRootToken().getNode().getName(), 
-//				"node1");
-		
-		instance.signal();
-		assertEquals(
-				"Instance is in end state", 
-				instance.getRootToken().getNode().getName(), 
-				"end");
-		assertTrue("Instance has ended", instance.hasEnded());
-	}
-
-}

Copied: labs/jbossrules/trunk/drools-process/drools-jpdl/src/test/resources/simple3 (from rev 24303, labs/jbossrules/trunk/drools-process/drools-jpdl/src/test/resources/simple)


Property changes on: labs/jbossrules/trunk/drools-process/drools-jpdl/src/test/resources/simple3
___________________________________________________________________
Name: svn:mergeinfo
   +