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

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

Author: mark.proctor at jboss.com
Date: 2008-03-19 00:49:48 -0400 (Wed, 19 Mar 2008)
New Revision: 19098

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
Log:
fixing regressed fixes from http://fisheye.jboss.org/changelog/~author=tirelli/JBossRules/?cs=18997

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java	2008-03-19 04:43:36 UTC (rev 19097)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java	2008-03-19 04:49:48 UTC (rev 19098)
@@ -27,6 +27,7 @@
 import org.drools.base.FieldFactory;
 import org.drools.base.ValueType;
 import org.drools.base.evaluators.EvaluatorDefinition;
+import org.drools.base.field.ObjectFieldImpl;
 import org.drools.compiler.DescrBuildError;
 import org.drools.compiler.Dialect;
 import org.drools.facttemplates.FactTemplate;
@@ -791,6 +792,11 @@
             final Class staticClass = context.getDialect().getTypeResolver().resolveType( className );
             field = FieldFactory.getFieldValue( staticClass.getField( fieldName ).get( null ),
                                                 extractor.getValueType() );
+            if( field.isObjectField() ) {
+                ((ObjectFieldImpl) field).setEnum( true );
+                ((ObjectFieldImpl) field).setEnumName( staticClass.getName() );
+                ((ObjectFieldImpl) field).setFieldName( fieldName );
+            }            
         } catch ( final ClassNotFoundException e ) {
             // nothing to do, as it is not a class name with static field
         } catch ( final Exception e ) {

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	2008-03-19 04:43:36 UTC (rev 19097)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2008-03-19 04:49:48 UTC (rev 19098)
@@ -186,8 +186,6 @@
         cheesery2.setMaturity( Maturity.YOUNG );
         workingMemory.insert( cheesery2 );
 
-        //        workingMemory   = SerializationHelper.serializeObject(workingMemory);
-        //        list = (List) workingMemory.getGlobal( "list" );
         workingMemory.fireAllRules();
 
         assertEquals( 2,
@@ -197,6 +195,19 @@
                       list.get( 0 ) );
         assertEquals( cheesery2,
                       list.get( 1 ) );
+        
+//        // now try it again with the list from a serialised WM
+//        workingMemory   = SerializationHelper.serializeObject(workingMemory);
+//        list = (List) workingMemory.getGlobal( "list" );
+//        workingMemory.fireAllRules();
+//
+//        assertEquals( 2,
+//                      list.size() );
+//
+//        assertEquals( cheesery1,
+//                      list.get( 0 ) );
+//        assertEquals( cheesery2,
+//                      list.get( 1 ) );        
     }
 
     public void testPrimitiveArray() throws Exception {