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

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

Author: mark.proctor at jboss.com
Date: 2007-03-12 22:27:40 -0400 (Mon, 12 Mar 2007)
New Revision: 10143

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/clp/BooleanLiteralValue.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/clp/DoubleLiteralValue.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/clp/ClpParserTest.java
Log:
JBRULES-720 Clips Parser
-ParserTests now work

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/clp/BooleanLiteralValue.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/clp/BooleanLiteralValue.java	2007-03-13 02:19:11 UTC (rev 10142)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/clp/BooleanLiteralValue.java	2007-03-13 02:27:40 UTC (rev 10143)
@@ -57,4 +57,26 @@
     public String getStringValue(ExecutionContext context) {
         return Boolean.toString( this.booleanValue );
     }      
+    
+    public String toString() {
+        return "[BooleanLiteralValue value='" + this.booleanValue + "']";
+    }
+
+    public int hashCode() {
+        final int PRIME = 31;
+        int result = 1;
+        result = PRIME * result + (booleanValue ? 1231 : 1237);
+        return result;
+    }
+
+    public boolean equals(Object obj) {
+        if ( this == obj ) return true;
+        if ( obj == null ) return false;
+        if ( !(obj instanceof BooleanLiteralValue) ) return false;
+        final BooleanLiteralValue other = (BooleanLiteralValue) obj;
+        if ( booleanValue != other.booleanValue ) return false;
+        return true;
+    }
+    
+    
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/clp/DoubleLiteralValue.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/clp/DoubleLiteralValue.java	2007-03-13 02:19:11 UTC (rev 10142)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/clp/DoubleLiteralValue.java	2007-03-13 02:27:40 UTC (rev 10143)
@@ -56,5 +56,29 @@
 
     public String getStringValue(ExecutionContext context) {
         return Double.toString( this.doubleValue );
-    }      
+    }
+
+    public String toString() {
+        return "[DoubleLiteralValue value='" + this.doubleValue + "']";
+    }    
+    
+    public int hashCode() {
+        final int PRIME = 31;
+        int result = 1;
+        long temp;
+        temp = Double.doubleToLongBits( doubleValue );
+        result = PRIME * result + (int) (temp ^ (temp >>> 32));
+        return result;
+    }
+
+    public boolean equals(Object obj) {
+        if ( this == obj ) return true;
+        if ( obj == null ) return false;
+        if ( !(obj instanceof DoubleLiteralValue) ) return false;
+        final DoubleLiteralValue other = (DoubleLiteralValue) obj;
+        if ( Double.doubleToLongBits( doubleValue ) != Double.doubleToLongBits( other.doubleValue ) ) return false;
+        return true;
+    }
+    
+    
 }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/clp/ClpParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/clp/ClpParserTest.java	2007-03-13 02:19:11 UTC (rev 10142)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/clp/ClpParserTest.java	2007-03-13 02:27:40 UTC (rev 10143)
@@ -105,15 +105,15 @@
         CLPReturnValue clprv = ( CLPReturnValue ) retDescr.getContent();
         Function f = clprv.getFunctions()[0];
         assertEquals( "+", f.getName() );        
-        assertSame( new LongLiteralValue( 2 ), f.getParameters()[0] );
-        
-        
-//        assertEquals( "ppp",
-//                       );
+        assertEquals( new LongLiteralValue( 2 ), f.getParameters()[0] );
+        assertEquals( new LongLiteralValue( 3 ), f.getParameters()[1] );       
 
-        PredicateDescr predicateDescr = (PredicateDescr) colList.get( 1 );
-        assertEquals( "ooo",
-                      predicateDescr.getContent() );
+        PredicateDescr predicateDescr = (PredicateDescr) colList.get( 1 );        
+        CLPPredicate clpp = ( CLPPredicate ) predicateDescr.getContent();
+        f = clpp.getFunctions()[0];
+        assertEquals( "<", f.getName() );        
+        assertEquals( new LongLiteralValue( 1 ), f.getParameters()[0] );
+        assertEquals( new LongLiteralValue( 2 ), f.getParameters()[1] );        
 
         // Parse the second column
         col = (ColumnDescr) lhsList.get( 1 );
@@ -288,7 +288,7 @@
     }
     
     public void testTestRule() throws Exception {
-        RuleDescr rule = parse( "(defrule xxx (test (yyy)" ).rule();
+        RuleDescr rule = parse( "(defrule xxx (test (< 9.0 1.3)" ).rule();
 
         assertEquals( "xxx",
                       rule.getName() );
@@ -299,7 +299,13 @@
                       lhsList.size() );
 
         EvalDescr evalDescr = (EvalDescr) lhsList.get( 0 );
-        assertEquals( "yyy", evalDescr.getContent() );
+        
+        CLPEval clpe = ( CLPEval ) evalDescr.getContent();
+        Function f = clpe.getFunctions()[0];
+        assertEquals( "<", f.getName() );        
+        assertEquals( new DoubleLiteralValue( 9.0 ), f.getParameters()[0] );
+        assertEquals( new DoubleLiteralValue( 1.3 ), f.getParameters()[1] );  
+        
     }
 
     private CLPParser parse(final String text) throws Exception {