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

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

Author: michael.neale at jboss.com
Date: 2007-09-18 02:46:44 -0400 (Tue, 18 Sep 2007)
New Revision: 15197

Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Order.java
   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_EvalRewriteWithSpecialOperators.drl
Log:
corrected tests to work with Integer, as it was incorrectly mixing int and Long, which until recently the erroneous Evaluators allowed (but was fixed earlier, which broke this).

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-18 05:50:39 UTC (rev 15196)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Order.java	2007-09-18 06:46:44 UTC (rev 15197)
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006 JBoss Inc
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,11 +27,11 @@
 public class Order {
 
     private int number;
-    
+
     private String customer;
-    
+
     private Map items;
-    
+
     private OrderStatus status;
 
     public Order() {
@@ -57,21 +57,21 @@
     public void setNumber(final int number) {
         this.number = number;
     }
-    
+
     public Map getItems() {
         return this.items;
     }
-    
+
     public Collection getItemsValues() {
         return this.items.values();
     }
-    
+
     public Collection getItemsKeys() {
         return this.items.keySet();
     }
-    
+
     public void addItem( OrderItem item ) {
-        this.items.put( new Long( item.getSeq() ), item );
+        this.items.put( new Integer( item.getSeq() ), item );
     }
 
     /* (non-Javadoc)
@@ -111,7 +111,7 @@
     public void setCustomer(String customer) {
         this.customer = customer;
     }
-    
+
     public String toString() {
         return "Order( number="+this.getNumber()+" customer=\""+this.getCustomer()+"\" )";
     }
@@ -126,7 +126,7 @@
     public void setStatus(OrderStatus status) {
         this.status = status;
     }
-    
+
     public static class OrderStatus {
         private boolean active;
 

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-18 05:50:39 UTC (rev 15196)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_EvalRewrite.drl	2007-09-18 06:46:44 UTC (rev 15197)
@@ -21,15 +21,15 @@
 rule "eval rewrite3"
 	when
 		$o1 : OrderItem( order.number == 12, seq == 1 )
-		$o : Order( items[(Long) 1] == $o1 ) 
+		$o : Order( items[(Integer) 1] == $o1 )
 	then
 		results.add( $o );
-end 
+end
 
 rule "eval rewrite4"
 	when
 		OrderItem( $nbr : order.number == 13, seq == 1 )
-		$o : Order( number == $nbr ) 
+		$o : Order( number == $nbr )
 	then
 		results.add( $o );
 end

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_EvalRewriteWithSpecialOperators.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_EvalRewriteWithSpecialOperators.drl	2007-09-18 05:50:39 UTC (rev 15196)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_EvalRewriteWithSpecialOperators.drl	2007-09-18 06:46:44 UTC (rev 15197)
@@ -14,6 +14,7 @@
 	    Order( $id : number == 10 )
 		$o : OrderItem( order.number in ( 1, (1+1), $id ), seq == 1 )
 	then
+		System.err.println("r1");
 	    results.add( $o );
 end
 
@@ -23,6 +24,7 @@
 	    Order( $id : number == 10 )
 		$o : OrderItem( order.number not in ( 1, (1+1), ( $id + 1 ) ), order.number == $id, seq == 2 )
 	then
+			System.err.println("r2");
 	    results.add( $o );
 end
 
@@ -32,6 +34,7 @@
 		$o : OrderItem( order.number == 11, seq == 1 )
 	    Order( this.itemsValues contains $o )
 	then
+			System.err.println("r3");
 	    results.add( $o );
 end
 
@@ -41,6 +44,7 @@
 		$o : OrderItem( order.number == 11, seq == 2 )
 	    Order( number == 12, this.itemsValues not contains $o )
 	then
+			System.err.println("r4");
 	    results.add( $o );
 end
 
@@ -50,6 +54,9 @@
 	    $order : Order( number == 12 )
 		$o : OrderItem( seq == 1, order.number==12, this.seq memberOf $order.itemsKeys )
 	then
+			System.err.println("r5");
+
+			System.out.println($order.getItemsKeys());
 	    results.add( $o );
 end
 
@@ -59,6 +66,7 @@
 	    $order : Order( number == 11 )
 		$o : OrderItem( seq == 3, order.number==12, this.seq not memberOf $order.itemsKeys )
 	then
+			System.err.println("r6");
 	    results.add( $o );
 end
 
@@ -68,6 +76,7 @@
 		$o : OrderItem( order.number == 13, seq == 1 )
 	    Order( number == 12, this.itemsValues excludes $o )
 	then
+			System.err.println("r7");
 	    results.add( $o );
 end
 
@@ -76,6 +85,7 @@
 	when
 	    $o : Order( number == 14, this.customer matches "Mark" )
 	then
+				System.err.println("r8");
 	    results.add( $o );
 end
 
@@ -84,5 +94,6 @@
 	when
 	    $o : Order( number == 14, this.customer not matches "Bob" )
 	then
+			System.err.println("r9");
 	    results.add( $o );
 end