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.34 by jsr166, Sat Mar 25 21:41:10 2017 UTC vs.
Revision 1.36 by jsr166, Mon May 29 19:15:03 2017 UTC

# Line 248 | Line 248 | public class StampedLockTest extends JSR
248          long s = assertNonZero(lock.writeLock());
249          assertTrue(lock.validate(s));
250          assertFalse(lock.validate(lock.tryWriteLock()));
251 <        assertFalse(lock.validate(lock.tryWriteLock(0L, SECONDS)));
251 >        assertFalse(lock.validate(lock.tryWriteLock(randomExpiredTimeout(),
252 >                                                    randomTimeUnit())));
253          assertFalse(lock.validate(lock.tryReadLock()));
254 <        assertFalse(lock.validate(lock.tryReadLock(0L, SECONDS)));
254 >        assertFalse(lock.validate(lock.tryWriteLock(randomExpiredTimeout(),
255 >                                                    randomTimeUnit())));
256          assertFalse(lock.validate(lock.tryOptimisticRead()));
257          lock.unlockWrite(s);
258      }
# Line 492 | Line 494 | public class StampedLockTest extends JSR
494              }});
495  
496          await(aboutToLock);
497 <        waitForThreadToEnterWaitState(t);
497 >        assertThreadBlocks(t, Thread.State.WAITING);
498          assertFalse(lock.isWriteLocked());
499          assertTrue(lock.isReadLocked());
500          lock.unlockRead(rs);
# Line 546 | Line 548 | public class StampedLockTest extends JSR
548          Thread t2 = newStartedThread(acquireReleaseReadLock);
549  
550          await(threadsStarted);
551 <        waitForThreadToEnterWaitState(t1);
552 <        waitForThreadToEnterWaitState(t2);
551 >        assertThreadBlocks(t1, Thread.State.WAITING);
552 >        assertThreadBlocks(t2, Thread.State.WAITING);
553          assertTrue(lock.isWriteLocked());
554          assertFalse(lock.isReadLocked());
555          releaseWriteLock(lock, s);
# Line 753 | Line 755 | public class StampedLockTest extends JSR
755          await(locked);
756          assertFalse(lock.validate(p));
757          assertEquals(0L, lock.tryOptimisticRead());
758 <        waitForThreadToEnterWaitState(t);
758 >        assertThreadBlocks(t, Thread.State.WAITING);
759          t.interrupt();
760          awaitTermination(t);
761          assertTrue(lock.isWriteLocked());

Diff Legend

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