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

Comparing jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java (file contents):
Revision 1.21 by dl, Thu May 18 10:29:23 2006 UTC vs.
Revision 1.58 by jsr166, Fri Sep 29 19:34:37 2017 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
5 < * Other contributors include Andrew Wright, Jeffrey Hayes,
6 < * Pat Fisher, Mike Judd.
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 + import static java.util.concurrent.TimeUnit.NANOSECONDS;
11  
12 < import junit.framework.*;
13 < import java.util.*;
14 < import java.util.concurrent.*;
15 < import java.util.concurrent.locks.*;
16 < import java.io.*;
12 > import java.util.Arrays;
13 > import java.util.Collection;
14 > import java.util.HashSet;
15 > import java.util.concurrent.locks.AbstractQueuedSynchronizer;
16 > import java.util.concurrent.locks.AbstractQueuedSynchronizer.ConditionObject;
17 >
18 > import junit.framework.AssertionFailedError;
19 > import junit.framework.Test;
20 > import junit.framework.TestSuite;
21  
22 + @SuppressWarnings("WaitNotInLoop") // we implement spurious-wakeup freedom
23   public class AbstractQueuedSynchronizerTest extends JSR166TestCase {
24      public static void main(String[] args) {
25 <        junit.textui.TestRunner.run (suite());
25 >        main(suite(), args);
26      }
27      public static Test suite() {
28          return new TestSuite(AbstractQueuedSynchronizerTest.class);
29      }
30  
31      /**
32 <     * A simple mutex class, adapted from the
33 <     * AbstractQueuedSynchronizer javadoc.  Exclusive acquire tests
34 <     * exercise this as a sample user extension.  Other
35 <     * methods/features of AbstractQueuedSynchronizerTest are tested
36 <     * via other test classes, including those for ReentrantLock,
37 <     * ReentrantReadWriteLock, and Semaphore
32 >     * A simple mutex class, adapted from the class javadoc.  Exclusive
33 >     * acquire tests exercise this as a sample user extension.  Other
34 >     * methods/features of AbstractQueuedSynchronizer are tested via
35 >     * other test classes, including those for ReentrantLock,
36 >     * ReentrantReadWriteLock, and Semaphore.
37 >     *
38 >     * Unlike the javadoc sample, we don't track owner thread via
39 >     * AbstractOwnableSynchronizer methods.
40       */
41      static class Mutex extends AbstractQueuedSynchronizer {
42 <        public boolean isHeldExclusively() { return getState() == 1; }
43 <        
44 <        public boolean tryAcquire(int acquires) {
45 <            assertTrue(acquires == 1);
46 <            return compareAndSetState(0, 1);
42 >        /** An eccentric value for locked synchronizer state. */
43 >        static final int LOCKED = (1 << 31) | (1 << 15);
44 >
45 >        static final int UNLOCKED = 0;
46 >
47 >        /** Owner thread is untracked, so this is really just isLocked(). */
48 >        @Override public boolean isHeldExclusively() {
49 >            int state = getState();
50 >            assertTrue(state == UNLOCKED || state == LOCKED);
51 >            return state == LOCKED;
52 >        }
53 >
54 >        @Override protected boolean tryAcquire(int acquires) {
55 >            assertEquals(LOCKED, acquires);
56 >            return compareAndSetState(UNLOCKED, LOCKED);
57          }
58 <        
59 <        public boolean tryRelease(int releases) {
60 <            if (getState() == 0) throw new IllegalMonitorStateException();
61 <            setState(0);
58 >
59 >        @Override protected boolean tryRelease(int releases) {
60 >            if (getState() != LOCKED) throw new IllegalMonitorStateException();
61 >            assertEquals(LOCKED, releases);
62 >            setState(UNLOCKED);
63              return true;
64          }
45        
46        public AbstractQueuedSynchronizer.ConditionObject newCondition() { return new AbstractQueuedSynchronizer.ConditionObject(); }
65  
66 +        public boolean tryAcquireNanos(long nanos) throws InterruptedException {
67 +            return tryAcquireNanos(LOCKED, nanos);
68 +        }
69 +
70 +        public boolean tryAcquire() {
71 +            return tryAcquire(LOCKED);
72 +        }
73 +
74 +        public boolean tryRelease() {
75 +            return tryRelease(LOCKED);
76 +        }
77 +
78 +        public void acquire() {
79 +            acquire(LOCKED);
80 +        }
81 +
82 +        public void acquireInterruptibly() throws InterruptedException {
83 +            acquireInterruptibly(LOCKED);
84 +        }
85 +
86 +        public void release() {
87 +            release(LOCKED);
88 +        }
89 +
90 +        /** Faux-Implements Lock.newCondition(). */
91 +        public ConditionObject newCondition() {
92 +            return new ConditionObject();
93 +        }
94      }
95  
50    
96      /**
97 <     * A simple latch class, to test shared mode.
97 >     * A minimal latch class, to test shared mode.
98       */
99 <    static class BooleanLatch extends AbstractQueuedSynchronizer {
99 >    static class BooleanLatch extends AbstractQueuedSynchronizer {
100          public boolean isSignalled() { return getState() != 0; }
101  
102          public int tryAcquireShared(int ignore) {
103 <            return isSignalled()? 1 : -1;
103 >            return isSignalled() ? 1 : -1;
104          }
105 <        
105 >
106          public boolean tryReleaseShared(int ignore) {
107              setState(1);
108              return true;
# Line 65 | Line 110 | public class AbstractQueuedSynchronizerT
110      }
111  
112      /**
113 <     * A runnable calling acquireInterruptibly
113 >     * A runnable calling acquireInterruptibly that does not expect to
114 >     * be interrupted.
115       */
116 <    class InterruptibleSyncRunnable implements Runnable {
116 >    class InterruptibleSyncRunnable extends CheckedRunnable {
117          final Mutex sync;
118 <        InterruptibleSyncRunnable(Mutex l) { sync = l; }
119 <        public void run() {
120 <            try {
75 <                sync.acquireInterruptibly(1);
76 <            } catch(InterruptedException success){}
118 >        InterruptibleSyncRunnable(Mutex sync) { this.sync = sync; }
119 >        public void realRun() throws InterruptedException {
120 >            sync.acquireInterruptibly();
121          }
122      }
123  
80
124      /**
125       * A runnable calling acquireInterruptibly that expects to be
126 <     * interrupted
126 >     * interrupted.
127       */
128 <    class InterruptedSyncRunnable implements Runnable {
128 >    class InterruptedSyncRunnable extends CheckedInterruptedRunnable {
129          final Mutex sync;
130 <        InterruptedSyncRunnable(Mutex l) { sync = l; }
131 <        public void run() {
132 <            try {
133 <                sync.acquireInterruptibly(1);
134 <                threadShouldThrow();
135 <            } catch(InterruptedException success){}
130 >        InterruptedSyncRunnable(Mutex sync) { this.sync = sync; }
131 >        public void realRun() throws InterruptedException {
132 >            sync.acquireInterruptibly();
133 >        }
134 >    }
135 >
136 >    /** A constant to clarify calls to checking methods below. */
137 >    static final Thread[] NO_THREADS = new Thread[0];
138 >
139 >    /**
140 >     * Spin-waits until sync.isQueued(t) becomes true.
141 >     */
142 >    void waitForQueuedThread(AbstractQueuedSynchronizer sync, Thread t) {
143 >        long startTime = System.nanoTime();
144 >        while (!sync.isQueued(t)) {
145 >            if (millisElapsedSince(startTime) > LONG_DELAY_MS)
146 >                throw new AssertionFailedError("timed out");
147 >            Thread.yield();
148 >        }
149 >        assertTrue(t.isAlive());
150 >    }
151 >
152 >    /**
153 >     * Checks that sync has exactly the given queued threads.
154 >     */
155 >    void assertHasQueuedThreads(AbstractQueuedSynchronizer sync,
156 >                                Thread... expected) {
157 >        Collection<Thread> actual = sync.getQueuedThreads();
158 >        assertEquals(expected.length > 0, sync.hasQueuedThreads());
159 >        assertEquals(expected.length, sync.getQueueLength());
160 >        assertEquals(expected.length, actual.size());
161 >        assertEquals(expected.length == 0, actual.isEmpty());
162 >        assertEquals(new HashSet<Thread>(actual),
163 >                     new HashSet<Thread>(Arrays.asList(expected)));
164 >    }
165 >
166 >    /**
167 >     * Checks that sync has exactly the given (exclusive) queued threads.
168 >     */
169 >    void assertHasExclusiveQueuedThreads(AbstractQueuedSynchronizer sync,
170 >                                         Thread... expected) {
171 >        assertHasQueuedThreads(sync, expected);
172 >        assertEquals(new HashSet<Thread>(sync.getExclusiveQueuedThreads()),
173 >                     new HashSet<Thread>(sync.getQueuedThreads()));
174 >        assertEquals(0, sync.getSharedQueuedThreads().size());
175 >        assertTrue(sync.getSharedQueuedThreads().isEmpty());
176 >    }
177 >
178 >    /**
179 >     * Checks that sync has exactly the given (shared) queued threads.
180 >     */
181 >    void assertHasSharedQueuedThreads(AbstractQueuedSynchronizer sync,
182 >                                      Thread... expected) {
183 >        assertHasQueuedThreads(sync, expected);
184 >        assertEquals(new HashSet<Thread>(sync.getSharedQueuedThreads()),
185 >                     new HashSet<Thread>(sync.getQueuedThreads()));
186 >        assertEquals(0, sync.getExclusiveQueuedThreads().size());
187 >        assertTrue(sync.getExclusiveQueuedThreads().isEmpty());
188 >    }
189 >
190 >    /**
191 >     * Checks that condition c has exactly the given waiter threads,
192 >     * after acquiring mutex.
193 >     */
194 >    void assertHasWaitersUnlocked(Mutex sync, ConditionObject c,
195 >                                 Thread... threads) {
196 >        sync.acquire();
197 >        assertHasWaitersLocked(sync, c, threads);
198 >        sync.release();
199 >    }
200 >
201 >    /**
202 >     * Checks that condition c has exactly the given waiter threads.
203 >     */
204 >    void assertHasWaitersLocked(Mutex sync, ConditionObject c,
205 >                                Thread... threads) {
206 >        assertEquals(threads.length > 0, sync.hasWaiters(c));
207 >        assertEquals(threads.length, sync.getWaitQueueLength(c));
208 >        assertEquals(threads.length == 0, sync.getWaitingThreads(c).isEmpty());
209 >        assertEquals(threads.length, sync.getWaitingThreads(c).size());
210 >        assertEquals(new HashSet<Thread>(sync.getWaitingThreads(c)),
211 >                     new HashSet<Thread>(Arrays.asList(threads)));
212 >    }
213 >
214 >    enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil }
215 >
216 >    /**
217 >     * Awaits condition using the specified AwaitMethod.
218 >     */
219 >    void await(ConditionObject c, AwaitMethod awaitMethod)
220 >            throws InterruptedException {
221 >        long timeoutMillis = 2 * LONG_DELAY_MS;
222 >        switch (awaitMethod) {
223 >        case await:
224 >            c.await();
225 >            break;
226 >        case awaitTimed:
227 >            assertTrue(c.await(timeoutMillis, MILLISECONDS));
228 >            break;
229 >        case awaitNanos:
230 >            long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
231 >            long nanosRemaining = c.awaitNanos(nanosTimeout);
232 >            assertTrue(nanosRemaining > 0);
233 >            break;
234 >        case awaitUntil:
235 >            assertTrue(c.awaitUntil(delayedDate(timeoutMillis)));
236 >            break;
237 >        default:
238 >            throw new AssertionError();
239          }
240      }
241  
242      /**
243 +     * Checks that awaiting the given condition times out (using the
244 +     * default timeout duration).
245 +     */
246 +    void assertAwaitTimesOut(ConditionObject c, AwaitMethod awaitMethod) {
247 +        final long timeoutMillis = timeoutMillis();
248 +        final long startTime;
249 +        try {
250 +            switch (awaitMethod) {
251 +            case awaitTimed:
252 +                startTime = System.nanoTime();
253 +                assertFalse(c.await(timeoutMillis, MILLISECONDS));
254 +                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
255 +                break;
256 +            case awaitNanos:
257 +                startTime = System.nanoTime();
258 +                long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
259 +                long nanosRemaining = c.awaitNanos(nanosTimeout);
260 +                assertTrue(nanosRemaining <= 0);
261 +                assertTrue(nanosRemaining > -MILLISECONDS.toNanos(LONG_DELAY_MS));
262 +                assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
263 +                break;
264 +            case awaitUntil:
265 +                // We shouldn't assume that nanoTime and currentTimeMillis
266 +                // use the same time source, so don't use nanoTime here.
267 +                java.util.Date delayedDate = delayedDate(timeoutMillis);
268 +                assertFalse(c.awaitUntil(delayedDate(timeoutMillis)));
269 +                assertTrue(new java.util.Date().getTime() >= delayedDate.getTime());
270 +                break;
271 +            default:
272 +                throw new UnsupportedOperationException();
273 +            }
274 +        } catch (InterruptedException ie) { threadUnexpectedException(ie); }
275 +    }
276 +
277 +    /**
278       * isHeldExclusively is false upon construction
279       */
280 <    public void testIsHeldExclusively() {
281 <        Mutex rl = new Mutex();
282 <        assertFalse(rl.isHeldExclusively());
280 >    public void testIsHeldExclusively() {
281 >        Mutex sync = new Mutex();
282 >        assertFalse(sync.isHeldExclusively());
283      }
284 <    
284 >
285      /**
286       * acquiring released sync succeeds
287       */
288 <    public void testAcquire() {
289 <        Mutex rl = new Mutex();
290 <        rl.acquire(1);
291 <        assertTrue(rl.isHeldExclusively());
292 <        rl.release(1);
293 <        assertFalse(rl.isHeldExclusively());
288 >    public void testAcquire() {
289 >        Mutex sync = new Mutex();
290 >        sync.acquire();
291 >        assertTrue(sync.isHeldExclusively());
292 >        sync.release();
293 >        assertFalse(sync.isHeldExclusively());
294      }
295  
296      /**
297 <     * tryAcquire on an released sync succeeds
298 <     */
299 <    public void testTryAcquire() {
300 <        Mutex rl = new Mutex();
301 <        assertTrue(rl.tryAcquire(1));
302 <        assertTrue(rl.isHeldExclusively());
303 <        rl.release(1);
297 >     * tryAcquire on a released sync succeeds
298 >     */
299 >    public void testTryAcquire() {
300 >        Mutex sync = new Mutex();
301 >        assertTrue(sync.tryAcquire());
302 >        assertTrue(sync.isHeldExclusively());
303 >        sync.release();
304 >        assertFalse(sync.isHeldExclusively());
305      }
306  
307      /**
308       * hasQueuedThreads reports whether there are waiting threads
309       */
310 <    public void testhasQueuedThreads() {
311 <        final Mutex sync = new Mutex();
312 <        Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
313 <        Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
314 <        try {
315 <            assertFalse(sync.hasQueuedThreads());
316 <            sync.acquire(1);
317 <            t1.start();
318 <            Thread.sleep(SHORT_DELAY_MS);
319 <            assertTrue(sync.hasQueuedThreads());
320 <            t2.start();
321 <            Thread.sleep(SHORT_DELAY_MS);
322 <            assertTrue(sync.hasQueuedThreads());
323 <            t1.interrupt();
324 <            Thread.sleep(SHORT_DELAY_MS);
325 <            assertTrue(sync.hasQueuedThreads());
326 <            sync.release(1);
145 <            Thread.sleep(SHORT_DELAY_MS);
146 <            assertFalse(sync.hasQueuedThreads());
147 <            t1.join();
148 <            t2.join();
149 <        } catch(Exception e){
150 <            unexpectedException();
151 <        }
152 <    }
310 >    public void testHasQueuedThreads() {
311 >        final Mutex sync = new Mutex();
312 >        assertFalse(sync.hasQueuedThreads());
313 >        sync.acquire();
314 >        Thread t1 = newStartedThread(new InterruptedSyncRunnable(sync));
315 >        waitForQueuedThread(sync, t1);
316 >        assertTrue(sync.hasQueuedThreads());
317 >        Thread t2 = newStartedThread(new InterruptibleSyncRunnable(sync));
318 >        waitForQueuedThread(sync, t2);
319 >        assertTrue(sync.hasQueuedThreads());
320 >        t1.interrupt();
321 >        awaitTermination(t1);
322 >        assertTrue(sync.hasQueuedThreads());
323 >        sync.release();
324 >        awaitTermination(t2);
325 >        assertFalse(sync.hasQueuedThreads());
326 >    }
327  
328      /**
329 <     * isQueued(null) throws NPE
329 >     * isQueued(null) throws NullPointerException
330       */
331 <    public void testIsQueuedNPE() {
332 <        final Mutex sync = new Mutex();
331 >    public void testIsQueuedNPE() {
332 >        final Mutex sync = new Mutex();
333          try {
334              sync.isQueued(null);
335              shouldThrow();
336 <        } catch (NullPointerException success) {
163 <        }
336 >        } catch (NullPointerException success) {}
337      }
338  
339      /**
340 <     * isQueued reports whether a thread is queued.
340 >     * isQueued reports whether a thread is queued
341       */
342 <    public void testIsQueued() {
343 <        final Mutex sync = new Mutex();
342 >    public void testIsQueued() {
343 >        final Mutex sync = new Mutex();
344          Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
345          Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
346 <        try {
347 <            assertFalse(sync.isQueued(t1));
348 <            assertFalse(sync.isQueued(t2));
349 <            sync.acquire(1);
350 <            t1.start();
351 <            Thread.sleep(SHORT_DELAY_MS);
352 <            assertTrue(sync.isQueued(t1));
353 <            t2.start();
354 <            Thread.sleep(SHORT_DELAY_MS);
355 <            assertTrue(sync.isQueued(t1));
356 <            assertTrue(sync.isQueued(t2));
357 <            t1.interrupt();
358 <            Thread.sleep(SHORT_DELAY_MS);
359 <            assertFalse(sync.isQueued(t1));
360 <            assertTrue(sync.isQueued(t2));
361 <            sync.release(1);
362 <            Thread.sleep(SHORT_DELAY_MS);
363 <            assertFalse(sync.isQueued(t1));
364 <            Thread.sleep(SHORT_DELAY_MS);
365 <            assertFalse(sync.isQueued(t2));
193 <            t1.join();
194 <            t2.join();
195 <        } catch(Exception e){
196 <            unexpectedException();
197 <        }
198 <    }
346 >        assertFalse(sync.isQueued(t1));
347 >        assertFalse(sync.isQueued(t2));
348 >        sync.acquire();
349 >        t1.start();
350 >        waitForQueuedThread(sync, t1);
351 >        assertTrue(sync.isQueued(t1));
352 >        assertFalse(sync.isQueued(t2));
353 >        t2.start();
354 >        waitForQueuedThread(sync, t2);
355 >        assertTrue(sync.isQueued(t1));
356 >        assertTrue(sync.isQueued(t2));
357 >        t1.interrupt();
358 >        awaitTermination(t1);
359 >        assertFalse(sync.isQueued(t1));
360 >        assertTrue(sync.isQueued(t2));
361 >        sync.release();
362 >        awaitTermination(t2);
363 >        assertFalse(sync.isQueued(t1));
364 >        assertFalse(sync.isQueued(t2));
365 >    }
366  
367      /**
368       * getFirstQueuedThread returns first waiting thread or null if none
369       */
370 <    public void testGetFirstQueuedThread() {
371 <        final Mutex sync = new Mutex();
372 <        Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
373 <        Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
374 <        try {
375 <            assertNull(sync.getFirstQueuedThread());
376 <            sync.acquire(1);
377 <            t1.start();
378 <            Thread.sleep(SHORT_DELAY_MS);
379 <            assertEquals(t1, sync.getFirstQueuedThread());
380 <            t2.start();
381 <            Thread.sleep(SHORT_DELAY_MS);
382 <            assertEquals(t1, sync.getFirstQueuedThread());
383 <            t1.interrupt();
384 <            Thread.sleep(SHORT_DELAY_MS);
385 <            Thread.sleep(SHORT_DELAY_MS);
386 <            assertEquals(t2, sync.getFirstQueuedThread());
220 <            sync.release(1);
221 <            Thread.sleep(SHORT_DELAY_MS);
222 <            assertNull(sync.getFirstQueuedThread());
223 <            t1.join();
224 <            t2.join();
225 <        } catch(Exception e){
226 <            unexpectedException();
227 <        }
228 <    }
229 <
370 >    public void testGetFirstQueuedThread() {
371 >        final Mutex sync = new Mutex();
372 >        assertNull(sync.getFirstQueuedThread());
373 >        sync.acquire();
374 >        Thread t1 = newStartedThread(new InterruptedSyncRunnable(sync));
375 >        waitForQueuedThread(sync, t1);
376 >        assertEquals(t1, sync.getFirstQueuedThread());
377 >        Thread t2 = newStartedThread(new InterruptibleSyncRunnable(sync));
378 >        waitForQueuedThread(sync, t2);
379 >        assertEquals(t1, sync.getFirstQueuedThread());
380 >        t1.interrupt();
381 >        awaitTermination(t1);
382 >        assertEquals(t2, sync.getFirstQueuedThread());
383 >        sync.release();
384 >        awaitTermination(t2);
385 >        assertNull(sync.getFirstQueuedThread());
386 >    }
387  
388      /**
389       * hasContended reports false if no thread has ever blocked, else true
390       */
391 <    public void testHasContended() {
392 <        final Mutex sync = new Mutex();
393 <        Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
394 <        Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
395 <        try {
396 <            assertFalse(sync.hasContended());
397 <            sync.acquire(1);
398 <            t1.start();
399 <            Thread.sleep(SHORT_DELAY_MS);
400 <            assertTrue(sync.hasContended());
401 <            t2.start();
402 <            Thread.sleep(SHORT_DELAY_MS);
403 <            assertTrue(sync.hasContended());
404 <            t1.interrupt();
405 <            Thread.sleep(SHORT_DELAY_MS);
406 <            assertTrue(sync.hasContended());
407 <            sync.release(1);
408 <            Thread.sleep(SHORT_DELAY_MS);
252 <            assertTrue(sync.hasContended());
253 <            t1.join();
254 <            t2.join();
255 <        } catch(Exception e){
256 <            unexpectedException();
257 <        }
258 <    }
391 >    public void testHasContended() {
392 >        final Mutex sync = new Mutex();
393 >        assertFalse(sync.hasContended());
394 >        sync.acquire();
395 >        assertFalse(sync.hasContended());
396 >        Thread t1 = newStartedThread(new InterruptedSyncRunnable(sync));
397 >        waitForQueuedThread(sync, t1);
398 >        assertTrue(sync.hasContended());
399 >        Thread t2 = newStartedThread(new InterruptibleSyncRunnable(sync));
400 >        waitForQueuedThread(sync, t2);
401 >        assertTrue(sync.hasContended());
402 >        t1.interrupt();
403 >        awaitTermination(t1);
404 >        assertTrue(sync.hasContended());
405 >        sync.release();
406 >        awaitTermination(t2);
407 >        assertTrue(sync.hasContended());
408 >    }
409  
410      /**
411 <     * getQueuedThreads includes waiting threads
411 >     * getQueuedThreads returns all waiting threads
412       */
413 <    public void testGetQueuedThreads() {
414 <        final Mutex sync = new Mutex();
413 >    public void testGetQueuedThreads() {
414 >        final Mutex sync = new Mutex();
415          Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
416          Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
417 <        try {
418 <            assertTrue(sync.getQueuedThreads().isEmpty());
419 <            sync.acquire(1);
420 <            assertTrue(sync.getQueuedThreads().isEmpty());
421 <            t1.start();
422 <            Thread.sleep(SHORT_DELAY_MS);
423 <            assertTrue(sync.getQueuedThreads().contains(t1));
424 <            t2.start();
425 <            Thread.sleep(SHORT_DELAY_MS);
426 <            assertTrue(sync.getQueuedThreads().contains(t1));
427 <            assertTrue(sync.getQueuedThreads().contains(t2));
428 <            t1.interrupt();
429 <            Thread.sleep(SHORT_DELAY_MS);
430 <            assertFalse(sync.getQueuedThreads().contains(t1));
431 <            assertTrue(sync.getQueuedThreads().contains(t2));
432 <            sync.release(1);
433 <            Thread.sleep(SHORT_DELAY_MS);
434 <            assertTrue(sync.getQueuedThreads().isEmpty());
435 <            t1.join();
436 <            t2.join();
287 <        } catch(Exception e){
288 <            unexpectedException();
289 <        }
290 <    }
417 >        assertHasExclusiveQueuedThreads(sync, NO_THREADS);
418 >        sync.acquire();
419 >        assertHasExclusiveQueuedThreads(sync, NO_THREADS);
420 >        t1.start();
421 >        waitForQueuedThread(sync, t1);
422 >        assertHasExclusiveQueuedThreads(sync, t1);
423 >        assertTrue(sync.getQueuedThreads().contains(t1));
424 >        assertFalse(sync.getQueuedThreads().contains(t2));
425 >        t2.start();
426 >        waitForQueuedThread(sync, t2);
427 >        assertHasExclusiveQueuedThreads(sync, t1, t2);
428 >        assertTrue(sync.getQueuedThreads().contains(t1));
429 >        assertTrue(sync.getQueuedThreads().contains(t2));
430 >        t1.interrupt();
431 >        awaitTermination(t1);
432 >        assertHasExclusiveQueuedThreads(sync, t2);
433 >        sync.release();
434 >        awaitTermination(t2);
435 >        assertHasExclusiveQueuedThreads(sync, NO_THREADS);
436 >    }
437  
438      /**
439 <     * getExclusiveQueuedThreads includes waiting threads
439 >     * getExclusiveQueuedThreads returns all exclusive waiting threads
440       */
441 <    public void testGetExclusiveQueuedThreads() {
442 <        final Mutex sync = new Mutex();
441 >    public void testGetExclusiveQueuedThreads() {
442 >        final Mutex sync = new Mutex();
443          Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
444          Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
445 <        try {
446 <            assertTrue(sync.getExclusiveQueuedThreads().isEmpty());
447 <            sync.acquire(1);
448 <            assertTrue(sync.getExclusiveQueuedThreads().isEmpty());
449 <            t1.start();
450 <            Thread.sleep(SHORT_DELAY_MS);
451 <            assertTrue(sync.getExclusiveQueuedThreads().contains(t1));
452 <            t2.start();
453 <            Thread.sleep(SHORT_DELAY_MS);
454 <            assertTrue(sync.getExclusiveQueuedThreads().contains(t1));
455 <            assertTrue(sync.getExclusiveQueuedThreads().contains(t2));
456 <            t1.interrupt();
457 <            Thread.sleep(SHORT_DELAY_MS);
458 <            assertFalse(sync.getExclusiveQueuedThreads().contains(t1));
459 <            assertTrue(sync.getExclusiveQueuedThreads().contains(t2));
460 <            sync.release(1);
461 <            Thread.sleep(SHORT_DELAY_MS);
462 <            assertTrue(sync.getExclusiveQueuedThreads().isEmpty());
463 <            t1.join();
464 <            t2.join();
319 <        } catch(Exception e){
320 <            unexpectedException();
321 <        }
322 <    }
445 >        assertHasExclusiveQueuedThreads(sync, NO_THREADS);
446 >        sync.acquire();
447 >        assertHasExclusiveQueuedThreads(sync, NO_THREADS);
448 >        t1.start();
449 >        waitForQueuedThread(sync, t1);
450 >        assertHasExclusiveQueuedThreads(sync, t1);
451 >        assertTrue(sync.getExclusiveQueuedThreads().contains(t1));
452 >        assertFalse(sync.getExclusiveQueuedThreads().contains(t2));
453 >        t2.start();
454 >        waitForQueuedThread(sync, t2);
455 >        assertHasExclusiveQueuedThreads(sync, t1, t2);
456 >        assertTrue(sync.getExclusiveQueuedThreads().contains(t1));
457 >        assertTrue(sync.getExclusiveQueuedThreads().contains(t2));
458 >        t1.interrupt();
459 >        awaitTermination(t1);
460 >        assertHasExclusiveQueuedThreads(sync, t2);
461 >        sync.release();
462 >        awaitTermination(t2);
463 >        assertHasExclusiveQueuedThreads(sync, NO_THREADS);
464 >    }
465  
466      /**
467       * getSharedQueuedThreads does not include exclusively waiting threads
468       */
469 <    public void testGetSharedQueuedThreads() {
470 <        final Mutex sync = new Mutex();
471 <        Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
472 <        Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
473 <        try {
474 <            assertTrue(sync.getSharedQueuedThreads().isEmpty());
475 <            sync.acquire(1);
476 <            assertTrue(sync.getSharedQueuedThreads().isEmpty());
477 <            t1.start();
478 <            Thread.sleep(SHORT_DELAY_MS);
479 <            assertTrue(sync.getSharedQueuedThreads().isEmpty());
480 <            t2.start();
481 <            Thread.sleep(SHORT_DELAY_MS);
482 <            assertTrue(sync.getSharedQueuedThreads().isEmpty());
483 <            t1.interrupt();
484 <            Thread.sleep(SHORT_DELAY_MS);
485 <            assertTrue(sync.getSharedQueuedThreads().isEmpty());
486 <            sync.release(1);
345 <            Thread.sleep(SHORT_DELAY_MS);
346 <            assertTrue(sync.getSharedQueuedThreads().isEmpty());
347 <            t1.join();
348 <            t2.join();
349 <        } catch(Exception e){
350 <            unexpectedException();
351 <        }
352 <    }
469 >    public void testGetSharedQueuedThreads_Exclusive() {
470 >        final Mutex sync = new Mutex();
471 >        assertTrue(sync.getSharedQueuedThreads().isEmpty());
472 >        sync.acquire();
473 >        assertTrue(sync.getSharedQueuedThreads().isEmpty());
474 >        Thread t1 = newStartedThread(new InterruptedSyncRunnable(sync));
475 >        waitForQueuedThread(sync, t1);
476 >        assertTrue(sync.getSharedQueuedThreads().isEmpty());
477 >        Thread t2 = newStartedThread(new InterruptibleSyncRunnable(sync));
478 >        waitForQueuedThread(sync, t2);
479 >        assertTrue(sync.getSharedQueuedThreads().isEmpty());
480 >        t1.interrupt();
481 >        awaitTermination(t1);
482 >        assertTrue(sync.getSharedQueuedThreads().isEmpty());
483 >        sync.release();
484 >        awaitTermination(t2);
485 >        assertTrue(sync.getSharedQueuedThreads().isEmpty());
486 >    }
487  
488      /**
489 <     * tryAcquireNanos is interruptible.
489 >     * getSharedQueuedThreads returns all shared waiting threads
490       */
491 <    public void testInterruptedException2() {
492 <        final Mutex sync = new Mutex();
493 <        sync.acquire(1);
494 <        Thread t = new Thread(new Runnable() {
495 <                public void run() {
496 <                    try {
497 <                        sync.tryAcquireNanos(1, MEDIUM_DELAY_MS * 1000 * 1000);
498 <                        threadShouldThrow();
499 <                    } catch(InterruptedException success){}
500 <                }
501 <            });
502 <        try {
503 <            t.start();
504 <            t.interrupt();
505 <        } catch(Exception e){
506 <            unexpectedException();
507 <        }
491 >    public void testGetSharedQueuedThreads_Shared() {
492 >        final BooleanLatch l = new BooleanLatch();
493 >        assertHasSharedQueuedThreads(l, NO_THREADS);
494 >        Thread t1 = newStartedThread(new CheckedInterruptedRunnable() {
495 >            public void realRun() throws InterruptedException {
496 >                l.acquireSharedInterruptibly(0);
497 >            }});
498 >        waitForQueuedThread(l, t1);
499 >        assertHasSharedQueuedThreads(l, t1);
500 >        Thread t2 = newStartedThread(new CheckedRunnable() {
501 >            public void realRun() throws InterruptedException {
502 >                l.acquireSharedInterruptibly(0);
503 >            }});
504 >        waitForQueuedThread(l, t2);
505 >        assertHasSharedQueuedThreads(l, t1, t2);
506 >        t1.interrupt();
507 >        awaitTermination(t1);
508 >        assertHasSharedQueuedThreads(l, t2);
509 >        assertTrue(l.releaseShared(0));
510 >        awaitTermination(t2);
511 >        assertHasSharedQueuedThreads(l, NO_THREADS);
512      }
513  
514 +    /**
515 +     * tryAcquireNanos is interruptible
516 +     */
517 +    public void testTryAcquireNanos_Interruptible() {
518 +        final Mutex sync = new Mutex();
519 +        sync.acquire();
520 +        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
521 +            public void realRun() throws InterruptedException {
522 +                sync.tryAcquireNanos(MILLISECONDS.toNanos(2 * LONG_DELAY_MS));
523 +            }});
524 +
525 +        waitForQueuedThread(sync, t);
526 +        t.interrupt();
527 +        awaitTermination(t);
528 +    }
529  
530      /**
531 <     * TryAcquire on exclusively held sync fails
532 <     */
533 <    public void testTryAcquireWhenSynced() {
534 <        final Mutex sync = new Mutex();
535 <        sync.acquire(1);
536 <        Thread t = new Thread(new Runnable() {
537 <                public void run() {
538 <                    threadAssertFalse(sync.tryAcquire(1));
539 <                }
540 <            });
541 <        try {
542 <            t.start();
543 <            t.join();
391 <            sync.release(1);
392 <        } catch(Exception e){
393 <            unexpectedException();
394 <        }
395 <    }
531 >     * tryAcquire on exclusively held sync fails
532 >     */
533 >    public void testTryAcquireWhenSynced() {
534 >        final Mutex sync = new Mutex();
535 >        sync.acquire();
536 >        Thread t = newStartedThread(new CheckedRunnable() {
537 >            public void realRun() {
538 >                assertFalse(sync.tryAcquire());
539 >            }});
540 >
541 >        awaitTermination(t);
542 >        sync.release();
543 >    }
544  
545      /**
546       * tryAcquireNanos on an exclusively held sync times out
547       */
548 <    public void testAcquireNanos_Timeout() {
549 <        final Mutex sync = new Mutex();
550 <        sync.acquire(1);
551 <        Thread t = new Thread(new Runnable() {
552 <                public void run() {
553 <                    try {
554 <                        threadAssertFalse(sync.tryAcquireNanos(1, 1000 * 1000));
555 <                    } catch (Exception ex) {
556 <                        threadUnexpectedException();
557 <                    }
558 <                }
559 <            });
560 <        try {
561 <            t.start();
562 <            t.join();
415 <            sync.release(1);
416 <        } catch(Exception e){
417 <            unexpectedException();
418 <        }
419 <    }
420 <    
421 <  
548 >    public void testAcquireNanos_Timeout() {
549 >        final Mutex sync = new Mutex();
550 >        sync.acquire();
551 >        Thread t = newStartedThread(new CheckedRunnable() {
552 >            public void realRun() throws InterruptedException {
553 >                long startTime = System.nanoTime();
554 >                long nanos = MILLISECONDS.toNanos(timeoutMillis());
555 >                assertFalse(sync.tryAcquireNanos(nanos));
556 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
557 >            }});
558 >
559 >        awaitTermination(t);
560 >        sync.release();
561 >    }
562 >
563      /**
564       * getState is true when acquired and false when not
565       */
566      public void testGetState() {
567 <        final Mutex sync = new Mutex();
568 <        sync.acquire(1);
569 <        assertTrue(sync.isHeldExclusively());
570 <        sync.release(1);
571 <        assertFalse(sync.isHeldExclusively());
572 <        Thread t = new Thread(new Runnable() {
573 <                public void run() {
574 <                    sync.acquire(1);
575 <                    try {
576 <                        Thread.sleep(SMALL_DELAY_MS);
577 <                    }
578 <                    catch(Exception e) {
579 <                        threadUnexpectedException();
580 <                    }
581 <                    sync.release(1);
582 <                }
583 <            });
584 <        try {
585 <            t.start();
586 <            Thread.sleep(SHORT_DELAY_MS);
587 <            assertTrue(sync.isHeldExclusively());
447 <            t.join();
448 <            assertFalse(sync.isHeldExclusively());
449 <        } catch(Exception e){
450 <            unexpectedException();
451 <        }
567 >        final Mutex sync = new Mutex();
568 >        sync.acquire();
569 >        assertTrue(sync.isHeldExclusively());
570 >        sync.release();
571 >        assertFalse(sync.isHeldExclusively());
572 >
573 >        final BooleanLatch acquired = new BooleanLatch();
574 >        final BooleanLatch done = new BooleanLatch();
575 >        Thread t = newStartedThread(new CheckedRunnable() {
576 >            public void realRun() throws InterruptedException {
577 >                sync.acquire();
578 >                assertTrue(acquired.releaseShared(0));
579 >                done.acquireShared(0);
580 >                sync.release();
581 >            }});
582 >
583 >        acquired.acquireShared(0);
584 >        assertTrue(sync.isHeldExclusively());
585 >        assertTrue(done.releaseShared(0));
586 >        awaitTermination(t);
587 >        assertFalse(sync.isHeldExclusively());
588      }
589  
454
455    /**
456     * acquireInterruptibly is interruptible.
457     */
458    public void testAcquireInterruptibly1() {
459        final Mutex sync = new Mutex();
460        sync.acquire(1);
461        Thread t = new Thread(new InterruptedSyncRunnable(sync));
462        try {
463            t.start();
464            Thread.sleep(SHORT_DELAY_MS);
465            t.interrupt();
466            Thread.sleep(SHORT_DELAY_MS);
467            sync.release(1);
468            t.join();
469        } catch(Exception e){
470            unexpectedException();
471        }
472    }
473
590      /**
591       * acquireInterruptibly succeeds when released, else is interruptible
592       */
593 <    public void testAcquireInterruptibly2() {
594 <        final Mutex sync = new Mutex();
595 <        try {
596 <            sync.acquireInterruptibly(1);
597 <        } catch(Exception e) {
598 <            unexpectedException();
599 <        }
600 <        Thread t = new Thread(new InterruptedSyncRunnable(sync));
601 <        try {
602 <            t.start();
603 <            t.interrupt();
604 <            assertTrue(sync.isHeldExclusively());
605 <            t.join();
606 <        } catch(Exception e){
607 <            unexpectedException();
492 <        }
593 >    public void testAcquireInterruptibly() throws InterruptedException {
594 >        final Mutex sync = new Mutex();
595 >        final BooleanLatch threadStarted = new BooleanLatch();
596 >        sync.acquireInterruptibly();
597 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
598 >            public void realRun() throws InterruptedException {
599 >                assertTrue(threadStarted.releaseShared(0));
600 >                sync.acquireInterruptibly();
601 >            }});
602 >
603 >        threadStarted.acquireShared(0);
604 >        waitForQueuedThread(sync, t);
605 >        t.interrupt();
606 >        awaitTermination(t);
607 >        assertTrue(sync.isHeldExclusively());
608      }
609  
610      /**
611       * owns is true for a condition created by sync else false
612       */
613      public void testOwns() {
614 <        final Mutex sync = new Mutex();
615 <        final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
614 >        final Mutex sync = new Mutex();
615 >        final ConditionObject c = sync.newCondition();
616          final Mutex sync2 = new Mutex();
617          assertTrue(sync.owns(c));
618          assertFalse(sync2.owns(c));
# Line 506 | Line 621 | public class AbstractQueuedSynchronizerT
621      /**
622       * Calling await without holding sync throws IllegalMonitorStateException
623       */
624 <    public void testAwait_IllegalMonitor() {
625 <        final Mutex sync = new Mutex();
626 <        final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
627 <        try {
628 <            c.await();
629 <            shouldThrow();
630 <        }
631 <        catch (IllegalMonitorStateException success) {
632 <        }
633 <        catch (Exception ex) {
634 <            unexpectedException();
624 >    public void testAwait_IMSE() {
625 >        final Mutex sync = new Mutex();
626 >        final ConditionObject c = sync.newCondition();
627 >        for (AwaitMethod awaitMethod : AwaitMethod.values()) {
628 >            long startTime = System.nanoTime();
629 >            try {
630 >                await(c, awaitMethod);
631 >                shouldThrow();
632 >            } catch (IllegalMonitorStateException success) {
633 >            } catch (InterruptedException e) { threadUnexpectedException(e); }
634 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
635          }
636      }
637  
638      /**
639       * Calling signal without holding sync throws IllegalMonitorStateException
640       */
641 <    public void testSignal_IllegalMonitor() {
642 <        final Mutex sync = new Mutex();
643 <        final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
641 >    public void testSignal_IMSE() {
642 >        final Mutex sync = new Mutex();
643 >        final ConditionObject c = sync.newCondition();
644          try {
645              c.signal();
646              shouldThrow();
647 <        }
648 <        catch (IllegalMonitorStateException success) {
534 <        }
535 <        catch (Exception ex) {
536 <            unexpectedException();
537 <        }
647 >        } catch (IllegalMonitorStateException success) {}
648 >        assertHasWaitersUnlocked(sync, c, NO_THREADS);
649      }
650  
651      /**
652 <     * awaitNanos without a signal times out
652 >     * Calling signalAll without holding sync throws IllegalMonitorStateException
653       */
654 <    public void testAwaitNanos_Timeout() {
655 <        final Mutex sync = new Mutex();
656 <        final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
654 >    public void testSignalAll_IMSE() {
655 >        final Mutex sync = new Mutex();
656 >        final ConditionObject c = sync.newCondition();
657          try {
658 <            sync.acquire(1);
659 <            long t = c.awaitNanos(100);
660 <            assertTrue(t <= 0);
550 <            sync.release(1);
551 <        }
552 <        catch (Exception ex) {
553 <            unexpectedException();
554 <        }
658 >            c.signalAll();
659 >            shouldThrow();
660 >        } catch (IllegalMonitorStateException success) {}
661      }
662  
663      /**
664 <     *  Timed await without a signal times out
664 >     * await/awaitNanos/awaitUntil without a signal times out
665       */
666 <    public void testAwait_Timeout() {
667 <        final Mutex sync = new Mutex();
668 <        final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
669 <        try {
670 <            sync.acquire(1);
671 <            assertFalse(c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
672 <            sync.release(1);
673 <        }
674 <        catch (Exception ex) {
569 <            unexpectedException();
570 <        }
666 >    public void testAwaitTimed_Timeout() { testAwait_Timeout(AwaitMethod.awaitTimed); }
667 >    public void testAwaitNanos_Timeout() { testAwait_Timeout(AwaitMethod.awaitNanos); }
668 >    public void testAwaitUntil_Timeout() { testAwait_Timeout(AwaitMethod.awaitUntil); }
669 >    public void testAwait_Timeout(AwaitMethod awaitMethod) {
670 >        final Mutex sync = new Mutex();
671 >        final ConditionObject c = sync.newCondition();
672 >        sync.acquire();
673 >        assertAwaitTimesOut(c, awaitMethod);
674 >        sync.release();
675      }
676  
677      /**
678 <     * awaitUntil without a signal times out
679 <     */
680 <    public void testAwaitUntil_Timeout() {
681 <        final Mutex sync = new Mutex();
682 <        final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
683 <        try {
684 <            sync.acquire(1);
685 <            java.util.Date d = new java.util.Date();
686 <            assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
687 <            sync.release(1);
688 <        }
689 <        catch (Exception ex) {
690 <            unexpectedException();
691 <        }
678 >     * await/awaitNanos/awaitUntil returns when signalled
679 >     */
680 >    public void testSignal_await()      { testSignal(AwaitMethod.await); }
681 >    public void testSignal_awaitTimed() { testSignal(AwaitMethod.awaitTimed); }
682 >    public void testSignal_awaitNanos() { testSignal(AwaitMethod.awaitNanos); }
683 >    public void testSignal_awaitUntil() { testSignal(AwaitMethod.awaitUntil); }
684 >    public void testSignal(final AwaitMethod awaitMethod) {
685 >        final Mutex sync = new Mutex();
686 >        final ConditionObject c = sync.newCondition();
687 >        final BooleanLatch acquired = new BooleanLatch();
688 >        Thread t = newStartedThread(new CheckedRunnable() {
689 >            public void realRun() throws InterruptedException {
690 >                sync.acquire();
691 >                assertTrue(acquired.releaseShared(0));
692 >                await(c, awaitMethod);
693 >                sync.release();
694 >            }});
695 >
696 >        acquired.acquireShared(0);
697 >        sync.acquire();
698 >        assertHasWaitersLocked(sync, c, t);
699 >        assertHasExclusiveQueuedThreads(sync, NO_THREADS);
700 >        c.signal();
701 >        assertHasWaitersLocked(sync, c, NO_THREADS);
702 >        assertHasExclusiveQueuedThreads(sync, t);
703 >        sync.release();
704 >        awaitTermination(t);
705      }
706  
707      /**
708 <     * await returns when signalled
592 <     */
593 <    public void testAwait() {
594 <        final Mutex sync = new Mutex();
595 <        final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
596 <        Thread t = new Thread(new Runnable() {
597 <                public void run() {
598 <                    try {
599 <                        sync.acquire(1);
600 <                        c.await();
601 <                        sync.release(1);
602 <                    }
603 <                    catch(InterruptedException e) {
604 <                        threadUnexpectedException();
605 <                    }
606 <                }
607 <            });
608 <
609 <        try {
610 <            t.start();
611 <            Thread.sleep(SHORT_DELAY_MS);
612 <            sync.acquire(1);
613 <            c.signal();
614 <            sync.release(1);
615 <            t.join(SHORT_DELAY_MS);
616 <            assertFalse(t.isAlive());
617 <        }
618 <        catch (Exception ex) {
619 <            unexpectedException();
620 <        }
621 <    }
622 <
623 <
624 <
625 <    /**
626 <     * hasWaiters throws NPE if null
708 >     * hasWaiters(null) throws NullPointerException
709       */
710      public void testHasWaitersNPE() {
711 <        final Mutex sync = new Mutex();
711 >        final Mutex sync = new Mutex();
712          try {
713              sync.hasWaiters(null);
714              shouldThrow();
715 <        } catch (NullPointerException success) {
634 <        } catch (Exception ex) {
635 <            unexpectedException();
636 <        }
715 >        } catch (NullPointerException success) {}
716      }
717  
718      /**
719 <     * getWaitQueueLength throws NPE if null
719 >     * getWaitQueueLength(null) throws NullPointerException
720       */
721      public void testGetWaitQueueLengthNPE() {
722 <        final Mutex sync = new Mutex();
722 >        final Mutex sync = new Mutex();
723          try {
724              sync.getWaitQueueLength(null);
725              shouldThrow();
726 <        } catch (NullPointerException success) {
648 <        } catch (Exception ex) {
649 <            unexpectedException();
650 <        }
726 >        } catch (NullPointerException success) {}
727      }
728  
653
729      /**
730 <     * getWaitingThreads throws NPE if null
730 >     * getWaitingThreads(null) throws NullPointerException
731       */
732      public void testGetWaitingThreadsNPE() {
733 <        final Mutex sync = new Mutex();
733 >        final Mutex sync = new Mutex();
734          try {
735              sync.getWaitingThreads(null);
736              shouldThrow();
737 <        } catch (NullPointerException success) {
663 <        } catch (Exception ex) {
664 <            unexpectedException();
665 <        }
737 >        } catch (NullPointerException success) {}
738      }
739  
668
740      /**
741 <     * hasWaiters throws IAE if not owned
741 >     * hasWaiters throws IllegalArgumentException if not owned
742       */
743      public void testHasWaitersIAE() {
744 <        final Mutex sync = new Mutex();
745 <        final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
746 <        final Mutex sync2 = new Mutex();
744 >        final Mutex sync = new Mutex();
745 >        final ConditionObject c = sync.newCondition();
746 >        final Mutex sync2 = new Mutex();
747          try {
748              sync2.hasWaiters(c);
749              shouldThrow();
750 <        } catch (IllegalArgumentException success) {
751 <        } catch (Exception ex) {
681 <            unexpectedException();
682 <        }
750 >        } catch (IllegalArgumentException success) {}
751 >        assertHasWaitersUnlocked(sync, c, NO_THREADS);
752      }
753  
754      /**
755 <     * hasWaiters throws IMSE if not synced
755 >     * hasWaiters throws IllegalMonitorStateException if not synced
756       */
757      public void testHasWaitersIMSE() {
758 <        final Mutex sync = new Mutex();
759 <        final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
758 >        final Mutex sync = new Mutex();
759 >        final ConditionObject c = sync.newCondition();
760          try {
761              sync.hasWaiters(c);
762              shouldThrow();
763 <        } catch (IllegalMonitorStateException success) {
764 <        } catch (Exception ex) {
696 <            unexpectedException();
697 <        }
763 >        } catch (IllegalMonitorStateException success) {}
764 >        assertHasWaitersUnlocked(sync, c, NO_THREADS);
765      }
766  
700
767      /**
768 <     * getWaitQueueLength throws IAE if not owned
768 >     * getWaitQueueLength throws IllegalArgumentException if not owned
769       */
770      public void testGetWaitQueueLengthIAE() {
771 <        final Mutex sync = new Mutex();
772 <        final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
773 <        final Mutex sync2 = new Mutex();
771 >        final Mutex sync = new Mutex();
772 >        final ConditionObject c = sync.newCondition();
773 >        final Mutex sync2 = new Mutex();
774          try {
775              sync2.getWaitQueueLength(c);
776              shouldThrow();
777 <        } catch (IllegalArgumentException success) {
778 <        } catch (Exception ex) {
713 <            unexpectedException();
714 <        }
777 >        } catch (IllegalArgumentException success) {}
778 >        assertHasWaitersUnlocked(sync, c, NO_THREADS);
779      }
780  
781      /**
782 <     * getWaitQueueLength throws IMSE if not synced
782 >     * getWaitQueueLength throws IllegalMonitorStateException if not synced
783       */
784      public void testGetWaitQueueLengthIMSE() {
785 <        final Mutex sync = new Mutex();
786 <        final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
785 >        final Mutex sync = new Mutex();
786 >        final ConditionObject c = sync.newCondition();
787          try {
788              sync.getWaitQueueLength(c);
789              shouldThrow();
790 <        } catch (IllegalMonitorStateException success) {
791 <        } catch (Exception ex) {
728 <            unexpectedException();
729 <        }
790 >        } catch (IllegalMonitorStateException success) {}
791 >        assertHasWaitersUnlocked(sync, c, NO_THREADS);
792      }
793  
732
794      /**
795 <     * getWaitingThreads throws IAE if not owned
795 >     * getWaitingThreads throws IllegalArgumentException if not owned
796       */
797      public void testGetWaitingThreadsIAE() {
798 <        final Mutex sync = new Mutex();
799 <        final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
800 <        final Mutex sync2 = new Mutex();        
798 >        final Mutex sync = new Mutex();
799 >        final ConditionObject c = sync.newCondition();
800 >        final Mutex sync2 = new Mutex();
801          try {
802              sync2.getWaitingThreads(c);
803              shouldThrow();
804 <        } catch (IllegalArgumentException success) {
805 <        } catch (Exception ex) {
745 <            unexpectedException();
746 <        }
804 >        } catch (IllegalArgumentException success) {}
805 >        assertHasWaitersUnlocked(sync, c, NO_THREADS);
806      }
807  
808      /**
809 <     * getWaitingThreads throws IMSE if not synced
809 >     * getWaitingThreads throws IllegalMonitorStateException if not synced
810       */
811      public void testGetWaitingThreadsIMSE() {
812 <        final Mutex sync = new Mutex();
813 <        final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
812 >        final Mutex sync = new Mutex();
813 >        final ConditionObject c = sync.newCondition();
814          try {
815              sync.getWaitingThreads(c);
816              shouldThrow();
817 <        } catch (IllegalMonitorStateException success) {
818 <        } catch (Exception ex) {
760 <            unexpectedException();
761 <        }
817 >        } catch (IllegalMonitorStateException success) {}
818 >        assertHasWaitersUnlocked(sync, c, NO_THREADS);
819      }
820  
764
765
821      /**
822       * hasWaiters returns true when a thread is waiting, else false
823       */
824      public void testHasWaiters() {
825 <        final Mutex sync = new Mutex();
826 <        final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
827 <        Thread t = new Thread(new Runnable() {
828 <                public void run() {
829 <                    try {
830 <                        sync.acquire(1);
831 <                        threadAssertFalse(sync.hasWaiters(c));
832 <                        threadAssertEquals(0, sync.getWaitQueueLength(c));
833 <                        c.await();
834 <                        sync.release(1);
835 <                    }
836 <                    catch(InterruptedException e) {
837 <                        threadUnexpectedException();
838 <                    }
839 <                }
840 <            });
825 >        final Mutex sync = new Mutex();
826 >        final ConditionObject c = sync.newCondition();
827 >        final BooleanLatch acquired = new BooleanLatch();
828 >        Thread t = newStartedThread(new CheckedRunnable() {
829 >            public void realRun() throws InterruptedException {
830 >                sync.acquire();
831 >                assertHasWaitersLocked(sync, c, NO_THREADS);
832 >                assertFalse(sync.hasWaiters(c));
833 >                assertTrue(acquired.releaseShared(0));
834 >                c.await();
835 >                sync.release();
836 >            }});
837 >
838 >        acquired.acquireShared(0);
839 >        sync.acquire();
840 >        assertHasWaitersLocked(sync, c, t);
841 >        assertHasExclusiveQueuedThreads(sync, NO_THREADS);
842 >        assertTrue(sync.hasWaiters(c));
843 >        c.signal();
844 >        assertHasWaitersLocked(sync, c, NO_THREADS);
845 >        assertHasExclusiveQueuedThreads(sync, t);
846 >        assertFalse(sync.hasWaiters(c));
847 >        sync.release();
848  
849 <        try {
850 <            t.start();
789 <            Thread.sleep(SHORT_DELAY_MS);
790 <            sync.acquire(1);
791 <            assertTrue(sync.hasWaiters(c));
792 <            assertEquals(1, sync.getWaitQueueLength(c));
793 <            c.signal();
794 <            sync.release(1);
795 <            Thread.sleep(SHORT_DELAY_MS);
796 <            sync.acquire(1);
797 <            assertFalse(sync.hasWaiters(c));
798 <            assertEquals(0, sync.getWaitQueueLength(c));
799 <            sync.release(1);
800 <            t.join(SHORT_DELAY_MS);
801 <            assertFalse(t.isAlive());
802 <        }
803 <        catch (Exception ex) {
804 <            unexpectedException();
805 <        }
849 >        awaitTermination(t);
850 >        assertHasWaitersUnlocked(sync, c, NO_THREADS);
851      }
852  
853      /**
854       * getWaitQueueLength returns number of waiting threads
855       */
856      public void testGetWaitQueueLength() {
857 <        final Mutex sync = new Mutex();
858 <        final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
859 <        Thread t1 = new Thread(new Runnable() {
860 <                public void run() {
861 <                    try {
862 <                        sync.acquire(1);
863 <                        threadAssertFalse(sync.hasWaiters(c));
864 <                        threadAssertEquals(0, sync.getWaitQueueLength(c));
865 <                        c.await();
866 <                        sync.release(1);
867 <                    }
868 <                    catch(InterruptedException e) {
869 <                        threadUnexpectedException();
870 <                    }
871 <                }
872 <            });
873 <
874 <        Thread t2 = new Thread(new Runnable() {
875 <                public void run() {
876 <                    try {
877 <                        sync.acquire(1);
878 <                        threadAssertTrue(sync.hasWaiters(c));
879 <                        threadAssertEquals(1, sync.getWaitQueueLength(c));
880 <                        c.await();
881 <                        sync.release(1);
882 <                    }
883 <                    catch(InterruptedException e) {
884 <                        threadUnexpectedException();
885 <                    }
886 <                }
887 <            });
888 <
889 <        try {
890 <            t1.start();
891 <            Thread.sleep(SHORT_DELAY_MS);
892 <            t2.start();
893 <            Thread.sleep(SHORT_DELAY_MS);
894 <            sync.acquire(1);
895 <            assertTrue(sync.hasWaiters(c));
896 <            assertEquals(2, sync.getWaitQueueLength(c));
897 <            c.signalAll();
898 <            sync.release(1);
854 <            Thread.sleep(SHORT_DELAY_MS);
855 <            sync.acquire(1);
856 <            assertFalse(sync.hasWaiters(c));
857 <            assertEquals(0, sync.getWaitQueueLength(c));
858 <            sync.release(1);
859 <            t1.join(SHORT_DELAY_MS);
860 <            t2.join(SHORT_DELAY_MS);
861 <            assertFalse(t1.isAlive());
862 <            assertFalse(t2.isAlive());
863 <        }
864 <        catch (Exception ex) {
865 <            unexpectedException();
866 <        }
857 >        final Mutex sync = new Mutex();
858 >        final ConditionObject c = sync.newCondition();
859 >        final BooleanLatch acquired1 = new BooleanLatch();
860 >        final BooleanLatch acquired2 = new BooleanLatch();
861 >        final Thread t1 = newStartedThread(new CheckedRunnable() {
862 >            public void realRun() throws InterruptedException {
863 >                sync.acquire();
864 >                assertHasWaitersLocked(sync, c, NO_THREADS);
865 >                assertEquals(0, sync.getWaitQueueLength(c));
866 >                assertTrue(acquired1.releaseShared(0));
867 >                c.await();
868 >                sync.release();
869 >            }});
870 >        acquired1.acquireShared(0);
871 >        sync.acquire();
872 >        assertHasWaitersLocked(sync, c, t1);
873 >        assertEquals(1, sync.getWaitQueueLength(c));
874 >        sync.release();
875 >
876 >        final Thread t2 = newStartedThread(new CheckedRunnable() {
877 >            public void realRun() throws InterruptedException {
878 >                sync.acquire();
879 >                assertHasWaitersLocked(sync, c, t1);
880 >                assertEquals(1, sync.getWaitQueueLength(c));
881 >                assertTrue(acquired2.releaseShared(0));
882 >                c.await();
883 >                sync.release();
884 >            }});
885 >        acquired2.acquireShared(0);
886 >        sync.acquire();
887 >        assertHasWaitersLocked(sync, c, t1, t2);
888 >        assertHasExclusiveQueuedThreads(sync, NO_THREADS);
889 >        assertEquals(2, sync.getWaitQueueLength(c));
890 >        c.signalAll();
891 >        assertHasWaitersLocked(sync, c, NO_THREADS);
892 >        assertHasExclusiveQueuedThreads(sync, t1, t2);
893 >        assertEquals(0, sync.getWaitQueueLength(c));
894 >        sync.release();
895 >
896 >        awaitTermination(t1);
897 >        awaitTermination(t2);
898 >        assertHasWaitersUnlocked(sync, c, NO_THREADS);
899      }
900  
901      /**
902       * getWaitingThreads returns only and all waiting threads
903       */
904      public void testGetWaitingThreads() {
905 <        final Mutex sync = new Mutex();
906 <        final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
907 <        Thread t1 = new Thread(new Runnable() {
908 <                public void run() {
909 <                    try {
910 <                        sync.acquire(1);
911 <                        threadAssertTrue(sync.getWaitingThreads(c).isEmpty());
912 <                        c.await();
913 <                        sync.release(1);
914 <                    }
915 <                    catch(InterruptedException e) {
916 <                        threadUnexpectedException();
917 <                    }
918 <                }
919 <            });
920 <
921 <        Thread t2 = new Thread(new Runnable() {
922 <                public void run() {
923 <                    try {
924 <                        sync.acquire(1);
925 <                        threadAssertFalse(sync.getWaitingThreads(c).isEmpty());
926 <                        c.await();
927 <                        sync.release(1);
928 <                    }
929 <                    catch(InterruptedException e) {
930 <                        threadUnexpectedException();
931 <                    }
932 <                }
933 <            });
934 <
935 <        try {
936 <            sync.acquire(1);
937 <            assertTrue(sync.getWaitingThreads(c).isEmpty());
938 <            sync.release(1);
939 <            t1.start();
940 <            Thread.sleep(SHORT_DELAY_MS);
941 <            t2.start();
942 <            Thread.sleep(SHORT_DELAY_MS);
943 <            sync.acquire(1);
944 <            assertTrue(sync.hasWaiters(c));
945 <            assertTrue(sync.getWaitingThreads(c).contains(t1));
946 <            assertTrue(sync.getWaitingThreads(c).contains(t2));
947 <            c.signalAll();
948 <            sync.release(1);
949 <            Thread.sleep(SHORT_DELAY_MS);
950 <            sync.acquire(1);
951 <            assertFalse(sync.hasWaiters(c));
952 <            assertTrue(sync.getWaitingThreads(c).isEmpty());
953 <            sync.release(1);
954 <            t1.join(SHORT_DELAY_MS);
955 <            t2.join(SHORT_DELAY_MS);
956 <            assertFalse(t1.isAlive());
957 <            assertFalse(t2.isAlive());
958 <        }
959 <        catch (Exception ex) {
960 <            unexpectedException();
961 <        }
905 >        final Mutex sync = new Mutex();
906 >        final ConditionObject c = sync.newCondition();
907 >        final BooleanLatch acquired1 = new BooleanLatch();
908 >        final BooleanLatch acquired2 = new BooleanLatch();
909 >        final Thread t1 = new Thread(new CheckedRunnable() {
910 >            public void realRun() throws InterruptedException {
911 >                sync.acquire();
912 >                assertHasWaitersLocked(sync, c, NO_THREADS);
913 >                assertTrue(sync.getWaitingThreads(c).isEmpty());
914 >                assertTrue(acquired1.releaseShared(0));
915 >                c.await();
916 >                sync.release();
917 >            }});
918 >
919 >        final Thread t2 = new Thread(new CheckedRunnable() {
920 >            public void realRun() throws InterruptedException {
921 >                sync.acquire();
922 >                assertHasWaitersLocked(sync, c, t1);
923 >                assertTrue(sync.getWaitingThreads(c).contains(t1));
924 >                assertFalse(sync.getWaitingThreads(c).isEmpty());
925 >                assertEquals(1, sync.getWaitingThreads(c).size());
926 >                assertTrue(acquired2.releaseShared(0));
927 >                c.await();
928 >                sync.release();
929 >            }});
930 >
931 >        sync.acquire();
932 >        assertHasWaitersLocked(sync, c, NO_THREADS);
933 >        assertFalse(sync.getWaitingThreads(c).contains(t1));
934 >        assertFalse(sync.getWaitingThreads(c).contains(t2));
935 >        assertTrue(sync.getWaitingThreads(c).isEmpty());
936 >        assertEquals(0, sync.getWaitingThreads(c).size());
937 >        sync.release();
938 >
939 >        t1.start();
940 >        acquired1.acquireShared(0);
941 >        sync.acquire();
942 >        assertHasWaitersLocked(sync, c, t1);
943 >        assertTrue(sync.getWaitingThreads(c).contains(t1));
944 >        assertFalse(sync.getWaitingThreads(c).contains(t2));
945 >        assertFalse(sync.getWaitingThreads(c).isEmpty());
946 >        assertEquals(1, sync.getWaitingThreads(c).size());
947 >        sync.release();
948 >
949 >        t2.start();
950 >        acquired2.acquireShared(0);
951 >        sync.acquire();
952 >        assertHasWaitersLocked(sync, c, t1, t2);
953 >        assertHasExclusiveQueuedThreads(sync, NO_THREADS);
954 >        assertTrue(sync.getWaitingThreads(c).contains(t1));
955 >        assertTrue(sync.getWaitingThreads(c).contains(t2));
956 >        assertFalse(sync.getWaitingThreads(c).isEmpty());
957 >        assertEquals(2, sync.getWaitingThreads(c).size());
958 >        c.signalAll();
959 >        assertHasWaitersLocked(sync, c, NO_THREADS);
960 >        assertHasExclusiveQueuedThreads(sync, t1, t2);
961 >        assertFalse(sync.getWaitingThreads(c).contains(t1));
962 >        assertFalse(sync.getWaitingThreads(c).contains(t2));
963 >        assertTrue(sync.getWaitingThreads(c).isEmpty());
964 >        assertEquals(0, sync.getWaitingThreads(c).size());
965 >        sync.release();
966 >
967 >        awaitTermination(t1);
968 >        awaitTermination(t2);
969 >        assertHasWaitersUnlocked(sync, c, NO_THREADS);
970      }
971  
932
933
972      /**
973 <     * awaitUninterruptibly doesn't abort on interrupt
973 >     * awaitUninterruptibly is uninterruptible
974       */
975      public void testAwaitUninterruptibly() {
976 <        final Mutex sync = new Mutex();
977 <        final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
978 <        Thread t = new Thread(new Runnable() {
979 <                public void run() {
980 <                    sync.acquire(1);
981 <                    c.awaitUninterruptibly();
982 <                    sync.release(1);
983 <                }
984 <            });
985 <
986 <        try {
987 <            t.start();
988 <            Thread.sleep(SHORT_DELAY_MS);
989 <            t.interrupt();
990 <            sync.acquire(1);
991 <            c.signal();
992 <            sync.release(1);
993 <            t.join(SHORT_DELAY_MS);
994 <            assertFalse(t.isAlive());
995 <        }
996 <        catch (Exception ex) {
997 <            unexpectedException();
998 <        }
976 >        final Mutex sync = new Mutex();
977 >        final ConditionObject condition = sync.newCondition();
978 >        final BooleanLatch pleaseInterrupt = new BooleanLatch();
979 >        Thread t = newStartedThread(new CheckedRunnable() {
980 >            public void realRun() {
981 >                sync.acquire();
982 >                assertTrue(pleaseInterrupt.releaseShared(0));
983 >                condition.awaitUninterruptibly();
984 >                assertTrue(Thread.interrupted());
985 >                assertHasWaitersLocked(sync, condition, NO_THREADS);
986 >                sync.release();
987 >            }});
988 >
989 >        pleaseInterrupt.acquireShared(0);
990 >        sync.acquire();
991 >        assertHasWaitersLocked(sync, condition, t);
992 >        sync.release();
993 >        t.interrupt();
994 >        assertHasWaitersUnlocked(sync, condition, t);
995 >        assertThreadBlocks(t, Thread.State.WAITING);
996 >        sync.acquire();
997 >        assertHasWaitersLocked(sync, condition, t);
998 >        assertHasExclusiveQueuedThreads(sync, NO_THREADS);
999 >        condition.signal();
1000 >        assertHasWaitersLocked(sync, condition, NO_THREADS);
1001 >        assertHasExclusiveQueuedThreads(sync, t);
1002 >        sync.release();
1003 >        awaitTermination(t);
1004      }
1005  
1006      /**
1007 <     * await is interruptible
1008 <     */
1009 <    public void testAwait_Interrupt() {
1010 <        final Mutex sync = new Mutex();
1011 <        final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
1012 <        Thread t = new Thread(new Runnable() {
1013 <                public void run() {
1014 <                    try {
1015 <                        sync.acquire(1);
1016 <                        c.await();
1017 <                        sync.release(1);
1018 <                        threadShouldThrow();
1019 <                    }
1020 <                    catch(InterruptedException success) {
1021 <                    }
1022 <                }
1023 <            });
1024 <
1025 <        try {
1026 <            t.start();
984 <            Thread.sleep(SHORT_DELAY_MS);
985 <            t.interrupt();
986 <            t.join(SHORT_DELAY_MS);
987 <            assertFalse(t.isAlive());
988 <        }
989 <        catch (Exception ex) {
990 <            unexpectedException();
991 <        }
992 <    }
993 <
994 <    /**
995 <     * awaitNanos is interruptible
996 <     */
997 <    public void testAwaitNanos_Interrupt() {
998 <        final Mutex sync = new Mutex();
999 <        final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
1000 <        Thread t = new Thread(new Runnable() {
1001 <                public void run() {
1002 <                    try {
1003 <                        sync.acquire(1);
1004 <                        c.awaitNanos(1000 * 1000 * 1000); // 1 sec
1005 <                        sync.release(1);
1006 <                        threadShouldThrow();
1007 <                    }
1008 <                    catch(InterruptedException success) {
1009 <                    }
1010 <                }
1011 <            });
1012 <
1013 <        try {
1014 <            t.start();
1015 <            Thread.sleep(SHORT_DELAY_MS);
1016 <            t.interrupt();
1017 <            t.join(SHORT_DELAY_MS);
1018 <            assertFalse(t.isAlive());
1019 <        }
1020 <        catch (Exception ex) {
1021 <            unexpectedException();
1022 <        }
1023 <    }
1024 <
1025 <    /**
1026 <     * awaitUntil is interruptible
1027 <     */
1028 <    public void testAwaitUntil_Interrupt() {
1029 <        final Mutex sync = new Mutex();
1030 <        final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
1031 <        Thread t = new Thread(new Runnable() {
1032 <                public void run() {
1033 <                    try {
1034 <                        sync.acquire(1);
1035 <                        java.util.Date d = new java.util.Date();
1036 <                        c.awaitUntil(new java.util.Date(d.getTime() + 10000));
1037 <                        sync.release(1);
1038 <                        threadShouldThrow();
1039 <                    }
1040 <                    catch(InterruptedException success) {
1041 <                    }
1042 <                }
1043 <            });
1044 <
1045 <        try {
1046 <            t.start();
1047 <            Thread.sleep(SHORT_DELAY_MS);
1048 <            t.interrupt();
1049 <            t.join(SHORT_DELAY_MS);
1050 <            assertFalse(t.isAlive());
1051 <        }
1052 <        catch (Exception ex) {
1053 <            unexpectedException();
1054 <        }
1007 >     * await/awaitNanos/awaitUntil is interruptible
1008 >     */
1009 >    public void testInterruptible_await()      { testInterruptible(AwaitMethod.await); }
1010 >    public void testInterruptible_awaitTimed() { testInterruptible(AwaitMethod.awaitTimed); }
1011 >    public void testInterruptible_awaitNanos() { testInterruptible(AwaitMethod.awaitNanos); }
1012 >    public void testInterruptible_awaitUntil() { testInterruptible(AwaitMethod.awaitUntil); }
1013 >    public void testInterruptible(final AwaitMethod awaitMethod) {
1014 >        final Mutex sync = new Mutex();
1015 >        final ConditionObject c = sync.newCondition();
1016 >        final BooleanLatch pleaseInterrupt = new BooleanLatch();
1017 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1018 >            public void realRun() throws InterruptedException {
1019 >                sync.acquire();
1020 >                assertTrue(pleaseInterrupt.releaseShared(0));
1021 >                await(c, awaitMethod);
1022 >            }});
1023 >
1024 >        pleaseInterrupt.acquireShared(0);
1025 >        t.interrupt();
1026 >        awaitTermination(t);
1027      }
1028  
1029      /**
1030       * signalAll wakes up all threads
1031       */
1032 <    public void testSignalAll() {
1033 <        final Mutex sync = new Mutex();
1034 <        final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
1035 <        Thread t1 = new Thread(new Runnable() {
1036 <                public void run() {
1037 <                    try {
1038 <                        sync.acquire(1);
1039 <                        c.await();
1040 <                        sync.release(1);
1041 <                    }
1042 <                    catch(InterruptedException e) {
1043 <                        threadUnexpectedException();
1044 <                    }
1045 <                }
1046 <            });
1047 <
1048 <        Thread t2 = new Thread(new Runnable() {
1049 <                public void run() {
1050 <                    try {
1051 <                        sync.acquire(1);
1052 <                        c.await();
1053 <                        sync.release(1);
1054 <                    }
1055 <                    catch(InterruptedException e) {
1056 <                        threadUnexpectedException();
1057 <                    }
1058 <                }
1059 <            });
1060 <
1061 <        try {
1062 <            t1.start();
1063 <            t2.start();
1064 <            Thread.sleep(SHORT_DELAY_MS);
1065 <            sync.acquire(1);
1066 <            c.signalAll();
1067 <            sync.release(1);
1096 <            t1.join(SHORT_DELAY_MS);
1097 <            t2.join(SHORT_DELAY_MS);
1098 <            assertFalse(t1.isAlive());
1099 <            assertFalse(t2.isAlive());
1100 <        }
1101 <        catch (Exception ex) {
1102 <            unexpectedException();
1103 <        }
1032 >    public void testSignalAll_await()      { testSignalAll(AwaitMethod.await); }
1033 >    public void testSignalAll_awaitTimed() { testSignalAll(AwaitMethod.awaitTimed); }
1034 >    public void testSignalAll_awaitNanos() { testSignalAll(AwaitMethod.awaitNanos); }
1035 >    public void testSignalAll_awaitUntil() { testSignalAll(AwaitMethod.awaitUntil); }
1036 >    public void testSignalAll(final AwaitMethod awaitMethod) {
1037 >        final Mutex sync = new Mutex();
1038 >        final ConditionObject c = sync.newCondition();
1039 >        final BooleanLatch acquired1 = new BooleanLatch();
1040 >        final BooleanLatch acquired2 = new BooleanLatch();
1041 >        Thread t1 = newStartedThread(new CheckedRunnable() {
1042 >            public void realRun() throws InterruptedException {
1043 >                sync.acquire();
1044 >                acquired1.releaseShared(0);
1045 >                await(c, awaitMethod);
1046 >                sync.release();
1047 >            }});
1048 >
1049 >        Thread t2 = newStartedThread(new CheckedRunnable() {
1050 >            public void realRun() throws InterruptedException {
1051 >                sync.acquire();
1052 >                acquired2.releaseShared(0);
1053 >                await(c, awaitMethod);
1054 >                sync.release();
1055 >            }});
1056 >
1057 >        acquired1.acquireShared(0);
1058 >        acquired2.acquireShared(0);
1059 >        sync.acquire();
1060 >        assertHasWaitersLocked(sync, c, t1, t2);
1061 >        assertHasExclusiveQueuedThreads(sync, NO_THREADS);
1062 >        c.signalAll();
1063 >        assertHasWaitersLocked(sync, c, NO_THREADS);
1064 >        assertHasExclusiveQueuedThreads(sync, t1, t2);
1065 >        sync.release();
1066 >        awaitTermination(t1);
1067 >        awaitTermination(t2);
1068      }
1069  
1106
1070      /**
1071       * toString indicates current state
1072       */
1073      public void testToString() {
1074          Mutex sync = new Mutex();
1075 <        String us = sync.toString();
1076 <        assertTrue(us.indexOf("State = 0") >= 0);
1077 <        sync.acquire(1);
1115 <        String ls = sync.toString();
1116 <        assertTrue(ls.indexOf("State = 1") >= 0);
1075 >        assertTrue(sync.toString().contains("State = " + Mutex.UNLOCKED));
1076 >        sync.acquire();
1077 >        assertTrue(sync.toString().contains("State = " + Mutex.LOCKED));
1078      }
1079  
1080      /**
1081 <     * A serialized AQS deserializes with current state
1081 >     * A serialized AQS deserializes with current state, but no queued threads
1082       */
1083      public void testSerialization() {
1084 <        Mutex l = new Mutex();
1085 <        l.acquire(1);
1086 <        assertTrue(l.isHeldExclusively());
1087 <
1088 <        try {
1089 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1090 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1091 <            out.writeObject(l);
1092 <            out.close();
1093 <
1094 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1095 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1096 <            Mutex r = (Mutex) in.readObject();
1097 <            assertTrue(r.isHeldExclusively());
1098 <        } catch(Exception e){
1099 <            e.printStackTrace();
1100 <            unexpectedException();
1101 <        }
1084 >        Mutex sync = new Mutex();
1085 >        assertFalse(serialClone(sync).isHeldExclusively());
1086 >        sync.acquire();
1087 >        Thread t = newStartedThread(new InterruptedSyncRunnable(sync));
1088 >        waitForQueuedThread(sync, t);
1089 >        assertTrue(sync.isHeldExclusively());
1090 >
1091 >        Mutex clone = serialClone(sync);
1092 >        assertTrue(clone.isHeldExclusively());
1093 >        assertHasExclusiveQueuedThreads(sync, t);
1094 >        assertHasExclusiveQueuedThreads(clone, NO_THREADS);
1095 >        t.interrupt();
1096 >        awaitTermination(t);
1097 >        sync.release();
1098 >        assertFalse(sync.isHeldExclusively());
1099 >        assertTrue(clone.isHeldExclusively());
1100 >        assertHasExclusiveQueuedThreads(sync, NO_THREADS);
1101 >        assertHasExclusiveQueuedThreads(clone, NO_THREADS);
1102      }
1103  
1143
1104      /**
1105       * tryReleaseShared setting state changes getState
1106       */
1107      public void testGetStateWithReleaseShared() {
1108 <        final BooleanLatch l = new BooleanLatch();
1109 <        assertFalse(l.isSignalled());
1110 <        l.releaseShared(0);
1111 <        assertTrue(l.isSignalled());
1108 >        final BooleanLatch l = new BooleanLatch();
1109 >        assertFalse(l.isSignalled());
1110 >        assertTrue(l.releaseShared(0));
1111 >        assertTrue(l.isSignalled());
1112      }
1113  
1114      /**
1115       * releaseShared has no effect when already signalled
1116       */
1117      public void testReleaseShared() {
1118 <        final BooleanLatch l = new BooleanLatch();
1119 <        assertFalse(l.isSignalled());
1120 <        l.releaseShared(0);
1121 <        assertTrue(l.isSignalled());
1122 <        l.releaseShared(0);
1123 <        assertTrue(l.isSignalled());
1118 >        final BooleanLatch l = new BooleanLatch();
1119 >        assertFalse(l.isSignalled());
1120 >        assertTrue(l.releaseShared(0));
1121 >        assertTrue(l.isSignalled());
1122 >        assertTrue(l.releaseShared(0));
1123 >        assertTrue(l.isSignalled());
1124      }
1125  
1126      /**
1127       * acquireSharedInterruptibly returns after release, but not before
1128       */
1129      public void testAcquireSharedInterruptibly() {
1130 <        final BooleanLatch l = new BooleanLatch();
1130 >        final BooleanLatch l = new BooleanLatch();
1131  
1132 <        Thread t = new Thread(new Runnable() {
1133 <                public void run() {
1134 <                    try {
1135 <                        threadAssertFalse(l.isSignalled());
1136 <                        l.acquireSharedInterruptibly(0);
1137 <                        threadAssertTrue(l.isSignalled());
1138 <                    } catch(InterruptedException e){
1139 <                        threadUnexpectedException();
1140 <                    }
1141 <                }
1142 <            });
1143 <        try {
1144 <            t.start();
1145 <            assertFalse(l.isSignalled());
1146 <            Thread.sleep(SHORT_DELAY_MS);
1147 <            l.releaseShared(0);
1188 <            assertTrue(l.isSignalled());
1189 <            t.join();
1190 <        } catch (InterruptedException e){
1191 <            unexpectedException();
1192 <        }
1132 >        Thread t = newStartedThread(new CheckedRunnable() {
1133 >            public void realRun() throws InterruptedException {
1134 >                assertFalse(l.isSignalled());
1135 >                l.acquireSharedInterruptibly(0);
1136 >                assertTrue(l.isSignalled());
1137 >                l.acquireSharedInterruptibly(0);
1138 >                assertTrue(l.isSignalled());
1139 >            }});
1140 >
1141 >        waitForQueuedThread(l, t);
1142 >        assertFalse(l.isSignalled());
1143 >        assertThreadBlocks(t, Thread.State.WAITING);
1144 >        assertHasSharedQueuedThreads(l, t);
1145 >        assertTrue(l.releaseShared(0));
1146 >        assertTrue(l.isSignalled());
1147 >        awaitTermination(t);
1148      }
1194    
1149  
1150      /**
1151 <     * acquireSharedTimed returns after release
1151 >     * tryAcquireSharedNanos returns after release, but not before
1152       */
1153 <    public void testAsquireSharedTimed() {
1154 <        final BooleanLatch l = new BooleanLatch();
1153 >    public void testTryAcquireSharedNanos() {
1154 >        final BooleanLatch l = new BooleanLatch();
1155  
1156 <        Thread t = new Thread(new Runnable() {
1157 <                public void run() {
1158 <                    try {
1159 <                        threadAssertFalse(l.isSignalled());
1160 <                        threadAssertTrue(l.tryAcquireSharedNanos(0, MEDIUM_DELAY_MS* 1000 * 1000));
1161 <                        threadAssertTrue(l.isSignalled());
1162 <
1163 <                    } catch(InterruptedException e){
1164 <                        threadUnexpectedException();
1165 <                    }
1166 <                }
1167 <            });
1168 <        try {
1169 <            t.start();
1170 <            assertFalse(l.isSignalled());
1171 <            Thread.sleep(SHORT_DELAY_MS);
1218 <            l.releaseShared(0);
1219 <            assertTrue(l.isSignalled());
1220 <            t.join();
1221 <        } catch (InterruptedException e){
1222 <            unexpectedException();
1223 <        }
1156 >        Thread t = newStartedThread(new CheckedRunnable() {
1157 >            public void realRun() throws InterruptedException {
1158 >                assertFalse(l.isSignalled());
1159 >                long nanos = MILLISECONDS.toNanos(2 * LONG_DELAY_MS);
1160 >                assertTrue(l.tryAcquireSharedNanos(0, nanos));
1161 >                assertTrue(l.isSignalled());
1162 >                assertTrue(l.tryAcquireSharedNanos(0, nanos));
1163 >                assertTrue(l.isSignalled());
1164 >            }});
1165 >
1166 >        waitForQueuedThread(l, t);
1167 >        assertFalse(l.isSignalled());
1168 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
1169 >        assertTrue(l.releaseShared(0));
1170 >        assertTrue(l.isSignalled());
1171 >        awaitTermination(t);
1172      }
1173 <    
1173 >
1174      /**
1175 <     * acquireSharedInterruptibly throws IE if interrupted before released
1175 >     * acquireSharedInterruptibly is interruptible
1176       */
1177 <    public void testAcquireSharedInterruptibly_InterruptedException() {
1177 >    public void testAcquireSharedInterruptibly_Interruptible() {
1178          final BooleanLatch l = new BooleanLatch();
1179 <        Thread t = new Thread(new Runnable() {
1180 <                public void run() {
1181 <                    try {
1182 <                        threadAssertFalse(l.isSignalled());
1183 <                        l.acquireSharedInterruptibly(0);
1184 <                        threadShouldThrow();
1185 <                    } catch(InterruptedException success){}
1186 <                }
1187 <            });
1188 <        t.start();
1189 <        try {
1242 <            assertFalse(l.isSignalled());
1243 <            t.interrupt();
1244 <            t.join();
1245 <        } catch (InterruptedException e){
1246 <            unexpectedException();
1247 <        }
1179 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1180 >            public void realRun() throws InterruptedException {
1181 >                assertFalse(l.isSignalled());
1182 >                l.acquireSharedInterruptibly(0);
1183 >            }});
1184 >
1185 >        waitForQueuedThread(l, t);
1186 >        assertFalse(l.isSignalled());
1187 >        t.interrupt();
1188 >        awaitTermination(t);
1189 >        assertFalse(l.isSignalled());
1190      }
1191  
1192      /**
1193 <     * acquireSharedTimed throws IE if interrupted before released
1193 >     * tryAcquireSharedNanos is interruptible
1194       */
1195 <    public void testAcquireSharedNanos_InterruptedException() {
1195 >    public void testTryAcquireSharedNanos_Interruptible() {
1196          final BooleanLatch l = new BooleanLatch();
1197 <        Thread t = new Thread(new Runnable() {
1198 <                public void run() {
1199 <                    try {
1200 <                        threadAssertFalse(l.isSignalled());
1201 <                        l.tryAcquireSharedNanos(0, SMALL_DELAY_MS* 1000 * 1000);
1202 <                        threadShouldThrow();                        
1203 <                    } catch(InterruptedException success){}
1204 <                }
1205 <            });
1206 <        t.start();
1207 <        try {
1208 <            Thread.sleep(SHORT_DELAY_MS);
1267 <            assertFalse(l.isSignalled());
1268 <            t.interrupt();
1269 <            t.join();
1270 <        } catch (InterruptedException e){
1271 <            unexpectedException();
1272 <        }
1197 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1198 >            public void realRun() throws InterruptedException {
1199 >                assertFalse(l.isSignalled());
1200 >                long nanos = MILLISECONDS.toNanos(2 * LONG_DELAY_MS);
1201 >                l.tryAcquireSharedNanos(0, nanos);
1202 >            }});
1203 >
1204 >        waitForQueuedThread(l, t);
1205 >        assertFalse(l.isSignalled());
1206 >        t.interrupt();
1207 >        awaitTermination(t);
1208 >        assertFalse(l.isSignalled());
1209      }
1210  
1211      /**
1212 <     * acquireSharedTimed times out if not released before timeout
1212 >     * tryAcquireSharedNanos times out if not released before timeout
1213       */
1214 <    public void testAcquireSharedNanos_Timeout() {
1214 >    public void testTryAcquireSharedNanos_Timeout() {
1215          final BooleanLatch l = new BooleanLatch();
1216 <        Thread t = new Thread(new Runnable() {
1217 <                public void run() {
1218 <                    try {
1219 <                        threadAssertFalse(l.isSignalled());
1220 <                        threadAssertFalse(l.tryAcquireSharedNanos(0, SMALL_DELAY_MS* 1000 * 1000));
1221 <                    } catch(InterruptedException ie){
1222 <                        threadUnexpectedException();
1223 <                    }
1216 >        final BooleanLatch observedQueued = new BooleanLatch();
1217 >        Thread t = newStartedThread(new CheckedRunnable() {
1218 >            public void realRun() throws InterruptedException {
1219 >                assertFalse(l.isSignalled());
1220 >                for (long millis = timeoutMillis();
1221 >                     !observedQueued.isSignalled();
1222 >                     millis *= 2) {
1223 >                    long nanos = MILLISECONDS.toNanos(millis);
1224 >                    long startTime = System.nanoTime();
1225 >                    assertFalse(l.tryAcquireSharedNanos(0, nanos));
1226 >                    assertTrue(millisElapsedSince(startTime) >= millis);
1227                  }
1228 <            });
1229 <        t.start();
1230 <        try {
1231 <            Thread.sleep(SHORT_DELAY_MS);
1232 <            assertFalse(l.isSignalled());
1233 <            t.join();
1234 <        } catch (InterruptedException e){
1235 <            unexpectedException();
1236 <        }
1228 >                assertFalse(l.isSignalled());
1229 >            }});
1230 >
1231 >        waitForQueuedThread(l, t);
1232 >        observedQueued.releaseShared(0);
1233 >        assertFalse(l.isSignalled());
1234 >        awaitTermination(t);
1235 >        assertFalse(l.isSignalled());
1236 >    }
1237 >
1238 >    /**
1239 >     * awaitNanos/timed await with 0 wait times out immediately
1240 >     */
1241 >    public void testAwait_Zero() throws InterruptedException {
1242 >        final Mutex sync = new Mutex();
1243 >        final ConditionObject c = sync.newCondition();
1244 >        sync.acquire();
1245 >        assertTrue(c.awaitNanos(0L) <= 0);
1246 >        assertFalse(c.await(0L, NANOSECONDS));
1247 >        sync.release();
1248 >    }
1249 >
1250 >    /**
1251 >     * awaitNanos/timed await with maximum negative wait times does not underflow
1252 >     */
1253 >    public void testAwait_NegativeInfinity() throws InterruptedException {
1254 >        final Mutex sync = new Mutex();
1255 >        final ConditionObject c = sync.newCondition();
1256 >        sync.acquire();
1257 >        assertTrue(c.awaitNanos(Long.MIN_VALUE) <= 0);
1258 >        assertFalse(c.await(Long.MIN_VALUE, NANOSECONDS));
1259 >        sync.release();
1260      }
1261  
1300    
1262   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines