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

[Manik Surtani]

  User: msurtani
  Date: 07/01/30 21:40:21

  Modified:    tests/functional/org/jboss/cache/lock 
                        ReadWriteLockTest.java
  Log:
  Removed dependency on concurrent.jar
  
  Revision  Changes    Path
  1.3       +22 -21    JBossCache/tests/functional/org/jboss/cache/lock/ReadWriteLockTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ReadWriteLockTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/lock/ReadWriteLockTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ReadWriteLockTest.java	5 May 2006 12:06:58 -0000	1.2
  +++ ReadWriteLockTest.java	31 Jan 2007 02:40:20 -0000	1.3
  @@ -1,15 +1,16 @@
   package org.jboss.cache.lock;
   
  -import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock;
  -import EDU.oswego.cs.dl.util.concurrent.ReentrantWriterPreferenceReadWriteLock;
   import junit.framework.Test;
   import junit.framework.TestCase;
   import junit.framework.TestSuite;
   
  +import java.util.concurrent.locks.ReadWriteLock;
  +import java.util.concurrent.locks.ReentrantReadWriteLock;
  +
   /**
    * Tests the various ReadWriteLock implementations
    * @author Bela Ban
  - * @version $Id: ReadWriteLockTest.java,v 1.2 2006/05/05 12:06:58 msurtani Exp $
  + * @version $Id: ReadWriteLockTest.java,v 1.3 2007/01/31 02:40:20 msurtani Exp $
    */
   public class ReadWriteLockTest extends TestCase {
      ReadWriteLock lock;
  @@ -30,18 +31,18 @@
   
   
      public void testMoreWriteReleasesThanAcquisitions() throws InterruptedException {
  -      lock=new ReentrantWriterPreferenceReadWriteLock();
  -      lock.writeLock().acquire();
  -      lock.writeLock().release();
  -      lock.writeLock().release();
  +      lock = new ReentrantReadWriteLock();
  +      lock.writeLock().lock();
  +      lock.writeLock().unlock();
  +      lock.writeLock().unlock();
      }
   
      public void testMoreReadReleasesThanAcquisitions() throws InterruptedException {
  -      lock=new ReentrantWriterPreferenceReadWriteLock();
  -      lock.readLock().acquire();
  -      lock.readLock().release();
  +      lock = new ReentrantReadWriteLock();
  +      lock.readLock().lock();
  +      lock.readLock().unlock();
         try {
  -         lock.readLock().release();
  +         lock.readLock().unlock();
            fail("read locks cannot be released more than acquired");
         }
         catch(IllegalStateException illegalStateEx) {
  @@ -50,16 +51,16 @@
      }
   
      public void testSimple() throws InterruptedException {
  -      lock=new ReentrantWriterPreferenceReadWriteLock();
  -      lock.readLock().acquire();
  -      lock.readLock().acquire();
  -      lock.writeLock().acquire();
  -      lock.writeLock().acquire();
  +      lock = new ReentrantReadWriteLock();
  +      lock.readLock().lock();
  +      lock.readLock().lock();
  +      lock.writeLock().lock();
  +      lock.writeLock().lock();
      }
   
   
      public void testOneWriterMultipleReaders() throws InterruptedException {
  -      lock=new ReentrantWriterPreferenceReadWriteLock();
  +      lock = new ReentrantReadWriteLock();
   
         Writer writer=new Writer("writer");
         Reader reader1=new Reader("reader1");
  @@ -83,7 +84,7 @@
         public void run() {
            try {
               log("acquiring WL");
  -            lock.writeLock().acquire();
  +            lock.writeLock().lock();
               log("acquired WL successfully");
               sleep(1000);
            }
  @@ -92,7 +93,7 @@
            }
            finally {
               log("releasing WL");
  -            lock.writeLock().release();
  +            lock.writeLock().unlock();
            }
         }
      }
  @@ -108,7 +109,7 @@
         public void run() {
            try {
               log("acquiring RL");
  -            lock.readLock().acquire();
  +            lock.readLock().lock();
               log("acquired RL successfully");
               sleep(500);
            }
  @@ -117,7 +118,7 @@
            }
            finally {
               log("releasing RL");
  -            lock.readLock().release();
  +            lock.readLock().unlock();
            }
         }
      }