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

[Manik Surtani]

  User: msurtani
  Date: 07/01/29 11:55:47

  Modified:    tests/functional/org/jboss/cache/loader   BdbjeTest.java
                        CacheLoaderTestsBase.java
  Log:
  Fixed UT failures and a bug in region selection loop
  
  Revision  Changes    Path
  1.19      +7 -7      JBossCache/tests/functional/org/jboss/cache/loader/BdbjeTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BdbjeTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/BdbjeTest.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- BdbjeTest.java	17 Jan 2007 14:13:06 -0000	1.18
  +++ BdbjeTest.java	29 Jan 2007 16:55:47 -0000	1.19
  @@ -37,7 +37,7 @@
    * directory.  Any scratch directory will do, but beware that all files in
    * the directory will be deleted by setUp().</p>
    *
  - * @version $Revision: 1.18 $
  + * @version $Revision: 1.19 $
    */
   public class BdbjeTest extends TestCase
   {
  @@ -1139,7 +1139,7 @@
   
         ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
         MarshalledValueOutputStream os = new MarshalledValueOutputStream(baos);
  -      os.writeObject(StateTransferManager.STREAMING_DELIMITER_NODE);
  +      cache.getMarshaller().objectToObjectStream(StateTransferManager.STREAMING_DELIMITER_NODE, os);
         os.close();
   
         ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
  @@ -1271,7 +1271,7 @@
         ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
         MarshalledValueOutputStream os = new MarshalledValueOutputStream(baos);
         loader.loadEntireState(os);
  -      os.writeObject(StateTransferManager.STREAMING_DELIMITER_NODE);
  +      cache.getMarshaller().objectToObjectStream(StateTransferManager.STREAMING_DELIMITER_NODE, os);
         os.close();
   
         ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
  @@ -1282,7 +1282,7 @@
         baos = new ByteArrayOutputStream(1024);
         os = new MarshalledValueOutputStream(baos);
         loader.loadEntireState(os);
  -      os.writeObject(StateTransferManager.STREAMING_DELIMITER_NODE);
  +      cache.getMarshaller().objectToObjectStream(StateTransferManager.STREAMING_DELIMITER_NODE, os);
         os.close();
   
         bais = new ByteArrayInputStream(baos.toByteArray());
  @@ -1293,7 +1293,7 @@
         baos = new ByteArrayOutputStream(1024);
         os = new MarshalledValueOutputStream(baos);
         loader.loadEntireState(os);
  -      os.writeObject(StateTransferManager.STREAMING_DELIMITER_NODE);
  +      cache.getMarshaller().objectToObjectStream(StateTransferManager.STREAMING_DELIMITER_NODE, os);
         os.close();
   
         assertEquals(null, loader.get(FQN));
  @@ -1313,7 +1313,7 @@
         baos = new ByteArrayOutputStream(1024);
         os = new MarshalledValueOutputStream(baos);
         loader.loadEntireState(os);
  -      os.writeObject(StateTransferManager.STREAMING_DELIMITER_NODE);
  +      cache.getMarshaller().objectToObjectStream(StateTransferManager.STREAMING_DELIMITER_NODE, os);
         assertTrue(baos.size() > STREAM_HEADER_LENGTH);
         os.close();
   
  @@ -1322,7 +1322,7 @@
         /* Clear state. */
         baos = new ByteArrayOutputStream(1024);
         os = new MarshalledValueOutputStream(baos);
  -      os.writeObject(StateTransferManager.STREAMING_DELIMITER_NODE);
  +      cache.getMarshaller().objectToObjectStream(StateTransferManager.STREAMING_DELIMITER_NODE, os);
         os.close();
         bais = new ByteArrayInputStream(baos.toByteArray());
         is = new MarshalledValueInputStream(bais);
  
  
  
  1.46      +4 -4      JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderTestsBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheLoaderTestsBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/CacheLoaderTestsBase.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -b -r1.45 -r1.46
  --- CacheLoaderTestsBase.java	21 Jan 2007 15:46:42 -0000	1.45
  +++ CacheLoaderTestsBase.java	29 Jan 2007 16:55:47 -0000	1.46
  @@ -32,7 +32,7 @@
    * Commons tests for all CacheLoaders
    *
    * @author Bela Ban
  - * @version $Id: CacheLoaderTestsBase.java,v 1.45 2007/01/21 15:46:42 gzamarreno Exp $
  + * @version $Id: CacheLoaderTestsBase.java,v 1.46 2007/01/29 16:55:47 msurtani Exp $
    */
   abstract public class CacheLoaderTestsBase extends AbstractCacheLoaderTestBase
   {
  @@ -1775,7 +1775,7 @@
         }
         finally
         {
  -         os.writeObject(StateTransferManager.STREAMING_DELIMITER_NODE);
  +         cache.getMarshaller().objectToObjectStream(StateTransferManager.STREAMING_DELIMITER_NODE, os);
            os.close();
            assertTrue(baos.size() > 0);
            state = baos.toByteArray();
  @@ -1964,7 +1964,7 @@
         ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
         MarshalledValueOutputStream os = new MarshalledValueOutputStream(baos);
         loader.loadState(SUBTREE_FQN, os);
  -      os.writeObject(StateTransferManager.STREAMING_DELIMITER_NODE);
  +      cache.getMarshaller().objectToObjectStream(StateTransferManager.STREAMING_DELIMITER_NODE, os);
         os.close();
         assertTrue(baos.size() > 0);
         loader.remove(SUBTREE_FQN);
  @@ -2012,7 +2012,7 @@
         ByteArrayOutputStream baos = new ByteArrayOutputStream(1024);
         MarshalledValueOutputStream os = new MarshalledValueOutputStream(baos);
         loader.loadState(FQN, os);
  -      os.writeObject(StateTransferManager.STREAMING_DELIMITER_NODE);
  +      cache.getMarshaller().objectToObjectStream(StateTransferManager.STREAMING_DELIMITER_NODE, os);
         os.close();
         assertTrue(baos.size() > 0);