[jboss-svn-commits] JBL Code SVN: r14913 - in labs/jbossrules/trunk/drools-compiler/src/test: java/org/drools/integrationtests and 1 other directories.

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

Author: tirelli
Date: 2007-09-06 13:05:49 -0400 (Thu, 06 Sep 2007)
New Revision: 14913

Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Order.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/OrderItem.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_EvalRewrite.drl
Log:
Fixing integration test

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Order.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Order.java	2007-09-06 14:21:13 UTC (rev 14912)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Order.java	2007-09-06 17:05:49 UTC (rev 14913)
@@ -69,7 +69,7 @@
     }
     
     public void addItem( OrderItem item ) {
-        this.items.put( new Integer( item.getSeq() ), item );
+        this.items.put( new Long( item.getSeq() ), item );
     }
 
     /* (non-Javadoc)
@@ -109,5 +109,9 @@
     public void setCustomer(String customer) {
         this.customer = customer;
     }
+    
+    public String toString() {
+        return "Order( number="+this.getNumber()+" customer=\""+this.getCustomer()+"\" )";
+    }
 
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/OrderItem.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/OrderItem.java	2007-09-06 14:21:13 UTC (rev 14912)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/OrderItem.java	2007-09-06 17:05:49 UTC (rev 14913)
@@ -100,5 +100,8 @@
         }
         return true;
     }
-
+    
+    public String toString() {
+        return "OrderItem( order="+this.getOrder()+" seq="+this.getSeq()+")";
+    }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2007-09-06 14:21:13 UTC (rev 14912)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2007-09-06 17:05:49 UTC (rev 14913)
@@ -3841,8 +3841,7 @@
 
     }
 
-    // FIXME
-    public void FIXMEtestEvalRewriteWithSpecialOperators() throws Exception {
+    public void testEvalRewriteWithSpecialOperators() throws Exception {
         final PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_EvalRewriteWithSpecialOperators.drl" ) ) );
         final Package pkg = builder.getPackage();

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_EvalRewrite.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_EvalRewrite.drl	2007-09-06 14:21:13 UTC (rev 14912)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_EvalRewrite.drl	2007-09-06 17:05:49 UTC (rev 14913)
@@ -2,6 +2,7 @@
 
 global java.util.List results;
 
+
 rule "eval rewrite"
 	when
 		$o : OrderItem( order.number == 10 )
@@ -20,7 +21,7 @@
 rule "eval rewrite3"
 	when
 		$o1 : OrderItem( order.number == 12, seq == 1 )
-		$o : Order( items[1] == $o1 ) 
+		$o : Order( items[(Long) 1] == $o1 ) 
 	then
 		results.add( $o );
 end