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

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

Author: tirelli
Date: 2009-03-14 13:19:11 -0400 (Sat, 14 Mar 2009)
New Revision: 25649

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-1951: fixing tests

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	2009-03-14 16:23:28 UTC (rev 25648)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2009-03-14 17:19:11 UTC (rev 25649)
@@ -567,7 +567,6 @@
      * there are any generated classes to compile of course.
      */
     public void addPackage(final PackageDescr packageDescr) {
-        //validatePackageName( packageDescr );
         validateUniqueRuleNames( packageDescr );
 
         String dialectName = this.defaultDialect;
@@ -583,7 +582,9 @@
         if ( isEmpty( packageDescr.getNamespace() ) ) {
             packageDescr.setNamespace( this.configuration.getDefaultPackageName() );
         }
-        checkNamespace( packageDescr.getNamespace() );
+        if( ! checkNamespace( packageDescr.getNamespace() ) ) {
+            return;
+        }
 
         PackageRegistry pkgRegistry = this.pkgRegistryMap.get( packageDescr.getNamespace() );
         if ( pkgRegistry == null ) {
@@ -669,7 +670,10 @@
      */
     private boolean checkNamespace(String newName) {
         if ( this.configuration == null ) return true;
-        return this.configuration.isAllowMultipleNamespaces();
+        if( (! this.pkgRegistryMap.isEmpty()) && (! this.pkgRegistryMap.containsKey( newName )) ) {
+            return this.configuration.isAllowMultipleNamespaces();
+        }
+        return true;
     }
 
     public boolean isEmpty(String string) {

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	2009-03-14 16:23:28 UTC (rev 25648)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2009-03-14 17:19:11 UTC (rev 25649)
@@ -1352,7 +1352,7 @@
 
         PackageBuilder bldr = new PackageBuilder( cfg );
         bldr.addPackageFromDrl( new StringReader( "package testBuilderPackageConfig \n import java.util.List" ) );
-        bldr.addPackageFromDrl( new StringReader( "function void doSomething() {\n System.err.println(List.class.toString()); }" ) );
+        bldr.addPackageFromDrl( new StringReader( "package testBuilderPackageConfig \n function void doSomething() {\n System.err.println(List.class.toString()); }" ) );
 
         assertFalse( bldr.hasErrors() );
     }
@@ -1365,6 +1365,7 @@
         assertFalse( bldr.hasErrors() );
         bldr.addPackageFromDrl( new StringReader( "package whee\n import org.drools.Person" ) );
         assertFalse( bldr.hasErrors() );
+        // following package will not be added because configuration is set for single namespace builders
         bldr.addPackageFromDrl( new StringReader( "package whee2\n import org.drools.Person" ) );
         assertFalse( bldr.hasErrors() );
 
@@ -1377,12 +1378,13 @@
         bldr = new PackageBuilder( cfg );
         bldr.addPackageFromDrl( new StringReader( "package whee\n import org.drools.Cheese" ) );
         assertFalse( bldr.hasErrors() );
+        // following import will be added to the default package name
         bldr.addPackageFromDrl( new StringReader( "import org.drools.Person" ) );
         assertFalse( bldr.hasErrors() );
         bldr.addPackageFromDrl( new StringReader( "package whee2\n import org.drools.Person" ) );
         assertFalse( bldr.hasErrors() );
 
-        assertEquals( 2,
+        assertEquals( 3,
                       bldr.getPackages().length );
     }