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

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

Author: tirelli
Date: 2007-08-16 13:46:47 -0400 (Thu, 16 Aug 2007)
New Revision: 14318

Modified:
   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_IterateObjects.drl
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassObjectFilter.java
Log:
JBRULES-1093: fixing bug when iterating over objects with ClassObjectFilter

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-08-16 17:27:19 UTC (rev 14317)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2007-08-16 17:46:47 UTC (rev 14318)
@@ -3544,7 +3544,9 @@
         PackageBuilder builder = new PackageBuilder();
         builder.addPackageFromDrl( new InputStreamReader( MiscTest.class.getResourceAsStream( "test_CrossProductRemovingIdentityEquals.drl" ) ) );
 
-        RuleBase rb = RuleBaseFactory.newRuleBase();
+        RuleBaseConfiguration conf = new RuleBaseConfiguration();
+        conf.setShadowProxy( true );
+        RuleBase rb = RuleBaseFactory.newRuleBase( conf );
         rb.addPackage( builder.getPackage() );
         StatefulSession session = rb.newStatefulSession();
         
@@ -3557,13 +3559,13 @@
                            list2 );        
 
         SpecialString first42 = new SpecialString( "42" );
-        SpecialString second43 = new SpecialString( "43" );
+        SpecialString second43 = new SpecialString( "42" );
         SpecialString world = new SpecialString( "World" );
         session.insert( world );
         session.insert( first42 );
         session.insert( second43 );
 
-        System.out.println( "Firing rules ..." );
+        //System.out.println( "Firing rules ..." );
 
         session.fireAllRules();
         
@@ -3598,11 +3600,11 @@
         workingMemory.setGlobal( "results",
                                  results );
         
-        workingMemory.insert( new Person( "Bob", "Stilton" ) );
+        workingMemory.insert( new Cheese( "stilton", 10 ) );
 
         workingMemory.fireAllRules();
 
-        Iterator events = workingMemory.iterateObjects(new ClassObjectFilter(Cheese.class));
+        Iterator events = workingMemory.iterateObjects(new ClassObjectFilter(PersonInterface.class));
         
         assertTrue( events.hasNext() );
         assertEquals( 1,

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_IterateObjects.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_IterateObjects.drl	2007-08-16 17:27:19 UTC (rev 14317)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_IterateObjects.drl	2007-08-16 17:46:47 UTC (rev 14318)
@@ -4,8 +4,8 @@
 
 rule "test iterate objects"
 when
-    Person( $likes : likes )
+    Cheese( $type : type )
 then
-    results.add( new Cheese( $likes, 10 ) );
+    results.add( new Person( "Bob", $type ) );
     insert( results.get(0) );
 end

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassObjectFilter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassObjectFilter.java	2007-08-16 17:27:19 UTC (rev 14317)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassObjectFilter.java	2007-08-16 17:46:47 UTC (rev 14318)
@@ -24,7 +24,7 @@
      * @return
      */    
     public boolean accept(Object object) {
-        return object.getClass().isAssignableFrom( this.clazz );
+        return this.clazz.isAssignableFrom( object.getClass() );
     }
     
 }