[jboss-svn-commits] JBL Code SVN: r13378 - in labs/jbossrules/trunk/drools-jbrms/src: test/java/org/drools/brms/server and 1 other directories.

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

Author: michael.neale at jboss.com
Date: 2007-07-11 20:29:52 -0400 (Wed, 11 Jul 2007)
New Revision: 13378

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/DRLFileContentHandler.java
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/PerfServiceTest.java
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/DRLFileContentHandlerTest.java
Log:
tightened tests around drl type sniffer

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/DRLFileContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/DRLFileContentHandler.java	2007-07-12 00:08:37 UTC (rev 13377)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/DRLFileContentHandler.java	2007-07-12 00:29:52 UTC (rev 13378)
@@ -50,6 +50,9 @@
      * (in the latter case, the content is passed as it to the compiler).
      */
     static boolean isStandAloneRule(String content) {
+        if (content == null || "".equals( content.trim() )) {
+            return false;
+        }
         StringTokenizer st = new StringTokenizer(content, " ");
         while (st.hasMoreTokens()) {
             String tok = st.nextToken();

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/PerfServiceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/PerfServiceTest.java	2007-07-12 00:08:37 UTC (rev 13377)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/PerfServiceTest.java	2007-07-12 00:29:52 UTC (rev 13378)
@@ -82,7 +82,7 @@
             Calendar lastModified = Calendar.getInstance();
             
             ruleNode.setProperty( AssetItem.LAST_MODIFIED_PROPERTY_NAME, lastModified );            
-            ruleNode.setProperty( AssetItem.PACKAGE_NAME_PROPERTY, this.getName() );
+//            ruleNode.setProperty( AssetItem.PACKAGE_NAME_PROPERTY, this.getName() );
             ruleNode.setProperty( AssetItem.CREATOR_PROPERTY_NAME, session.getUserID() );
 
                         

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/DRLFileContentHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/DRLFileContentHandlerTest.java	2007-07-12 00:08:37 UTC (rev 13377)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/DRLFileContentHandlerTest.java	2007-07-12 00:29:52 UTC (rev 13378)
@@ -44,4 +44,20 @@
         assertTrue(h.isStandAloneRule( moreNewRule ));
     }    
     
+    public void testRuleWithDialect() {
+       String rule = "rule \"DemoRule\" \n "+
+                    "    salience 10 \n" +
+                    "    dialect \"mvel\" \n " +
+                    " when \n" +
+                    " Driver( age > 65 ) \n" +
+                    " then \n" +
+                    " insert(new Rejection(\" too old \"));" +
+                    "end ";
+       DRLFileContentHandler h = new DRLFileContentHandler();
+       assertFalse(h.isStandAloneRule( rule ));
+       
+       assertFalse(h.isStandAloneRule( "" ));
+       
+    }
+    
 }
\ No newline at end of file