[jboss-svn-commits] JBL Code SVN: r6039 - in labs/jbossrules/trunk/drools-compiler/src/test: java/org/drools java/org/drools/integrationtests resources/org/drools/integrationtests

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

Author: michael.neale at jboss.com
Date: 2006-08-31 06:39:06 -0400 (Thu, 31 Aug 2006)
New Revision: 6039

Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FromTestClass.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_FromWithParams.drl
Log:
JBRULES-339 with inline list support

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FromTestClass.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FromTestClass.java	2006-08-31 10:10:26 UTC (rev 6038)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/FromTestClass.java	2006-08-31 10:39:06 UTC (rev 6039)
@@ -5,13 +5,14 @@
 import java.util.Map;
 
 public class FromTestClass {
-    public List toList(Object object1, Object object2, String object3, int integer, Map map) {
+    public List toList(Object object1, Object object2, String object3, int integer, Map map, List inputList) {
         List list = new ArrayList();
         list.add( object1 );
         list.add( object2 );
         list.add( object3 );
         list.add( new Integer( integer ) );
         list.add( map );
+        list.add( inputList );
         return list;
     }
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-08-31 10:10:26 UTC (rev 6038)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-08-31 10:39:06 UTC (rev 6039)
@@ -859,9 +859,20 @@
         
         workingMemory.fireAllRules();
         
-        assertEquals( 5, list.size() );
+        assertEquals( 6, list.size() );
 
-        Map map = ( Map ) list.get( 0 );       
+        List array = (List) list.get( 0 );
+        assertEquals(3, array.size());
+        Person p = (Person) array.get( 0 );
+        assertSame(p, bob);
+        
+        assertEquals("42", array.get( 1 ));
+        
+        List nested = (List) array.get( 2 );
+        assertEquals("x", nested.get( 0 ));
+        assertEquals("y", nested.get( 1 ));
+        
+        Map map = ( Map ) list.get( 1 );       
         assertEquals( 2, map.keySet().size() );
         
         assertTrue( map.keySet().contains( bob ) );
@@ -873,10 +884,10 @@
         assertTrue( nestedMap.keySet().contains( "key2" ) );
         assertEquals( "value2", nestedMap.get( "key2" ) );
                 
-        assertEquals( new Integer( 42 ), list.get( 1 ) );
-        assertEquals( "literal", list.get( 2 ) );                        
-        assertSame( bob, list.get( 3 ) );
-        assertSame( globalObject, list.get( 4 ) );        
+        assertEquals( new Integer( 42 ), list.get( 2 ) );
+        assertEquals( "literal", list.get( 3 ) );                        
+        assertSame( bob, list.get( 4 ) );
+        assertSame( globalObject, list.get( 5 ) );        
     }    
     
     public void testWithInvalidRule() throws Exception {

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_FromWithParams.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_FromWithParams.drl	2006-08-31 10:10:26 UTC (rev 6038)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_FromWithParams.drl	2006-08-31 10:39:06 UTC (rev 6039)
@@ -10,7 +10,7 @@
 rule "test from"
 	when
 		$person : Person()
-		$object : Object() from testObject.toList(globalObject, $person, "literal", 42, { $person => globalObject, "key1" => { "key2" => "value2" } } )		
+		$object : Object() from testObject.toList(globalObject, $person, "literal", 42, { $person => globalObject, "key1" => { "key2" => "value2" } }, [$person, 42, ["x", "y"]] )		
 	then
 		list.add( $object );
 end