[jboss-svn-commits] JBL Code SVN: r20313 - labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl.

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

Author: mattgeis
Date: 2008-06-04 16:26:24 -0400 (Wed, 04 Jun 2008)
New Revision: 20313

Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DSLTokenizedMappingFileTest.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultExpanderTest.java
Log:
JBRULES-1633: Adjusting expected values to match with new value patterns being generated.

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DSLTokenizedMappingFileTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DSLTokenizedMappingFileTest.java	2008-06-04 20:24:41 UTC (rev 20312)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DSLTokenizedMappingFileTest.java	2008-06-04 20:26:24 UTC (rev 20313)
@@ -65,7 +65,7 @@
             assertEquals( "(\\W|^)ATTRIBUTE \"(.*?)\" IS IN [(.*?)](\\W|$)",
                           entry.getKeyPattern().toString() );
             //Attribute( {attr} in ({list}) )
-            assertEquals( "Attribute( $2 in ($3) ) ",
+            assertEquals( "$1Attribute( $2 in ($3) ) $4",
                           entry.getValuePattern() );
 
         } catch ( final IOException e ) {
@@ -100,7 +100,7 @@
             assertEquals( "(\\W|^)ATTRIBUTE \"(.*?)\" IS IN \\[(.*?)\\](\\W|$)",
                           entry.getKeyPattern().toString() );
             //Attribute( {attr} in ({list}) )
-            assertEquals( "Attribute( $2 in ($3) ) ",
+            assertEquals( "$1Attribute( $2 in ($3) ) $4",
                           entry.getValuePattern() );
 
         } catch ( final IOException e ) {
@@ -168,7 +168,7 @@
                           entry.getMetaData() );
             assertEquals( "(\\W|^)something:\\=(.*?)$",
                           entry.getKeyPattern().toString() );
-            assertEquals( "Attribute( something == \"$2\" ) ",
+            assertEquals( "$1Attribute( something == \"$2\" ) ",
                           entry.getMappingValue() );
 
         } catch ( final IOException e ) {

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	2008-06-04 20:24:41 UTC (rev 20312)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/dsl/DefaultExpanderTest.java	2008-06-04 20:26:24 UTC (rev 20313)
@@ -165,8 +165,8 @@
 
         DefaultExpander ex = new DefaultExpander();
         ex.addDSLMapping( file.getMapping() );
-        String source = "package something;\n\nrule \"1\"\nwhen\n    Invoke rule executor\nthen\n    Execute rule \"5\"\nend";
-        String expected = "package something;\n\nrule \"1\"\nwhen\n   ruleExec: RuleExecutor() \nthen\n   ruleExec.ExecuteSubRule( new Long(5)); \nend\n";
+        String source =   "package something;\n\nrule \"1\"\nwhen\n    Invoke rule executor\nthen\n    Execute rule \"5\"\nend";
+        String expected = "package something;\n\nrule \"1\"\nwhen\n    ruleExec: RuleExecutor()  \nthen\n    ruleExec.ExecuteSubRule( new Long(5)); \nend\n";
         String drl = ex.expand( source );
 //        System.out.println("["+drl+"]" );
 //        System.out.println("["+expected+"]" );