[jboss-svn-commits] JBL Code SVN: r33453 - in labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools: integrationtests and 1 other directory.

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

Author: tirelli
Date: 2010-06-11 12:40:00 -0400 (Fri, 11 Jun 2010)
New Revision: 33453

Modified:
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/compiler/Java5Test.java
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
Log:
JBRULES-1543: Forcing selected tests to run with JDT compiler, since JANINO fails for some java 5 features

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/compiler/Java5Test.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/compiler/Java5Test.java	2010-06-11 16:27:29 UTC (rev 33452)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/compiler/Java5Test.java	2010-06-11 16:40:00 UTC (rev 33453)
@@ -20,7 +20,7 @@
         javaConf.setCompiler( JavaDialectConfiguration.ECLIPSE );
         javaConf.setJavaLanguageLevel( "1.5" );
         
-        final PackageBuilder builder = new PackageBuilder( );
+        final PackageBuilder builder = new PackageBuilder( conf );
         builder.addPackageFromDrl( new InputStreamReader( this.getClass().getResourceAsStream( "java5_rule.drl" ) ) );
         assertFalse( builder.hasErrors() );
     }

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java	2010-06-11 16:27:29 UTC (rev 33452)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java	2010-06-11 16:40:00 UTC (rev 33453)
@@ -36,7 +36,11 @@
 import org.drools.io.ResourceFactory;
 import org.drools.lang.descr.PackageDescr;
 import org.drools.rule.Package;
+<<<<<<< .working
 import org.drools.runtime.StatefulKnowledgeSession;
+=======
+import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
+>>>>>>> .merge-right.r33452
 
 public class AccumulateTest extends TestCase {
     protected RuleBase getRuleBase() throws Exception {
@@ -69,6 +73,9 @@
             Assert.fail( "Error messages in parser, need to sort this our (or else collect error messages)" );
         }
         // pre build the package
+        JavaDialectConfiguration jconf = (JavaDialectConfiguration) conf.getDialectConfiguration( "java" );
+        // required because JANINO compiler fails for some java 5 code features
+        jconf.setCompiler( JavaDialectConfiguration.ECLIPSE );
         final PackageBuilder builder = new PackageBuilder( conf );
         builder.addPackage( packageDescr );
         final Package pkg = builder.getPackage();

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2010-06-11 16:27:29 UTC (rev 33452)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java	2010-06-11 16:40:00 UTC (rev 33453)
@@ -2458,7 +2458,10 @@
     }
 
     public void testWithInvalidRule() throws Exception {
-        final PackageBuilder builder = new PackageBuilder();
+        final PackageBuilderConfiguration conf = new PackageBuilderConfiguration();
+        final JavaDialectConfiguration jconf = (JavaDialectConfiguration) conf.getDialectConfiguration( "java" );
+        jconf.setCompiler( JavaDialectConfiguration.ECLIPSE );
+        final PackageBuilder builder = new PackageBuilder( conf );
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "invalid_rule.drl" ) ) );
         final Package pkg = builder.getPackage();
         // Mark: please check if the conseqeuence/should/shouldn't be built