ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/StampedLockTest.java
(Generate patch)

Comparing jsr166/src/test/tck/StampedLockTest.java (file contents):
Revision 1.29 by jsr166, Sun Nov 6 22:42:10 2016 UTC vs.
Revision 1.32 by jsr166, Sat Feb 18 00:39:20 2017 UTC

# Line 272 | Line 272 | public class StampedLockTest extends JSR
272       * interruptible operations throw InterruptedException when pre-interrupted
273       */
274      public void testInterruptibleOperationsThrowInterruptedExceptionWhenPreInterrupted() {
275 –        final CountDownLatch running = new CountDownLatch(1);
275          final StampedLock lock = new StampedLock();
276  
277          Action[] interruptibleLockActions = {
# Line 337 | Line 336 | public class StampedLockTest extends JSR
336       * interruptible operations throw InterruptedException when write locked and interrupted
337       */
338      public void testInterruptibleOperationsThrowInterruptedExceptionWriteLockedInterrupted() {
340 –        final CountDownLatch running = new CountDownLatch(1);
339          final StampedLock lock = new StampedLock();
340          long s = lock.writeLock();
341  
# Line 360 | Line 358 | public class StampedLockTest extends JSR
358       * interruptible operations throw InterruptedException when read locked and interrupted
359       */
360      public void testInterruptibleOperationsThrowInterruptedExceptionReadLockedInterrupted() {
363 –        final CountDownLatch running = new CountDownLatch(1);
361          final StampedLock lock = new StampedLock();
362          long s = lock.readLock();
363  
# Line 482 | Line 479 | public class StampedLockTest extends JSR
479       * A writelock succeeds only after a reading thread unlocks
480       */
481      public void testWriteAfterReadLock() throws InterruptedException {
482 <        final CountDownLatch running = new CountDownLatch(1);
482 >        final CountDownLatch threadStarted = new CountDownLatch(1);
483          final StampedLock lock = new StampedLock();
484          long rs = lock.readLock();
485          Thread t = newStartedThread(new CheckedRunnable() {
486              public void realRun() {
487 <                running.countDown();
487 >                threadStarted.countDown();
488                  long s = lock.writeLock();
489                  lock.unlockWrite(s);
490              }});
491  
492 <        running.await();
492 >        threadStarted.await();
493          waitForThreadToEnterWaitState(t, MEDIUM_DELAY_MS);
494          assertFalse(lock.isWriteLocked());
495          lock.unlockRead(rs);
# Line 738 | Line 735 | public class StampedLockTest extends JSR
735       */
736      public void testValidateOptimisticWriteLocked2()
737              throws InterruptedException {
738 <        final CountDownLatch running = new CountDownLatch(1);
738 >        final CountDownLatch locked = new CountDownLatch(1);
739          final StampedLock lock = new StampedLock();
740          final long p = assertValid(lock, lock.tryOptimisticRead());
741  
742          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
743              public void realRun() throws InterruptedException {
744                  lock.writeLockInterruptibly();
745 <                running.countDown();
745 >                locked.countDown();
746                  lock.writeLockInterruptibly();
747              }});
748  
749 <        running.await();
749 >        locked.await();
750          assertFalse(lock.validate(p));
751          assertEquals(0L, lock.tryOptimisticRead());
752          t.interrupt();

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines