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

[Manik Surtani]

  User: msurtani
  Date: 06/12/06 11:00:14

  Modified:    tests/functional/org/jboss/cache/options   Tag:
                        Branch_JBossCache_1_4_0 SuppressLockingTest.java
                        ExplicitVersionsReplTest.java
  Log:
  JBCACHE-894
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +6 -6      JBossCache/tests/functional/org/jboss/cache/options/SuppressLockingTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SuppressLockingTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/options/SuppressLockingTest.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -b -r1.4 -r1.4.2.1
  --- SuppressLockingTest.java	12 May 2006 00:01:48 -0000	1.4
  +++ SuppressLockingTest.java	6 Dec 2006 16:00:14 -0000	1.4.2.1
  @@ -44,7 +44,7 @@
   
              m.begin();
              cache.put(fqn, "x", "1");
  -           assertEquals(1, cache.getNumberOfLocksHeld());
  +           assertEquals(2, cache.getNumberOfLocksHeld());
              m.commit();
              assertEquals(0, cache.getNumberOfLocksHeld());
   
  @@ -61,7 +61,7 @@
   
              m.begin();
              cache.put(fqn, "x", "3");
  -           assertEquals(1, cache.getNumberOfLocksHeld());
  +           assertEquals(2, cache.getNumberOfLocksHeld());
              m.commit();
              assertEquals(0, cache.getNumberOfLocksHeld());
   
  @@ -89,7 +89,7 @@
   
              m.begin();
              cache.put(fqn, "x", "1");
  -           assertEquals(1, cache.getNumberOfLocksHeld());
  +           assertEquals(2, cache.getNumberOfLocksHeld());
              m.commit();
              assertEquals(0, cache.getNumberOfLocksHeld());
   
  @@ -116,7 +116,7 @@
   
              m.begin();
              cache.put(fqn, "x", "3");
  -           assertEquals(1, cache.getNumberOfLocksHeld());
  +           assertEquals(2, cache.getNumberOfLocksHeld());
              m.commit();
              assertEquals(0, cache.getNumberOfLocksHeld());
   
  @@ -142,7 +142,7 @@
   
               m.begin();
               cache.get(fqn, "x");
  -            assertEquals(1, cache.getNumberOfLocksHeld());
  +            assertEquals(2, cache.getNumberOfLocksHeld());
               m.commit();
               assertEquals(0, cache.getNumberOfLocksHeld());
   
  @@ -156,7 +156,7 @@
   
               m.begin();
               cache.get(fqn, "x");
  -            assertEquals(1, cache.getNumberOfLocksHeld());
  +            assertEquals(2, cache.getNumberOfLocksHeld());
               m.commit();
               assertEquals(0, cache.getNumberOfLocksHeld());
   
  
  
  
  1.1.2.2   +13 -0     JBossCache/tests/functional/org/jboss/cache/options/ExplicitVersionsReplTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ExplicitVersionsReplTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/options/ExplicitVersionsReplTest.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- ExplicitVersionsReplTest.java	11 Nov 2006 17:50:03 -0000	1.1.2.1
  +++ ExplicitVersionsReplTest.java	6 Dec 2006 16:00:14 -0000	1.1.2.2
  @@ -288,5 +288,18 @@
         assertEquals(expected, ((OptimisticTreeNode) cache[1].get(fqn)).getVersion());
      }
   
  +   public void testExplicitVersionOnRoot() throws Exception
  +   {
  +      TestVersion newVersion = new TestVersion("100");
  +      option = new Option();
  +      option.setDataVersion(newVersion);
  +
  +      cache[0].getTransactionManager().begin();
  +      cache[0].put(Fqn.ROOT, "k", "v", option);
  +
  +      // should not barf
  +      cache[0].getTransactionManager().commit();
  +   }
  +
   
   }