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

[Manik Surtani]

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

  Modified:    tests/functional/org/jboss/cache/invalidation 
                        InvalidationInterceptorTest.java
  Log:
  Major changes to restructure cache and node object model
  
  Revision  Changes    Path
  1.19      +27 -27    JBossCache/tests/functional/org/jboss/cache/invalidation/InvalidationInterceptorTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InvalidationInterceptorTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/invalidation/InvalidationInterceptorTest.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- InvalidationInterceptorTest.java	25 Oct 2006 04:50:20 -0000	1.18
  +++ InvalidationInterceptorTest.java	30 Dec 2006 17:50:05 -0000	1.19
  @@ -13,8 +13,8 @@
   import junit.textui.TestRunner;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  +import org.jboss.cache.CacheImpl;
   import org.jboss.cache.Fqn;
  -import org.jboss.cache.TreeCache;
   import org.jboss.cache.config.CacheLoaderConfig;
   import org.jboss.cache.config.Configuration;
   import org.jboss.cache.factories.XmlConfigurationParser;
  @@ -39,8 +39,8 @@
   
      public void testPessimisticNonTransactional() throws Exception
      {
  -      TreeCache cache1 = createCache(false);
  -      TreeCache cache2 = createCache(false);
  +      CacheImpl cache1 = createCache(false);
  +      CacheImpl cache2 = createCache(false);
   
         Fqn fqn = Fqn.fromString("/a/b");
         cache1.put(fqn, "key", "value");
  @@ -70,8 +70,8 @@
   
      public void testUnnecessaryEvictions() throws Exception
      {
  -      TreeCache cache1 = createCache(false);
  -      TreeCache cache2 = createCache(false);
  +      CacheImpl cache1 = createCache(false);
  +      CacheImpl cache2 = createCache(false);
   
         Fqn fqn1 = Fqn.fromString("/a/b/c");
         Fqn fqn2 = Fqn.fromString("/a/b/d");
  @@ -103,8 +103,8 @@
   
      public void testPessimisticNonTransactionalAsync() throws Exception
      {
  -      TreeCache cache1 = createUnstartedCache(false);
  -      TreeCache cache2 = createUnstartedCache(false);
  +      CacheImpl cache1 = createUnstartedCache(false);
  +      CacheImpl cache2 = createUnstartedCache(false);
         cache1.getConfiguration().setCacheMode(Configuration.CacheMode.INVALIDATION_ASYNC);
         cache2.getConfiguration().setCacheMode(Configuration.CacheMode.INVALIDATION_ASYNC);
         cache1.start();
  @@ -141,8 +141,8 @@
   
      public void testPessimisticTransactional() throws Exception
      {
  -      TreeCache cache1 = createCache(false);
  -      TreeCache cache2 = createCache(false);
  +      CacheImpl cache1 = createCache(false);
  +      CacheImpl cache2 = createCache(false);
   
         Fqn fqn = Fqn.fromString("/a/b");
         cache1.put(fqn, "key", "value");
  @@ -201,8 +201,8 @@
   
      public void testOptSyncUnableToEvict() throws Exception
      {
  -      TreeCache cache1 = createCache(true);
  -      TreeCache cache2 = createCache(true);
  +      CacheImpl cache1 = createCache(true);
  +      CacheImpl cache2 = createCache(true);
   
         Fqn fqn = Fqn.fromString("/a/b");
   
  @@ -251,8 +251,8 @@
   
      public void testPessTxSyncUnableToEvict() throws Exception
      {
  -      TreeCache cache1 = createCache(false);
  -      TreeCache cache2 = createCache(false);
  +      CacheImpl cache1 = createCache(false);
  +      CacheImpl cache2 = createCache(false);
   
         Fqn fqn = Fqn.fromString("/a/b");
   
  @@ -301,8 +301,8 @@
   
      public void testPessTxAsyncUnableToEvict() throws Exception
      {
  -      TreeCache cache1 = createUnstartedCache(false);
  -      TreeCache cache2 = createUnstartedCache(false);
  +      CacheImpl cache1 = createUnstartedCache(false);
  +      CacheImpl cache2 = createUnstartedCache(false);
         cache1.getConfiguration().setCacheMode(Configuration.CacheMode.INVALIDATION_ASYNC);
         cache2.getConfiguration().setCacheMode(Configuration.CacheMode.INVALIDATION_ASYNC);
         cache1.start();
  @@ -356,8 +356,8 @@
   
      public void testOptimistic() throws Exception
      {
  -      TreeCache cache1 = createCache(true);
  -      TreeCache cache2 = createCache(true);
  +      CacheImpl cache1 = createCache(true);
  +      CacheImpl cache2 = createCache(true);
   
         Fqn fqn = Fqn.fromString("/a/b");
         cache1.put(fqn, "key", "value");
  @@ -424,7 +424,7 @@
   
      public void testPessimisticNonTransactionalWithCacheLoader() throws Exception
      {
  -      TreeCache[] caches = createCachesWithSharedCL(false);
  +      CacheImpl[] caches = createCachesWithSharedCL(false);
   
         Fqn fqn = Fqn.fromString("/a/b");
         caches[0].put(fqn, "key", "value");
  @@ -455,7 +455,7 @@
   
      public void testPessimisticTransactionalWithCacheLoader() throws Exception
      {
  -      TreeCache[] caches = createCachesWithSharedCL(false);
  +      CacheImpl[] caches = createCachesWithSharedCL(false);
   
         Fqn fqn = Fqn.fromString("/a/b");
         TransactionManager mgr = caches[0].getTransactionManager();
  @@ -488,7 +488,7 @@
   
      public void testOptimisticWithCacheLoader() throws Exception
      {
  -      TreeCache[] caches = createCachesWithSharedCL(true);
  +      CacheImpl[] caches = createCachesWithSharedCL(true);
   
         Fqn fqn = Fqn.fromString("/a/b");
         TransactionManager mgr = caches[0].getTransactionManager();
  @@ -533,7 +533,7 @@
   
      protected void doRegionBasedTest(boolean optimistic) throws Exception
      {
  -      TreeCache[] caches = new TreeCache[2];
  +      CacheImpl[] caches = new CacheImpl[2];
         caches[0] = createUnstartedCache(false);
         caches[1] = createUnstartedCache(false);
   
  @@ -574,9 +574,9 @@
         caches[1] = null;
      }
   
  -   protected TreeCache createUnstartedCache(boolean optimistic) throws Exception
  +   protected CacheImpl createUnstartedCache(boolean optimistic) throws Exception
      {
  -      TreeCache cache = new TreeCache();
  +      CacheImpl cache = new CacheImpl();
         cache.getConfiguration().setClusterName("MyCluster");
         cache.getConfiguration().setInitialStateRetrievalTimeout(3000);
         cache.getConfiguration().setCacheMode(Configuration.CacheMode.INVALIDATION_SYNC);
  @@ -585,16 +585,16 @@
         return cache;
      }
   
  -   protected TreeCache createCache(boolean optimistic) throws Exception
  +   protected CacheImpl createCache(boolean optimistic) throws Exception
      {
  -      TreeCache cache = createUnstartedCache(optimistic);
  +      CacheImpl cache = createUnstartedCache(optimistic);
         cache.start();
         return cache;
      }
   
  -   protected TreeCache[] createCachesWithSharedCL(boolean optimistic) throws Exception
  +   protected CacheImpl[] createCachesWithSharedCL(boolean optimistic) throws Exception
      {
  -      TreeCache[] caches = new TreeCache[2];
  +      CacheImpl[] caches = new CacheImpl[2];
         caches[0] = createUnstartedCache(optimistic);
         caches[1] = createUnstartedCache(optimistic);