ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ReentrantReadWriteLockTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ReentrantReadWriteLockTest.java (file contents):
Revision 1.8 by dl, Fri Dec 19 14:44:25 2003 UTC vs.
Revision 1.9 by dl, Mon Dec 22 00:48:56 2003 UTC

# Line 76 | Line 76 | public class ReentrantReadWriteLockTest
76          ReentrantReadWriteLock rl = new ReentrantReadWriteLock();
77          assertFalse(rl.isFair());
78          assertFalse(rl.isWriteLocked());
79 <        assertEquals(0, rl.getReadLocks());
79 >        assertEquals(0, rl.getReadLockCount());
80          ReentrantReadWriteLock r2 = new ReentrantReadWriteLock(true);
81          assertTrue(r2.isFair());
82          assertFalse(r2.isWriteLocked());
83 <        assertEquals(0, r2.getReadLocks());
83 >        assertEquals(0, r2.getReadLockCount());
84      }
85  
86      /**
# Line 91 | Line 91 | public class ReentrantReadWriteLockTest
91          rl.writeLock().lock();
92          assertTrue(rl.isWriteLocked());
93          assertTrue(rl.isWriteLockedByCurrentThread());
94 <        assertEquals(0, rl.getReadLocks());
94 >        assertEquals(0, rl.getReadLockCount());
95          rl.writeLock().unlock();
96          assertFalse(rl.isWriteLocked());
97          assertFalse(rl.isWriteLockedByCurrentThread());
98 <        assertEquals(0, rl.getReadLocks());
98 >        assertEquals(0, rl.getReadLockCount());
99          rl.readLock().lock();
100          assertFalse(rl.isWriteLocked());
101          assertFalse(rl.isWriteLockedByCurrentThread());
102 <        assertEquals(1, rl.getReadLocks());
102 >        assertEquals(1, rl.getReadLockCount());
103          rl.readLock().unlock();
104          assertFalse(rl.isWriteLocked());
105          assertFalse(rl.isWriteLockedByCurrentThread());
106 <        assertEquals(0, rl.getReadLocks());
106 >        assertEquals(0, rl.getReadLockCount());
107      }
108  
109  
# Line 115 | Line 115 | public class ReentrantReadWriteLockTest
115          rl.writeLock().lock();
116          assertTrue(rl.isWriteLocked());
117          assertTrue(rl.isWriteLockedByCurrentThread());
118 <        assertEquals(0, rl.getReadLocks());
118 >        assertEquals(0, rl.getReadLockCount());
119          rl.writeLock().unlock();
120          assertFalse(rl.isWriteLocked());
121          assertFalse(rl.isWriteLockedByCurrentThread());
122 <        assertEquals(0, rl.getReadLocks());
122 >        assertEquals(0, rl.getReadLockCount());
123          rl.readLock().lock();
124          assertFalse(rl.isWriteLocked());
125          assertFalse(rl.isWriteLockedByCurrentThread());
126 <        assertEquals(1, rl.getReadLocks());
126 >        assertEquals(1, rl.getReadLockCount());
127          rl.readLock().unlock();
128          assertFalse(rl.isWriteLocked());
129          assertFalse(rl.isWriteLockedByCurrentThread());
130 <        assertEquals(0, rl.getReadLocks());
130 >        assertEquals(0, rl.getReadLockCount());
131      }
132  
133      /**

Diff Legend

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