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

Manik Surtani msurtani at jboss.com
Tue Sep 5 07:24:45 EDT 2006


  User: msurtani
  Date: 06/09/05 07:24:45

  Modified:    tests/functional/org/jboss/cache 
                        InterceptorConfigurationTest.java
  Log:
  updated UT accordingly
  
  Revision  Changes    Path
  1.17      +221 -209  JBossCache/tests/functional/org/jboss/cache/InterceptorConfigurationTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InterceptorConfigurationTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/InterceptorConfigurationTest.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- InterceptorConfigurationTest.java	16 Aug 2006 11:15:56 -0000	1.16
  +++ InterceptorConfigurationTest.java	5 Sep 2006 11:24:45 -0000	1.17
  @@ -9,6 +9,7 @@
   import org.jboss.cache.xml.XmlHelper;
   import org.w3c.dom.Element;
   
  +import java.util.Iterator;
   import java.util.List;
   
   /**
  @@ -43,14 +44,18 @@
      {
         cache.getConfiguration().setUseInterceptorMbeans(false);
         Interceptor chain = new InterceptorChainFactory().buildInterceptorChain(cache);
  -      List list = InterceptorChainFactory.asList(chain);
  +      List<Interceptor> list = InterceptorChainFactory.asList(chain);
  +      Iterator<Interceptor> interceptors = list.iterator();
  +
         System.out.println("testBareConfig interceptors are:\n" + list);
         assertNotNull(list);
  -      assertEquals(4, list.size());
  -      assertEquals(list.get(0).getClass(), TxInterceptor.class);
  -      assertEquals(list.get(1).getClass(), UnlockInterceptor.class);
  -      assertEquals(list.get(2).getClass(), PessimisticLockInterceptor.class);
  -      assertEquals(list.get(3).getClass(), CallInterceptor.class);
  +      assertEquals(5, list.size());
  +
  +      assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
  +      assertEquals(TxInterceptor.class, interceptors.next().getClass());
  +      assertEquals(UnlockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(PessimisticLockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CallInterceptor.class, interceptors.next().getClass());
      }
   
   
  @@ -60,14 +65,18 @@
         cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
   
         Interceptor chain = new InterceptorChainFactory().buildInterceptorChain(cache);
  -      List list = InterceptorChainFactory.asList(chain);
  +      List<Interceptor> list = InterceptorChainFactory.asList(chain);
  +      Iterator<Interceptor> interceptors = list.iterator();
  +
         System.out.println("testTxConfig interceptors are:\n" + list);
         assertNotNull(list);
  -      assertEquals(4, list.size());
  -      assertEquals(list.get(0).getClass(), TxInterceptor.class);
  -      assertEquals(list.get(1).getClass(), UnlockInterceptor.class);
  -      assertEquals(list.get(2).getClass(), PessimisticLockInterceptor.class);
  -      assertEquals(list.get(3).getClass(), CallInterceptor.class);
  +      assertEquals(5, list.size());
  +
  +      assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
  +      assertEquals(TxInterceptor.class, interceptors.next().getClass());
  +      assertEquals(UnlockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(PessimisticLockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CallInterceptor.class, interceptors.next().getClass());
      }
   
      protected Element getCacheLoaderConfig(boolean pasv, boolean fetchPersistentState) throws Exception
  @@ -100,20 +109,22 @@
         cache.getConfiguration().setFetchInMemoryState(false);
         cache.createService();
         Interceptor chain = new InterceptorChainFactory().buildInterceptorChain(cache);
  -      List list = InterceptorChainFactory.asList(chain);
  +      List<Interceptor> list = InterceptorChainFactory.asList(chain);
  +      Iterator<Interceptor> interceptors = list.iterator();
  +
         System.out.println("testSharedCacheLoaderConfig interceptors are:\n" + list);
         assertNotNull(list);
   
  -      assertEquals(7, list.size());
  +      assertEquals(8, list.size());
   
  -      int i = 0;
  -      assertEquals(list.get(i++).getClass(), TxInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), CacheStoreInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), ReplicationInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), UnlockInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), CacheLoaderInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), PessimisticLockInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), CallInterceptor.class);
  +      assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
  +      assertEquals(TxInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CacheStoreInterceptor.class, interceptors.next().getClass());
  +      assertEquals(ReplicationInterceptor.class, interceptors.next().getClass());
  +      assertEquals(UnlockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CacheLoaderInterceptor.class, interceptors.next().getClass());
  +      assertEquals(PessimisticLockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CallInterceptor.class, interceptors.next().getClass());
      }
   
      public void testUnsharedCacheLoaderConfig() throws Exception
  @@ -125,20 +136,22 @@
         cache.getConfiguration().setFetchInMemoryState(false);
         cache.createService();
         Interceptor chain = new InterceptorChainFactory().buildInterceptorChain(cache);
  -      List list = InterceptorChainFactory.asList(chain);
  +      List<Interceptor> list = InterceptorChainFactory.asList(chain);
  +      Iterator<Interceptor> interceptors = list.iterator();
  +
         System.out.println("testUnsharedCacheLoaderConfig interceptors are:\n" + list);
         assertNotNull(list);
   
  -      assertEquals(7, list.size());
  +      assertEquals(8, list.size());
   
  -      int i = 0;
  -      assertEquals(list.get(i++).getClass(), TxInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), ReplicationInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), UnlockInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), CacheLoaderInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), CacheStoreInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), PessimisticLockInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), CallInterceptor.class);
  +      assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
  +      assertEquals(TxInterceptor.class, interceptors.next().getClass());
  +      assertEquals(ReplicationInterceptor.class, interceptors.next().getClass());
  +      assertEquals(UnlockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CacheLoaderInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CacheStoreInterceptor.class, interceptors.next().getClass());
  +      assertEquals(PessimisticLockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CallInterceptor.class, interceptors.next().getClass());
      }
   
      public void testTxAndRepl() throws Exception
  @@ -147,18 +160,20 @@
         cache.getConfiguration().setCacheMode("repl_sync");
         cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
         Interceptor chain = new InterceptorChainFactory().buildInterceptorChain(cache);
  -      List list = InterceptorChainFactory.asList(chain);
  +      List<Interceptor> list = InterceptorChainFactory.asList(chain);
  +      Iterator<Interceptor> interceptors = list.iterator();
  +
         System.out.println("testTxAndRepl interceptors are:\n" + list);
         assertNotNull(list);
   
  -      assertEquals(5, list.size());
  +      assertEquals(6, list.size());
   
  -      int i = 0;
  -      assertEquals(list.get(i++).getClass(), TxInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), ReplicationInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), UnlockInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), PessimisticLockInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), CallInterceptor.class);
  +      assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
  +      assertEquals(TxInterceptor.class, interceptors.next().getClass());
  +      assertEquals(ReplicationInterceptor.class, interceptors.next().getClass());
  +      assertEquals(UnlockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(PessimisticLockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CallInterceptor.class, interceptors.next().getClass());
      }
   
   
  @@ -171,20 +186,18 @@
         Interceptor next = new InterceptorChainFactory().buildInterceptorChain(cache);
   
         // test the chain size.
  -      List chainAsList = InterceptorChainFactory.asList(next);
  -      Assert.assertEquals(6, chainAsList.size());
  +      List<Interceptor> list = InterceptorChainFactory.asList(next);
  +      Iterator<Interceptor> interceptors = list.iterator();
  +
  +      Assert.assertEquals(7, list.size());
   
  -      Assert.assertEquals(TxInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticLockingInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticValidatorInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticCreateIfNotExistsInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticNodeInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(CallInterceptor.class, next.getClass());
  +      assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
  +      assertEquals(TxInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticLockingInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticValidatorInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticCreateIfNotExistsInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticNodeInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CallInterceptor.class, interceptors.next().getClass());
      }
   
      public void testOptimisticReplicatedChain() throws Exception
  @@ -197,22 +210,19 @@
         Interceptor next = new InterceptorChainFactory().buildInterceptorChain(cache);
   
         // test the chain size.
  -      List chainAsList = InterceptorChainFactory.asList(next);
  -      Assert.assertEquals(7, chainAsList.size());
  +      List<Interceptor> list = InterceptorChainFactory.asList(next);
  +      Iterator<Interceptor> interceptors = list.iterator();
  +
  +      Assert.assertEquals(8, list.size());
   
  -      Assert.assertEquals(TxInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticReplicationInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticLockingInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticValidatorInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticCreateIfNotExistsInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticNodeInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(CallInterceptor.class, next.getClass());
  +      assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
  +      assertEquals(TxInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticReplicationInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticLockingInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticValidatorInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticCreateIfNotExistsInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticNodeInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CallInterceptor.class, interceptors.next().getClass());
      }
   
      public void testOptimisticCacheLoaderChain() throws Exception
  @@ -225,25 +235,20 @@
         Interceptor next = new InterceptorChainFactory().buildInterceptorChain(cache);
   
         // test the chain size.
  -      List chainAsList = InterceptorChainFactory.asList(next);
  -      Assert.assertEquals(8, chainAsList.size());
  +      List<Interceptor> list = InterceptorChainFactory.asList(next);
  +      Iterator<Interceptor> interceptors = list.iterator();
   
  +      Assert.assertEquals(9, list.size());
   
  -      Assert.assertEquals(TxInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(CacheStoreInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(CacheLoaderInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticLockingInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticValidatorInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticCreateIfNotExistsInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticNodeInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(CallInterceptor.class, next.getClass());
  +      assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
  +      assertEquals(TxInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CacheStoreInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CacheLoaderInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticLockingInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticValidatorInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticCreateIfNotExistsInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticNodeInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CallInterceptor.class, interceptors.next().getClass());
      }
   
      public void testOptimisticPassivationCacheLoaderChain() throws Exception
  @@ -256,25 +261,21 @@
         Interceptor next = new InterceptorChainFactory().buildInterceptorChain(cache);
   
         // test the chain size.
  -      List chainAsList = InterceptorChainFactory.asList(next);
  -      Assert.assertEquals(8, chainAsList.size());
  +      List<Interceptor> list = InterceptorChainFactory.asList(next);
  +      Iterator<Interceptor> interceptors = list.iterator();
   
  +      Assert.assertEquals(9, list.size());
   
  -      Assert.assertEquals(TxInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(PassivationInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(ActivationInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticLockingInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticValidatorInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticCreateIfNotExistsInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(OptimisticNodeInterceptor.class, next.getClass());
  -      next = next.getNext();
  -      Assert.assertEquals(CallInterceptor.class, next.getClass());
  +
  +      assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
  +      assertEquals(TxInterceptor.class, interceptors.next().getClass());
  +      assertEquals(PassivationInterceptor.class, interceptors.next().getClass());
  +      assertEquals(ActivationInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticLockingInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticValidatorInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticCreateIfNotExistsInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticNodeInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CallInterceptor.class, interceptors.next().getClass());
      }
   
      public void testInvalidationInterceptorChain() throws Exception
  @@ -286,18 +287,17 @@
         Interceptor chain = new InterceptorChainFactory().buildInterceptorChain(cache);
   
         // test the chain size.
  -      List chainAsList = InterceptorChainFactory.asList(chain);
  -      Assert.assertEquals(5, chainAsList.size());
  +      List<Interceptor> list = InterceptorChainFactory.asList(chain);
  +      Iterator<Interceptor> interceptors = list.iterator();
  +
  +      Assert.assertEquals(6, list.size());
   
  -      Assert.assertEquals(TxInterceptor.class, chain.getClass());
  -      chain = chain.getNext();
  -      Assert.assertEquals(ReplicationInterceptor.class, chain.getClass());
  -      chain = chain.getNext();
  -      Assert.assertEquals(UnlockInterceptor.class, chain.getClass());
  -      chain = chain.getNext();
  -      Assert.assertEquals(PessimisticLockInterceptor.class, chain.getClass());
  -      chain = chain.getNext();
  -      Assert.assertEquals(CallInterceptor.class, chain.getClass());
  +      assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
  +      assertEquals(TxInterceptor.class, interceptors.next().getClass());
  +      assertEquals(ReplicationInterceptor.class, interceptors.next().getClass());
  +      assertEquals(UnlockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(PessimisticLockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CallInterceptor.class, interceptors.next().getClass());
   
         // ok, my replication chain looks good.
   
  @@ -308,49 +308,57 @@
         chain = new InterceptorChainFactory().buildInterceptorChain(cache);
   
         // test the chain size.
  -      chainAsList = InterceptorChainFactory.asList(chain);
  -      Assert.assertEquals(5, chainAsList.size());
  +      list = InterceptorChainFactory.asList(chain);
  +      interceptors = list.iterator();
   
  -      Assert.assertEquals(TxInterceptor.class, chain.getClass());
  -      chain = chain.getNext();
  -      Assert.assertEquals(InvalidationInterceptor.class, chain.getClass());
  -      chain = chain.getNext();
  -      Assert.assertEquals(UnlockInterceptor.class, chain.getClass());
  -      chain = chain.getNext();
  -      Assert.assertEquals(PessimisticLockInterceptor.class, chain.getClass());
  -      chain = chain.getNext();
  -      Assert.assertEquals(CallInterceptor.class, chain.getClass());
  +      Assert.assertEquals(6, list.size());
  +
  +      assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
  +      assertEquals(TxInterceptor.class, interceptors.next().getClass());
  +      assertEquals(InvalidationInterceptor.class, interceptors.next().getClass());
  +      assertEquals(UnlockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(PessimisticLockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CallInterceptor.class, interceptors.next().getClass());
      }
   
      public void testCacheMgmtConfig() throws Exception
      {
         cache.getConfiguration().setUseInterceptorMbeans(true);
         Interceptor chain = new InterceptorChainFactory().buildInterceptorChain(cache);
  -      List list = InterceptorChainFactory.asList(chain);
  +      List<Interceptor> list = InterceptorChainFactory.asList(chain);
  +      Iterator<Interceptor> interceptors = list.iterator();
  +
         System.out.println("testCacheMgmtConfig interceptors are:\n" + list);
         assertNotNull(list);
  -      assertEquals(5, list.size());
  -      assertEquals(list.get(0).getClass(), CacheMgmtInterceptor.class);
  -      assertEquals(list.get(1).getClass(), TxInterceptor.class);
  -      assertEquals(list.get(2).getClass(), UnlockInterceptor.class);
  -      assertEquals(list.get(3).getClass(), PessimisticLockInterceptor.class);
  -      assertEquals(list.get(4).getClass(), CallInterceptor.class);
  +      assertEquals(6, list.size());
  +
  +      assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CacheMgmtInterceptor.class, interceptors.next().getClass());
  +      assertEquals(TxInterceptor.class, interceptors.next().getClass());
  +      assertEquals(UnlockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(PessimisticLockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CallInterceptor.class, interceptors.next().getClass());
  +
      }
   
      public void testEvictionInterceptorConfig() throws Exception
      {
         cache.setIsUsingEviction(true);
         Interceptor chain = new InterceptorChainFactory().buildInterceptorChain(cache);
  -      List list = InterceptorChainFactory.asList(chain);
  +      List<Interceptor> list = InterceptorChainFactory.asList(chain);
  +      Iterator<Interceptor> interceptors = list.iterator();
  +
         System.out.println("testEvictionInterceptorConfig interceptors are:\n" + list);
         assertNotNull(list);
  -      assertEquals(6, list.size());
  -      assertEquals(list.get(0).getClass(), CacheMgmtInterceptor.class);
  -      assertEquals(list.get(1).getClass(), TxInterceptor.class);
  -      assertEquals(list.get(2).getClass(), UnlockInterceptor.class);
  -      assertEquals(list.get(3).getClass(), PessimisticLockInterceptor.class);
  -      assertEquals(list.get(4).getClass(), EvictionInterceptor.class);
  -      assertEquals(list.get(5).getClass(), CallInterceptor.class);
  +      assertEquals(7, list.size());
  +
  +      assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CacheMgmtInterceptor.class, interceptors.next().getClass());
  +      assertEquals(TxInterceptor.class, interceptors.next().getClass());
  +      assertEquals(UnlockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(PessimisticLockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(EvictionInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CallInterceptor.class, interceptors.next().getClass());
      }
   
      public void testBuddyReplicationOptLocking() throws Exception
  @@ -363,26 +371,28 @@
           xmlString += "<buddyPoolName>buddyPoolName</buddyPoolName>";
           xmlString += "</config>";
           cache.getConfiguration().setCacheMode("REPL_SYNC");
  -        cache.getConfiguration().setBuddyReplicationConfig( XmlHelper.stringToElement(xmlString) );
  +      cache.getConfiguration().setBuddyReplicationConfig(XmlHelper.stringToElement(xmlString));
           cache.getConfiguration().setNodeLockingScheme("OPTIMISTIC");
           cache._createService(); // initialise various subsystems such as BRManager
           Interceptor chain = new InterceptorChainFactory().buildInterceptorChain(cache);
   
  -          List list = InterceptorChainFactory.asList(chain);
  +      List<Interceptor> list = InterceptorChainFactory.asList(chain);
  +      Iterator<Interceptor> interceptors = list.iterator();
  +
             System.out.println("testEvictionInterceptorConfig interceptors are:\n" + list);
             assertNotNull(list);
  -          assertEquals(9, list.size());
  -          int i=0;
  -          assertEquals(list.get(i++).getClass(), CacheMgmtInterceptor.class);
  -          assertEquals(list.get(i++).getClass(), TxInterceptor.class);
  -          assertEquals(list.get(i++).getClass(), OptimisticReplicationInterceptor.class);
  -          assertEquals(list.get(i++).getClass(), DataGravitatorInterceptor.class);
  -          assertEquals(list.get(i++).getClass(), OptimisticLockingInterceptor.class);
  -          assertEquals(list.get(i++).getClass(), OptimisticValidatorInterceptor.class);
  -          assertEquals(list.get(i++).getClass(), OptimisticCreateIfNotExistsInterceptor.class);
  -          assertEquals(list.get(i++).getClass(), OptimisticNodeInterceptor.class);
  -          assertEquals(list.get(i++).getClass(), CallInterceptor.class);
  +      assertEquals(10, list.size());
   
  +      assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CacheMgmtInterceptor.class, interceptors.next().getClass());
  +      assertEquals(TxInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticReplicationInterceptor.class, interceptors.next().getClass());
  +      assertEquals(DataGravitatorInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticLockingInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticValidatorInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticCreateIfNotExistsInterceptor.class, interceptors.next().getClass());
  +      assertEquals(OptimisticNodeInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CallInterceptor.class, interceptors.next().getClass());
      }
   
       public void testBuddyReplicationPessLocking() throws Exception
  @@ -395,23 +405,25 @@
            xmlString += "<buddyPoolName>buddyPoolName</buddyPoolName>";
            xmlString += "</config>";
            cache.getConfiguration().setCacheMode("REPL_SYNC");
  -         cache.getConfiguration().setBuddyReplicationConfig( XmlHelper.stringToElement(xmlString) );
  +      cache.getConfiguration().setBuddyReplicationConfig(XmlHelper.stringToElement(xmlString));
            cache._createService(); // initialise various subsystems such as BRManager
            Interceptor chain = new InterceptorChainFactory().buildInterceptorChain(cache);
   
  -           List list = InterceptorChainFactory.asList(chain);
  +      List<Interceptor> list = InterceptorChainFactory.asList(chain);
  +      Iterator<Interceptor> interceptors = list.iterator();
  +
              System.out.println("testEvictionInterceptorConfig interceptors are:\n" + list);
              assertNotNull(list);
  -           assertEquals(7, list.size());
  -           int i=0;
  -           assertEquals(list.get(i++).getClass(), CacheMgmtInterceptor.class);
  -           assertEquals(list.get(i++).getClass(), TxInterceptor.class);
  -           assertEquals(list.get(i++).getClass(), ReplicationInterceptor.class);
  -           assertEquals(list.get(i++).getClass(), UnlockInterceptor.class);
  -           assertEquals(list.get(i++).getClass(), DataGravitatorInterceptor.class);
  -           assertEquals(list.get(i++).getClass(), PessimisticLockInterceptor.class);
  -           assertEquals(list.get(i++).getClass(), CallInterceptor.class);
  +      assertEquals(8, list.size());
   
  +      assertEquals(InvocationContextInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CacheMgmtInterceptor.class, interceptors.next().getClass());
  +      assertEquals(TxInterceptor.class, interceptors.next().getClass());
  +      assertEquals(ReplicationInterceptor.class, interceptors.next().getClass());
  +      assertEquals(UnlockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(DataGravitatorInterceptor.class, interceptors.next().getClass());
  +      assertEquals(PessimisticLockInterceptor.class, interceptors.next().getClass());
  +      assertEquals(CallInterceptor.class, interceptors.next().getClass());
       }
   
   
  
  
  



More information about the jboss-cvs-commits mailing list