[jboss-svn-commits] JBL Code SVN: r18373 - in labs/jbossrules/trunk/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 08:31:56 -0500 (Thu, 07 Feb 2008)
New Revision: 18373

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EqualityEvaluatorsDefinition.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java
Log:
JBRULES-1451: fixing type coercion in trunk

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EqualityEvaluatorsDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EqualityEvaluatorsDefinition.java	2008-02-07 13:31:23 UTC (rev 18372)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EqualityEvaluatorsDefinition.java	2008-02-07 13:31:56 UTC (rev 18373)
@@ -1715,7 +1715,7 @@
             if( ((ObjectVariableContextEntry) context).right != null && ((ObjectVariableContextEntry) context).right instanceof ShadowProxy ) {
                 return comparator.equals( ((ObjectVariableContextEntry) context).right,  value );
             }
-            return comparator.equals( value, ((ObjectVariableContextEntry) context).right );
+            return comparator.equals( ((ObjectVariableContextEntry) context).right, value );
         }
 
         public boolean evaluateCachedLeft(InternalWorkingMemory workingMemory,
@@ -1727,7 +1727,7 @@
             if( value != null && value instanceof ShadowProxy ) {
                 return comparator.equals( value, ((ObjectVariableContextEntry) context).left );
             }
-            return comparator.equals( ((ObjectVariableContextEntry) context).left, value );
+            return comparator.equals( value, ((ObjectVariableContextEntry) context).left );
         }
 
         public boolean evaluate(InternalWorkingMemory workingMemory,
@@ -1787,7 +1787,7 @@
             if( ((ObjectVariableContextEntry) context).right != null && ((ObjectVariableContextEntry) context).right instanceof ShadowProxy ) {
                 return !comparator.equals( ((ObjectVariableContextEntry) context).right, value );
             }
-            return !comparator.equals( value, ((ObjectVariableContextEntry) context).right );
+            return !comparator.equals( ((ObjectVariableContextEntry) context).right, value );
         }
 
         public boolean evaluateCachedLeft(InternalWorkingMemory workingMemory,
@@ -1799,7 +1799,7 @@
             if( value != null && value instanceof ShadowProxy ) {
                 return !comparator.equals( value, ((ObjectVariableContextEntry) context).left );
             }
-            return !comparator.equals( ((ObjectVariableContextEntry) context).left, value );
+            return !comparator.equals( value, ((ObjectVariableContextEntry) context).left );
         }
 
         public boolean evaluate(InternalWorkingMemory workingMemory,

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java	2008-02-07 13:31:23 UTC (rev 18372)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/EvaluatorFactoryTest.java	2008-02-07 13:31:56 UTC (rev 18373)
@@ -92,7 +92,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}
 
         };