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

[Manik Surtani]

  User: msurtani
  Date: 07/06/14 11:30:17

  Modified:    tests/functional/org/jboss/cache/transaction  
                        DeadlockTest.java TransactionTest.java
  Log:
  JBCACHE-1109
  
  Revision  Changes    Path
  1.13      +14 -5     JBossCache/tests/functional/org/jboss/cache/transaction/DeadlockTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DeadlockTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/transaction/DeadlockTest.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- DeadlockTest.java	11 Jun 2007 12:58:17 -0000	1.12
  +++ DeadlockTest.java	14 Jun 2007 15:30:17 -0000	1.13
  @@ -31,7 +31,7 @@
    * Tests transactional access to a local CacheImpl, with concurrent (deadlock-prone) access.
    * Note: we use DummpyTranasctionManager to replace jta
    *
  - * @version $Id: DeadlockTest.java,v 1.12 2007/06/11 12:58:17 msurtani Exp $
  + * @version $Id: DeadlockTest.java,v 1.13 2007/06/14 15:30:17 msurtani Exp $
    */
   public class DeadlockTest extends TestCase
   {
  @@ -55,7 +55,7 @@
         super.setUp();
         DummyTransactionManager.getInstance();
         cache = (CacheImpl) DefaultCacheFactory.getInstance().createCache(false);
  -      cache.getConfiguration().setInitialStateRetrievalTimeout(10000);
  +      cache.getConfiguration().setStateRetrievalTimeout(10000);
         cache.getConfiguration().setClusterName("test");
         cache.getConfiguration().setCacheMode(Configuration.CacheMode.LOCAL);
         cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
  @@ -442,7 +442,10 @@
            cache.get(fqn, "bla");// acquires RL
            log("done, locks: " + cache.printLockInfo());
   
  -         synchronized (this) {wait();}
  +         synchronized (this)
  +         {
  +            wait();
  +         }
   
            log("put(" + fqn + ")");
            cache.put(fqn, "key", "val");// need to upgrade RL to WL
  @@ -477,7 +480,10 @@
   
               cache.get(fqn, "bla");// acquires RL
   
  -            synchronized (lock) {lock.wait();}
  +            synchronized (lock)
  +            {
  +               lock.wait();
  +            }
   
               log("put(" + fqn + ")");
               cache.put(fqn, "key", "val");// need to upgrade RL to WL
  @@ -540,7 +546,10 @@
            log("put(" + fqn1 + ")");
            cache.put(fqn1, "key", "val");// need to upgrade RL to WL
            log("done, locks: " + cache.printLockInfo());
  -         synchronized (this) {wait();}
  +         synchronized (this)
  +         {
  +            wait();
  +         }
            log("put(" + fqn2 + ")");
            cache.put(fqn2, "key", "val");// need to upgrade RL to WL
            log("done, locks: " + cache.printLockInfo());
  
  
  
  1.31      +2 -2      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.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- TransactionTest.java	11 Jun 2007 21:17:21 -0000	1.30
  +++ TransactionTest.java	14 Jun 2007 15:30:17 -0000	1.31
  @@ -38,7 +38,7 @@
    * Tests transactional access to a local CacheImpl.
    * Note: we use DummpyTranasctionManager to replace jta
    *
  - * @version $Id: TransactionTest.java,v 1.30 2007/06/11 21:17:21 msurtani Exp $
  + * @version $Id: TransactionTest.java,v 1.31 2007/06/14 15:30:17 msurtani Exp $
    */
   public class TransactionTest extends TestCase
   {
  @@ -70,7 +70,7 @@
         tx = (UserTransaction) new InitialContext(p).lookup("UserTransaction");
         cache = (CacheImpl) DefaultCacheFactory.getInstance().createCache(false);
         cache.getConfiguration().setClusterName("test");
  -      cache.getConfiguration().setInitialStateRetrievalTimeout(10000);
  +      cache.getConfiguration().setStateRetrievalTimeout(10000);
         cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
         cache.getConfiguration().setIsolationLevel(IsolationLevel.SERIALIZABLE);
         cache.getConfiguration().setLockParentForChildInsertRemove(true);// this test case is written to assume this.