[jboss-svn-commits] JBL Code SVN: r18986 - labs/jbossrules/branches/ming-serialization/drools-compiler/src/test/java/org/drools/integrationtests.

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

Author: mingjin
Date: 2008-03-14 12:17:49 -0400 (Fri, 14 Mar 2008)
New Revision: 18986

Modified:
   labs/jbossrules/branches/ming-serialization/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java
Log:
added rulebase serialization to all

Modified: labs/jbossrules/branches/ming-serialization/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java
===================================================================
--- labs/jbossrules/branches/ming-serialization/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java	2008-03-14 16:15:54 UTC (rev 18985)
+++ labs/jbossrules/branches/ming-serialization/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java	2008-03-14 16:17:49 UTC (rev 18986)
@@ -1,13 +1,6 @@
 package org.drools.integrationtests;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import junit.framework.TestCase;
 import org.drools.Cheese;
 import org.drools.Person;
 import org.drools.Primitives;
@@ -21,7 +14,13 @@
 import org.drools.rule.Package;
 import org.drools.rule.Rule;
 
-import junit.framework.TestCase;
+import java.io.ByteArrayInputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class MarshallingTest extends TestCase {
     public void testSerializable() throws Exception {
@@ -35,10 +34,8 @@
         assertEquals( 0,
                       builder.getErrors().getErrors().length );
 
-        RuleBase ruleBase = getRuleBase();// RuleBaseFactory.newRuleBase();
+        RuleBase ruleBase = getRuleBase(pkg);// RuleBaseFactory.newRuleBase();
 
-        ruleBase.addPackage( pkg );
-
         Map map = new HashMap();
         map.put( "x",
                  ruleBase );
@@ -106,12 +103,13 @@
 
         RuleBase ruleBase = getRuleBase();// RuleBaseFactory.newRuleBase();
 
+
         WorkingMemory workingMemory = ruleBase.newStatefulSession();
 
         Map map = new HashMap();
         map.put( "x",
                  ruleBase );
-//        map = SerializationHelper.serializeObject(map);
+        map = SerializationHelper.serializeObject(map);
         ruleBase = (RuleBase) map.get( "x" );
 
         final byte[] wm = SerializationHelper.serializeOut( workingMemory );
@@ -317,6 +315,7 @@
         builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_Dynamic1.drl" ) ) );
         Package pkg = SerializationHelper.serializeObject( builder.getPackage());
         ruleBase.addPackage( pkg );
+        ruleBase    = SerializationHelper.serializeObject(ruleBase);
 
         StatefulSession session = ruleBase.newStatefulSession();
         List list = new ArrayList();
@@ -333,8 +332,6 @@
         session.dispose();
 
         // now recreate the rulebase, deserialize the session and test it
-//        ruleBase = SerializationHelper.serializeObject( ruleBase );
-
         session = ruleBase.newStatefulSession( new ByteArrayInputStream( serializedSession ) );
         list = (List) session.getGlobal( "list" );
 
@@ -371,10 +368,8 @@
                       0,
                       builder.getErrors().getErrors().length );
 
-        RuleBase ruleBase = getRuleBase();// RuleBaseFactory.newRuleBase();
+        RuleBase ruleBase = getRuleBase(pkg);// RuleBaseFactory.newRuleBase();
 
-        ruleBase.addPackage( pkg );
-
         Map map = new HashMap();
         map.put( "x",
                  ruleBase );
@@ -429,6 +424,13 @@
                                             null );
     }
 
+    protected RuleBase getRuleBase(Package pkg) throws Exception {
+        RuleBase    ruleBase    = getRuleBase();
+
+        ruleBase.addPackage(pkg);
+        return SerializationHelper.serializeObject(ruleBase);
+    }
+
     protected RuleBase getRuleBase(final RuleBaseConfiguration config) throws Exception {
 
         return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,