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

[Manik Surtani]

  User: msurtani
  Date: 06/08/21 13:05:50

  Modified:    tests/functional/org/jboss/cache/loader 
                        CacheLoaderTestsBase.java
  Log:
  fixed breaking cache loader code
  
  Revision  Changes    Path
  1.27      +16 -15    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.26
  retrieving revision 1.27
  diff -u -b -r1.26 -r1.27
  --- CacheLoaderTestsBase.java	14 Aug 2006 17:20:35 -0000	1.26
  +++ CacheLoaderTestsBase.java	21 Aug 2006 17:05:50 -0000	1.27
  @@ -16,7 +16,7 @@
   /**
    * Commons tests for all CacheLoaders
    * @author Bela Ban
  - * @version $Id: CacheLoaderTestsBase.java,v 1.26 2006/08/14 17:20:35 msurtani Exp $
  + * @version $Id: CacheLoaderTestsBase.java,v 1.27 2006/08/21 17:05:50 msurtani Exp $
    */
   abstract public class CacheLoaderTestsBase extends AbstractCacheLoaderTestBase {
   
  @@ -143,9 +143,8 @@
       * Tests various Map puts.
       */
      public void testPut3() throws CacheException {
  -      final String NODE="/a/b/c";
  -      final String KEY="key";
  -      Object retval=null;
  +      final Fqn NODE=Fqn.fromString("/a/b/c");
  +
         cache.remove(NODE);
         addDelay();
         Map m = new HashMap();
  @@ -154,15 +153,18 @@
         Map m2 = new HashMap();
         m2.put("e", "f");
         m2.put("g", "h");
  +
         cache.put(NODE, m);
  +
         addDelay();
         cache.get(NODE, "X");
  +
         assertEquals(m, cache.get(NODE).getData());
  -      cache.evict(Fqn.fromString(NODE));
  +      cache.evict(NODE);
         addDelay();
         cache.get(NODE, "X");
         assertEquals(m, cache.get(NODE).getData());
  -      cache.evict(Fqn.fromString(NODE));
  +      cache.evict(NODE);
         cache.get(NODE, "X");
         cache.put(NODE, m2);
         assertEquals("combined", 4, cache.get(NODE).getData().size());
  @@ -173,8 +175,6 @@
       */
      public void testPutRemoveCombos() throws Exception {
         final String NODE="/a/b/c";
  -      final String KEY="key";
  -      Object retval=null;
         cache.remove(NODE);
         Fqn fqn = Fqn.fromString(NODE);
         addDelay();
  @@ -182,9 +182,14 @@
         m.put("a", "b");
         m.put("c", "d");
         loader.put(fqn, m);
  +       System.out.println("*** MANIK: LOADER " + loader.get(fqn));
         cache.put(NODE, "e", "f");
  +       System.out.println("*** MANIK: CACHE " + cache.get(NODE).getData());
  +       System.out.println("*** MANIK: LOADER " + loader.get(fqn));
         addDelay();
  +       System.out.println("*** MANIK: CACHE " + cache.get(NODE));
         cache.get(NODE, "X");
  +       System.out.println("*** MANIK: CACHE " + cache.get(NODE).getData());
         assertEquals(3, cache.get(NODE).getData().size());
         cache.evict(fqn);
         cache.get(NODE, "X");
  @@ -472,8 +477,8 @@
         }
      }
   
  -   public void testGetChildren8() {
  -      try {
  +   public void testGetChildren8() throws Exception
  +   {
            cache.put("/a/1", null);
            cache.put("/a/2", null);
            cache.put("/a/3", null);
  @@ -492,10 +497,6 @@
            System.out.println("children: " + children);
            assertEquals("3 children weren't loaded", 3, children.size());
         }
  -      catch(Exception e) {
  -         fail(e.toString());
  -      }
  -   }
   
      public void testGetChildren9() {
         try {