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

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

Author: stevearoonie
Date: 2007-05-01 09:06:39 -0400 (Tue, 01 May 2007)
New Revision: 11554

Modified:
   labs/jbossrules/trunk/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerUnitTest.java
   labs/jbossrules/trunk/drools-decisiontables/src/test/resources/data/ComplexWorkbook.csv
   labs/jbossrules/trunk/drools-decisiontables/src/test/resources/templates/test_pricing2.drl
   labs/jbossrules/trunk/drools-decisiontables/src/test/resources/templates/test_template1.drl
Log:
fix up tests to work with MVEL

Modified: labs/jbossrules/trunk/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerUnitTest.java
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerUnitTest.java	2007-05-01 13:06:19 UTC (rev 11553)
+++ labs/jbossrules/trunk/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerUnitTest.java	2007-05-01 13:06:39 UTC (rev 11554)
@@ -29,8 +29,7 @@
  *         itself is correct).
  */
 public class ExternalSpreadsheetCompilerUnitTest extends TestCase {
-//  @FIXME    
-	public void FIXME_testLoadFromClassPath() {
+	public void testLoadFromClassPath() {
 		final ExternalSpreadsheetCompiler converter = new ExternalSpreadsheetCompiler();
 		final String drl = converter.compile("/data/MultiSheetDST.xls",
 				"/templates/test_template1.drl", 11, 2);
@@ -44,17 +43,15 @@
 		assertTrue(drl.indexOf("import example.model.Car;") > -1);
 	}
 
-//@FIXME    
-	public void FIXME_testLoadSpecificWorksheet() {
+	public void testLoadSpecificWorksheet() {
 		final ExternalSpreadsheetCompiler converter = new ExternalSpreadsheetCompiler();
 		final String drl = converter.compile("/data/MultiSheetDST.xls",
-				"Another Sheet", "/templates/test_template1.drl", 21, 2);
+				"Another Sheet", "/templates/test_template1.drl", 11, 2);
 //		System.out.println(drl);
 		assertNotNull(drl);
 	}
 
- //@FIXME
-	public void FIXME_testLoadCsv() {
+	public void testLoadCsv() {
 		final ExternalSpreadsheetCompiler converter = new ExternalSpreadsheetCompiler();
 		final String drl = converter.compile("/data/ComplexWorkbook.csv",
 				"/templates/test_template2.drl", InputType.CSV, 10, 2);

Modified: labs/jbossrules/trunk/drools-decisiontables/src/test/resources/data/ComplexWorkbook.csv
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/src/test/resources/data/ComplexWorkbook.csv	2007-05-01 13:06:19 UTC (rev 11553)
+++ labs/jbossrules/trunk/drools-decisiontables/src/test/resources/data/ComplexWorkbook.csv	2007-05-01 13:06:39 UTC (rev 11554)
@@ -9,7 +9,7 @@
 ,"Colour Type","Object size","Object size","Valid Object","Valid Object"
 "some stuff","red",1,3,TRUE,"1,2"
 "more to ignore","yellow",2,6,FALSE,"1,2"
-,"blue",7,9,"N","N"
+,"blue",7,9,"N","1,3"
 ,,,,,
 "RuleTable - freddy2",,,,,
 "C","C","C","A",,

Modified: labs/jbossrules/trunk/drools-decisiontables/src/test/resources/templates/test_pricing2.drl
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/src/test/resources/templates/test_pricing2.drl	2007-05-01 13:06:19 UTC (rev 11553)
+++ labs/jbossrules/trunk/drools-decisiontables/src/test/resources/templates/test_pricing2.drl	2007-05-01 13:06:39 UTC (rev 11554)
@@ -12,7 +12,7 @@
 policyType
 discount
 
-rule "Discounts_$row.rowNumber$"
+rule "Discounts_@{row.rowNumber}"
 	
 	when
 		Driver(age >= @{age0}, age <= @{age1}, priorClaims == "@{priorClaims}")

Modified: labs/jbossrules/trunk/drools-decisiontables/src/test/resources/templates/test_template1.drl
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/src/test/resources/templates/test_template1.drl	2007-05-01 13:06:19 UTC (rev 11553)
+++ labs/jbossrules/trunk/drools-decisiontables/src/test/resources/templates/test_template1.drl	2007-05-01 13:06:39 UTC (rev 11554)
@@ -17,7 +17,7 @@
 rule "How cool is @{name} @{row.rowNumber}"
 	when
 		user.getName().equals("@{name}")
-		user.getAge() >= @{age1} && user.getAge() <= @{age2}
+		user.getAge() >= @{age0} && user.getAge() <= @{age1}
 	then
 		System.out.println( "@{log}" );
 		user.setCoolness("@{coolness}");
@@ -30,7 +30,7 @@
 rule "How uncool is @{name} @{row.rowNumber}"
 	when
 		user.getName().equals("@{name}")
-		user.getAge() >= @{age1} && user.getAge() <= @{age2}
+		user.getAge() >= @{age0} && user.getAge() <= @{age1}
 	then
 		System.out.println( "@{log}" );
 		user.setCoolness("Not so cool"); //@{coolness} putting the column in the comments makes the line conditionally display