[jboss-svn-commits] JBL Code SVN: r13524 - labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/builder.

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

Author: mark.proctor at jboss.com
Date: 2007-07-14 22:55:16 -0400 (Sat, 14 Jul 2007)
New Revision: 13524

Modified:
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/builder/BRMSPackageBuilderTest.java
Log:
JBRULES-1010 pluggeable Dialect Configuration.
-fixing failing unit tests

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/builder/BRMSPackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/builder/BRMSPackageBuilderTest.java	2007-07-15 02:49:42 UTC (rev 13523)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/builder/BRMSPackageBuilderTest.java	2007-07-15 02:55:16 UTC (rev 13524)
@@ -28,6 +28,7 @@
 import org.drools.lang.descr.PackageDescr;
 import org.drools.lang.dsl.DSLMappingFile;
 import org.drools.rule.Package;
+import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
 
 public class BRMSPackageBuilderTest extends TestCase {
     
@@ -51,7 +52,8 @@
         builder.addPackageFromDrl( new StringReader(header) );
         assertFalse(builder.hasErrors());
         
-        assertEquals(PackageBuilderConfiguration.JANINO, builder.getPackageBuilderConfiguration().getCompiler());
+        JavaDialectConfiguration javaConf = ( JavaDialectConfiguration ) builder.getPackageBuilderConfiguration().getDialectConfiguration( "java" );        
+        assertEquals(JavaDialectConfiguration.JANINO, javaConf.getCompiler());
         
         String ruleAtom = "rule foo \n when \n Person() \n then \n System.out.println(42); end";
         builder.addPackageFromDrl( new StringReader(ruleAtom) );
@@ -105,15 +107,53 @@
         assertNotNull(builder.getDSLExpander());
     }
     
-    public void testDefaultCompiler() {
-        assertEquals(PackageBuilderConfiguration.JANINO, BRMSPackageBuilder.COMPILER);
-        assertEquals(PackageBuilderConfiguration.JANINO, BRMSPackageBuilder.getPreferredBRMSCompiler());
-        System.setProperty( "drools.compiler", "ECLIPSE" );
-        assertEquals(PackageBuilderConfiguration.ECLIPSE, BRMSPackageBuilder.getPreferredBRMSCompiler());
-        System.setProperty( "drools.compiler", "" );
-        assertEquals(PackageBuilderConfiguration.JANINO, BRMSPackageBuilder.getPreferredBRMSCompiler());
+//    public void testDefaultCompiler() {
+//        assertEquals(JavaDialectConfiguration.JANINO, BRMSPackageBuilder.COMPILER);
+//        assertEquals(PackageBuilderConfiguration.JANINO, BRMSPackageBuilder.getPreferredBRMSCompiler());
+//        System.setProperty( "drools.compiler", "ECLIPSE" );
+//        assertEquals(PackageBuilderConfiguration.ECLIPSE, BRMSPackageBuilder.getPreferredBRMSCompiler());
+//        System.setProperty( "drools.compiler", "" );
+//        assertEquals(PackageBuilderConfiguration.JANINO, BRMSPackageBuilder.getPreferredBRMSCompiler());
+//    }
+    
+    // @FIXME rule "abc" is null and the Packge has no namespace
+    public void testDefaultCompiler() throws Exception {
+
+        JarInputStream jis = new JarInputStream( this.getClass().getResourceAsStream( "/billasurf.jar" ) );
+        List<JarInputStream> l = new ArrayList<JarInputStream>();
+        l.add( jis );
+        BRMSPackageBuilder builder = BRMSPackageBuilder.getInstance( l );
+        
+        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());
+        
+        JavaDialectConfiguration javaConf = ( JavaDialectConfiguration ) builder.getPackageBuilderConfiguration().getDialectConfiguration( "java" );        
+        assertEquals(JavaDialectConfiguration.JANINO, javaConf.getCompiler());
     }
+    
+    public void testEclipseCompiler() throws Exception {
 
+        System.setProperty( "drools.dialect.java.compiler", "ECLIPSE" );
+        JarInputStream jis = new JarInputStream( this.getClass().getResourceAsStream( "/billasurf.jar" ) );
+        List<JarInputStream> l = new ArrayList<JarInputStream>();
+        l.add( jis );
+        BRMSPackageBuilder builder = BRMSPackageBuilder.getInstance( l );
+        
+        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());
+        
+        JavaDialectConfiguration javaConf = ( JavaDialectConfiguration ) builder.getPackageBuilderConfiguration().getDialectConfiguration( "java" );        
+        assertEquals(JavaDialectConfiguration.ECLIPSE, javaConf.getCompiler());
+    }    
+