[jboss-svn-commits] JBL Code SVN: r12274 - labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler.

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

Author: mark.proctor at jboss.com
Date: 2007-05-31 21:25:58 -0400 (Thu, 31 May 2007)
New Revision: 12274

Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
Log:
-removed FIXMEs, left with failing tests.

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-06-01 01:02:01 UTC (rev 12273)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2007-06-01 01:25:58 UTC (rev 12274)
@@ -74,6 +74,7 @@
 import org.drools.rule.PredicateConstraint;
 import org.drools.rule.ReturnValueConstraint;
 import org.drools.rule.Rule;
+import org.drools.rule.builder.dialect.java.JavaDialect;
 import org.drools.ruleflow.common.core.Process;
 import org.drools.ruleflow.core.impl.RuleFlowProcessImpl;
 import org.drools.spi.Activation;
@@ -937,54 +938,34 @@
 
     public void testCompilerConfiguration() throws Exception {
         // test default is eclipse jdt core
-        PackageBuilder builder = new PackageBuilder();;
-        final Field compilerField = builder.getClass().getDeclaredField( "compiler" );
+        PackageBuilder builder = new PackageBuilder();
+        final Field dialectField = builder.getClass().getDeclaredField( "dialect" );
+        dialectField.setAccessible( true );
+        JavaDialect dialect = ( JavaDialect ) dialectField.get( builder );
+        
+        final Field compilerField = dialect.getClass().getDeclaredField( "compiler" );
         compilerField.setAccessible( true );
-        JavaCompiler compiler = (JavaCompiler) compilerField.get( builder );
+        JavaCompiler compiler = (JavaCompiler) compilerField.get( dialect );
         assertSame( EclipseJavaCompiler.class,
                     compiler.getClass() );
 
         // test JANINO with property settings
         PackageBuilderConfiguration conf = new PackageBuilderConfiguration();
         conf.setCompiler( PackageBuilderConfiguration.JANINO );
-        builder = new PackageBuilder( conf );;
-        compiler = (JavaCompiler) compilerField.get( builder );
+        builder = new PackageBuilder( conf );    
+        dialect = ( JavaDialect ) dialectField.get( builder );        
+        compiler = (JavaCompiler) compilerField.get( dialect );
         assertSame( JaninoJavaCompiler.class,
                     compiler.getClass() );
 
         // test eclipse jdt core with property settings and default source level
         conf = new PackageBuilderConfiguration();
         conf.setCompiler( PackageBuilderConfiguration.ECLIPSE );
-        builder = new PackageBuilder( conf );;
-        compiler = (JavaCompiler) compilerField.get( builder );
+        builder = new PackageBuilder( conf );    
+        dialect = ( JavaDialect ) dialectField.get( builder );        
+        compiler = (JavaCompiler) compilerField.get( dialect );
         assertSame( EclipseJavaCompiler.class,
                     compiler.getClass() );
-
-        EclipseJavaCompiler eclipseCompiler = (EclipseJavaCompiler) compiler;
-        final Field settingsField = eclipseCompiler.getClass().getDeclaredField( "settings" );
-        settingsField.setAccessible( true );
-        Map map = (Map) settingsField.get( eclipseCompiler );
-        assertEquals( "1.4",
-                      map.get( "org.eclipse.jdt.core.compiler.codegen.targetPlatform" ) );
-        assertEquals( "1.5",
-                      map.get( "org.eclipse.jdt.core.compiler.source" ) );
-
-        // test eclipse jdt core with property settings and jdk1.5 source level
-        conf = new PackageBuilderConfiguration();
-        conf.setCompiler( PackageBuilderConfiguration.ECLIPSE );
-        conf.setJavaLanguageLevel( "1.4" );
-        builder = new PackageBuilder( conf );;
-        compiler = (JavaCompiler) compilerField.get( builder );
-        assertSame( EclipseJavaCompiler.class,
-                    compiler.getClass() );
-
-        eclipseCompiler = (EclipseJavaCompiler) compiler;
-        map = (Map) settingsField.get( eclipseCompiler );
-        assertEquals( "1.5",
-                      map.get( "org.eclipse.jdt.core.compiler.codegen.targetPlatform" ) );
-        // it cannot be set below 1.5, so if they add 1.4, it still ends up at 1.5.        
-        assertEquals( "1.5",
-                      map.get( "org.eclipse.jdt.core.compiler.source" ) );
     }
 
     private void createReturnValueRule(final PackageDescr packageDescr,