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

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

Author: fmeyer
Date: 2007-06-19 04:23:04 -0400 (Tue, 19 Jun 2007)
New Revision: 12689

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/DumperTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_Dump.drl
Log:
JBRULES-935 - Update DrlDumper to handle with the new language features


Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java	2007-06-19 07:20:07 UTC (rev 12688)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DrlDumper.java	2007-06-19 08:23:04 UTC (rev 12689)
@@ -168,7 +168,8 @@
     }
 
     public void visitRestrictionConnectiveDescr(final RestrictionConnectiveDescr descr) {
-        this.template = this.processFieldConstraint( descr, true );
+        String tmp = this.processFieldConstraint( descr, true );
+        this.template = tmp;
     }
 
     public void visitNotDescr(final NotDescr descr) {
@@ -263,8 +264,7 @@
             visit( iterator.next() );
             descrString += this.template;
             if ( descrString.endsWith( DrlDumper.eol ) ) {
-                descrString = descrString.substring( 0,
-                                                     descrString.indexOf( DrlDumper.eol ) );
+                descrString = descrString.substring( 0, descrString.indexOf( DrlDumper.eol ) );
             }
             descrString += " || ";
         }
@@ -334,10 +334,18 @@
 
     private String processDescrList(final List descr) {
         String descrString = "";
-        for ( final Iterator it = descr.iterator(); it.hasNext(); ) {
-            visit( it.next() );
+        for ( final Iterator ite = descr.iterator(); ite.hasNext(); ) {
+            
+            Object obj =  ite.next();
+            
+            visit( obj );
             descrString += this.template;
-            descrString += DrlDumper.eol;
+            
+            if (obj.getClass().equals( PatternDescr.class )) {
+                descrString += DrlDumper.eol;
+            } else if (ite.hasNext()) {
+                descrString += " && ";
+            }
         }
         return descrString;
     }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/DumperTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/DumperTest.java	2007-06-19 07:20:07 UTC (rev 12688)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/DumperTest.java	2007-06-19 08:23:04 UTC (rev 12689)
@@ -31,16 +31,6 @@
         
         String buffer = readFile("test_ParseRule.xml");
         
-        System.out.println("-------------");
-        
-        System.out.println(buffer);
-        
-        System.out.println("-------------");
-        
-        System.out.println(result);
-        
-        System.out.println("-------------");
-        
         assertEqualsIgnoreWhitespace( buffer, result );
         assertNotNull( result );
 
@@ -80,10 +70,9 @@
         final XmlDumper XMLdumper = new XmlDumper();
         final String XMLresult = XMLdumper.dump( pkgOriginal );
         
-        System.out.println(XMLresult);
-        
         final String result = dumper.dump( pkgOriginal );
         
+        
         System.out.println(result);
         
         assertNotNull( result );
@@ -116,9 +105,6 @@
         
         String buffer = readFile( "test_Dump.drl" );
         
-        System.out.println(result);
-        System.out.println(buffer);
-
         assertEqualsIgnoreWhitespace( buffer.toString(), result );
 
     }
@@ -133,7 +119,7 @@
         assertEquals( cleanExpected,
                       cleanActual );
     }
-
+    
     private String readFile(final String file) throws IOException {
         final InputStreamReader reader = new InputStreamReader( getClass().getResourceAsStream( file ) );
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_Dump.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_Dump.drl	2007-06-19 07:20:07 UTC (rev 12688)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/test_Dump.drl	2007-06-19 08:23:04 UTC (rev 12689)
@@ -6,7 +6,7 @@
   agenda-group "agenda-group"
   activation-group "activation-group"
   when
-	foo2 : Bar( ( a ( > 60 && < 70 ) || ( > 50 && < 55 ) && a3 == "black" ) || ( a == 40 && a3 == "pink" ) || ( a == 12 && ( a3 == "yellow" || a3 == "blue" ) ) )
+    foo2 : Bar( a ( > 60 && < 70 ) || ( > 50 && < 55 ) && a3 == "black" || a == 40 && a3 == "pink" || a == 12 && a3 == "yellow" || a3 == "blue")
     foo3 : Bar( a == 3 || == 4, a3 == "hello", a4 == null )    
     foo4 : Bar( a4 : a != 4 && != 5)
     foo5 : Bar( b == (a4 + 1) || > a4)