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

[Manik Surtani]

  User: msurtani
  Date: 06/11/08 11:47:37

  Modified:    tests/functional/org/jboss/cache  Tag:
                        Branch_JBossCache_1_4_0
                        InterceptorConfigurationTest.java
  Log:
  Rolled back potential fix for JBCACHE-814
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.14.2.2  +16 -16    JBossCache/tests/functional/org/jboss/cache/Attic/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/Attic/InterceptorConfigurationTest.java,v
  retrieving revision 1.14.2.1
  retrieving revision 1.14.2.2
  diff -u -b -r1.14.2.1 -r1.14.2.2
  --- InterceptorConfigurationTest.java	2 Nov 2006 15:34:06 -0000	1.14.2.1
  +++ InterceptorConfigurationTest.java	8 Nov 2006 16:47:37 -0000	1.14.2.2
  @@ -48,8 +48,8 @@
         assertNotNull(list);
         assertEquals(4, list.size());
         assertEquals(list.get(0).getClass(), TxInterceptor.class);
  -      assertEquals(list.get(1).getClass(), PessimisticLockInterceptor.class);
  -      assertEquals(list.get(2).getClass(), UnlockInterceptor.class);
  +      assertEquals(list.get(1).getClass(), UnlockInterceptor.class);
  +      assertEquals(list.get(2).getClass(), PessimisticLockInterceptor.class);
         assertEquals(list.get(3).getClass(), CallInterceptor.class);
      }
   
  @@ -65,8 +65,8 @@
         assertNotNull(list);
         assertEquals(4, list.size());
         assertEquals(list.get(0).getClass(), TxInterceptor.class);
  -      assertEquals(list.get(1).getClass(), PessimisticLockInterceptor.class);
  -      assertEquals(list.get(2).getClass(), UnlockInterceptor.class);
  +      assertEquals(list.get(1).getClass(), UnlockInterceptor.class);
  +      assertEquals(list.get(2).getClass(), PessimisticLockInterceptor.class);
         assertEquals(list.get(3).getClass(), CallInterceptor.class);
      }
   
  @@ -108,11 +108,11 @@
   
         int i = 0;
         assertEquals(list.get(i++).getClass(), TxInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), PessimisticLockInterceptor.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);
      }
   
  @@ -133,11 +133,11 @@
   
         int i = 0;
         assertEquals(list.get(i++).getClass(), TxInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), PessimisticLockInterceptor.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);
      }
   
  @@ -155,9 +155,9 @@
   
         int i = 0;
         assertEquals(list.get(i++).getClass(), TxInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), PessimisticLockInterceptor.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);
      }
   
  @@ -291,12 +291,12 @@
   
         Assert.assertEquals(TxInterceptor.class, chain.getClass());
         chain = chain.getNext();
  -      Assert.assertEquals(PessimisticLockInterceptor.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());
   
         // ok, my replication chain looks good.
  @@ -313,12 +313,12 @@
   
         Assert.assertEquals(TxInterceptor.class, chain.getClass());
         chain = chain.getNext();
  -      Assert.assertEquals(PessimisticLockInterceptor.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());
      }
   
  @@ -332,8 +332,8 @@
         assertEquals(5, list.size());
         assertEquals(list.get(0).getClass(), CacheMgmtInterceptor.class);
         assertEquals(list.get(1).getClass(), TxInterceptor.class);
  -      assertEquals(list.get(2).getClass(), PessimisticLockInterceptor.class);
  -      assertEquals(list.get(3).getClass(), UnlockInterceptor.class);
  +      assertEquals(list.get(2).getClass(), UnlockInterceptor.class);
  +      assertEquals(list.get(3).getClass(), PessimisticLockInterceptor.class);
         assertEquals(list.get(4).getClass(), CallInterceptor.class);
      }
   
  @@ -347,8 +347,8 @@
         assertEquals(6, list.size());
         assertEquals(list.get(0).getClass(), CacheMgmtInterceptor.class);
         assertEquals(list.get(1).getClass(), TxInterceptor.class);
  -      assertEquals(list.get(2).getClass(), PessimisticLockInterceptor.class);
  -      assertEquals(list.get(3).getClass(), UnlockInterceptor.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);
      }
  @@ -406,10 +406,10 @@
         int i = 0;
         assertEquals(list.get(i++).getClass(), CacheMgmtInterceptor.class);
         assertEquals(list.get(i++).getClass(), TxInterceptor.class);
  -      assertEquals(list.get(i++).getClass(), PessimisticLockInterceptor.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);
   
      }