[jboss-svn-commits] JBL Code SVN: r15020 - in labs/jbossrules/trunk/experimental/drools-insurance: src/main/java/org/acme/insurance/web and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 11 16:26:07 EDT 2007
Author: fmeyer
Date: 2007-09-11 16:26:07 -0400 (Tue, 11 Sep 2007)
New Revision: 15020
Modified:
labs/jbossrules/trunk/experimental/drools-insurance/pom.xml
labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/web/DroolsBusiness.java
labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/DriverAdditionalInfoTest.java
labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/DriverTest.java
labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/InsuranceCalculateTest.java
labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/InsuranceTestHelper.java
labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/SupplementalInfoTest.java
Log:
changes on drools insurance demo
Modified: labs/jbossrules/trunk/experimental/drools-insurance/pom.xml
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/pom.xml 2007-09-11 19:41:13 UTC (rev 15019)
+++ labs/jbossrules/trunk/experimental/drools-insurance/pom.xml 2007-09-11 20:26:07 UTC (rev 15020)
@@ -258,45 +258,20 @@
<scope>test</scope>
</dependency>
- <!-- Lang -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <!-- Logging -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.12</version>
- <!--<scope>runtime</scope> for the examples -->
- </dependency>
-
<!-- Drools -->
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
<version>4.0.2.SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
<version>4.0.2.SNAPSHOT</version>
</dependency>
- <!-- Xstream -->
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.2.2</version>
- </dependency>
</dependencies>
<dependencyManagement>
<dependencies/>
Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/web/DroolsBusiness.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/web/DroolsBusiness.java 2007-09-11 19:41:13 UTC (rev 15019)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/web/DroolsBusiness.java 2007-09-11 20:26:07 UTC (rev 15020)
@@ -1,19 +1,23 @@
package org.acme.insurance.web;
-import org.acme.insurance.base.*;
-import org.drools.RuleBase;
-import org.drools.RuleBaseFactory;
-import org.drools.StatefulSession;
-import org.drools.agent.RuleAgent;
-import org.drools.compiler.PackageBuilder;
-
-import javax.servlet.http.HttpServletRequest;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.text.SimpleDateFormat;
import java.util.Date;
+import javax.servlet.http.HttpServletRequest;
+
+import org.acme.insurance.base.AccessoriesCoverage;
+import org.acme.insurance.base.Driver;
+import org.acme.insurance.base.DriverAdditionalInfo;
+import org.acme.insurance.base.Policy;
+import org.acme.insurance.base.SupplementalInfo;
+import org.drools.RuleBase;
+import org.drools.RuleBaseFactory;
+import org.drools.StatefulSession;
+import org.drools.agent.RuleAgent;
+
public class DroolsBusiness {
private DriverAdditionalInfo driverAdit = new DriverAdditionalInfo();
@@ -51,20 +55,20 @@
return rulebase;
}
- private RuleBase loadRuleBaseFromDRL() throws Exception {
+// private RuleBase loadRuleBaseFromDRL() throws Exception {
+//
+// PackageBuilder builder = new PackageBuilder();
+// builder.addPackageFromDrl(getTechnicalRules("/approval/insurancefactor.drl"));
+// builder.addPackageFromDrl(getTechnicalRules("/approval/approval.drl"));
+// builder.addPackageFromDrl(getTechnicalRules("/approval/calculateInsurance.drl"));
+// builder.addPackageFromDrl(getTechnicalRules("/approval/marginalage.drl"));
+// builder.addRuleFlow(getTechnicalRules("/approval/insurance-process.rfm"));
+//
+// RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+// ruleBase.addPackage(builder.getPackage());
+// return ruleBase;
+// }
- PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl(getTechnicalRules("/approval/insurancefactor.drl"));
- builder.addPackageFromDrl(getTechnicalRules("/approval/approval.drl"));
- builder.addPackageFromDrl(getTechnicalRules("/approval/calculateInsurance.drl"));
- builder.addPackageFromDrl(getTechnicalRules("/approval/marginalage.drl"));
- builder.addRuleFlow(getTechnicalRules("/approval/insurance-process.rfm"));
-
- RuleBase ruleBase = RuleBaseFactory.newRuleBase();
- ruleBase.addPackage(builder.getPackage());
- return ruleBase;
- }
-
private Reader getTechnicalRules(String name) {
InputStream stream = this.getClass().getResourceAsStream(name);
Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/DriverAdditionalInfoTest.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/DriverAdditionalInfoTest.java 2007-09-11 19:41:13 UTC (rev 15019)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/DriverAdditionalInfoTest.java 2007-09-11 20:26:07 UTC (rev 15020)
@@ -1,9 +1,6 @@
package org.acme.insurance.test;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -12,11 +9,7 @@
import org.acme.insurance.base.Driver;
import org.acme.insurance.base.DriverAdditionalInfo;
import org.acme.insurance.base.Policy;
-import org.drools.RuleBase;
-import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.compiler.DroolsParserException;
-import org.drools.compiler.PackageBuilder;
public class DriverAdditionalInfoTest extends TestCase {
private StatefulSession session;
@@ -38,12 +31,12 @@
session.dispose();
}
- public void testDriveVehiclePlace() throws DroolsParserException,
+ public void testDriveVehiclePlace() throws
IOException,
Exception {
Driver driver = new Driver();
-
+
driver.setGenre( Driver.MALE );
driver.setBirhDate( defaultBirthday );
driver.setMaritalState( Driver.MARRIED );
Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/DriverTest.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/DriverTest.java 2007-09-11 19:41:13 UTC (rev 15019)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/DriverTest.java 2007-09-11 20:26:07 UTC (rev 15020)
@@ -10,7 +10,6 @@
import org.acme.insurance.base.Driver;
import org.acme.insurance.base.Policy;
import org.drools.StatefulSession;
-import org.drools.compiler.DroolsParserException;
public class DriverTest extends TestCase {
private StatefulSession session;
@@ -32,7 +31,7 @@
session.dispose();
}
- public void testDriverGenreFactor() throws DroolsParserException,
+ public void testDriverGenreFactor() throws
IOException,
Exception {
Driver driverMale = new Driver();
@@ -68,7 +67,7 @@
}
- public void testMatureDriverWithChildFactor() throws DroolsParserException,
+ public void testMatureDriverWithChildFactor() throws
IOException,
Exception {
Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/InsuranceCalculateTest.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/InsuranceCalculateTest.java 2007-09-11 19:41:13 UTC (rev 15019)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/InsuranceCalculateTest.java 2007-09-11 20:26:07 UTC (rev 15020)
@@ -12,8 +12,6 @@
import org.acme.insurance.base.Policy;
import org.acme.insurance.base.SupplementalInfo;
import org.drools.StatefulSession;
-import org.drools.audit.WorkingMemoryFileLogger;
-import org.drools.compiler.DroolsParserException;
public class InsuranceCalculateTest extends TestCase {
private StatefulSession session;
@@ -35,7 +33,7 @@
session.dispose();
}
- public void testHasExtraCar() throws DroolsParserException,
+ public void testHasExtraCar() throws
IOException,
Exception {
@@ -75,7 +73,7 @@
policy.getInsurancePrice() );
}
- public void testDriveVehiclePlace() throws DroolsParserException,
+ public void testDriveVehiclePlace() throws
IOException,
Exception {
@@ -110,7 +108,7 @@
policy.getInsurancePrice() );
}
- public void testAccessoriesValue() throws DroolsParserException,
+ public void testAccessoriesValue() throws
IOException,
Exception {
Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/InsuranceTestHelper.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/InsuranceTestHelper.java 2007-09-11 19:41:13 UTC (rev 15019)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/InsuranceTestHelper.java 2007-09-11 20:26:07 UTC (rev 15020)
@@ -5,10 +5,8 @@
import java.io.Reader;
import org.drools.RuleBase;
-import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.agent.RuleAgent;
-import org.drools.compiler.PackageBuilder;
public class InsuranceTestHelper {
private RuleBase rulebase;
@@ -16,8 +14,8 @@
public StatefulSession getSession() {
try {
- //rulebase = loadRuleBaseFromRuleAgent();
- rulebase = loadRuleBaseFromDRL();
+ rulebase = loadRuleBaseFromRuleAgent();
+ //rulebase = loadRuleBaseFromDRL();
session = rulebase.newStatefulSession();
session.startProcess( "insuranceProcess" );
@@ -39,23 +37,23 @@
}
- private RuleBase loadRuleBaseFromDRL() throws Exception {
+// private RuleBase loadRuleBaseFromDRL() throws Exception {
+//
+// PackageBuilder builder = new PackageBuilder();
+// builder.addPackageFromDrl( getTechnicalRules( "/approval/insurancefactor.drl" ) );
+// builder.addPackageFromDrl( getTechnicalRules( "/approval/approval.drl" ) );
+// builder.addPackageFromDrl( getTechnicalRules( "/approval/calculateInsurance.drl" ) );
+// builder.addPackageFromDrl( getTechnicalRules( "/approval/marginalage.dslr" ),
+// getTechnicalRules( "/approval/acme.dsl" ) );
+// builder.addRuleFlow( getTechnicalRules( "/approval/insurance-process.rfm" ) );
+//
+//
+//
+// RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+// ruleBase.addPackage( builder.getPackage() );
+// return ruleBase;
+// }
- PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( getTechnicalRules( "/approval/insurancefactor.drl" ) );
- builder.addPackageFromDrl( getTechnicalRules( "/approval/approval.drl" ) );
- builder.addPackageFromDrl( getTechnicalRules( "/approval/calculateInsurance.drl" ) );
- builder.addPackageFromDrl( getTechnicalRules( "/approval/marginalage.dslr" ),
- getTechnicalRules( "/approval/acme.dsl" ) );
- builder.addRuleFlow( getTechnicalRules( "/approval/insurance-process.rfm" ) );
-
-
-
- RuleBase ruleBase = RuleBaseFactory.newRuleBase();
- ruleBase.addPackage( builder.getPackage() );
- return ruleBase;
- }
-
private Reader getTechnicalRules(String name) {
InputStream stream = this.getClass().getResourceAsStream( name );
Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/SupplementalInfoTest.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/SupplementalInfoTest.java 2007-09-11 19:41:13 UTC (rev 15019)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/SupplementalInfoTest.java 2007-09-11 20:26:07 UTC (rev 15020)
@@ -10,7 +10,6 @@
import org.acme.insurance.base.Policy;
import org.acme.insurance.base.SupplementalInfo;
import org.drools.StatefulSession;
-import org.drools.compiler.DroolsParserException;
public class SupplementalInfoTest extends TestCase {
private StatefulSession session;
@@ -21,7 +20,7 @@
super.setUp();
session = (new InsuranceTestHelper()).getSession();
-
+
SimpleDateFormat df = new java.text.SimpleDateFormat( "dd/MM/yyyy" );
defaultBirthday = df.parse( "18/09/1983" );
}
@@ -32,8 +31,7 @@
session.dispose();
}
- public void testHasExtraCar() throws DroolsParserException,
- IOException,
+ public void testHasExtraCar() throws IOException,
Exception {
Driver driver = new Driver();
@@ -63,8 +61,7 @@
assertTrue( policy.isApproved() );
}
- public void testeHasExtraAssistence() throws DroolsParserException,
- IOException,
+ public void testeHasExtraAssistence() throws IOException,
Exception {
Driver driver = new Driver();
@@ -94,8 +91,7 @@
assertTrue( policy.isApproved() );
}
- public void testeGlassCoverage() throws DroolsParserException,
- IOException,
+ public void testeGlassCoverage() throws IOException,
Exception {
Driver driver = new Driver();
@@ -125,8 +121,7 @@
assertTrue( policy.isApproved() );
}
- public void testeNonRelatedExpenses() throws DroolsParserException,
- IOException,
+ public void testeNonRelatedExpenses() throws IOException,
Exception {
Driver driver = new Driver();
@@ -156,9 +151,8 @@
assertTrue( policy.isApproved() );
}
- public void testeSupplementalInfoMix() throws DroolsParserException,
- IOException,
- Exception {
+ public void testeSupplementalInfoMix() throws IOException,
+ Exception {
Driver driver = new Driver();
@@ -174,7 +168,7 @@
suppinfo.setGlassCoverage( true );
suppinfo.setExtraAssistence( true );
suppinfo.setExtraCar( true );
-
+
suppinfo.setDriverId( driver.getId() );
Policy policy = new Policy();
@@ -187,8 +181,7 @@
session.fireAllRules();
assertEquals( 1.2155062500000002,
- driver.getInsuranceFactor());
-
+ driver.getInsuranceFactor() );
assertTrue( policy.isApproved() );
}
More information about the jboss-svn-commits
mailing list