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

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

Author: KrisVerlaenen
Date: 2009-03-06 11:16:16 -0500 (Fri, 06 Mar 2009)
New Revision: 25525

Modified:
   labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkflowProcessInstance.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMarchallingTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java
Log:
 - added getVariable method to WorkflowProcessInstance

Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkflowProcessInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkflowProcessInstance.java	2009-03-06 15:43:24 UTC (rev 25524)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkflowProcessInstance.java	2009-03-06 16:16:16 UTC (rev 25525)
@@ -4,5 +4,7 @@
     extends
     ProcessInstance,
     NodeInstanceContainer {
+	
+	Object getVariable(String name);
 
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMarchallingTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMarchallingTest.java	2009-03-06 15:43:24 UTC (rev 25524)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMarchallingTest.java	2009-03-06 16:16:16 UTC (rev 25525)
@@ -15,14 +15,11 @@
 import org.drools.Person;
 import org.drools.RuleBase;
 import org.drools.RuleBaseFactory;
-import org.drools.SessionConfiguration;
 import org.drools.StatefulSession;
 import org.drools.compiler.PackageBuilder;
-import org.drools.impl.EnvironmentFactory;
 import org.drools.impl.StatefulKnowledgeSessionImpl;
 import org.drools.marshalling.Marshaller;
 import org.drools.marshalling.MarshallerFactory;
-import org.drools.marshalling.impl.DefaultMarshaller;
 import org.drools.process.core.context.variable.VariableScope;
 import org.drools.process.instance.ProcessInstance;
 import org.drools.process.instance.context.variable.VariableScopeInstance;

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java	2009-03-06 15:43:24 UTC (rev 25524)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java	2009-03-06 16:16:16 UTC (rev 25525)
@@ -23,6 +23,7 @@
 import org.drools.runtime.process.WorkItem;
 import org.drools.runtime.process.WorkItemHandler;
 import org.drools.runtime.process.WorkItemManager;
+import org.drools.runtime.process.WorkflowProcessInstance;
 
 public class ProcessWorkItemTest extends TestCase {
     
@@ -102,7 +103,8 @@
     	
         TestWorkItemHandler handler = new TestWorkItemHandler();
         ksession.getWorkItemManager().registerWorkItemHandler("Human Task", handler);
-        ProcessInstance processInstance = ksession.startProcess("org.drools.actions");
+        WorkflowProcessInstance processInstance = (WorkflowProcessInstance)
+        	ksession.startProcess("org.drools.actions");
         assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
         WorkItem workItem = handler.getWorkItem();
         assertNotNull(workItem);
@@ -116,7 +118,8 @@
         Person person = new Person();
         person.setName("Jane Doe");
         parameters.put("Person", person);
-        processInstance = ksession.startProcess("org.drools.actions", parameters);
+        processInstance = (WorkflowProcessInstance)
+        	ksession.startProcess("org.drools.actions", parameters);
         assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
         workItem = handler.getWorkItem();
         assertNotNull(workItem);
@@ -128,11 +131,8 @@
         results.put("Result", "SomeOtherString");
         ksession.getWorkItemManager().completeWorkItem(workItem.getId(), results);
         assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
-        VariableScopeInstance variableScope = (VariableScopeInstance)
-        	((org.drools.process.instance.ProcessInstance) processInstance)
-        		.getContextInstance(VariableScope.VARIABLE_SCOPE);
-        assertEquals("SomeOtherString", variableScope.getVariable("MyObject"));
-        assertEquals(15, variableScope.getVariable("Number"));
+        assertEquals("SomeOtherString", processInstance.getVariable("MyObject"));
+        assertEquals(15, processInstance.getVariable("Number"));
     }
     
     private static class TestWorkItemHandler implements WorkItemHandler {

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java	2009-03-06 15:43:24 UTC (rev 25524)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java	2009-03-06 16:16:16 UTC (rev 25525)
@@ -32,7 +32,9 @@
 import org.drools.definition.process.Node;
 import org.drools.definition.process.NodeContainer;
 import org.drools.definition.process.WorkflowProcess;
+import org.drools.process.core.context.variable.VariableScope;
 import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.context.variable.VariableScopeInstance;
 import org.drools.process.instance.impl.ProcessInstanceImpl;
 import org.drools.runtime.process.EventListener;
 import org.drools.runtime.process.NodeInstanceContainer;
@@ -156,6 +158,15 @@
 	public WorkflowProcess getWorkflowProcess() {
 		return (WorkflowProcess) getProcess();
 	}
+	
+	public Object getVariable(String name) {
+		VariableScopeInstance variableScopeInstance = (VariableScopeInstance)
+			getContextInstance(VariableScope.VARIABLE_SCOPE);
+		if (variableScopeInstance == null) {
+			return null;
+		}
+		return variableScopeInstance.getVariable(name);
+	}
 
 	public void setState(final int state) {
 		super.setState(state);