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

[Manik Surtani]

  User: msurtani
  Date: 06/12/18 07:54:23

  Modified:    tests/functional/org/jboss/cache/lock   LockReleaseTest.java
                        UpgradeLockTest.java
  Log:
  refactored
  
  Revision  Changes    Path
  1.5       +9 -9      JBossCache/tests/functional/org/jboss/cache/lock/LockReleaseTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LockReleaseTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/lock/LockReleaseTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- LockReleaseTest.java	20 Nov 2006 07:33:14 -0000	1.4
  +++ LockReleaseTest.java	18 Dec 2006 12:54:23 -0000	1.5
  @@ -26,7 +26,7 @@
    * Verifies that there are no read locks held when a transaction ends.
    *
    * @author Bela Ban
  - * @version $Id: LockReleaseTest.java,v 1.4 2006/11/20 07:33:14 genman Exp $
  + * @version $Id: LockReleaseTest.java,v 1.5 2006/12/18 12:54:23 msurtani Exp $
    */
   public class LockReleaseTest extends TestCase
   {
  @@ -161,9 +161,9 @@
   
         tx.begin();
         keys = cache.getKeys(NODE1);
  -      assertEquals("we should hold 1 read locks now: ", 1, cache.getNumberOfLocksHeld());
  +      assertEquals("we should hold 1 read locks now: ", 2, cache.getNumberOfLocksHeld());
         keys = cache.getKeys(NODE2);
  -      assertEquals("we should hold 3 read locks now: ", 3, cache.getNumberOfLocksHeld());
  +      assertEquals("we should hold 3 read locks now: ", 4, cache.getNumberOfLocksHeld());
         tx.commit();
         assertEquals("we should have released all 3 read locks: ", 0, cache.getNumberOfLocksHeld());
      }
  @@ -184,9 +184,9 @@
   
         tx.begin();
         keys = cache.getChildrenNames(NODE1);
  -      assertEquals("we should hold 1 read locks now: ", 1, cache.getNumberOfLocksHeld());
  +      assertEquals("we should hold 1 read locks now: ", 2, cache.getNumberOfLocksHeld());
         keys = cache.getChildrenNames(NODE2);
  -      assertEquals("we should hold 3 read locks now: ", 3, cache.getNumberOfLocksHeld());
  +      assertEquals("we should hold 3 read locks now: ", 4, cache.getNumberOfLocksHeld());
         tx.commit();
         assertEquals("we should have released all 3 read locks: ", 0, cache.getNumberOfLocksHeld());
      }
  @@ -204,9 +204,9 @@
   
         tx.begin();
         cache.print(NODE1);
  -      assertEquals("we should hold 1 read locks now (for print()): ", 1, cache.getNumberOfLocksHeld());
  +      assertEquals("we should hold 1 read locks now (for print()): ", 2, cache.getNumberOfLocksHeld());
         cache.print(NODE2);
  -      assertEquals("we should hold 3 read locks now (for print()): ", 3, cache.getNumberOfLocksHeld());
  +      assertEquals("we should hold 3 read locks now (for print()): ", 4, cache.getNumberOfLocksHeld());
         tx.commit();
         assertEquals("we should have released all 3 read locks: ", 0, cache.getNumberOfLocksHeld());
      }
  @@ -224,7 +224,7 @@
         tx.begin();
         assertEquals(VAL1, cache.get(NODE1, KEY));
         assertEquals(VAL1, cache.get(NODE2, KEY));
  -      assertEquals("we should hold 3 read locks now: ", 3, cache.getNumberOfLocksHeld());
  +      assertEquals("we should hold 3 read locks now: ", 4, cache.getNumberOfLocksHeld());
         tx.commit();
         assertEquals("we should have released all 3 read locks: ", 0, cache.getNumberOfLocksHeld());
      }
  @@ -241,7 +241,7 @@
         tx.begin();
         cache.put(NODE1, KEY, VAL1);
         cache.put(NODE2, KEY, VAL1);
  -      assertEquals("we should hold 3 write locks now: ", 3, cache.getNumberOfLocksHeld());
  +      assertEquals("we should hold 3 write locks now: ", 4, cache.getNumberOfLocksHeld());
         tx.commit();
         assertEquals("we should have released all 3 write locks: ", 0, cache.getNumberOfLocksHeld());
      }
  
  
  
  1.5       +2 -2      JBossCache/tests/functional/org/jboss/cache/lock/UpgradeLockTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UpgradeLockTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/lock/UpgradeLockTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- UpgradeLockTest.java	6 Sep 2006 15:30:58 -0000	1.4
  +++ UpgradeLockTest.java	18 Dec 2006 12:54:23 -0000	1.5
  @@ -24,7 +24,7 @@
    * Tests upgrade locks from read -> write
    *
    * @author Bela Ban
  - * @version $Id: UpgradeLockTest.java,v 1.4 2006/09/06 15:30:58 msurtani Exp $
  + * @version $Id: UpgradeLockTest.java,v 1.5 2006/12/18 12:54:23 msurtani Exp $
    */
   public class UpgradeLockTest extends TestCase
   {
  @@ -143,7 +143,7 @@
         cache = createCache(l);
         tx.begin();
   
  -      int expected_num_locks = l == IsolationLevel.NONE ? 0 : 1;
  +      int expected_num_locks = l == IsolationLevel.NONE ? 0 : 2;
   
         cache.put(NODE1, null);
         assertEquals(expected_num_locks, cache.getNumberOfLocksHeld());