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.18 by jsr166, Tue Jun 7 02:12:18 2016 UTC vs.
Revision 1.19 by jsr166, Tue Jun 7 06:25:29 2016 UTC

# Line 718 | Line 718 | public class StampedLockTest extends JSR
718      public void testTryConvertToOptimisticRead() throws InterruptedException {
719          StampedLock lock = new StampedLock();
720          long s, p;
721 <        s = 0L;
722 <        assertFalse((p = lock.tryConvertToOptimisticRead(s)) != 0L);
721 >        assertEquals(0L, lock.tryConvertToOptimisticRead(0L));
722 >
723          assertTrue((s = lock.tryOptimisticRead()) != 0L);
724 <        assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
724 >        assertEquals(s, lock.tryConvertToOptimisticRead(s));
725 >        assertTrue(lock.validate(s));
726 >
727          assertTrue((s = lock.writeLock()) != 0L);
728          assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
729          assertTrue(lock.validate(p));
730 +
731          assertTrue((s = lock.readLock()) != 0L);
732          assertTrue(lock.validate(s));
733          assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
734          assertTrue(lock.validate(p));
735 +
736          assertTrue((s = lock.tryWriteLock()) != 0L);
737          assertTrue(lock.validate(s));
738          assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
739          assertTrue(lock.validate(p));
740 +
741          assertTrue((s = lock.tryReadLock()) != 0L);
742          assertTrue(lock.validate(s));
743          assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
744          assertTrue(lock.validate(p));
745 +
746          assertTrue((s = lock.tryWriteLock(100L, MILLISECONDS)) != 0L);
747          assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
748          assertTrue(lock.validate(p));
749 +
750          assertTrue((s = lock.tryReadLock(100L, MILLISECONDS)) != 0L);
751          assertTrue(lock.validate(s));
752          assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines