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

[Manik Surtani]

  User: msurtani
  Date: 06/12/11 04:04:37

  Modified:    tests/functional/org/jboss/cache/transaction  Tag:
                        Branch_JBossCache_1_4_0 PrepareTxTest.java
  Log:
  fixed broken test
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.20.1  +10 -3     JBossCache/tests/functional/org/jboss/cache/transaction/PrepareTxTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PrepareTxTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/transaction/PrepareTxTest.java,v
  retrieving revision 1.1
  retrieving revision 1.1.20.1
  diff -u -b -r1.1 -r1.1.20.1
  --- PrepareTxTest.java	8 Jul 2005 05:58:10 -0000	1.1
  +++ PrepareTxTest.java	11 Dec 2006 09:04:36 -0000	1.1.20.1
  @@ -6,7 +6,6 @@
   import org.jboss.cache.CacheException;
   import org.jboss.cache.TransactionTable;
   import org.jboss.cache.TreeCache;
  -import org.jboss.cache.transaction.DummyTransactionManager;
   
   import javax.transaction.NotSupportedException;
   import javax.transaction.Synchronization;
  @@ -32,6 +31,14 @@
   
      protected void tearDown() throws Exception {
         super.tearDown();
  +      Transaction t = cache.getTransactionManager().getTransaction();
  +      try
  +      {
  +         if ( t != null ) t.rollback();
  +      }
  +      catch (Exception e)
  +      {
  +      }
         cache.stopService();
         cache.destroyService();
      }
  @@ -54,7 +61,7 @@
         cache.put("/one/two/three", "key1", "val1");
         System.out.println("before commit:\n" + cache.printLockInfo());
         numLocks=cache.getNumberOfLocksHeld();
  -      assertEquals(3, numLocks);
  +      assertEquals(4, numLocks);
   
         // we register *second*
         tx.registerSynchronization(new Synchronization() {
  @@ -105,7 +112,7 @@
          cache.put("/one/two/three", "key1", "val1");
          System.out.println("before commit:\n" + cache.printLockInfo());
          numLocks=cache.getNumberOfLocksHeld();
  -       assertEquals(3, numLocks);
  +       assertEquals(4, numLocks);
   
          // we register *second*
          tx.registerSynchronization(new Synchronization() {