[jboss-svn-commits] JBL Code SVN: r34236 - in labs/jbossrules/trunk/drools-guvnor/src: test/java/org/drools/guvnor/server/util and 1 other directory.

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

Author: mark.proctor at jboss.com
Date: 2010-07-27 19:25:31 -0400 (Tue, 27 Jul 2010)
New Revision: 34236

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ClassicDRLImporter.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java
Log:
-fixed classic importer to handle comments better

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ClassicDRLImporter.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ClassicDRLImporter.java	2010-07-27 21:33:46 UTC (rev 34235)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ClassicDRLImporter.java	2010-07-27 23:25:31 UTC (rev 34236)
@@ -98,7 +98,8 @@
                 StringBuffer currentRule = new StringBuffer();
                 laConsumeToEnd( lines,
                                 currentRule,
-                                "end" );
+                                "end",
+                                false );
                 addRule( ruleName,
                          currentRule );
 
@@ -124,9 +125,11 @@
             } else if ( line.startsWith( "/*" ) ) {
 
                 StringBuffer comment = new StringBuffer();
+                comment.append( line + "\n");
                 laConsumeToEnd( lines,
                                 comment,
-                                "*/" );
+                                "*/",
+                                true );
 
                 header.append( comment );
 
@@ -264,11 +267,14 @@
 
     private void laConsumeToEnd(StringTokenizer lines,
                                 StringBuffer currentRule,
-                                String end) {
+                                String end, boolean addLastLine) {
         String line;
         while ( lines.hasMoreTokens() ) {
             line = lines.nextToken();
             if ( line.trim().startsWith( end ) ) {
+                if ( addLastLine ) {
+                    currentRule.append( line + "\n" );
+                }
                 break;
             }
             currentRule.append( line );

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java	2010-07-27 21:33:46 UTC (rev 34235)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/util/ClassicDRLImporterTest.java	2010-07-27 23:25:31 UTC (rev 34236)
@@ -137,10 +137,12 @@
         assertTrue( imp.isDSLEnabled() );
         assertEquals( 2,
                       imp.getAssets().size() );
+        System.out.println( imp.getPackageHeader()  );   
+        
         assertEquals( "foo",
-                      imp.getPackageName() );
-        assertEqualsIgnoreWhitespace( "import goo.wee global ka.cha",
-                                      imp.getPackageHeader() );
+                      imp.getPackageName() );   
+        assertTrue( imp.getPackageHeader().contains( "import goo.wee" ));
+        assertTrue( imp.getPackageHeader().contains( "global ka.cha" ));
 
         assertEqualsIgnoreWhitespace( "when ka chow then bam",
                                       imp.getAssets().get( 0 ).content );