[jboss-svn-commits] JBL Code SVN: r18370 - in labs/jbossrules/branches/4.0.x/drools-core/src: test/java/org/drools/base and 1 other directory.

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

Author: tirelli
Date: 2008-02-07 07:08:55 -0500 (Thu, 07 Feb 2008)
New Revision: 18370

Modified:
   labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/evaluators/ObjectFactory.java
   labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java
Log:
JBRULES-1451: fixing minor type coercion bug

Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/evaluators/ObjectFactory.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/evaluators/ObjectFactory.java	2008-02-07 11:45:30 UTC (rev 18369)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/base/evaluators/ObjectFactory.java	2008-02-07 12:08:55 UTC (rev 18370)
@@ -110,8 +110,9 @@
 
         public boolean evaluateCachedRight(InternalWorkingMemory workingMemory,
                                            final VariableContextEntry context, final Object left) {
-            final Object value1 = context.declaration.getExtractor().getValue( workingMemory, left );
-            final Object value2 = ((ObjectVariableContextEntry) context).right;
+            final Object value2 = context.declaration.getExtractor().getValue( workingMemory, left );
+            final Object value1 = ((ObjectVariableContextEntry) context).right;
+            // the constrained field must be checked as the first parameter
             return comparator.equals( value1, value2 );
         }
 
@@ -160,8 +161,8 @@
 
         public boolean evaluateCachedRight(InternalWorkingMemory workingMemory,
                                            final VariableContextEntry context, final Object left) {
-            final Object value1 = context.declaration.getExtractor().getValue( workingMemory, left );
-            final Object value2 = ((ObjectVariableContextEntry) context).right;
+            final Object value2 = context.declaration.getExtractor().getValue( workingMemory, left );
+            final Object value1 = ((ObjectVariableContextEntry) context).right;
             return !comparator.equals( value1, value2 );
         }
 

Modified: labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java	2008-02-07 11:45:30 UTC (rev 18369)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java	2008-02-07 12:08:55 UTC (rev 18370)
@@ -90,7 +90,17 @@
                                  {"foo", "not memberOf", col, Boolean.FALSE},
                                  {"xyz", "not memberOf", col, Boolean.TRUE},
                                  {null, "not memberOf", col, Boolean.FALSE},
-                                 {"foo", "not memberOf", null, Boolean.FALSE}
+                                 {"foo", "not memberOf", null, Boolean.FALSE},
+                                 {Boolean.TRUE, "==", "xyz", Boolean.FALSE},
+                                 {Boolean.TRUE, "==", "true", Boolean.TRUE},
+                                 {Boolean.FALSE, "==", "xyz", Boolean.TRUE},
+                                 {Boolean.FALSE, "==", "false", Boolean.TRUE},
+                                 {Boolean.FALSE, "==", "true", Boolean.FALSE},
+                                 {Boolean.TRUE, "!=", "xyz", Boolean.TRUE},
+                                 {Boolean.TRUE, "!=", "true", Boolean.FALSE},
+                                 {Boolean.FALSE, "!=", "xyz", Boolean.FALSE},
+                                 {Boolean.FALSE, "!=", "true", Boolean.TRUE},
+                                 {Boolean.FALSE, "!=", "false", Boolean.FALSE}
 
         };