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.17 by jsr166, Tue Jun 7 02:04:47 2016 UTC vs.
Revision 1.21 by jsr166, Tue Jun 7 22:10:33 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((p = lock.readLock()) != 0L);
728 >        assertTrue((s = lock.tryOptimisticRead()) != 0L);
729 >        assertEquals(s, lock.tryConvertToOptimisticRead(s));
730 >        assertTrue(lock.validate(s));
731 >        lock.unlockRead(p);
732 >
733          assertTrue((s = lock.writeLock()) != 0L);
734          assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
735          assertTrue(lock.validate(p));
736 +
737          assertTrue((s = lock.readLock()) != 0L);
738          assertTrue(lock.validate(s));
739          assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
740          assertTrue(lock.validate(p));
741 +
742          assertTrue((s = lock.tryWriteLock()) != 0L);
743          assertTrue(lock.validate(s));
744          assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
745          assertTrue(lock.validate(p));
746 +
747          assertTrue((s = lock.tryReadLock()) != 0L);
748          assertTrue(lock.validate(s));
749          assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
750          assertTrue(lock.validate(p));
751 +
752          assertTrue((s = lock.tryWriteLock(100L, MILLISECONDS)) != 0L);
753          assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
754          assertTrue(lock.validate(p));
755 +
756          assertTrue((s = lock.tryReadLock(100L, MILLISECONDS)) != 0L);
757          assertTrue(lock.validate(s));
758          assertTrue((p = lock.tryConvertToOptimisticRead(s)) != 0L);
# Line 795 | Line 808 | public class StampedLockTest extends JSR
808      public void testTryConvertToWriteLock() throws InterruptedException {
809          StampedLock lock = new StampedLock();
810          long s, p;
811 <        s = 0L;
812 <        assertFalse((p = lock.tryConvertToWriteLock(s)) != 0L);
811 >
812 >        assertFalse((p = lock.tryConvertToWriteLock(0L)) != 0L);
813 >
814          assertTrue((s = lock.tryOptimisticRead()) != 0L);
815          assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
816          lock.unlockWrite(p);
817 +
818          assertTrue((s = lock.writeLock()) != 0L);
819 <        assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
820 <        assertTrue(lock.validate(p));
821 <        lock.unlockWrite(p);
819 >        assertEquals(s, lock.tryConvertToWriteLock(s));
820 >        assertTrue(lock.validate(s));
821 >        lock.unlockWrite(s);
822 >
823          assertTrue((s = lock.readLock()) != 0L);
824          assertTrue(lock.validate(s));
825          assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
826          assertTrue(lock.validate(p));
827          lock.unlockWrite(p);
828 +
829          assertTrue((s = lock.tryWriteLock()) != 0L);
830          assertTrue(lock.validate(s));
831 <        assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
832 <        assertTrue(lock.validate(p));
833 <        lock.unlockWrite(p);
831 >        assertEquals(s, lock.tryConvertToWriteLock(s));
832 >        assertTrue(lock.validate(s));
833 >        lock.unlockWrite(s);
834 >
835          assertTrue((s = lock.tryReadLock()) != 0L);
836          assertTrue(lock.validate(s));
837          assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
838          assertTrue(lock.validate(p));
839          lock.unlockWrite(p);
840 +
841          assertTrue((s = lock.tryWriteLock(100L, MILLISECONDS)) != 0L);
842          assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
843          assertTrue(lock.validate(p));
844          lock.unlockWrite(p);
845 +
846          assertTrue((s = lock.tryReadLock(100L, MILLISECONDS)) != 0L);
847          assertTrue(lock.validate(s));
848          assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
# Line 972 | Line 992 | public class StampedLockTest extends JSR
992              },
993              () -> {
994                  StampedLock sl = new StampedLock();
995 +                sl.readLock();
996 +                long stamp = sl.tryConvertToOptimisticRead(sl.readLock());
997 +                assertTrue(stamp != 0);
998 +                sl.readLock();
999 +                sl.unlockRead(stamp);
1000 +            },
1001 +            () -> {
1002 +                StampedLock sl = new StampedLock();
1003 +                long stamp = sl.tryConvertToOptimisticRead(sl.readLock());
1004 +                sl.readLock();
1005 +                sl.unlock(stamp);
1006 +            },
1007 +            () -> {
1008 +                StampedLock sl = new StampedLock();
1009 +                sl.readLock();
1010                  long stamp = sl.tryConvertToOptimisticRead(sl.readLock());
1011                  sl.readLock();
1012                  sl.unlock(stamp);

Diff Legend

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