[jboss-svn-commits] JBL Code SVN: r18785 - in labs/jbossrules/trunk/drools-compiler/src: test/java/org/drools/brms/server/util and 1 other directory.

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

Author: michael.neale at jboss.com
Date: 2008-03-09 21:51:00 -0400 (Sun, 09 Mar 2008)
New Revision: 18785

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/GuidedDTDRLPersistence.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/GuidedDTDRLPersistenceTest.java
Log:
JBRULES-1494 Decision table model

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/GuidedDTDRLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/GuidedDTDRLPersistence.java	2008-03-10 01:45:56 UTC (rev 18784)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/GuidedDTDRLPersistence.java	2008-03-10 01:51:00 UTC (rev 18785)
@@ -46,6 +46,7 @@
 			doConditions(dt.attributeCols.size(), dt.conditionCols, row, rm);
 			doActions(dt.attributeCols.size() + dt.conditionCols.size(), dt.actionCols, row, rm);
 
+			sb.append("#from row number: " + (i + 1) + "\n");
 			String rule = BRDRLPersistence.getInstance().marshal(rm);
 			sb.append(rule);
 			sb.append("\n");

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/GuidedDTDRLPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/GuidedDTDRLPersistenceTest.java	2008-03-10 01:45:56 UTC (rev 18784)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/GuidedDTDRLPersistenceTest.java	2008-03-10 01:51:00 UTC (rev 18785)
@@ -106,6 +106,10 @@
 		String drl = p.marshal(dt);
 		System.err.println(drl);
 
+		assertTrue(drl.indexOf("from row number") > -1);
+		assertTrue(drl.indexOf("rating == ( age * 0.2 )") > 0);
+		assertTrue(drl.indexOf("f2 : Driver( eval( age > 7 ))") > 0);
+		assertTrue(drl.indexOf("rating == ( age * 0.3 )") > drl.indexOf("rating == ( age * 0.2 )"));
 
 	}