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

[Elias Ross]

  User: genman  
  Date: 06/11/19 22:53:56

  Modified:    tests/functional/org/jboss/cache/loader  
                        CacheLoaderTestsBase.java
                        SingletonStoreCacheLoaderTest.java
  Log:
  JBCACHE-867, Move methods from the ProxyImpl to Node, refactor Node classes as well
  
  Revision  Changes    Path
  1.36      +3 -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.35
  retrieving revision 1.36
  diff -u -b -r1.35 -r1.36
  --- CacheLoaderTestsBase.java	13 Nov 2006 14:20:31 -0000	1.35
  +++ CacheLoaderTestsBase.java	20 Nov 2006 03:53:56 -0000	1.36
  @@ -31,7 +31,7 @@
    * Commons tests for all CacheLoaders
    *
    * @author Bela Ban
  - * @version $Id: CacheLoaderTestsBase.java,v 1.35 2006/11/13 14:20:31 msurtani Exp $
  + * @version $Id: CacheLoaderTestsBase.java,v 1.36 2006/11/20 03:53:56 genman Exp $
    */
   abstract public class CacheLoaderTestsBase extends AbstractCacheLoaderTestBase
   {
  @@ -330,7 +330,6 @@
         retval = cache.get(NODE);
   
         assertNotNull("Should not be null", retval);
  -      assertTrue("Expecting instance of data node", retval instanceof DataNode);
   
         DataNode node = (DataNode) retval;
         assertEquals(new Integer(10), node.get("1"));
  @@ -1112,7 +1111,7 @@
   
         /* get(Fqn) */
         addDelay();
  -      Map map = loader.get(fqn);
  +      Map map = new HashMap(loader.get(fqn));
         assertEquals(2, map.size());
         assertEquals("two", map.get("one"));
         assertEquals("four", map.get("three"));
  @@ -1531,7 +1530,7 @@
         }
         catch (UnsupportedOperationException ex)
         {
  -         System.out.println("caught unsupported operation exception that's okay: " + ex);
  +         log.info("caught unsupported operation exception that's okay: ", ex);
            return;
         }
   
  
  
  
  1.3       +3 -3      JBossCache/tests/functional/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SingletonStoreCacheLoaderTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- SingletonStoreCacheLoaderTest.java	25 Oct 2006 04:50:19 -0000	1.2
  +++ SingletonStoreCacheLoaderTest.java	20 Nov 2006 03:53:56 -0000	1.3
  @@ -37,9 +37,9 @@
         TreeCache tc2 = new TreeCache();
         TreeCache tc3 = new TreeCache();
   
  -      cache1 = new TreeCacheProxyImpl(tc1, (NodeImpl) tc1.getRoot());
  -      cache2 = new TreeCacheProxyImpl(tc2, (NodeImpl) tc2.getRoot());
  -      cache3 = new TreeCacheProxyImpl(tc3, (NodeImpl) tc3.getRoot());
  +      cache1 = tc1.getCacheSPI();
  +      cache2 = tc2.getCacheSPI();
  +      cache3 = tc3.getCacheSPI();
   
         cache1.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_SYNC);
         cache2.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_SYNC);