[jboss-svn-commits] JBL Code SVN: r20324 - in labs/jbossrules/trunk/drools-compiler/src: test/java/org/drools/compiler and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jun 5 05:38:22 EDT 2008
Author: KrisVerlaenen
Date: 2008-06-05 05:38:22 -0400 (Thu, 05 Jun 2008)
New Revision: 20324
Added:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
Log:
- drools-process-enterprise modifications
- runtime upgrading of processes
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java 2008-06-05 09:00:53 UTC (rev 20323)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java 2008-06-05 09:38:22 UTC (rev 20324)
@@ -96,7 +96,7 @@
e.printStackTrace( System.err );
}
buildNodes( process );
- this.packageBuilder.getPackage().addRuleFlow( process );
+ this.packageBuilder.getPackage().addProcess( process );
Package pkg = this.packageBuilder.getPackage();
if ( pkg != null ) {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2008-06-05 09:00:53 UTC (rev 20323)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2008-06-05 09:38:22 UTC (rev 20324)
@@ -1263,13 +1263,13 @@
public void testPackageRuleFlows() throws Exception {
Package pkg = new Package( "boo" );
Process rf = new MockRuleFlow( "1" );
- pkg.addRuleFlow( rf );
+ pkg.addProcess( rf );
assertTrue( pkg.getRuleFlows().containsKey( "1" ) );
assertSame( rf,
pkg.getRuleFlows().get( "1" ) );
Process rf2 = new MockRuleFlow( "2" );
- pkg.addRuleFlow( rf2 );
+ pkg.addProcess( rf2 );
assertTrue( pkg.getRuleFlows().containsKey( "1" ) );
assertSame( rf,
pkg.getRuleFlows().get( "1" ) );
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java 2008-06-05 09:38:22 UTC (rev 20324)
@@ -0,0 +1,113 @@
+package org.drools.integrationtests;
+
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.drools.Person;
+import org.drools.RuleBase;
+import org.drools.RuleBaseConfiguration;
+import org.drools.RuleBaseFactory;
+import org.drools.StatefulSession;
+import org.drools.compiler.PackageBuilder;
+import org.drools.process.instance.ProcessInstance;
+import org.drools.rule.Package;
+import org.drools.workflow.instance.WorkflowProcessInstanceUpgrader;
+
+public class ProcessUpgradeTest extends TestCase {
+
+ public void testUpgrade() throws Exception {
+ String rule = "package org.test;\n";
+ rule += "import org.drools.Person\n";
+ rule += "global java.util.List list\n";
+ rule += "rule \"Rule 1\"\n";
+ rule += " ruleflow-group \"hello\"\n";
+ rule += "when\n";
+ rule += " $p : Person( ) \n";
+ rule += "then\n";
+ rule += " list.add( $p );\n";
+ rule += "end";
+
+ PackageBuilder builder = new PackageBuilder();
+ builder.addPackageFromDrl( new StringReader( rule ));
+
+ String process =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<process xmlns=\"http://drools.org/drools-4.0/process\"\n" +
+ " xmlns:xs=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xs:schemaLocation=\"http://drools.org/drools-4.0/process drools-processes-4.0.xsd\"\n" +
+ " type=\"RuleFlow\" name=\"ruleflow\" id=\"org.test.ruleflow\" package-name=\"org.test\" >\n" +
+ " <header>\n" +
+ " </header>\n" +
+ " <nodes>\n" +
+ " <start id=\"1\" name=\"Start\" />\n" +
+ " <ruleSet id=\"2\" name=\"Hello\" ruleFlowGroup=\"hello\" />\n" +
+ " <end id=\"3\" name=\"End\" />\n" +
+ " </nodes>\n" +
+ " <connections>\n" +
+ " <connection from=\"1\" to=\"2\"/>\n" +
+ " <connection from=\"2\" to=\"3\"/>\n" +
+ " </connections>\n" +
+ "</process>";
+ builder.addProcessFromXml( new StringReader( process ));
+ Package pkg = builder.getPackage();
+
+ RuleBaseConfiguration config = new RuleBaseConfiguration();
+ config.setRuleBaseUpdateHandler(null);
+ final RuleBase ruleBase = RuleBaseFactory.newRuleBase(config);
+ ruleBase.addPackage(pkg);
+
+ StatefulSession session = ruleBase.newStatefulSession();
+
+ List list = new ArrayList();
+ session.setGlobal( "list", list );
+
+ Person p = new Person( "bobba fet", 32);
+ session.insert( p );
+ ProcessInstance processInstance = session.startProcess("org.test.ruleflow");
+
+ assertEquals(1, session.getProcessInstances().size());
+
+ String process2 =
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<process xmlns=\"http://drools.org/drools-4.0/process\"\n" +
+ " xmlns:xs=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
+ " xs:schemaLocation=\"http://drools.org/drools-4.0/process drools-processes-4.0.xsd\"\n" +
+ " type=\"RuleFlow\" name=\"ruleflow\" id=\"org.test.ruleflow2\" package-name=\"org.test\" >\n" +
+ " <header>\n" +
+ " <globals>\n" +
+ " <global identifier=\"list\" type=\"java.util.List\" />\n" +
+ " </globals>\n" +
+ " </header>\n" +
+ " <nodes>\n" +
+ " <start id=\"1\" name=\"Start\" />\n" +
+ " <ruleSet id=\"2\" name=\"Hello\" ruleFlowGroup=\"hello\" />\n" +
+ " <action id=\"4\" name=\"Action\" dialect=\"java\">System.out.println();\n" +
+ "list.add(\"Executed\");</action>/n" +
+ " <end id=\"3\" name=\"End\" />\n" +
+ " </nodes>\n" +
+ " <connections>\n" +
+ " <connection from=\"1\" to=\"2\"/>\n" +
+ " <connection from=\"2\" to=\"4\"/>\n" +
+ " <connection from=\"4\" to=\"3\"/>\n" +
+ " </connections>\n" +
+ "</process>";
+ builder = new PackageBuilder();
+ builder.addProcessFromXml( new StringReader( process2 ));
+ pkg = builder.getPackage();
+ ruleBase.addPackage(pkg);
+
+ WorkflowProcessInstanceUpgrader.upgradeProcessInstance(
+ session, processInstance.getId(), "org.test.ruleflow2", new HashMap<Long, Long>());
+ assertEquals("org.test.ruleflow2", processInstance.getProcessId());
+
+ session.fireAllRules();
+
+ assertEquals(2, list.size());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
+ }
+
+}
More information about the jboss-svn-commits
mailing list