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.22 by jsr166, Tue Jun 7 22:19:52 2016 UTC vs.
Revision 1.24 by jsr166, Tue Jun 7 23:28:30 2016 UTC

# Line 775 | Line 775 | public class StampedLockTest extends JSR
775          assertEquals(1, lock.getReadLockCount());
776          lock.unlockRead(p);
777  
778 +        assertTrue((s = lock.tryOptimisticRead()) != 0L);
779 +        lock.readLock();
780 +        assertTrue((p = lock.tryConvertToReadLock(s)) != 0L);
781 +        assertTrue(lock.isReadLocked());
782 +        assertEquals(2, lock.getReadLockCount());
783 +        lock.unlockRead(p);
784 +        lock.unlockRead(p);
785 +
786          assertTrue((s = lock.writeLock()) != 0L);
787          assertTrue((p = lock.tryConvertToReadLock(s)) != 0L);
788          assertTrue(lock.validate(p));
# Line 833 | Line 841 | public class StampedLockTest extends JSR
841  
842          assertTrue((s = lock.tryOptimisticRead()) != 0L);
843          assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
844 +        assertTrue(lock.isWriteLocked());
845          lock.unlockWrite(p);
846  
847          assertTrue((s = lock.writeLock()) != 0L);
848          assertEquals(s, lock.tryConvertToWriteLock(s));
849          assertTrue(lock.validate(s));
850 +        assertTrue(lock.isWriteLocked());
851          lock.unlockWrite(s);
852  
853          assertTrue((s = lock.readLock()) != 0L);
854          assertTrue(lock.validate(s));
855          assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
856          assertTrue(lock.validate(p));
857 +        assertTrue(lock.isWriteLocked());
858          lock.unlockWrite(p);
859  
860          assertTrue((s = lock.tryWriteLock()) != 0L);
861          assertTrue(lock.validate(s));
862          assertEquals(s, lock.tryConvertToWriteLock(s));
863          assertTrue(lock.validate(s));
864 +        assertTrue(lock.isWriteLocked());
865          lock.unlockWrite(s);
866  
867          assertTrue((s = lock.tryReadLock()) != 0L);
868          assertTrue(lock.validate(s));
869          assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
870          assertTrue(lock.validate(p));
871 +        assertTrue(lock.isWriteLocked());
872          lock.unlockWrite(p);
873  
874          assertTrue((s = lock.tryWriteLock(100L, MILLISECONDS)) != 0L);
875          assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
876          assertTrue(lock.validate(p));
877 +        assertTrue(lock.isWriteLocked());
878          lock.unlockWrite(p);
879  
880          assertTrue((s = lock.tryReadLock(100L, MILLISECONDS)) != 0L);
881          assertTrue(lock.validate(s));
882          assertTrue((p = lock.tryConvertToWriteLock(s)) != 0L);
883          assertTrue(lock.validate(p));
884 +        assertTrue(lock.isWriteLocked());
885          lock.unlockWrite(p);
886      }
887  

Diff Legend

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