[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/passivation ...

[Vladmir Blagojevic]

  User: vblagojevic
  Date: 06/08/31 10:56:46

  Modified:    tests/functional/org/jboss/cache/passivation 
                        PassivationTestsBase.java
  Log:
  CacheLoader API change (remove byte based load/store)
  
  Revision  Changes    Path
  1.15      +32 -6     JBossCache/tests/functional/org/jboss/cache/passivation/PassivationTestsBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PassivationTestsBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/passivation/PassivationTestsBase.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- PassivationTestsBase.java	20 Jul 2006 09:03:54 -0000	1.14
  +++ PassivationTestsBase.java	31 Aug 2006 14:56:46 -0000	1.15
  @@ -8,11 +8,17 @@
   import org.jboss.cache.loader.CacheLoader;
   import org.jboss.cache.loader.SamplePojo;
   import org.jboss.cache.lock.IsolationLevel;
  +import org.jboss.cache.statetransfer.StateTransferManager;
   import org.jboss.cache.transaction.DummyTransactionManager;
  +import org.jboss.invocation.MarshalledValueInputStream;
  +import org.jboss.invocation.MarshalledValueOutputStream;
   import org.w3c.dom.Element;
   
   import javax.transaction.NotSupportedException;
   import javax.transaction.Transaction;
  +
  +import java.io.ByteArrayInputStream;
  +import java.io.ByteArrayOutputStream;
   import java.io.Serializable;
   import java.util.*;
   
  @@ -23,7 +29,7 @@
    * Base tests for passivation using any of the cache loaders
    * 
    * @author <a href="mailto:{hmesha at novell.com}">{Hany Mesha}</a>
  - * @version $Id: PassivationTestsBase.java,v 1.14 2006/07/20 09:03:54 msurtani Exp $
  + * @version $Id: PassivationTestsBase.java,v 1.15 2006/08/31 14:56:46 vblagojevic Exp $
    */
   abstract public class PassivationTestsBase extends TestCase {
   
  @@ -1337,13 +1343,23 @@
   
         loader.remove(Fqn.fromString("/"));
   
  -      int num=loader.loadEntireState().length;
  +      ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
  +      MarshalledValueOutputStream os = new MarshalledValueOutputStream(baos);
  +      loader.loadEntireState(os);
  +      os.close();
  +      int num = baos.size();
   
         Object txnKey = new Object();
         List mods = createUpdates();
         loader.prepare(txnKey, mods, false);
         loader.rollback(txnKey);
  -      assertEquals(num, loader.loadEntireState().length);
  +      
  +      baos = new ByteArrayOutputStream(1024);
  +      os = new MarshalledValueOutputStream(baos);
  +      loader.loadEntireState(os);  
  +      os.close();
  +      
  +      assertEquals(num,baos.size());
      }
   
      /**
  @@ -1516,12 +1532,22 @@
         assertEquals(2, loader.get(FQN).size());
   
         /* Save state. */
  -      byte[] state = loader.loadEntireState();
  -      assertTrue(state.length > 0);
  +      ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
  +      MarshalledValueOutputStream os = new MarshalledValueOutputStream(baos);
  +      loader.loadEntireState(os);
  +      os.writeObject(StateTransferManager.STREAMING_DELIMETER_NODE);
  +      os.close();
  +      assertTrue(baos.size()>0);
  +      
  +      byte [] savedState = baos.toByteArray();
   
   
         /* Restore state. */
  -      loader.storeEntireState(state);
  +      ByteArrayInputStream bais = new ByteArrayInputStream(savedState);
  +      MarshalledValueInputStream is = new MarshalledValueInputStream(bais);
  +      loader.storeEntireState(is);
  +      is.close();
  +      
         addDelay();
         assertEquals(c1, loader.get(FQN).get(new Integer(1)));
         assertEquals(c2, loader.get(FQN).get(new Integer(2)));