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.33 by jsr166, Sat Feb 18 14:32:09 2017 UTC vs.
Revision 1.35 by jsr166, Sat May 13 23:05:02 2017 UTC

# Line 491 | Line 491 | public class StampedLockTest extends JSR
491                  lock.unlockWrite(s);
492              }});
493  
494 <        aboutToLock.await();
495 <        waitForThreadToEnterWaitState(t);
494 >        await(aboutToLock);
495 >        assertThreadBlocks(t, Thread.State.WAITING);
496          assertFalse(lock.isWriteLocked());
497          assertTrue(lock.isReadLocked());
498          lock.unlockRead(rs);
# Line 546 | Line 546 | public class StampedLockTest extends JSR
546          Thread t2 = newStartedThread(acquireReleaseReadLock);
547  
548          await(threadsStarted);
549 <        waitForThreadToEnterWaitState(t1);
550 <        waitForThreadToEnterWaitState(t2);
549 >        assertThreadBlocks(t1, Thread.State.WAITING);
550 >        assertThreadBlocks(t2, Thread.State.WAITING);
551          assertTrue(lock.isWriteLocked());
552          assertFalse(lock.isReadLocked());
553          releaseWriteLock(lock, s);
# Line 750 | Line 750 | public class StampedLockTest extends JSR
750                  lock.writeLockInterruptibly();
751              }});
752  
753 <        locked.await();
753 >        await(locked);
754          assertFalse(lock.validate(p));
755          assertEquals(0L, lock.tryOptimisticRead());
756 <        waitForThreadToEnterWaitState(t);
756 >        assertThreadBlocks(t, Thread.State.WAITING);
757          t.interrupt();
758          awaitTermination(t);
759          assertTrue(lock.isWriteLocked());

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines