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

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

Author: michael.neale at jboss.com
Date: 2009-03-18 19:56:57 -0400 (Wed, 18 Mar 2009)
New Revision: 25716

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java
Log:
fixing broken test

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java	2009-03-18 23:24:52 UTC (rev 25715)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/ContentPackageAssembler.java	2009-03-18 23:56:57 UTC (rev 25716)
@@ -131,15 +131,13 @@
 	}
 
 	public void createBuilder() {
-		List<JarInputStream> jars = BRMSPackageBuilder.getJars(pkg);
-        Properties ps = new Properties();
         try {
-            ps = loadConfProperties(pkg);
+            Properties ps = loadConfProperties(pkg);
+            ps.setProperty( DefaultPackageNameOption.PROPERTY_NAME, this.pkg.getName() );
+            builder = BRMSPackageBuilder.getInstance(BRMSPackageBuilder.getJars(pkg), ps);
         } catch (IOException e) {
             throw new RulesRepositoryException("Unable to load configuration properties for package.", e);            
         }
-        ps.setProperty( DefaultPackageNameOption.PROPERTY_NAME, this.pkg.getName() );
-        builder = BRMSPackageBuilder.getInstance(jars, ps);
 	}
 
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java	2009-03-18 23:24:52 UTC (rev 25715)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java	2009-03-18 23:56:57 UTC (rev 25716)
@@ -29,6 +29,7 @@
 import org.drools.lang.dsl.DSLTokenizedMappingFile;
 import org.drools.rule.Package;
 import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
+import org.drools.builder.conf.DefaultPackageNameOption;
 
 public class BRMSPackageBuilderTest extends TestCase {
 
@@ -51,11 +52,14 @@
         JarInputStream jis = new JarInputStream( this.getClass().getResourceAsStream( "/billasurf.jar" ) );
         List<JarInputStream> l = new ArrayList<JarInputStream>();
         l.add( jis );
-        BRMSPackageBuilder builder = BRMSPackageBuilder.getInstance( l, new Properties() );
 
-        PackageDescr pc = new PackageDescr("foo.bar");
-        builder.addPackage( pc );
+        Properties ps = new Properties();
+        ps.setProperty( DefaultPackageNameOption.PROPERTY_NAME, "foo.bar" );
+        BRMSPackageBuilder builder = BRMSPackageBuilder.getInstance( l, ps );
 
+        //PackageDescr pc = new PackageDescr("foo.bar");
+        //builder.addPackage( pc );
+
         String header = "import com.billasurf.Person\n import com.billasurf.Board";
         builder.addPackageFromDrl( new StringReader(header) );
         assertFalse(builder.hasErrors());