[jboss-svn-commits] JBL Code SVN: r12097 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/brms/server/util and 2 other directories.

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

Author: michael.neale at jboss.com
Date: 2007-05-23 03:41:18 -0400 (Wed, 23 May 2007)
New Revision: 12097

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/DSLSentence.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultExpanderTest.java
Log:
JBRULES-869 critical bug fix

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/DSLSentence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/DSLSentence.java	2007-05-23 07:22:12 UTC (rev 12096)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brxml/DSLSentence.java	2007-05-23 07:41:18 UTC (rev 12097)
@@ -26,6 +26,10 @@
         return result;
     }
 
+    /**
+     * This is used by the GUI when adding a sentence to LHS or RHS.
+     * @return
+     */
     public DSLSentence copy() {
         final DSLSentence newOne = new DSLSentence();
         newOne.sentence = this.sentence;

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java	2007-05-23 07:22:12 UTC (rev 12096)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/util/BRDRLPersistence.java	2007-05-23 07:41:18 UTC (rev 12097)
@@ -172,7 +172,7 @@
 
         public void visitDSLSentence(final DSLSentence sentence) {
             buf.append( "\t\t" );
-            buf.append( sentence.sentence );
+            buf.append( sentence.toString() );
             buf.append( "\n" );
         }
 
@@ -330,7 +330,7 @@
 
         public void visitDSLSentence(final DSLSentence sentence) {
             buf.append( "\t\t" );
-            buf.append( sentence.sentence );
+            buf.append( sentence.toString() );
             buf.append( "\n" );
         }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java	2007-05-23 07:22:12 UTC (rev 12096)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java	2007-05-23 07:41:18 UTC (rev 12097)
@@ -63,7 +63,7 @@
                           "\t\t>p1.setStatus( \"rejected\" );\n"+
                           "\t\t>modify( p1 );\n"+
                           "\t\t>retract( p1 );\n"+
-                          "\t\tSend an email to {administrator}\n"+
+                          "\t\tSend an email to administrator\n"+
                           "end\n";
 
         final String drl = p.marshal( m );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultExpanderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultExpanderTest.java	2007-05-23 07:22:12 UTC (rev 12096)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultExpanderTest.java	2007-05-23 07:41:18 UTC (rev 12097)
@@ -41,6 +41,19 @@
         final String result = this.expander.expand( rules );
     }
 
+    
+    public void testExpandParts() throws Exception {
+        DSLMappingFile file = new DSLMappingFile();
+        String dsl = "[when]foo=Foo()\n[then]bar {num}=baz({num});";
+        file.parseAndLoad( new StringReader( dsl ) );
+        assertEquals( 0,
+                      file.getErrors().size() );
+        DefaultExpander ex = new DefaultExpander();
+        ex.addDSLMapping( file.getMapping() );
+        
+        System.err.println(ex.expand( "rule 'x' \n when \n foo \n then \n end" ));
+    }
+    
     public void testExpandFailure() throws Exception {
 
         DSLMappingFile file = new DSLMappingFile();