ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/StampedLockTest.java

Comparing jsr166/src/test/tck/StampedLockTest.java (file contents):
Revision 1.20 by jsr166, Tue Jun 7 07:20:09 2016 UTC vs.
Revision 1.21 by jsr166, Tue Jun 7 22:10:33 2016 UTC

#	Line 808 | 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);

Diff Legend

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