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

Manik Surtani msurtani at jboss.com
Wed Jan 17 11:24:06 EST 2007


  User: msurtani
  Date: 07/01/17 11:24:06

  Modified:    tests/functional/org/jboss/cache/transaction  
                        TransactionTest.java AsyncRollbackTxTest.java
  Log:
  JBCACHE-565
  
  Revision  Changes    Path
  1.25      +10 -10    JBossCache/tests/functional/org/jboss/cache/transaction/TransactionTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TransactionTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/transaction/TransactionTest.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- TransactionTest.java	11 Jan 2007 13:49:06 -0000	1.24
  +++ TransactionTest.java	17 Jan 2007 16:24:06 -0000	1.25
  @@ -39,7 +39,7 @@
    * Tests transactional access to a local CacheImpl.
    * Note: we use DummpyTranasctionManager to replace jta
    *
  - * @version $Id: TransactionTest.java,v 1.24 2007/01/11 13:49:06 msurtani Exp $
  + * @version $Id: TransactionTest.java,v 1.25 2007/01/17 16:24:06 msurtani Exp $
    */
   public class TransactionTest extends TestCase
   {
  @@ -458,11 +458,11 @@
         GlobalTransaction gtx = cache.getCurrentTransaction();
         assertLocked(gtx, "/", false);
         assertLocked(gtx, "/a", false);
  -      assertNull("/a/b should not exist", cache.peek(Fqn.fromString("/a/b")));
  -      assertNull("/a/b/c should not exist", cache.peek(Fqn.fromString("/a/b/c")));
  +      assertNull("/a/b should not exist", cache.peek(Fqn.fromString("/a/b"), true));
  +      assertNull("/a/b/c should not exist", cache.peek(Fqn.fromString("/a/b/c"), true));
         tx.rollback();
  -      assertNull("/a/b should not exist", cache.peek(Fqn.fromString("/a/b")));
  -      assertNull("/a/b/c should not exist", cache.peek(Fqn.fromString("/a/b/c")));
  +      assertNull("/a/b should not exist", cache.peek(Fqn.fromString("/a/b"), true));
  +      assertNull("/a/b/c should not exist", cache.peek(Fqn.fromString("/a/b/c"), true));
   
      }
   
  @@ -478,11 +478,11 @@
         GlobalTransaction gtx = cache.getCurrentTransaction();
         assertLocked(gtx, "/", false);
         assertLocked(gtx, "/a", false);
  -      assertNull("/a/b should not exist", cache.peek(Fqn.fromString("/a/b")));
  -      assertNull("/a/b/c should not exist", cache.peek(Fqn.fromString("/a/b/c")));
  +      assertNull("/a/b should not exist", cache.peek(Fqn.fromString("/a/b"), true));
  +      assertNull("/a/b/c should not exist", cache.peek(Fqn.fromString("/a/b/c"), true));
         tx.rollback();
  -      assertNull("/a/b should not exist", cache.peek(Fqn.fromString("/a/b")));
  -      assertNull("/a/b/c should not exist", cache.peek(Fqn.fromString("/a/b/c")));
  +      assertNull("/a/b should not exist", cache.peek(Fqn.fromString("/a/b"), true));
  +      assertNull("/a/b/c should not exist", cache.peek(Fqn.fromString("/a/b/c"), true));
   
      }
   
  @@ -565,7 +565,7 @@
   
      private void assertLocked(Object owner, String fqn, boolean write_locked) throws Exception
      {
  -      NodeSPI n = cache.peek(Fqn.fromString(fqn));
  +      NodeSPI n = cache.peek(Fqn.fromString(fqn), true);
         NodeLock lock = n.getLock();
         if (owner == null)
         {
  
  
  
  1.4       +3 -3      JBossCache/tests/functional/org/jboss/cache/transaction/AsyncRollbackTxTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AsyncRollbackTxTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/transaction/AsyncRollbackTxTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- AsyncRollbackTxTest.java	11 Jan 2007 13:49:06 -0000	1.3
  +++ AsyncRollbackTxTest.java	17 Jan 2007 16:24:06 -0000	1.4
  @@ -82,7 +82,7 @@
         // make sure the node was NOT added!!
         assertFalse(cache.exists(fqn));
         // even in a "deleted" form
  -      assertNull(cache.peek(fqn));
  +      assertNull(cache.peek(fqn, true));
      }
   
   
  @@ -137,7 +137,7 @@
         // make sure the node was NOT added!!
         assertFalse(cache.exists(fqn));
         // even in a "deleted" form
  -      assertNull(cache.peek(fqn));
  +      assertNull(cache.peek(fqn, true));
   
         //Put not some data into cache. Because no transaction is used
         //no locks should be helds after this line.
  @@ -158,7 +158,7 @@
         // make sure the node was NOT added!!
         assertFalse(cache.exists(fqn));
         // even in a "deleted" form
  -      assertNull(cache.peek(fqn));
  +      assertNull(cache.peek(fqn, true));
         assertNull(tm.getTransaction());
         assertEquals(0, cache.getNumberOfLocksHeld());
   
  
  
  



More information about the jboss-cvs-commits mailing list