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

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

Author: mark.proctor at jboss.com
Date: 2009-01-16 02:30:56 -0500 (Fri, 16 Jan 2009)
New Revision: 24753

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_NullHandling.drl
Log:
JBRULES-1827 comparing fact property to global causes NPE if global is set after the fact but before fireAllRules
-Double check that a null global does not error.

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	2009-01-16 07:00:13 UTC (rev 24752)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2009-01-16 07:30:56 UTC (rev 24753)
@@ -943,7 +943,7 @@
 
         session.insert( notNullPerson );
 
-        final Person nullPerson = new Person( "whee" );
+        Person nullPerson = new Person( "whee" );
         nullPerson.setBigDecimal( null );
 
         session.insert( nullPerson );
@@ -954,7 +954,14 @@
         System.out.println( ((List) session.getGlobal( "list" )).get( 0 ) );
         assertEquals( 3,
                       ((List) session.getGlobal( "list" )).size() );
+        
+        nullPerson = new Person( null );
 
+        session.insert( nullPerson );     
+        session.fireAllRules();
+        assertEquals( 4,
+                      ((List) session.getGlobal( "list" )).size() );        
+
     }
 
     public void NullFieldOnCompositeSink() throws Exception {

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_NullHandling.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_NullHandling.drl	2009-01-16 07:00:13 UTC (rev 24752)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_NullHandling.drl	2009-01-16 07:30:56 UTC (rev 24753)
@@ -4,6 +4,8 @@
 import org.drools.Person;
 
 global java.util.List list;
+
+global java.lang.String str;
  
 rule "simple rule"
     when
@@ -24,4 +26,12 @@
      	Person( name== "whee", bigDecimal != 3 )
     then
     	list.add( new Integer(7) );
-end     	
\ No newline at end of file
+end   
+
+rule "global is null"
+    when
+        p : Person( name == str )
+    then
+        // str is null, we are just testing we don't get a null pointer
+        list.add( p );
+end  	
\ No newline at end of file