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

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

Author: michael.neale at jboss.com
Date: 2007-04-16 07:52:17 -0400 (Mon, 16 Apr 2007)
New Revision: 10998

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
Log:
JBRULES-799 Package name validation fixes

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2007-04-16 11:45:20 UTC (rev 10997)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2007-04-16 11:52:17 UTC (rev 10998)
@@ -213,6 +213,9 @@
     }
 
     private void validatePackageName(final PackageDescr packageDescr) {
+        if (this.pkg != null) {
+            return;
+        }
         if ( packageDescr.getName() == null || "".equals( packageDescr.getName() ) ) {
 
             throw new MissingPackageNameException( "Missing package name for rule package." );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2007-04-16 11:45:20 UTC (rev 10997)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2007-04-16 11:52:17 UTC (rev 10998)
@@ -24,6 +24,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
+import java.io.StringReader;
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.List;
@@ -270,7 +271,7 @@
         return bytes;
     }
 
-    public void testNoPackageName() {
+    public void testNoPackageName() throws Exception {
         final PackageBuilder builder = new PackageBuilder();
         try {
             builder.addPackage( new PackageDescr( null ) );
@@ -284,6 +285,10 @@
         } catch ( final RuntimeException e ) {
             assertNotNull( e.getMessage() );
         }
+        
+        builder.addPackageFromDrl( new StringReader("package foo") );
+        builder.addPackageFromDrl( new StringReader("rule x end") );
+
     }
 
     public void testFactTemplate() {