[jboss-svn-commits] JBL Code SVN: r25442 - in labs/jbossrules/trunk/drools-process/drools-osworkflow: src/main/java/org/drools/osworkflow/persistence/marshaller and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 26 16:11:24 EST 2009
Author: KrisVerlaenen
Date: 2009-02-26 16:11:24 -0500 (Thu, 26 Feb 2009)
New Revision: 25442
Added:
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/ComplexProcessTest.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/SimpleDroolsFlowTest.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/AbstractJPAPersistenceTest.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/ComplexProcessPersistenceTest.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceSplitJoinTest.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceTest.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceWFPTest.java
Removed:
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/resources/META-INF/orm.xml
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/resources/META-INF/persistence.xml
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/ComplexProcessTestCase.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/DroolsOSWorkFlowTestCase.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/SimpleDroolsFlowTestCase.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/AbstractJPAPersistenceTestCase.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/ComplexProcessPersistenceTestCase.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceSplitJoinTestCase.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceTestCase.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceWFPTestCase.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/suite/
Modified:
labs/jbossrules/trunk/drools-process/drools-osworkflow/.classpath
labs/jbossrules/trunk/drools-process/drools-osworkflow/pom.xml
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/persistence/marshaller/OSWorkflowProcessInstanceMarshaller.java
Log:
JBRULES-1915: Improve process persistence usability
- fixed OSWorkflow after generic persistence changes
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/.classpath 2009-02-26 17:20:59 UTC (rev 25441)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/.classpath 2009-02-26 21:11:24 UTC (rev 25442)
@@ -9,6 +9,7 @@
<classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.1.1/antlr-runtime-3.1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
<classpathentry kind="var" path="M2_REPO/bsh/bsh/1.2b7/bsh-1.2b7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/btm/btm/1.3.2/btm-1.3.2.jar"/>
<classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
@@ -19,6 +20,8 @@
<classpathentry kind="var" path="M2_REPO/org/drools/drools-core/5.0.0.SNAPSHOT/drools-core-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-core/5.0.0.SNAPSHOT/drools-core-5.0.0.SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/drools/drools-process-enterprise/5.0.0.SNAPSHOT/drools-process-enterprise-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-process-enterprise/5.0.0.SNAPSHOT/drools-process-enterprise-5.0.0.SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.0.1/geronimo-jms_1.1_spec-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0.1/geronimo-jta_1.0.1B_spec-1.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.77/h2-1.0.77.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
@@ -35,7 +38,7 @@
<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
<classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.6/mvel2-2.0.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.7-SNAPSHOT/mvel2-2.0.7-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/opensymphony/oscore/2.2.5/oscore-2.2.5.jar"/>
<classpathentry kind="var" path="M2_REPO/opensymphony/osworkflow/2.8.0/osworkflow-2.8.0.jar"/>
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/pom.xml 2009-02-26 17:20:59 UTC (rev 25441)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/pom.xml 2009-02-26 21:11:24 UTC (rev 25442)
@@ -81,6 +81,13 @@
<artifactId>antlr-runtime</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.btm</groupId>
+ <artifactId>btm</artifactId>
+ <version>1.3.2</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/persistence/marshaller/OSWorkflowProcessInstanceMarshaller.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/persistence/marshaller/OSWorkflowProcessInstanceMarshaller.java 2009-02-26 17:20:59 UTC (rev 25441)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/persistence/marshaller/OSWorkflowProcessInstanceMarshaller.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -6,10 +6,10 @@
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalWorkingMemory;
-import org.drools.marshalling.AbstractProcessInstanceMarshaller;
-import org.drools.marshalling.MarshallerReaderContext;
-import org.drools.marshalling.MarshallerWriteContext;
-import org.drools.marshalling.PersisterEnums;
+import org.drools.marshalling.impl.AbstractProcessInstanceMarshaller;
+import org.drools.marshalling.impl.MarshallerReaderContext;
+import org.drools.marshalling.impl.MarshallerWriteContext;
+import org.drools.marshalling.impl.PersisterEnums;
import org.drools.osworkflow.instance.OSWorkflowProcessInstance;
import org.drools.osworkflow.instance.node.StepNodeInstance;
import org.drools.process.core.context.variable.VariableScope;
Deleted: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/resources/META-INF/orm.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/resources/META-INF/orm.xml 2009-02-26 17:20:59 UTC (rev 25441)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/resources/META-INF/orm.xml 2009-02-26 21:11:24 UTC (rev 25442)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
- version="1.0">
- <named-query name="ProcessInstancesWaitingForEvent">
- <query>
-select
- processInstanceInfo.processInstanceId
-from
- ProcessInstanceInfo processInstanceInfo
-where
- :type in elements(processInstanceInfo.eventTypes)
- </query>
- </named-query>
-</entity-mappings>
Deleted: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/resources/META-INF/persistence.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/resources/META-INF/persistence.xml 2009-02-26 17:20:59 UTC (rev 25441)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/resources/META-INF/persistence.xml 2009-02-26 21:11:24 UTC (rev 25442)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<persistence
- version="1.0"
- xsi:schemaLocation=
- "http://java.sun.com/xml/ns/persistence
- http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd
- http://java.sun.com/xml/ns/persistence/orm
- http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
- xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/persistence">
-
- <!--persistence-unit name="ProcessService">
- <jta-data-source>java:/DefaultDS</jta-data-source>
- <properties>
- <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
- </properties>
- </persistence-unit-->
-
- <persistence-unit name="org.drools.persistence.jpa">
- <provider>org.hibernate.ejb.HibernatePersistence</provider>
- <class>org.drools.persistence.jpa.ByteArrayObject</class>
- <class>org.drools.persistence.processinstance.ProcessInstanceInfo</class>
- <class>org.drools.persistence.processinstance.ProcessInstanceEventInfo</class>
- <class>org.drools.persistence.processinstance.WorkItemInfo</class>
-
- <properties>
- <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
- <property name="hibernate.connection.driver_class" value="org.h2.Driver"/>
- <property name="hibernate.connection.url" value="jdbc:h2:~/test" />
- <!--property name="hibernate.connection.url" value="jdbc:h2:file:/home/kverlaen/NotBackedUp/development/drools/drools-process/drools-process-enterprise/bin/mydb" /-->
-
-<!-- <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>-->
-<!-- <property name="hibernate.connection.driver_class" value="org.postgresql.Driver"/> -->
-<!-- <property name="hibernate.connection.url" value="jdbc:postgresql://localhost/postgres"/>-->
-
- <property name="hibernate.connection.username" value="sa"/>
- <property name="hibernate.connection.password" value=""/>
- <property name="hibernate.connection.autocommit" value="false" />
- <property name="hibernate.max_fetch_depth" value="3"/>
- <property name="hibernate.hbm2ddl.auto" value="update" />
- <property name="hibernate.show_sql" value="true" />
- </properties>
- </persistence-unit>
-
-</persistence>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/ComplexProcessTest.java (from rev 25440, labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/ComplexProcessTestCase.java)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/ComplexProcessTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/ComplexProcessTest.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -0,0 +1,100 @@
+package org.drools.osworkflow.test;
+
+import java.io.StringReader;
+import java.util.Collection;
+import java.util.Collections;
+
+import junit.framework.TestCase;
+
+import org.drools.compiler.PackageBuilderConfiguration;
+import org.drools.osworkflow.DroolsWorkflow;
+import org.drools.osworkflow.OSWorkflowParser;
+import org.drools.osworkflow.core.OSWorkflowProcess;
+import org.drools.osworkflow.xml.XmlOSWorkflowProcessDumper;
+import org.drools.xml.XmlProcessReader;
+
+import com.opensymphony.workflow.InvalidActionException;
+import com.opensymphony.workflow.InvalidEntryStateException;
+import com.opensymphony.workflow.InvalidInputException;
+import com.opensymphony.workflow.InvalidRoleException;
+import com.opensymphony.workflow.Workflow;
+import com.opensymphony.workflow.WorkflowException;
+import com.opensymphony.workflow.config.DefaultConfiguration;
+import com.opensymphony.workflow.loader.WorkflowDescriptor;
+import com.opensymphony.workflow.spi.Step;
+
+public class ComplexProcessTest extends TestCase {
+
+ public void testComplexProcess() {
+ Workflow workflow = new DroolsWorkflow();
+ DefaultConfiguration config = new DefaultConfiguration();
+ workflow.setConfiguration(config);
+ try {
+ long id = workflow.initialize("entrevista", 1, null);
+ Collection<Step> currentSteps = workflow.getCurrentSteps(id);
+ // verify we only have one current step
+ assertEquals("Unexpected number of current steps", 1, currentSteps.size());
+ // verify it's step 1
+ Step currentStep = currentSteps.iterator().next();
+ assertEquals("Unexpected current step", 1, currentStep.getStepId());
+
+ int[] availableActions = workflow.getAvailableActions(id, Collections.EMPTY_MAP);
+ // verify we only have 6 available actions
+ assertEquals("Unexpected number of available actions", 6, availableActions.length);
+ workflow.doAction(id, 2, null);
+ currentSteps = workflow.getCurrentSteps(id);
+ // verify we have one current step
+ assertEquals("Unexpected number of current steps", 1, currentSteps.size());
+ // verify it's step 2
+ currentStep = currentSteps.iterator().next();
+ assertEquals("Unexpected current step", 2, currentStep.getStepId());
+
+ availableActions = workflow.getAvailableActions(id, Collections.EMPTY_MAP);
+ // verify we have 6 available action
+ assertEquals("Unexpected number of available actions", 6, availableActions.length);
+ // //verify it's action 3
+ // assertEquals("Unexpected available action", 3,
+ // availableActions[0]);
+ workflow.doAction(id, 6, null);
+ currentSteps = workflow.getCurrentSteps(id);
+ // verify we have no current Step (since we ended the process)
+ assertEquals("Unexpected number of current steps", 0, currentSteps.size());
+ // verify we have no available action
+ availableActions = workflow.getAvailableActions(id, Collections.EMPTY_MAP);
+ assertEquals("Unexpected number of available actions", 0, availableActions.length);
+
+ } catch (InvalidActionException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (InvalidRoleException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (InvalidInputException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (InvalidEntryStateException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (WorkflowException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ public void testToXML() throws Exception {
+ DefaultConfiguration config = new DefaultConfiguration();
+ config.load(null);
+ WorkflowDescriptor workflowDescriptor = config.getWorkflow("entrevista");
+ OSWorkflowProcess process = new OSWorkflowParser().parseOSWorkflow(workflowDescriptor);
+
+ String processXML = XmlOSWorkflowProcessDumper.INSTANCE.dump(process);
+ System.out.println(processXML);
+
+ XmlProcessReader reader = new XmlProcessReader(
+ new PackageBuilderConfiguration().getSemanticModules());
+ System.setProperty( "drools.schema.validating", "false" );
+ OSWorkflowProcess process2 = (OSWorkflowProcess) reader.read(new StringReader(processXML));
+ assertNotNull(process2);
+ }
+
+}
Deleted: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/ComplexProcessTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/ComplexProcessTestCase.java 2009-02-26 17:20:59 UTC (rev 25441)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/ComplexProcessTestCase.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -1,100 +0,0 @@
-package org.drools.osworkflow.test;
-
-import java.io.StringReader;
-import java.util.Collection;
-import java.util.Collections;
-
-import junit.framework.TestCase;
-
-import org.drools.compiler.PackageBuilderConfiguration;
-import org.drools.osworkflow.DroolsWorkflow;
-import org.drools.osworkflow.OSWorkflowParser;
-import org.drools.osworkflow.core.OSWorkflowProcess;
-import org.drools.osworkflow.xml.XmlOSWorkflowProcessDumper;
-import org.drools.xml.XmlProcessReader;
-
-import com.opensymphony.workflow.InvalidActionException;
-import com.opensymphony.workflow.InvalidEntryStateException;
-import com.opensymphony.workflow.InvalidInputException;
-import com.opensymphony.workflow.InvalidRoleException;
-import com.opensymphony.workflow.Workflow;
-import com.opensymphony.workflow.WorkflowException;
-import com.opensymphony.workflow.config.DefaultConfiguration;
-import com.opensymphony.workflow.loader.WorkflowDescriptor;
-import com.opensymphony.workflow.spi.Step;
-
-public class ComplexProcessTestCase extends TestCase {
-
- public void testComplexProcess() {
- Workflow workflow = new DroolsWorkflow();
- DefaultConfiguration config = new DefaultConfiguration();
- workflow.setConfiguration(config);
- try {
- long id = workflow.initialize("entrevista", 1, null);
- Collection<Step> currentSteps = workflow.getCurrentSteps(id);
- // verify we only have one current step
- assertEquals("Unexpected number of current steps", 1, currentSteps.size());
- // verify it's step 1
- Step currentStep = currentSteps.iterator().next();
- assertEquals("Unexpected current step", 1, currentStep.getStepId());
-
- int[] availableActions = workflow.getAvailableActions(id, Collections.EMPTY_MAP);
- // verify we only have 6 available actions
- assertEquals("Unexpected number of available actions", 6, availableActions.length);
- workflow.doAction(id, 2, null);
- currentSteps = workflow.getCurrentSteps(id);
- // verify we have one current step
- assertEquals("Unexpected number of current steps", 1, currentSteps.size());
- // verify it's step 2
- currentStep = currentSteps.iterator().next();
- assertEquals("Unexpected current step", 2, currentStep.getStepId());
-
- availableActions = workflow.getAvailableActions(id, Collections.EMPTY_MAP);
- // verify we have 6 available action
- assertEquals("Unexpected number of available actions", 6, availableActions.length);
- // //verify it's action 3
- // assertEquals("Unexpected available action", 3,
- // availableActions[0]);
- workflow.doAction(id, 6, null);
- currentSteps = workflow.getCurrentSteps(id);
- // verify we have no current Step (since we ended the process)
- assertEquals("Unexpected number of current steps", 0, currentSteps.size());
- // verify we have no available action
- availableActions = workflow.getAvailableActions(id, Collections.EMPTY_MAP);
- assertEquals("Unexpected number of available actions", 0, availableActions.length);
-
- } catch (InvalidActionException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InvalidRoleException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InvalidInputException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InvalidEntryStateException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (WorkflowException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-
- public void testToXML() throws Exception {
- DefaultConfiguration config = new DefaultConfiguration();
- config.load(null);
- WorkflowDescriptor workflowDescriptor = config.getWorkflow("entrevista");
- OSWorkflowProcess process = new OSWorkflowParser().parseOSWorkflow(workflowDescriptor);
-
- String processXML = XmlOSWorkflowProcessDumper.INSTANCE.dump(process);
- System.out.println(processXML);
-
- XmlProcessReader reader = new XmlProcessReader(
- new PackageBuilderConfiguration().getSemanticModules());
- System.setProperty( "drools.schema.validating", "false" );
- OSWorkflowProcess process2 = (OSWorkflowProcess) reader.read(new StringReader(processXML));
- assertNotNull(process2);
- }
-
-}
Deleted: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/DroolsOSWorkFlowTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/DroolsOSWorkFlowTestCase.java 2009-02-26 17:20:59 UTC (rev 25441)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/DroolsOSWorkFlowTestCase.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -1,132 +0,0 @@
-package org.drools.osworkflow.test;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.drools.osworkflow.DroolsWorkflow;
-
-import com.opensymphony.workflow.InvalidInputException;
-import com.opensymphony.workflow.Workflow;
-import com.opensymphony.workflow.WorkflowException;
-import com.opensymphony.workflow.config.DefaultConfiguration;
-import com.opensymphony.workflow.spi.Step;
-import com.opensymphony.workflow.spi.WorkflowEntry;
-
-public class DroolsOSWorkFlowTestCase extends TestCase {
-
- private String resource;
-
-
- private DroolsOSWorkFlowTestCase(String xmlname) {
- super("testPrimer");
- this.resource = xmlname;
- }
-
- public static TestSuite suite() {
- InnerTestSuite suite = new InnerTestSuite();
- addResources(suite);
- return suite;
- }
-
-
- public static void addResources(InnerTestSuite suite) {
- suite.addTestFor("simple");
- }
-
-
- /**
- * Testcase.
- */
- public void testPrimer() {
- Workflow workflow = new DroolsWorkflow();
- DefaultConfiguration config = new DefaultConfiguration();
- workflow.setConfiguration(config);
- try {
- long workflowId = workflow.initialize(this.resource, 1, null);
-
- Collection<Step> currentSteps = workflow.getCurrentSteps(workflowId);
- //verify we only have one current step
- assertNumberOfCurrentSteps(1, currentSteps.size());
- //verify it's step 1
- Step currentStep = currentSteps.iterator().next();
- assertCurrentStep(1,currentStep);
- int[] availableActions = workflow.getAvailableActions(workflowId, Collections.EMPTY_MAP);
- //verify we only have one available action
- assertEquals("Unexpected number of available actions", 1, availableActions.length);
- //verify it's action 2
- assertEquals("Unexpected available action", 2, availableActions[0]);
-
- workflow.doAction(workflowId, 2, null);
- currentSteps = workflow.getCurrentSteps(workflowId);
- //verify we only have one current step
- assertEquals("Unexpected number of current steps", 1, currentSteps.size());
- //verify it's step 1
- currentStep = currentSteps.iterator().next();
- assertEquals("Unexpected current step", 1, currentStep.getStepId());
-
- availableActions = workflow.getAvailableActions(workflowId, Collections.EMPTY_MAP);
- //verify we only have one available action
- assertEquals("Unexpected number of available actions", 1, availableActions.length);
- //verify it's action 3
- assertEquals("Unexpected available action", 3, availableActions[0]);
-
- workflow.doAction(workflowId, 3, null);
- currentSteps = workflow.getCurrentSteps(workflowId);
- //verify we only have no more current steps
- assertEquals("Unexpected number of current steps", 0, currentSteps.size());
- //verify process completed
- assertEquals("Unexpected state", WorkflowEntry.COMPLETED, workflow.getEntryState(workflowId));
-
- availableActions = workflow.getAvailableActions(workflowId, Collections.EMPTY_MAP);
- //verify we only have no available action
- assertEquals("Unexpected number of available actions", 0, availableActions.length);
- }
- catch (InvalidInputException e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- catch (WorkflowException e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- private void assertCurrentStep (int stepIteration , long expectedStepId) {
- assertEquals("Unexpected current step", stepIteration, expectedStepId);
- }
-
- public void assertCurrentStep (int stepIteration , Step currentStep) {
- assertCurrentStep (stepIteration, currentStep.getId());
- }
-
- public void assertAvaliableActions (int stepIdIteration, int expectedAvaliableActions) {
- assertEquals("Unexpected number of available actions", 1, expectedAvaliableActions);
- }
-
- public void assertWFState (Workflow workflow, int stepId , int expectedStateId) {
-// int wId = workflow.getHistorySteps(id)
-// assertEquals("Unexpected state", expectedStateId, workflow.getEntryState(id))
- }
-
- public void assertNumberOfCurrentSteps(int stepIteration , int expectedSteps) {
- assertEquals("Unexpected number of current steps", stepIteration, expectedSteps);
- }
-
- /**
- * @author ar26818347
- */
- private static class InnerTestSuite extends TestSuite {
-
- public DroolsOSWorkFlowTestCase addTestFor(String xmlname) {
- DroolsOSWorkFlowTestCase test = new DroolsOSWorkFlowTestCase(xmlname);
- this.addTest(test);
- return test;
- }
-
-
- }
-}
-
Copied: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/SimpleDroolsFlowTest.java (from rev 25440, labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/SimpleDroolsFlowTestCase.java)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/SimpleDroolsFlowTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/SimpleDroolsFlowTest.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -0,0 +1,43 @@
+package org.drools.osworkflow.test;
+
+import java.io.InputStreamReader;
+import java.io.Reader;
+
+import junit.framework.TestCase;
+
+import org.drools.RuleBase;
+import org.drools.RuleBaseFactory;
+import org.drools.StatefulSession;
+import org.drools.compiler.PackageBuilder;
+import org.drools.rule.Package;
+
+public class SimpleDroolsFlowTest extends TestCase {
+
+ public void testSimple() {
+ try {
+ // load the process
+ RuleBase ruleBase = createKnowledgeBase();
+ // create a new session
+ StatefulSession session = ruleBase.newStatefulSession();
+ // start a new process instance
+ session.startProcess("simple");
+ } catch (Throwable t) {
+ t.printStackTrace();
+ }
+ }
+
+ private RuleBase createKnowledgeBase() throws Exception {
+ // create a builder
+ PackageBuilder builder = new PackageBuilder();
+ // load the process
+ Reader source = new InputStreamReader(SimpleDroolsFlowTest.class
+ .getResourceAsStream("/simple.rf"));
+ builder.addProcessFromXml(source);
+ // create the knowledge base
+ Package pkg = builder.getPackage();
+ RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+ ruleBase.addPackage(pkg);
+ return ruleBase;
+ }
+
+}
Deleted: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/SimpleDroolsFlowTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/SimpleDroolsFlowTestCase.java 2009-02-26 17:20:59 UTC (rev 25441)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/SimpleDroolsFlowTestCase.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -1,43 +0,0 @@
-package org.drools.osworkflow.test;
-
-import java.io.InputStreamReader;
-import java.io.Reader;
-
-import junit.framework.TestCase;
-
-import org.drools.RuleBase;
-import org.drools.RuleBaseFactory;
-import org.drools.StatefulSession;
-import org.drools.compiler.PackageBuilder;
-import org.drools.rule.Package;
-
-public class SimpleDroolsFlowTestCase extends TestCase {
-
- public void testSimple() {
- try {
- // load the process
- RuleBase ruleBase = createKnowledgeBase();
- // create a new session
- StatefulSession session = ruleBase.newStatefulSession();
- // start a new process instance
- session.startProcess("simple");
- } catch (Throwable t) {
- t.printStackTrace();
- }
- }
-
- private RuleBase createKnowledgeBase() throws Exception {
- // create a builder
- PackageBuilder builder = new PackageBuilder();
- // load the process
- Reader source = new InputStreamReader(SimpleDroolsFlowTestCase.class
- .getResourceAsStream("/simple.rf"));
- builder.addProcessFromXml(source);
- // create the knowledge base
- Package pkg = builder.getPackage();
- RuleBase ruleBase = RuleBaseFactory.newRuleBase();
- ruleBase.addPackage(pkg);
- return ruleBase;
- }
-
-}
Copied: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/AbstractJPAPersistenceTest.java (from rev 25440, labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/AbstractJPAPersistenceTestCase.java)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/AbstractJPAPersistenceTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/AbstractJPAPersistenceTest.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -0,0 +1,89 @@
+package org.drools.osworkflow.test.persistence;
+
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Properties;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+import junit.framework.TestCase;
+
+import org.drools.RuleBase;
+import org.drools.RuleBaseConfiguration;
+import org.drools.RuleBaseFactory;
+import org.drools.compiler.PackageBuilder;
+import org.drools.marshalling.impl.ProcessMarshallerRegistry;
+import org.drools.osworkflow.core.OSWorkflowProcess;
+import org.drools.osworkflow.persistence.marshaller.OSWorkflowProcessInstanceMarshaller;
+import org.drools.rule.Package;
+
+import bitronix.tm.resource.jdbc.PoolingDataSource;
+
+public abstract class AbstractJPAPersistenceTest extends TestCase {
+
+ PoolingDataSource ds1;
+ private EntityManagerFactory emf;
+
+ protected void setUp() {
+ ds1 = new PoolingDataSource();
+ ds1.setUniqueName( "jdbc/testDS1" );
+ ds1.setClassName( "org.h2.jdbcx.JdbcDataSource" );
+ ds1.setMaxPoolSize( 3 );
+ ds1.setAllowLocalTransactions( true );
+ ds1.getDriverProperties().put( "user",
+ "sa" );
+ ds1.getDriverProperties().put( "password",
+ "sasa" );
+ ds1.getDriverProperties().put( "URL",
+ "jdbc:h2:mem:mydb" );
+ ds1.init();
+
+ emf = Persistence.createEntityManagerFactory( "org.drools.persistence.jpa" );
+ }
+
+ protected void tearDown() {
+ emf.close();
+ ds1.close();
+ }
+
+ public EntityManagerFactory getEmf() {
+ return emf;
+ }
+
+ protected Properties setupCommonProperties() {
+ Properties properties = new Properties();
+ properties.setProperty("drools.commandService", "org.drools.persistence.session.SingleSessionCommandService");
+ properties.setProperty("drools.processInstanceManagerFactory", "org.drools.persistence.processinstance.JPAProcessInstanceManagerFactory");
+ properties.setProperty("drools.workItemManagerFactory", "org.drools.persistence.processinstance.JPAWorkItemManagerFactory");
+ properties.setProperty("drools.processSignalManagerFactory", "org.drools.persistence.processinstance.JPASignalManagerFactory");
+ //TODO configure this with IOC
+ ProcessMarshallerRegistry.INSTANCE.register(OSWorkflowProcess.OSWORKFLOW_TYPE, OSWorkflowProcessInstanceMarshaller.INSTANCE);
+ return properties;
+ }
+
+ /**
+ * Process definition.
+ */
+ protected static RuleBase createKnowledgeBase(RuleBaseConfiguration conf, String resourceName) {
+ try {
+ // create a builder
+ PackageBuilder builder = new PackageBuilder();
+ // load the process
+ Reader source = new InputStreamReader(OSWorkFlowPersistenceTest.class
+ .getResourceAsStream(resourceName));
+ builder.addProcessFromXml(source);
+ // create the knowledge base
+ Package pkg = builder.getPackage();
+ RuleBase ruleBase = RuleBaseFactory.newRuleBase(conf);
+ ruleBase.addPackage(pkg);
+ return ruleBase;
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ fail(e.getMessage());
+ return null;
+ }
+ }
+
+}
Property changes on: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/AbstractJPAPersistenceTest.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/AbstractJPAPersistenceTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/AbstractJPAPersistenceTestCase.java 2009-02-26 17:20:59 UTC (rev 25441)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/AbstractJPAPersistenceTestCase.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -1,78 +0,0 @@
-package org.drools.osworkflow.test.persistence;
-
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.Properties;
-
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-
-import junit.framework.TestCase;
-
-import org.drools.RuleBase;
-import org.drools.RuleBaseConfiguration;
-import org.drools.RuleBaseFactory;
-import org.drools.compiler.PackageBuilder;
-import org.drools.marshalling.ProcessMarshallerRegistry;
-import org.drools.osworkflow.core.OSWorkflowProcess;
-import org.drools.osworkflow.instance.OSWorkflowProcessInstance;
-import org.drools.osworkflow.persistence.marshaller.OSWorkflowProcessInstanceMarshaller;
-import org.drools.rule.Package;
-
-public abstract class AbstractJPAPersistenceTestCase extends TestCase {
-
- private EntityManagerFactory emf;
-
- public EntityManagerFactory getEmf() {
- return emf;
- }
-
- public void setEmf(EntityManagerFactory emf) {
- this.emf = emf;
- }
-
-
- protected void setUp() {
- emf = Persistence.createEntityManagerFactory("org.drools.persistence.jpa");
- }
-
- protected void tearDown() {
- emf.close();
- }
-
- protected Properties setupCommonProperties() {
- Properties properties = new Properties();
- properties.setProperty("drools.commandService", "org.drools.persistence.session.SingleSessionCommandService");
- properties.setProperty("drools.processInstanceManagerFactory", "org.drools.persistence.processinstance.JPAProcessInstanceManagerFactory");
- properties.setProperty("drools.workItemManagerFactory", "org.drools.persistence.processinstance.JPAWorkItemManagerFactory");
- properties.setProperty("drools.processSignalManagerFactory", "org.drools.persistence.processinstance.JPASignalManagerFactory");
- //TODO configure this with IOC
- ProcessMarshallerRegistry.INSTANCE.register(OSWorkflowProcess.OSWORKFLOW_TYPE, OSWorkflowProcessInstanceMarshaller.INSTANCE);
- return properties;
- }
-
- /**
- * Process definition.
- */
- protected static RuleBase createKnowledgeBase(RuleBaseConfiguration conf, String resourceName) {
- try {
- // create a builder
- PackageBuilder builder = new PackageBuilder();
- // load the process
- Reader source = new InputStreamReader(OSWorkFlowPersistenceTestCase.class
- .getResourceAsStream(resourceName));
- builder.addProcessFromXml(source);
- // create the knowledge base
- Package pkg = builder.getPackage();
- RuleBase ruleBase = RuleBaseFactory.newRuleBase(conf);
- ruleBase.addPackage(pkg);
- return ruleBase;
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- fail(e.getMessage());
- return null;
- }
- }
-
-}
Copied: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/ComplexProcessPersistenceTest.java (from rev 25440, labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/ComplexProcessPersistenceTestCase.java)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/ComplexProcessPersistenceTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/ComplexProcessPersistenceTest.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -0,0 +1,75 @@
+package org.drools.osworkflow.test.persistence;
+
+import java.util.Properties;
+
+import org.drools.KnowledgeBaseFactory;
+import org.drools.RuleBase;
+import org.drools.RuleBaseConfiguration;
+import org.drools.SessionConfiguration;
+import org.drools.osworkflow.core.command.DoActionCommand;
+import org.drools.persistence.session.SingleSessionCommandService;
+import org.drools.process.command.GetProcessInstanceCommand;
+import org.drools.process.command.StartProcessCommand;
+import org.drools.runtime.Environment;
+import org.drools.runtime.EnvironmentName;
+import org.drools.runtime.process.ProcessInstance;
+
+import bitronix.tm.TransactionManagerServices;
+
+public class ComplexProcessPersistenceTest extends AbstractJPAPersistenceTest {
+
+ public void testComplex() {
+ Environment environment = KnowledgeBaseFactory.newEnvironment();
+ environment.set( EnvironmentName.ENTITY_MANAGER_FACTORY, getEmf() );
+ environment.set( "drools.TransactionManager",
+ TransactionManagerServices.getTransactionManager() );
+
+ Properties properties = setupCommonProperties();
+ RuleBaseConfiguration conf = new RuleBaseConfiguration(properties);
+ // load the process
+ RuleBase ruleBase = createKnowledgeBase(conf,"/entrevistarf.rf");
+
+ SessionConfiguration config = new SessionConfiguration(properties);
+
+ SingleSessionCommandService service = new SingleSessionCommandService(ruleBase, config, environment);
+ int sessionId = service.getSessionId();
+ StartProcessCommand startProcessCommand = new StartProcessCommand();
+ startProcessCommand.setProcessId("entrevista");
+ ProcessInstance processInstance = (ProcessInstance) service.execute(startProcessCommand);
+ System.out.println("Started process instance " + processInstance.getId());
+
+ service = new SingleSessionCommandService(ruleBase, config, environment, sessionId);
+ GetProcessInstanceCommand getProcessInstanceCommand = new GetProcessInstanceCommand();
+ getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
+ processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
+ assertNotNull(processInstance);
+ System.out.println("Now working with processInstance " + processInstance.getId());
+
+ service = new SingleSessionCommandService(ruleBase, config, environment, sessionId);
+ DoActionCommand doActionCmd = new DoActionCommand();
+ doActionCmd.setProcessInstanceId(processInstance.getId());
+ doActionCmd.setActionId(2); //Action to be executed at current step
+ service.execute(doActionCmd);
+
+ service = new SingleSessionCommandService(ruleBase, config, environment, sessionId);
+ getProcessInstanceCommand = new GetProcessInstanceCommand();
+ getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
+ processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
+ assertNotNull(processInstance);
+ System.out.println("Now working with processInstance " + processInstance.getId());
+
+
+ service = new SingleSessionCommandService(ruleBase, config, environment, sessionId);
+ doActionCmd = new DoActionCommand();
+ doActionCmd.setProcessInstanceId(processInstance.getId());
+ doActionCmd.setActionId(4); //Action to be executed at current step
+ service.execute(doActionCmd);
+
+ service = new SingleSessionCommandService(ruleBase, config, environment, sessionId);
+ getProcessInstanceCommand = new GetProcessInstanceCommand();
+ getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
+ processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
+ assertNull(processInstance);
+ }
+
+}
Property changes on: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/ComplexProcessPersistenceTest.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/ComplexProcessPersistenceTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/ComplexProcessPersistenceTestCase.java 2009-02-26 17:20:59 UTC (rev 25441)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/ComplexProcessPersistenceTestCase.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -1,68 +0,0 @@
-package org.drools.osworkflow.test.persistence;
-
-import java.util.Properties;
-
-import org.drools.RuleBase;
-import org.drools.RuleBaseConfiguration;
-import org.drools.SessionConfiguration;
-import org.drools.impl.EnvironmentFactory;
-import org.drools.osworkflow.core.command.DoActionCommand;
-import org.drools.persistence.session.SingleSessionCommandService;
-import org.drools.process.command.GetProcessInstanceCommand;
-import org.drools.process.command.StartProcessCommand;
-import org.drools.runtime.Environment;
-import org.drools.runtime.process.ProcessInstance;
-
-public class ComplexProcessPersistenceTestCase extends AbstractJPAPersistenceTestCase {
-
- public void testComplex() {
- Properties properties = setupCommonProperties();
- RuleBaseConfiguration conf = new RuleBaseConfiguration(properties);
- // load the process
- RuleBase ruleBase = createKnowledgeBase(conf,"/entrevistarf.rf");
-
- SessionConfiguration config = new SessionConfiguration(properties);
- Environment environment = EnvironmentFactory.newEnvironment();
-
- SingleSessionCommandService service = new SingleSessionCommandService(ruleBase, config, environment);
- int sessionId = service.getSessionId();
- StartProcessCommand startProcessCommand = new StartProcessCommand();
- startProcessCommand.setProcessId("entrevista");
- ProcessInstance processInstance = (ProcessInstance) service.execute(startProcessCommand);
- System.out.println("Started process instance " + processInstance.getId());
-
- service = new SingleSessionCommandService(ruleBase, config, environment, sessionId);
- GetProcessInstanceCommand getProcessInstanceCommand = new GetProcessInstanceCommand();
- getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
- processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
- assertNotNull(processInstance);
- System.out.println("Now working with processInstance " + processInstance.getId());
-
- service = new SingleSessionCommandService(ruleBase, config, environment, sessionId);
- DoActionCommand doActionCmd = new DoActionCommand();
- doActionCmd.setProcessInstanceId(processInstance.getId());
- doActionCmd.setActionId(2); //Action to be executed at current step
- service.execute(doActionCmd);
-
- service = new SingleSessionCommandService(ruleBase, config, environment, sessionId);
- getProcessInstanceCommand = new GetProcessInstanceCommand();
- getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
- processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
- assertNotNull(processInstance);
- System.out.println("Now working with processInstance " + processInstance.getId());
-
-
- service = new SingleSessionCommandService(ruleBase, config, environment, sessionId);
- doActionCmd = new DoActionCommand();
- doActionCmd.setProcessInstanceId(processInstance.getId());
- doActionCmd.setActionId(4); //Action to be executed at current step
- service.execute(doActionCmd);
-
- service = new SingleSessionCommandService(ruleBase, config, environment, sessionId);
- getProcessInstanceCommand = new GetProcessInstanceCommand();
- getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
- processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
- assertNull(processInstance);
- }
-
-}
Copied: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceSplitJoinTest.java (from rev 25440, labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceSplitJoinTestCase.java)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceSplitJoinTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceSplitJoinTest.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -0,0 +1,113 @@
+package org.drools.osworkflow.test.persistence;
+
+import java.util.Properties;
+
+import org.drools.KnowledgeBaseFactory;
+import org.drools.RuleBase;
+import org.drools.RuleBaseConfiguration;
+import org.drools.SessionConfiguration;
+import org.drools.osworkflow.core.command.DoActionCommand;
+import org.drools.osworkflow.instance.OSWorkflowProcessInstance;
+import org.drools.osworkflow.instance.node.StepNodeInstance;
+import org.drools.persistence.session.SingleSessionCommandService;
+import org.drools.process.command.GetProcessInstanceCommand;
+import org.drools.process.command.StartProcessCommand;
+import org.drools.runtime.Environment;
+import org.drools.runtime.EnvironmentName;
+import org.drools.runtime.process.ProcessInstance;
+
+import bitronix.tm.TransactionManagerServices;
+
+public class OSWorkFlowPersistenceSplitJoinTest extends AbstractJPAPersistenceTest {
+
+ public void testPersistence() {
+ Environment environment = KnowledgeBaseFactory.newEnvironment();
+ environment.set( EnvironmentName.ENTITY_MANAGER_FACTORY, getEmf() );
+ environment.set( "drools.TransactionManager",
+ TransactionManagerServices.getTransactionManager() );
+
+ Properties properties = setupCommonProperties();
+ RuleBaseConfiguration conf = new RuleBaseConfiguration(properties);
+ // load the process
+ RuleBase ruleBase = createKnowledgeBase(conf,"/simple2rf.rf");
+
+ SessionConfiguration config = new SessionConfiguration(properties);
+
+ SingleSessionCommandService service = new SingleSessionCommandService(ruleBase, config, environment);
+ StartProcessCommand startProcessCommand = new StartProcessCommand();
+ startProcessCommand.setProcessId("simple2");
+ ProcessInstance processInstance = (ProcessInstance) service.execute(startProcessCommand);
+ System.out.println("Started process instance " + processInstance.getId());
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ GetProcessInstanceCommand getProcessInstanceCommand = new GetProcessInstanceCommand();
+ getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
+ processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
+ assertNotNull(processInstance);
+ System.out.println("Now working with processInstance " + processInstance.getId());
+ assertEquals("Active",
+ ((StepNodeInstance)
+ ((OSWorkflowProcessInstance)processInstance)
+ .getNodeInstances().iterator().next()).getStatus());
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ DoActionCommand doActionCmd = new DoActionCommand();
+ doActionCmd.setProcessInstanceId(processInstance.getId());
+ doActionCmd.setActionId(2); //Action to be executed at current step
+ service.execute(doActionCmd);
+
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ getProcessInstanceCommand = new GetProcessInstanceCommand();
+ getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
+ processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
+ assertNotNull(processInstance);
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ doActionCmd = new DoActionCommand();
+ doActionCmd.setProcessInstanceId(processInstance.getId());
+ doActionCmd.setActionId(3); //Action to be executed at current step
+ service.execute(doActionCmd);
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ getProcessInstanceCommand = new GetProcessInstanceCommand();
+ getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
+ processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
+ assertNotNull(processInstance);
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ doActionCmd = new DoActionCommand();
+ doActionCmd.setProcessInstanceId(processInstance.getId());
+ doActionCmd.setActionId(4); //Action to be executed at current step
+ service.execute(doActionCmd);
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ getProcessInstanceCommand = new GetProcessInstanceCommand();
+ getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
+ processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
+ assertNotNull(processInstance);
+
+ assertEquals("Active",
+ ((StepNodeInstance)
+ ((OSWorkflowProcessInstance)processInstance)
+ .getNodeInstances().iterator().next()).getStatus());
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ doActionCmd = new DoActionCommand();
+ doActionCmd.setProcessInstanceId(processInstance.getId());
+ doActionCmd.setActionId(5); //Action to be executed at current step
+ service.execute(doActionCmd);
+
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ getProcessInstanceCommand = new GetProcessInstanceCommand();
+ getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
+ processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
+ assertNull(processInstance);
+
+ }
+
+
+
+
+}
Property changes on: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceSplitJoinTest.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceSplitJoinTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceSplitJoinTestCase.java 2009-02-26 17:20:59 UTC (rev 25441)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceSplitJoinTestCase.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -1,105 +0,0 @@
-package org.drools.osworkflow.test.persistence;
-
-import java.util.Properties;
-
-import org.drools.RuleBase;
-import org.drools.RuleBaseConfiguration;
-import org.drools.SessionConfiguration;
-import org.drools.osworkflow.core.command.DoActionCommand;
-import org.drools.osworkflow.instance.OSWorkflowProcessInstance;
-import org.drools.osworkflow.instance.node.StepNodeInstance;
-import org.drools.persistence.session.SingleSessionCommandService;
-import org.drools.process.command.GetProcessInstanceCommand;
-import org.drools.process.command.StartProcessCommand;
-import org.drools.runtime.process.ProcessInstance;
-
-public class OSWorkFlowPersistenceSplitJoinTestCase extends AbstractJPAPersistenceTestCase {
-
-
- public void testPersistence() {
- Properties properties = setupCommonProperties();
- RuleBaseConfiguration conf = new RuleBaseConfiguration(properties);
- // load the process
- RuleBase ruleBase = createKnowledgeBase(conf,"/simple2rf.rf");
-
- SessionConfiguration config = new SessionConfiguration(properties);
-
-
- SingleSessionCommandService service = new SingleSessionCommandService(ruleBase, config);
- StartProcessCommand startProcessCommand = new StartProcessCommand();
- startProcessCommand.setProcessId("simple2");
- ProcessInstance processInstance = (ProcessInstance) service.execute(startProcessCommand);
- System.out.println("Started process instance " + processInstance.getId());
-
- service = new SingleSessionCommandService(ruleBase, config);
- GetProcessInstanceCommand getProcessInstanceCommand = new GetProcessInstanceCommand();
- getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
- processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
- assertNotNull(processInstance);
- System.out.println("Now working with processInstance " + processInstance.getId());
- assertEquals("Active",
- ((StepNodeInstance)
- ((OSWorkflowProcessInstance)processInstance)
- .getNodeInstances().iterator().next()).getStatus());
-
- service = new SingleSessionCommandService(ruleBase, config);
- DoActionCommand doActionCmd = new DoActionCommand();
- doActionCmd.setProcessInstanceId(processInstance.getId());
- doActionCmd.setActionId(2); //Action to be executed at current step
- service.execute(doActionCmd);
-
-
- service = new SingleSessionCommandService(ruleBase, config);
- getProcessInstanceCommand = new GetProcessInstanceCommand();
- getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
- processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
- assertNotNull(processInstance);
-
- service = new SingleSessionCommandService(ruleBase, config);
- doActionCmd = new DoActionCommand();
- doActionCmd.setProcessInstanceId(processInstance.getId());
- doActionCmd.setActionId(3); //Action to be executed at current step
- service.execute(doActionCmd);
-
- service = new SingleSessionCommandService(ruleBase, config);
- getProcessInstanceCommand = new GetProcessInstanceCommand();
- getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
- processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
- assertNotNull(processInstance);
-
- service = new SingleSessionCommandService(ruleBase, config);
- doActionCmd = new DoActionCommand();
- doActionCmd.setProcessInstanceId(processInstance.getId());
- doActionCmd.setActionId(4); //Action to be executed at current step
- service.execute(doActionCmd);
-
- service = new SingleSessionCommandService(ruleBase, config);
- getProcessInstanceCommand = new GetProcessInstanceCommand();
- getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
- processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
- assertNotNull(processInstance);
-
- assertEquals("Active",
- ((StepNodeInstance)
- ((OSWorkflowProcessInstance)processInstance)
- .getNodeInstances().iterator().next()).getStatus());
-
- service = new SingleSessionCommandService(ruleBase, config);
- doActionCmd = new DoActionCommand();
- doActionCmd.setProcessInstanceId(processInstance.getId());
- doActionCmd.setActionId(5); //Action to be executed at current step
- service.execute(doActionCmd);
-
-
- service = new SingleSessionCommandService(ruleBase, config);
- getProcessInstanceCommand = new GetProcessInstanceCommand();
- getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
- processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
- assertNull(processInstance);
-
- }
-
-
-
-
-}
Copied: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceTest.java (from rev 25440, labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceTestCase.java)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceTest.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -0,0 +1,97 @@
+package org.drools.osworkflow.test.persistence;
+
+import java.util.Properties;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+import org.drools.KnowledgeBaseFactory;
+import org.drools.RuleBase;
+import org.drools.RuleBaseConfiguration;
+import org.drools.SessionConfiguration;
+import org.drools.osworkflow.core.command.DoActionCommand;
+import org.drools.osworkflow.instance.OSWorkflowProcessInstance;
+import org.drools.osworkflow.instance.node.StepNodeInstance;
+import org.drools.persistence.session.SingleSessionCommandService;
+import org.drools.process.command.GetProcessInstanceCommand;
+import org.drools.process.command.StartProcessCommand;
+import org.drools.runtime.Environment;
+import org.drools.runtime.EnvironmentName;
+import org.drools.runtime.process.ProcessInstance;
+
+import bitronix.tm.TransactionManagerServices;
+import bitronix.tm.resource.jdbc.PoolingDataSource;
+
+public class OSWorkFlowPersistenceTest extends AbstractJPAPersistenceTest {
+
+ public void testPersistence() {
+ Environment environment = KnowledgeBaseFactory.newEnvironment();
+ environment.set( EnvironmentName.ENTITY_MANAGER_FACTORY, getEmf() );
+ environment.set( "drools.TransactionManager",
+ TransactionManagerServices.getTransactionManager() );
+
+ Properties properties = setupCommonProperties();
+ RuleBaseConfiguration conf = new RuleBaseConfiguration(properties);
+ // load the process
+ RuleBase ruleBase = createKnowledgeBase(conf,"/simplerf.rf");
+
+ SessionConfiguration config = new SessionConfiguration(properties);
+
+ SingleSessionCommandService service = new SingleSessionCommandService(ruleBase,config, environment);
+ StartProcessCommand startProcessCommand = new StartProcessCommand();
+ startProcessCommand.setProcessId("simple");
+ ProcessInstance processInstance = (ProcessInstance) service.execute(startProcessCommand);
+ System.out.println("Started process instance " + processInstance.getId());
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ GetProcessInstanceCommand getProcessInstanceCommand = new GetProcessInstanceCommand();
+ getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
+ processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
+ assertNotNull(processInstance);
+ System.out.println("Now working with processInstance " + processInstance.getId());
+ assertEquals("Queued",
+ ((StepNodeInstance)
+ ((OSWorkflowProcessInstance)processInstance)
+ .getNodeInstances().iterator().next()).getStatus());
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ DoActionCommand doActionCmd = new DoActionCommand();
+ doActionCmd.setProcessInstanceId(processInstance.getId());
+ doActionCmd.setActionId(2); //Action to be executed at current step
+ service.execute(doActionCmd);
+
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ getProcessInstanceCommand = new GetProcessInstanceCommand();
+ getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
+ processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
+ assertNotNull(processInstance);
+
+ assertEquals("Underway",
+ ((StepNodeInstance)
+ ((OSWorkflowProcessInstance)processInstance)
+ .getNodeInstances().iterator().next()).getStatus());
+ System.out.println("Now working with processInstance " + processInstance.getId());
+
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ doActionCmd = new DoActionCommand();
+ doActionCmd.setProcessInstanceId(processInstance.getId());
+ doActionCmd.setActionId(3); //Action to be executed at current step
+ service.execute(doActionCmd);
+
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ getProcessInstanceCommand = new GetProcessInstanceCommand();
+ getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
+ processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
+ //Because it is finished the instance will not longer be available
+ assertNull(processInstance);
+
+
+ }
+
+
+
+
+}
Deleted: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceTestCase.java 2009-02-26 17:20:59 UTC (rev 25441)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceTestCase.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -1,84 +0,0 @@
-package org.drools.osworkflow.test.persistence;
-
-import java.util.Properties;
-
-import org.drools.RuleBase;
-import org.drools.RuleBaseConfiguration;
-import org.drools.SessionConfiguration;
-import org.drools.osworkflow.core.command.DoActionCommand;
-import org.drools.osworkflow.instance.OSWorkflowProcessInstance;
-import org.drools.osworkflow.instance.node.StepNodeInstance;
-import org.drools.persistence.session.SingleSessionCommandService;
-import org.drools.process.command.GetProcessInstanceCommand;
-import org.drools.process.command.StartProcessCommand;
-import org.drools.runtime.process.ProcessInstance;
-
-public class OSWorkFlowPersistenceTestCase extends AbstractJPAPersistenceTestCase {
-
-
- public void testPersistence() {
- Properties properties = setupCommonProperties();
- RuleBaseConfiguration conf = new RuleBaseConfiguration(properties);
- // load the process
- RuleBase ruleBase = createKnowledgeBase(conf,"/simplerf.rf");
-
- SessionConfiguration config = new SessionConfiguration(properties);
-
- SingleSessionCommandService service = new SingleSessionCommandService(ruleBase,config);
- StartProcessCommand startProcessCommand = new StartProcessCommand();
- startProcessCommand.setProcessId("simple");
- ProcessInstance processInstance = (ProcessInstance) service.execute(startProcessCommand);
- System.out.println("Started process instance " + processInstance.getId());
-
- service = new SingleSessionCommandService(ruleBase, config);
- GetProcessInstanceCommand getProcessInstanceCommand = new GetProcessInstanceCommand();
- getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
- processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
- assertNotNull(processInstance);
- System.out.println("Now working with processInstance " + processInstance.getId());
- assertEquals("Queued",
- ((StepNodeInstance)
- ((OSWorkflowProcessInstance)processInstance)
- .getNodeInstances().iterator().next()).getStatus());
-
- service = new SingleSessionCommandService(ruleBase, config);
- DoActionCommand doActionCmd = new DoActionCommand();
- doActionCmd.setProcessInstanceId(processInstance.getId());
- doActionCmd.setActionId(2); //Action to be executed at current step
- service.execute(doActionCmd);
-
-
- service = new SingleSessionCommandService(ruleBase, config);
- getProcessInstanceCommand = new GetProcessInstanceCommand();
- getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
- processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
- assertNotNull(processInstance);
-
- assertEquals("Underway",
- ((StepNodeInstance)
- ((OSWorkflowProcessInstance)processInstance)
- .getNodeInstances().iterator().next()).getStatus());
- System.out.println("Now working with processInstance " + processInstance.getId());
-
-
- service = new SingleSessionCommandService(ruleBase, config);
- doActionCmd = new DoActionCommand();
- doActionCmd.setProcessInstanceId(processInstance.getId());
- doActionCmd.setActionId(3); //Action to be executed at current step
- service.execute(doActionCmd);
-
-
- service = new SingleSessionCommandService(ruleBase, config);
- getProcessInstanceCommand = new GetProcessInstanceCommand();
- getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
- processInstance = (ProcessInstance) service.execute(getProcessInstanceCommand);
- //Because it is finished the instance will not longer be available
- assertNull(processInstance);
-
-
- }
-
-
-
-
-}
Copied: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceWFPTest.java (from rev 25440, labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceWFPTestCase.java)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceWFPTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceWFPTest.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -0,0 +1,106 @@
+package org.drools.osworkflow.test.persistence;
+
+/*Author: salaboy */
+
+import java.util.Properties;
+
+import org.drools.KnowledgeBaseFactory;
+import org.drools.RuleBase;
+import org.drools.RuleBaseConfiguration;
+import org.drools.SessionConfiguration;
+import org.drools.osworkflow.core.command.DoActionCommand;
+import org.drools.osworkflow.instance.OSWorkflowProcessInstance;
+import org.drools.osworkflow.instance.node.StepNodeInstance;
+import org.drools.persistence.session.SingleSessionCommandService;
+import org.drools.process.command.GetProcessInstanceCommand;
+import org.drools.process.command.StartProcessCommand;
+import org.drools.runtime.Environment;
+import org.drools.runtime.EnvironmentName;
+import org.drools.runtime.process.ProcessInstance;
+
+import bitronix.tm.TransactionManagerServices;
+
+public class OSWorkFlowPersistenceWFPTest extends AbstractJPAPersistenceTest {
+
+ public void testPersistence() {
+ Environment environment = KnowledgeBaseFactory.newEnvironment();
+ environment.set( EnvironmentName.ENTITY_MANAGER_FACTORY, getEmf() );
+ environment.set( "drools.TransactionManager",
+ TransactionManagerServices.getTransactionManager() );
+
+ Properties properties = setupCommonProperties();
+ RuleBaseConfiguration conf = new RuleBaseConfiguration(properties);
+ // load the process
+ RuleBase ruleBase = createKnowledgeBase(conf, "/wfprf.rf");
+
+ SessionConfiguration config = new SessionConfiguration(properties);
+
+ SingleSessionCommandService service = new SingleSessionCommandService(
+ ruleBase, config, environment);
+ StartProcessCommand startProcessCommand = new StartProcessCommand();
+ startProcessCommand.setProcessId("wfp");
+ /*
+ * Persistence test of variables Map parameters = new HashMap();
+ * ProcessEntity pE = new ProcessEntity(); pE.setId(1);
+ * pE.setTest("This is a Test"); parameters.put("var1", pE);
+ * startProcessCommand.setParameters(parameters);
+ */
+ ProcessInstance processInstance = (ProcessInstance) service
+ .execute(startProcessCommand);
+ System.out.println("Started process instance "
+ + processInstance.getId());
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ GetProcessInstanceCommand getProcessInstanceCommand = new GetProcessInstanceCommand();
+ getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
+ processInstance = (ProcessInstance) service
+ .execute(getProcessInstanceCommand);
+ assertNotNull(processInstance);
+ System.out.println("Now working with processInstance "
+ + processInstance.getId());
+ assertEquals(
+ "Iniciada",
+ ((StepNodeInstance) ((OSWorkflowProcessInstance) processInstance)
+ .getNodeInstances().iterator().next()).getStatus());
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ DoActionCommand doActionCmd = new DoActionCommand();
+ doActionCmd.setProcessInstanceId(processInstance.getId());
+ // doActionCmd.setActionId(2); //Action to be executed at current step
+ doActionCmd.setActionId(4); // Action to be executed at current step
+ service.execute(doActionCmd);
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ getProcessInstanceCommand = new GetProcessInstanceCommand();
+ getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
+ processInstance = (ProcessInstance) service
+ .execute(getProcessInstanceCommand);
+ assertNotNull(processInstance);
+
+ /*
+ * assertEquals("Pend. Finalizacion", ((StepNodeInstance)
+ * ((OSWorkflowProcessInstance)processInstance)
+ * .getNodeInstances().iterator().next()).getStatus());
+ */
+ assertEquals(
+ "Pend. de Finalizacion",
+ ((StepNodeInstance) ((OSWorkflowProcessInstance) processInstance)
+ .getNodeInstances().iterator().next()).getStatus());
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ doActionCmd = new DoActionCommand();
+ doActionCmd.setProcessInstanceId(processInstance.getId());
+ // doActionCmd.setActionId(5); //Action to be executed at current step
+ doActionCmd.setActionId(6); // Action to be executed at current step
+ service.execute(doActionCmd);
+
+ service = new SingleSessionCommandService(ruleBase, config, environment);
+ getProcessInstanceCommand = new GetProcessInstanceCommand();
+ getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
+ processInstance = (ProcessInstance) service
+ .execute(getProcessInstanceCommand);
+ assertNull(processInstance);
+
+ }
+
+}
Property changes on: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceWFPTest.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceWFPTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceWFPTestCase.java 2009-02-26 17:20:59 UTC (rev 25441)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/test/java/org/drools/osworkflow/test/persistence/OSWorkFlowPersistenceWFPTestCase.java 2009-02-26 21:11:24 UTC (rev 25442)
@@ -1,97 +0,0 @@
-package org.drools.osworkflow.test.persistence;
-
-/*Author: salaboy */
-
-import java.util.Properties;
-
-import org.drools.RuleBase;
-import org.drools.RuleBaseConfiguration;
-import org.drools.SessionConfiguration;
-import org.drools.osworkflow.core.command.DoActionCommand;
-import org.drools.osworkflow.instance.OSWorkflowProcessInstance;
-import org.drools.osworkflow.instance.node.StepNodeInstance;
-import org.drools.persistence.session.SingleSessionCommandService;
-import org.drools.process.command.GetProcessInstanceCommand;
-import org.drools.process.command.StartProcessCommand;
-import org.drools.runtime.process.ProcessInstance;
-
-public class OSWorkFlowPersistenceWFPTestCase extends
- AbstractJPAPersistenceTestCase {
-
- public void testPersistence() {
- Properties properties = setupCommonProperties();
- RuleBaseConfiguration conf = new RuleBaseConfiguration(properties);
- // load the process
- RuleBase ruleBase = createKnowledgeBase(conf, "/wfprf.rf");
-
- SessionConfiguration config = new SessionConfiguration(properties);
-
- SingleSessionCommandService service = new SingleSessionCommandService(
- ruleBase, config);
- StartProcessCommand startProcessCommand = new StartProcessCommand();
- startProcessCommand.setProcessId("wfp");
- /*
- * Persistence test of variables Map parameters = new HashMap();
- * ProcessEntity pE = new ProcessEntity(); pE.setId(1);
- * pE.setTest("This is a Test"); parameters.put("var1", pE);
- * startProcessCommand.setParameters(parameters);
- */
- ProcessInstance processInstance = (ProcessInstance) service
- .execute(startProcessCommand);
- System.out.println("Started process instance "
- + processInstance.getId());
-
- service = new SingleSessionCommandService(ruleBase, config);
- GetProcessInstanceCommand getProcessInstanceCommand = new GetProcessInstanceCommand();
- getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
- processInstance = (ProcessInstance) service
- .execute(getProcessInstanceCommand);
- assertNotNull(processInstance);
- System.out.println("Now working with processInstance "
- + processInstance.getId());
- assertEquals(
- "Iniciada",
- ((StepNodeInstance) ((OSWorkflowProcessInstance) processInstance)
- .getNodeInstances().iterator().next()).getStatus());
-
- service = new SingleSessionCommandService(ruleBase, config);
- DoActionCommand doActionCmd = new DoActionCommand();
- doActionCmd.setProcessInstanceId(processInstance.getId());
- // doActionCmd.setActionId(2); //Action to be executed at current step
- doActionCmd.setActionId(4); // Action to be executed at current step
- service.execute(doActionCmd);
-
- service = new SingleSessionCommandService(ruleBase, config);
- getProcessInstanceCommand = new GetProcessInstanceCommand();
- getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
- processInstance = (ProcessInstance) service
- .execute(getProcessInstanceCommand);
- assertNotNull(processInstance);
-
- /*
- * assertEquals("Pend. Finalizacion", ((StepNodeInstance)
- * ((OSWorkflowProcessInstance)processInstance)
- * .getNodeInstances().iterator().next()).getStatus());
- */
- assertEquals(
- "Pend. de Finalizacion",
- ((StepNodeInstance) ((OSWorkflowProcessInstance) processInstance)
- .getNodeInstances().iterator().next()).getStatus());
-
- service = new SingleSessionCommandService(ruleBase, config);
- doActionCmd = new DoActionCommand();
- doActionCmd.setProcessInstanceId(processInstance.getId());
- // doActionCmd.setActionId(5); //Action to be executed at current step
- doActionCmd.setActionId(6); // Action to be executed at current step
- service.execute(doActionCmd);
-
- service = new SingleSessionCommandService(ruleBase, config);
- getProcessInstanceCommand = new GetProcessInstanceCommand();
- getProcessInstanceCommand.setProcessInstanceId(processInstance.getId());
- processInstance = (ProcessInstance) service
- .execute(getProcessInstanceCommand);
- assertNull(processInstance);
-
- }
-
-}
More information about the jboss-svn-commits
mailing list