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

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

Author: michael.neale at jboss.com
Date: 2007-04-16 03:18:19 -0400 (Mon, 16 Apr 2007)
New Revision: 10995

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/BRXMLContentHandler.java
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ContentHandler.java
   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/ContentHandlerTest.java
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/assembler/PackageAssemblerTest.java
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/ContentHandlerTest.java
Log:
JBRULES-773 BRMS assembler

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/BRXMLContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/BRXMLContentHandler.java	2007-04-16 02:49:58 UTC (rev 10994)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/BRXMLContentHandler.java	2007-04-16 07:18:19 UTC (rev 10995)
@@ -8,7 +8,7 @@
 
 import com.google.gwt.user.client.rpc.SerializableException;
 
-public class BRXMLContentHandler extends ContentHandler {
+public class BRXMLContentHandler extends ContentHandler implements IRuleAsset {
     
 
     public void retrieveAssetContent(RuleAsset asset,

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ContentHandler.java	2007-04-16 02:49:58 UTC (rev 10994)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/ContentHandler.java	2007-04-16 07:18:19 UTC (rev 10995)
@@ -7,7 +7,6 @@
 import org.drools.brms.client.rpc.RuleAsset;
 import org.drools.repository.AssetItem;
 import org.drools.repository.PackageItem;
-import org.drools.repository.RulesRepositoryException;
 
 import com.google.gwt.user.client.rpc.SerializableException;
 
@@ -59,4 +58,14 @@
         return h;
     }
     
+    /** 
+     * @return true if the current content type is for a rule asset.
+     * If it is a rule asset, then it can be assembled into a package. 
+     * If its not, then it is there, nominally to support compiling or 
+     * validation/testing of the package (eg a model, or a dsl file).
+     */
+    public boolean isRuleAsset() {
+        return this instanceof IRuleAsset;
+    }
+    
 }
\ No newline at end of file

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-04-16 02:49:58 UTC (rev 10994)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/contenthandler/DRLFileContentHandler.java	2007-04-16 07:18:19 UTC (rev 10995)
@@ -1,5 +1,5 @@
 package org.drools.brms.server.contenthandler;
 
-public class DRLFileContentHandler extends PlainTextContentHandler {
+public class DRLFileContentHandler extends PlainTextContentHandler implements IRuleAsset {
 
 }

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ContentHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ContentHandlerTest.java	2007-04-16 02:49:58 UTC (rev 10994)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ContentHandlerTest.java	2007-04-16 07:18:19 UTC (rev 10995)
@@ -12,14 +12,6 @@
 
     
     public void testContentHandlerCreate() {
-        assertTrue(ContentHandler.getHandler( AssetFormats.DRL ) instanceof PlainTextContentHandler);
-        assertTrue(ContentHandler.getHandler( AssetFormats.DSL_TEMPLATE_RULE ) instanceof DSLRuleContentHandler);
-        assertTrue(ContentHandler.getHandler( AssetFormats.BUSINESS_RULE ) instanceof BRXMLContentHandler);
-        try {
-            ContentHandler.getHandler( "XXX" );
-            fail("should have thrown an exception");
-        } catch (IllegalArgumentException e) {
-            assertNotNull(e.getMessage());
-        }
+
     }
 }

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/assembler/PackageAssemblerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/assembler/PackageAssemblerTest.java	2007-04-16 02:49:58 UTC (rev 10994)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/assembler/PackageAssemblerTest.java	2007-04-16 07:18:19 UTC (rev 10995)
@@ -59,6 +59,16 @@
         }
         assertFalse(builder.hasErrors());
 
+        ruleAtom = "package foo.bar2 rule foo2 \n when \n Person() \n then \n System.out.println(42); end";
+        builder.addPackageFromDrl( new StringReader(ruleAtom) );
+        if (builder.hasErrors()) {            
+            System.err.println(builder.getErrors()[0].getMessage());
+        }
+        assertFalse(builder.hasErrors());
+        
+        
+        
+        
     }
 
 }

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/ContentHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/ContentHandlerTest.java	2007-04-16 02:49:58 UTC (rev 10994)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/contenthandler/ContentHandlerTest.java	2007-04-16 07:18:19 UTC (rev 10995)
@@ -9,8 +9,24 @@
     public void testContentFormat() {
         assertTrue(ContentHandler.getHandler( AssetFormats.DRL ) instanceof DRLFileContentHandler);
         assertTrue(ContentHandler.getHandler( AssetFormats.DSL ) instanceof DSLDefinitionContentHandler);
+        assertTrue(ContentHandler.getHandler( AssetFormats.DSL_TEMPLATE_RULE ) instanceof DSLRuleContentHandler);
         assertTrue(ContentHandler.getHandler( AssetFormats.BUSINESS_RULE ) instanceof BRXMLContentHandler);
-
+        
+        try {
+            ContentHandler.getHandler( "XXX" );
+            fail("should have thrown an exception");
+        } catch (IllegalArgumentException e) {
+            assertNotNull(e.getMessage());
+        }        
     }
     
+    public void testRuleAssetType() {
+        assertTrue(ContentHandler.getHandler( AssetFormats.DRL ).isRuleAsset());
+        assertTrue(ContentHandler.getHandler( AssetFormats.DSL_TEMPLATE_RULE ).isRuleAsset());
+        assertTrue(ContentHandler.getHandler( AssetFormats.BUSINESS_RULE ).isRuleAsset());
+        
+        assertFalse(ContentHandler.getHandler( AssetFormats.DSL ).isRuleAsset());
+        assertFalse(ContentHandler.getHandler( AssetFormats.MODEL ).isRuleAsset());
+    }
+    
 }