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

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

Author: mingjin
Date: 2008-03-18 21:19:25 -0400 (Tue, 18 Mar 2008)
New Revision: 19084

Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
Log:
JBRULES-1095 fix bad merge
- brought back testTypeDeclaration().

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	2008-03-19 01:16:00 UTC (rev 19083)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2008-03-19 01:19:25 UTC (rev 19084)
@@ -36,20 +36,20 @@
 import org.drools.RuleBase;
 import org.drools.RuleBaseFactory;
 import org.drools.StatefulSession;
+import org.drools.WorkingMemory;
 import org.drools.StockTick;
-import org.drools.WorkingMemory;
+import org.drools.integrationtests.SerializationHelper;
 import org.drools.base.DefaultKnowledgeHelper;
 import org.drools.common.ActivationGroupNode;
 import org.drools.common.DroolsObjectInputStream;
-import org.drools.common.DroolsObjectOutputStream;
 import org.drools.common.InternalFactHandle;
 import org.drools.common.LogicalDependency;
 import org.drools.common.RuleFlowGroupNode;
+import org.drools.common.DroolsObjectOutputStream;
 import org.drools.commons.jci.compilers.EclipseJavaCompiler;
 import org.drools.commons.jci.compilers.JaninoJavaCompiler;
 import org.drools.commons.jci.compilers.JavaCompiler;
 import org.drools.facttemplates.Fact;
-import org.drools.integrationtests.SerializationHelper;
 import org.drools.lang.descr.AndDescr;
 import org.drools.lang.descr.BaseDescr;
 import org.drools.lang.descr.ConditionalElementDescr;
@@ -1018,17 +1018,6 @@
                     compiler.getClass() );
     }
 
-    public void testPackageMerge() throws Exception {
-        final PackageBuilder builder = new PackageBuilder();
-        try {
-            builder.addPackage( new PackageDescr( "org.drools" ) );
-
-            builder.addPackageFromDrl( new StringReader( "package org.drools\n" + "function boolean testIt() {\n" + "  return true;\n" + "}\n" ) );
-        } catch ( RuntimeException e ) {
-            fail( "Should not raise any exception: " + e.getMessage() );
-        }
-    }
-    
     public void testTypeDeclaration() throws Exception {
         PackageDescr pkgDescr = new PackageDescr( "org.test" );
         TypeDeclarationDescr typeDescr = new TypeDeclarationDescr( "StockTick" );
@@ -1042,6 +1031,7 @@
         builder.addPackage( pkgDescr );
 
         Package pkg = builder.getPackage();
+        pkg = SerializationHelper.serializeObject(pkg);
         assertEquals( 1,
                       pkg.getTypeDeclarations().size() );
 
@@ -1052,8 +1042,19 @@
                       type.getRole() );
         assertEquals( StockTick.class,
                       type.getTypeClass() );
-    }    
+    }
 
+    public void testPackageMerge() throws Exception {
+        final PackageBuilder builder = new PackageBuilder();
+        try {
+            builder.addPackage( new PackageDescr( "org.drools" ) );
+
+            builder.addPackageFromDrl( new StringReader( "package org.drools\n" + "function boolean testIt() {\n" + "  return true;\n" + "}\n" ) );
+        } catch ( RuntimeException e ) {
+            fail( "Should not raise any exception: " + e.getMessage() );
+        }
+    }
+
     private void createReturnValueRule(final PackageDescr packageDescr,
                                        final String expression) {
         final RuleDescr ruleDescr = new RuleDescr( "rule-1" );