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

[Manik Surtani]

  User: msurtani
  Date: 06/11/26 06:52:05

  Modified:    tests/functional/org/jboss/cache/replicated  Tag:
                        Branch_JBossCache_1_3_0 SyncReplTxTest.java
  Log:
  More fixes
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.4   +26 -5     JBossCache/tests/functional/org/jboss/cache/replicated/SyncReplTxTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SyncReplTxTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/replicated/SyncReplTxTest.java,v
  retrieving revision 1.7.2.3
  retrieving revision 1.7.2.4
  diff -u -b -r1.7.2.3 -r1.7.2.4
  --- SyncReplTxTest.java	26 Nov 2006 10:56:50 -0000	1.7.2.3
  +++ SyncReplTxTest.java	26 Nov 2006 11:52:05 -0000	1.7.2.4
  @@ -18,6 +18,7 @@
   import org.jboss.cache.Fqn;
   import org.jboss.cache.TreeCache;
   import org.jboss.cache.lock.IsolationLevel;
  +import org.jboss.cache.lock.TimeoutException;
   import org.jboss.cache.transaction.DummyTransactionManager;
   
   import javax.naming.Context;
  @@ -28,13 +29,15 @@
   import javax.transaction.SystemException;
   import javax.transaction.Transaction;
   import javax.transaction.TransactionManager;
  +import java.util.List;
  +import java.util.ArrayList;
   
   /**
    * Replicated unit test for sync transactional TreeCache
    * Note: we use DummyTransactionManager for Tx purpose instead of relying on
    * jta.
    *
  - * @version $Revision: 1.7.2.3 $
  + * @version $Revision: 1.7.2.4 $
    */
   public class SyncReplTxTest extends TestCase {
       private static Log log = LogFactory.getLog(SyncReplTxTest.class);
  @@ -690,6 +693,7 @@
         c2.setLockAcquisitionTimeout(5000);
         c1.start();
         c2.start();
  +      final List exceptions = new ArrayList();
   
         class MyThread extends Thread {
            Object mutex;
  @@ -700,7 +704,7 @@
            }
   
            public void run() {
  -            Transaction tx;
  +            Transaction tx = null;
   
               try {
                  tx=beginTransaction();
  @@ -715,7 +719,17 @@
                  System.out.println("Thread " + getName() + " committed successfully");
               }
               catch(Exception e) {
  -               ex=e;
  +               exceptions.add(e);
  +            }
  +            finally {
  +               try
  +               {
  +                  if (tx != null) tx.rollback();
  +               }
  +               catch (Exception e)
  +               {
  +
  +               }
               }
            }
         }
  @@ -756,8 +770,15 @@
         c1.stop();
         c2.stop();
   
  -      if(ex != null)
  -         fail("Thread failed: " + ex);
  +//      if(ex != null)
  +//      {
  +//         ex.printStackTrace();
  +//         fail("Thread failed: " + ex);
  +//      }
  +
  +      // we can only expect 1 thread to succeed.  The others will fail.  So, threads.length -1 exceptions.
  +      assertEquals(threads.length - 1, exceptions.size());
  +      for (int i=0; i<exceptions.size(); i++) assertEquals(TimeoutException.class, exceptions.get(i).getClass());
      }