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

[Manik Surtani]

  User: msurtani
  Date: 06/12/30 12:50:03

  Modified:    tests/functional/org/jboss/cache/misc  TestingUtil.java
  Log:
  Major changes to restructure cache and node object model
  
  Revision  Changes    Path
  1.11      +10 -10    JBossCache/tests/functional/org/jboss/cache/misc/TestingUtil.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TestingUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/misc/TestingUtil.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- TestingUtil.java	20 Dec 2006 13:34:28 -0000	1.10
  +++ TestingUtil.java	30 Dec 2006 17:50:03 -0000	1.11
  @@ -8,8 +8,8 @@
   package org.jboss.cache.misc;
   
   import org.jboss.cache.Cache;
  +import org.jboss.cache.CacheImpl;
   import org.jboss.cache.CacheSPI;
  -import org.jboss.cache.TreeCache;
   
   import java.io.File;
   import java.util.List;
  @@ -52,7 +52,7 @@
      }
   
      /**
  -    * Loops, continually calling {@link #areCacheViewsComplete(TreeCache[])}
  +    * Loops, continually calling {@link #areCacheViewsComplete(CacheImpl[])}
       * until it either returns true or <code>timeout</code> ms have elapsed.
       *
       * @param caches  caches which must all have consistent views
  @@ -60,7 +60,7 @@
       * @throws RuntimeException if <code>timeout</code> ms have elapse without
       *                          all caches having the same number of members.
       */
  -   public static void blockUntilViewsReceived(TreeCache[] caches, long timeout)
  +   public static void blockUntilViewsReceived(CacheImpl[] caches, long timeout)
      {
         long failTime = System.currentTimeMillis() + timeout;
   
  @@ -77,7 +77,7 @@
      }
   
      /**
  -    * Loops, continually calling {@link #areCacheViewsComplete(TreeCache[])}
  +    * Loops, continually calling {@link #areCacheViewsComplete(CacheImpl[])}
       * until it either returns true or <code>timeout</code> ms have elapsed.
       *
       * @param groupSize number of caches expected in the group
  @@ -102,7 +102,7 @@
      }
   
      /**
  -    * Loops, continually calling {@link #areCacheViewsComplete(TreeCache[])}
  +    * Loops, continually calling {@link #areCacheViewsComplete(CacheImpl[])}
       * until it either returns true or <code>timeout</code> ms have elapsed.
       *
       * @param groupSize number of caches expected in the group
  @@ -110,7 +110,7 @@
       * @throws RuntimeException if <code>timeout</code> ms have elapse without
       *                          all caches having the same number of members.
       */
  -   public static void blockUntilViewReceived(TreeCache cache, int groupSize, long timeout)
  +   public static void blockUntilViewReceived(CacheImpl cache, int groupSize, long timeout)
      {
         long failTime = System.currentTimeMillis() + timeout;
   
  @@ -154,7 +154,7 @@
   
      /**
       * Checks each cache to see if the number of elements in the array
  -    * returned by {@link TreeCache#getMembers()} matches the size of
  +    * returned by {@link CacheImpl#getMembers()} matches the size of
       * the <code>caches</code> parameter.
       *
       * @param caches caches that should form a View
  @@ -163,13 +163,13 @@
       * @throws IllegalStateException if any of the caches have MORE view
       *                               members than caches.length
       */
  -   public static boolean areCacheViewsComplete(TreeCache[] caches)
  +   public static boolean areCacheViewsComplete(CacheImpl[] caches)
      {
         int memberCount = caches.length;
   
         for (int i = 0; i < memberCount; i++)
         {
  -         TreeCache cache = caches[i];
  +         CacheImpl cache = caches[i];
            return isCacheViewComplete(cache, memberCount);
         }
   
  @@ -180,7 +180,7 @@
       * @param cache
       * @param memberCount
       */
  -   public static boolean isCacheViewComplete(TreeCache cache, int memberCount)
  +   public static boolean isCacheViewComplete(CacheImpl cache, int memberCount)
      {
         List members = cache.getMembers();
         if (members == null || memberCount > members.size())