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

Comparing jsr166/src/test/tck/SemaphoreTest.java (file contents):
Revision 1.19 by jsr166, Tue Nov 17 02:22:50 2009 UTC vs.
Revision 1.45 by jsr166, Tue Aug 13 00:46:27 2019 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
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 junit.framework.*;
10 import java.util.*;
11 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.io.*;
10 >
11 > import java.util.Collection;
12 > import java.util.concurrent.CountDownLatch;
13 > import java.util.concurrent.Semaphore;
14 >
15 > import junit.framework.Test;
16 > import junit.framework.TestSuite;
17  
18   public class SemaphoreTest extends JSR166TestCase {
19      public static void main(String[] args) {
20 <        junit.textui.TestRunner.run (suite());
20 >        main(suite(), args);
21      }
22      public static Test suite() {
23 <        return new TestSuite(SemaphoreTest.class);
23 >        return new TestSuite(SemaphoreTest.class);
24      }
25  
26      /**
27       * Subclass to expose protected methods
28       */
29      static class PublicSemaphore extends Semaphore {
30 <        PublicSemaphore(int p, boolean f) { super(p, f); }
30 >        PublicSemaphore(int permits) { super(permits); }
31 >        PublicSemaphore(int permits, boolean fair) { super(permits, fair); }
32          public Collection<Thread> getQueuedThreads() {
33              return super.getQueuedThreads();
34          }
35 <        public void reducePermits(int p) {
36 <            super.reducePermits(p);
35 >        public boolean hasQueuedThread(Thread t) {
36 >            return super.getQueuedThreads().contains(t);
37 >        }
38 >        public void reducePermits(int reduction) {
39 >            super.reducePermits(reduction);
40          }
41      }
42  
# Line 38 | Line 45 | public class SemaphoreTest extends JSR16
45       */
46      class InterruptibleLockRunnable extends CheckedRunnable {
47          final Semaphore lock;
48 <        InterruptibleLockRunnable(Semaphore l) { lock = l; }
48 >        InterruptibleLockRunnable(Semaphore s) { lock = s; }
49          public void realRun() {
50              try {
51                  lock.acquire();
# Line 47 | Line 54 | public class SemaphoreTest extends JSR16
54          }
55      }
56  
50
57      /**
58 <     * A runnable calling acquire that expects to be
53 <     * interrupted
58 >     * A runnable calling acquire that expects to be interrupted
59       */
60      class InterruptedLockRunnable extends CheckedInterruptedRunnable {
61          final Semaphore lock;
62 <        InterruptedLockRunnable(Semaphore l) { lock = l; }
62 >        InterruptedLockRunnable(Semaphore s) { lock = s; }
63          public void realRun() throws InterruptedException {
64              lock.acquire();
65          }
66      }
67  
68      /**
69 <     * Zero, negative, and positive initial values are allowed in constructor
69 >     * Spin-waits until s.hasQueuedThread(t) becomes true.
70 >     */
71 >    void waitForQueuedThread(PublicSemaphore s, Thread t) {
72 >        long startTime = System.nanoTime();
73 >        while (!s.hasQueuedThread(t)) {
74 >            if (millisElapsedSince(startTime) > LONG_DELAY_MS)
75 >                throw new AssertionError("timed out");
76 >            Thread.yield();
77 >        }
78 >        assertTrue(s.hasQueuedThreads());
79 >        assertTrue(t.isAlive());
80 >    }
81 >
82 >    /**
83 >     * Spin-waits until s.hasQueuedThreads() becomes true.
84       */
85 <    public void testConstructor() {
86 <        for (int permits : new int[] { -1, 0, 1 }) {
87 <            for (boolean fair : new boolean[] { false, true }) {
88 <                Semaphore s = new Semaphore(permits, fair);
89 <                assertEquals(permits, s.availablePermits());
90 <                assertEquals(fair, s.isFair());
85 >    void waitForQueuedThreads(Semaphore s) {
86 >        long startTime = System.nanoTime();
87 >        while (!s.hasQueuedThreads()) {
88 >            if (millisElapsedSince(startTime) > LONG_DELAY_MS)
89 >                throw new AssertionError("timed out");
90 >            Thread.yield();
91 >        }
92 >    }
93 >
94 >    enum AcquireMethod {
95 >        acquire() {
96 >            void acquire(Semaphore s) throws InterruptedException {
97 >                s.acquire();
98 >            }
99 >        },
100 >        acquireN() {
101 >            void acquire(Semaphore s, int permits) throws InterruptedException {
102 >                s.acquire(permits);
103 >            }
104 >        },
105 >        acquireUninterruptibly() {
106 >            void acquire(Semaphore s) {
107 >                s.acquireUninterruptibly();
108 >            }
109 >        },
110 >        acquireUninterruptiblyN() {
111 >            void acquire(Semaphore s, int permits) {
112 >                s.acquireUninterruptibly(permits);
113 >            }
114 >        },
115 >        tryAcquire() {
116 >            void acquire(Semaphore s) {
117 >                assertTrue(s.tryAcquire());
118 >            }
119 >        },
120 >        tryAcquireN() {
121 >            void acquire(Semaphore s, int permits) {
122 >                assertTrue(s.tryAcquire(permits));
123              }
124 +        },
125 +        tryAcquireTimed() {
126 +            void acquire(Semaphore s) throws InterruptedException {
127 +                assertTrue(s.tryAcquire(2 * LONG_DELAY_MS, MILLISECONDS));
128 +            }
129 +            Thread.State parkedState() { return Thread.State.TIMED_WAITING; }
130 +        },
131 +        tryAcquireTimedN {
132 +            void acquire(Semaphore s, int permits) throws InterruptedException {
133 +                assertTrue(s.tryAcquire(permits, 2 * LONG_DELAY_MS, MILLISECONDS));
134 +            }
135 +            Thread.State parkedState() { return Thread.State.TIMED_WAITING; }
136 +        };
137 +
138 +        // Intentionally meta-circular
139 +
140 +        /** Acquires 1 permit. */
141 +        void acquire(Semaphore s) throws InterruptedException {
142 +            acquire(s, 1);
143 +        }
144 +        /** Acquires the given number of permits. */
145 +        void acquire(Semaphore s, int permits) throws InterruptedException {
146 +            for (int i = 0; i < permits; i++)
147 +                acquire(s);
148 +        }
149 +        Thread.State parkedState() { return Thread.State.WAITING; }
150 +    }
151 +
152 +    /**
153 +     * Zero, negative, and positive initial values are allowed in constructor
154 +     */
155 +    public void testConstructor()      { testConstructor(false); }
156 +    public void testConstructor_fair() { testConstructor(true); }
157 +    public void testConstructor(boolean fair) {
158 +        for (int permits : new int[] { -42, -1, 0, 1, 42 }) {
159 +            Semaphore s = new Semaphore(permits, fair);
160 +            assertEquals(permits, s.availablePermits());
161 +            assertEquals(fair, s.isFair());
162          }
163      }
164  
165      /**
166       * Constructor without fairness argument behaves as nonfair
167       */
168 <    public void testConstructor2() {
169 <        for (int permits : new int[] { -1, 0, 1 }) {
168 >    public void testConstructorDefaultsToNonFair() {
169 >        for (int permits : new int[] { -42, -1, 0, 1, 42 }) {
170              Semaphore s = new Semaphore(permits);
171              assertEquals(permits, s.availablePermits());
172              assertFalse(s.isFair());
# Line 87 | Line 176 | public class SemaphoreTest extends JSR16
176      /**
177       * tryAcquire succeeds when sufficient permits, else fails
178       */
179 <    public void testTryAcquireInSameThread() {
180 <        Semaphore s = new Semaphore(2, false);
179 >    public void testTryAcquireInSameThread()      { testTryAcquireInSameThread(false); }
180 >    public void testTryAcquireInSameThread_fair() { testTryAcquireInSameThread(true); }
181 >    public void testTryAcquireInSameThread(boolean fair) {
182 >        Semaphore s = new Semaphore(2, fair);
183          assertEquals(2, s.availablePermits());
184          assertTrue(s.tryAcquire());
185          assertTrue(s.tryAcquire());
186          assertEquals(0, s.availablePermits());
187          assertFalse(s.tryAcquire());
188 +        assertFalse(s.tryAcquire());
189 +        assertEquals(0, s.availablePermits());
190      }
191  
192      /**
193 <     * Acquire and release of semaphore succeed if initially available
101 <     */
102 <    public void testAcquireReleaseInSameThread()
103 <        throws InterruptedException {
104 <        Semaphore s = new Semaphore(1, false);
105 <        s.acquire();
106 <        s.release();
107 <        s.acquire();
108 <        s.release();
109 <        s.acquire();
110 <        s.release();
111 <        s.acquire();
112 <        s.release();
113 <        s.acquire();
114 <        s.release();
115 <        assertEquals(1, s.availablePermits());
116 <    }
117 <
118 <    /**
119 <     * Uninterruptible acquire and release of semaphore succeed if
120 <     * initially available
193 >     * timed tryAcquire times out
194       */
195 <    public void testAcquireUninterruptiblyReleaseInSameThread()
196 <        throws InterruptedException {
197 <        Semaphore s = new Semaphore(1, false);
198 <        s.acquireUninterruptibly();
199 <        s.release();
200 <        s.acquireUninterruptibly();
201 <        s.release();
202 <        s.acquireUninterruptibly();
203 <        s.release();
204 <        s.acquireUninterruptibly();
205 <        s.release();
206 <        s.acquireUninterruptibly();
207 <        s.release();
208 <        assertEquals(1, s.availablePermits());
209 <    }
195 >    public void testTryAcquire_timeout() throws InterruptedException {
196 >        final boolean fair = randomBoolean();
197 >        final Semaphore s = new Semaphore(0, fair);
198 >        final long startTime = System.nanoTime();
199 >        assertFalse(s.tryAcquire(timeoutMillis(), MILLISECONDS));
200 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
201 >    }
202 >
203 >    /**
204 >     * timed tryAcquire(N) times out
205 >     */
206 >    public void testTryAcquireN_timeout() throws InterruptedException {
207 >        final boolean fair = randomBoolean();
208 >        final Semaphore s = new Semaphore(2, fair);
209 >        final long startTime = System.nanoTime();
210 >        assertFalse(s.tryAcquire(3, timeoutMillis(), MILLISECONDS));
211 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
212 >    }
213 >
214 >    /**
215 >     * acquire(), acquire(N), timed tryAcquired, timed tryAcquire(N)
216 >     * are interruptible
217 >     */
218 >    public void testInterruptible_acquire()               { testInterruptible(false, AcquireMethod.acquire); }
219 >    public void testInterruptible_acquire_fair()          { testInterruptible(true,  AcquireMethod.acquire); }
220 >    public void testInterruptible_acquireN()              { testInterruptible(false, AcquireMethod.acquireN); }
221 >    public void testInterruptible_acquireN_fair()         { testInterruptible(true,  AcquireMethod.acquireN); }
222 >    public void testInterruptible_tryAcquireTimed()       { testInterruptible(false, AcquireMethod.tryAcquireTimed); }
223 >    public void testInterruptible_tryAcquireTimed_fair()  { testInterruptible(true,  AcquireMethod.tryAcquireTimed); }
224 >    public void testInterruptible_tryAcquireTimedN()      { testInterruptible(false, AcquireMethod.tryAcquireTimedN); }
225 >    public void testInterruptible_tryAcquireTimedN_fair() { testInterruptible(true,  AcquireMethod.tryAcquireTimedN); }
226 >    public void testInterruptible(boolean fair, final AcquireMethod acquirer) {
227 >        final PublicSemaphore s = new PublicSemaphore(0, fair);
228 >        final java.util.concurrent.CyclicBarrier pleaseInterrupt
229 >            = new java.util.concurrent.CyclicBarrier(2);
230 >        Thread t = newStartedThread(new CheckedRunnable() {
231 >            public void realRun() {
232 >                // Interrupt before acquire
233 >                Thread.currentThread().interrupt();
234 >                try {
235 >                    acquirer.acquire(s);
236 >                    shouldThrow();
237 >                } catch (InterruptedException success) {}
238 >                assertFalse(Thread.interrupted());
239 >
240 >                // Interrupt before acquire(N)
241 >                Thread.currentThread().interrupt();
242 >                try {
243 >                    acquirer.acquire(s, 3);
244 >                    shouldThrow();
245 >                } catch (InterruptedException success) {}
246 >                assertFalse(Thread.interrupted());
247 >
248 >                // Interrupt during acquire
249 >                await(pleaseInterrupt);
250 >                try {
251 >                    acquirer.acquire(s);
252 >                    shouldThrow();
253 >                } catch (InterruptedException success) {}
254 >                assertFalse(Thread.interrupted());
255 >
256 >                // Interrupt during acquire(N)
257 >                await(pleaseInterrupt);
258 >                try {
259 >                    acquirer.acquire(s, 3);
260 >                    shouldThrow();
261 >                } catch (InterruptedException success) {}
262 >                assertFalse(Thread.interrupted());
263 >            }});
264 >
265 >        for (int n = 2; n-->0; ) {
266 >            await(pleaseInterrupt);
267 >            assertThreadBlocks(t, acquirer.parkedState());
268 >            t.interrupt();
269 >        }
270  
271 <    /**
139 <     * Timed Acquire and release of semaphore succeed if
140 <     * initially available
141 <     */
142 <    public void testTimedAcquireReleaseInSameThread()
143 <        throws InterruptedException {
144 <        Semaphore s = new Semaphore(1, false);
145 <        assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
146 <        s.release();
147 <        assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
148 <        s.release();
149 <        assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
150 <        s.release();
151 <        assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
152 <        s.release();
153 <        assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
154 <        s.release();
155 <        assertEquals(1, s.availablePermits());
271 >        awaitTermination(t);
272      }
273  
274      /**
275 <     * A release in one thread enables an acquire in another thread
275 >     * acquireUninterruptibly(), acquireUninterruptibly(N) are
276 >     * uninterruptible
277       */
278 <    public void testAcquireReleaseInDifferentThreads()
279 <        throws InterruptedException {
280 <        final Semaphore s = new Semaphore(0, false);
281 <        Thread t = new Thread(new CheckedRunnable() {
282 <            public void realRun() throws InterruptedException {
283 <                s.acquire();
284 <                s.release();
168 <                s.release();
169 <                s.acquire();
170 <            }});
278 >    public void testUninterruptible_acquireUninterruptibly()       { testUninterruptible(false, AcquireMethod.acquireUninterruptibly); }
279 >    public void testUninterruptible_acquireUninterruptibly_fair()  { testUninterruptible(true,  AcquireMethod.acquireUninterruptibly); }
280 >    public void testUninterruptible_acquireUninterruptiblyN()      { testUninterruptible(false, AcquireMethod.acquireUninterruptiblyN); }
281 >    public void testUninterruptible_acquireUninterruptiblyN_fair() { testUninterruptible(true,  AcquireMethod.acquireUninterruptiblyN); }
282 >    public void testUninterruptible(boolean fair, final AcquireMethod acquirer) {
283 >        final PublicSemaphore s = new PublicSemaphore(0, fair);
284 >        final Semaphore pleaseInterrupt = new Semaphore(-1, fair);
285  
286 <        t.start();
173 <        Thread.sleep(SHORT_DELAY_MS);
174 <        s.release();
175 <        s.release();
176 <        s.acquire();
177 <        s.acquire();
178 <        s.release();
179 <        t.join();
180 <    }
181 <
182 <    /**
183 <     * A release in one thread enables an uninterruptible acquire in another thread
184 <     */
185 <    public void testUninterruptibleAcquireReleaseInDifferentThreads()
186 <        throws InterruptedException {
187 <        final Semaphore s = new Semaphore(0, false);
188 <        Thread t = new Thread(new CheckedRunnable() {
286 >        Thread t1 = newStartedThread(new CheckedRunnable() {
287              public void realRun() throws InterruptedException {
288 <                s.acquireUninterruptibly();
289 <                s.release();
290 <                s.release();
291 <                s.acquireUninterruptibly();
288 >                // Interrupt before acquire
289 >                pleaseInterrupt.release();
290 >                Thread.currentThread().interrupt();
291 >                acquirer.acquire(s);
292 >                assertTrue(Thread.interrupted());
293              }});
294  
295 <        t.start();
197 <        Thread.sleep(SHORT_DELAY_MS);
198 <        s.release();
199 <        s.release();
200 <        s.acquireUninterruptibly();
201 <        s.acquireUninterruptibly();
202 <        s.release();
203 <        t.join();
204 <    }
205 <
206 <
207 <    /**
208 <     *  A release in one thread enables a timed acquire in another thread
209 <     */
210 <    public void testTimedAcquireReleaseInDifferentThreads()
211 <        throws InterruptedException {
212 <        final Semaphore s = new Semaphore(1, false);
213 <        Thread t = new Thread(new CheckedRunnable() {
295 >        Thread t2 = newStartedThread(new CheckedRunnable() {
296              public void realRun() throws InterruptedException {
297 <                s.release();
298 <                threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
299 <                s.release();
300 <                threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
297 >                // Interrupt during acquire
298 >                pleaseInterrupt.release();
299 >                acquirer.acquire(s);
300 >                assertTrue(Thread.interrupted());
301              }});
302  
303 <        t.start();
304 <        assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
305 <        s.release();
306 <        assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
225 <        s.release();
226 <        s.release();
227 <        t.join();
228 <    }
303 >        await(pleaseInterrupt);
304 >        waitForQueuedThread(s, t1);
305 >        waitForQueuedThread(s, t2);
306 >        t2.interrupt();
307  
308 <    /**
309 <     * A waiting acquire blocks interruptibly
232 <     */
233 <    public void testAcquire_InterruptedException()
234 <        throws InterruptedException {
235 <        final Semaphore s = new Semaphore(0, false);
236 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
237 <            public void realRun() throws InterruptedException {
238 <                s.acquire();
239 <            }});
308 >        assertThreadBlocks(t1, Thread.State.WAITING);
309 >        assertThreadBlocks(t2, Thread.State.WAITING);
310  
311 <        t.start();
242 <        Thread.sleep(SHORT_DELAY_MS);
243 <        t.interrupt();
244 <        t.join();
245 <    }
246 <
247 <    /**
248 <     *  A waiting timed acquire blocks interruptibly
249 <     */
250 <    public void testTryAcquire_InterruptedException()
251 <        throws InterruptedException {
252 <        final Semaphore s = new Semaphore(0, false);
253 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
254 <            public void realRun() throws InterruptedException {
255 <                s.tryAcquire(MEDIUM_DELAY_MS, MILLISECONDS);
256 <            }});
311 >        s.release(2);
312  
313 <        t.start();
314 <        Thread.sleep(SHORT_DELAY_MS);
260 <        t.interrupt();
261 <        t.join();
313 >        awaitTermination(t1);
314 >        awaitTermination(t2);
315      }
316  
317      /**
318       * hasQueuedThreads reports whether there are waiting threads
319       */
320 <    public void testHasQueuedThreads() throws InterruptedException {
321 <        final Semaphore lock = new Semaphore(1, false);
322 <        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
323 <        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
320 >    public void testHasQueuedThreads()      { testHasQueuedThreads(false); }
321 >    public void testHasQueuedThreads_fair() { testHasQueuedThreads(true); }
322 >    public void testHasQueuedThreads(boolean fair) {
323 >        final PublicSemaphore lock = new PublicSemaphore(1, fair);
324          assertFalse(lock.hasQueuedThreads());
325          lock.acquireUninterruptibly();
326 <        t1.start();
327 <        Thread.sleep(SHORT_DELAY_MS);
326 >        Thread t1 = newStartedThread(new InterruptedLockRunnable(lock));
327 >        waitForQueuedThread(lock, t1);
328          assertTrue(lock.hasQueuedThreads());
329 <        t2.start();
330 <        Thread.sleep(SHORT_DELAY_MS);
329 >        Thread t2 = newStartedThread(new InterruptibleLockRunnable(lock));
330 >        waitForQueuedThread(lock, t2);
331          assertTrue(lock.hasQueuedThreads());
332          t1.interrupt();
333 <        Thread.sleep(SHORT_DELAY_MS);
333 >        awaitTermination(t1);
334          assertTrue(lock.hasQueuedThreads());
335          lock.release();
336 <        Thread.sleep(SHORT_DELAY_MS);
336 >        awaitTermination(t2);
337          assertFalse(lock.hasQueuedThreads());
285        t1.join();
286        t2.join();
338      }
339  
340      /**
341       * getQueueLength reports number of waiting threads
342       */
343 <    public void testGetQueueLength() throws InterruptedException {
344 <        final Semaphore lock = new Semaphore(1, false);
345 <        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
346 <        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
343 >    public void testGetQueueLength()      { testGetQueueLength(false); }
344 >    public void testGetQueueLength_fair() { testGetQueueLength(true); }
345 >    public void testGetQueueLength(boolean fair) {
346 >        final PublicSemaphore lock = new PublicSemaphore(1, fair);
347          assertEquals(0, lock.getQueueLength());
348          lock.acquireUninterruptibly();
349 <        t1.start();
350 <        Thread.sleep(SHORT_DELAY_MS);
349 >        Thread t1 = newStartedThread(new InterruptedLockRunnable(lock));
350 >        waitForQueuedThread(lock, t1);
351          assertEquals(1, lock.getQueueLength());
352 <        t2.start();
353 <        Thread.sleep(SHORT_DELAY_MS);
352 >        Thread t2 = newStartedThread(new InterruptibleLockRunnable(lock));
353 >        waitForQueuedThread(lock, t2);
354          assertEquals(2, lock.getQueueLength());
355          t1.interrupt();
356 <        Thread.sleep(SHORT_DELAY_MS);
356 >        awaitTermination(t1);
357          assertEquals(1, lock.getQueueLength());
358          lock.release();
359 <        Thread.sleep(SHORT_DELAY_MS);
359 >        awaitTermination(t2);
360          assertEquals(0, lock.getQueueLength());
310        t1.join();
311        t2.join();
361      }
362  
363      /**
364       * getQueuedThreads includes waiting threads
365       */
366 <    public void testGetQueuedThreads() throws InterruptedException {
367 <        final PublicSemaphore lock = new PublicSemaphore(1, false);
368 <        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
369 <        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
366 >    public void testGetQueuedThreads()      { testGetQueuedThreads(false); }
367 >    public void testGetQueuedThreads_fair() { testGetQueuedThreads(true); }
368 >    public void testGetQueuedThreads(boolean fair) {
369 >        final PublicSemaphore lock = new PublicSemaphore(1, fair);
370          assertTrue(lock.getQueuedThreads().isEmpty());
371          lock.acquireUninterruptibly();
372          assertTrue(lock.getQueuedThreads().isEmpty());
373 <        t1.start();
374 <        Thread.sleep(SHORT_DELAY_MS);
373 >        Thread t1 = newStartedThread(new InterruptedLockRunnable(lock));
374 >        waitForQueuedThread(lock, t1);
375          assertTrue(lock.getQueuedThreads().contains(t1));
376 <        t2.start();
377 <        Thread.sleep(SHORT_DELAY_MS);
376 >        Thread t2 = newStartedThread(new InterruptibleLockRunnable(lock));
377 >        waitForQueuedThread(lock, t2);
378          assertTrue(lock.getQueuedThreads().contains(t1));
379          assertTrue(lock.getQueuedThreads().contains(t2));
380          t1.interrupt();
381 <        Thread.sleep(SHORT_DELAY_MS);
381 >        awaitTermination(t1);
382          assertFalse(lock.getQueuedThreads().contains(t1));
383          assertTrue(lock.getQueuedThreads().contains(t2));
384          lock.release();
385 <        Thread.sleep(SHORT_DELAY_MS);
385 >        awaitTermination(t2);
386          assertTrue(lock.getQueuedThreads().isEmpty());
338        t1.join();
339        t2.join();
387      }
388  
389      /**
390       * drainPermits reports and removes given number of permits
391       */
392 <    public void testDrainPermits() {
393 <        Semaphore s = new Semaphore(0, false);
392 >    public void testDrainPermits()      { testDrainPermits(false); }
393 >    public void testDrainPermits_fair() { testDrainPermits(true); }
394 >    public void testDrainPermits(boolean fair) {
395 >        Semaphore s = new Semaphore(0, fair);
396          assertEquals(0, s.availablePermits());
397          assertEquals(0, s.drainPermits());
398          s.release(10);
# Line 354 | Line 403 | public class SemaphoreTest extends JSR16
403      }
404  
405      /**
406 <     * reducePermits reduces number of permits
406 >     * release(-N) throws IllegalArgumentException
407       */
408 <    public void testReducePermits() {
409 <        PublicSemaphore s = new PublicSemaphore(10, false);
410 <        assertEquals(10, s.availablePermits());
411 <        s.reducePermits(1);
412 <        assertEquals(9, s.availablePermits());
413 <        s.reducePermits(10);
414 <        assertEquals(-1, s.availablePermits());
408 >    public void testReleaseIAE()      { testReleaseIAE(false); }
409 >    public void testReleaseIAE_fair() { testReleaseIAE(true); }
410 >    public void testReleaseIAE(boolean fair) {
411 >        Semaphore s = new Semaphore(10, fair);
412 >        try {
413 >            s.release(-1);
414 >            shouldThrow();
415 >        } catch (IllegalArgumentException success) {}
416      }
417  
418      /**
419 <     * a deserialized serialized semaphore has same number of permits
420 <     */
421 <    public void testSerialization() throws Exception {
422 <        Semaphore l = new Semaphore(3, false);
423 <        l.acquire();
424 <        l.release();
425 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
426 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
427 <        out.writeObject(l);
428 <        out.close();
379 <
380 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
381 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
382 <        Semaphore r = (Semaphore) in.readObject();
383 <        assertEquals(3, r.availablePermits());
384 <        assertFalse(r.isFair());
385 <        r.acquire();
386 <        r.release();
419 >     * reducePermits(-N) throws IllegalArgumentException
420 >     */
421 >    public void testReducePermitsIAE()      { testReducePermitsIAE(false); }
422 >    public void testReducePermitsIAE_fair() { testReducePermitsIAE(true); }
423 >    public void testReducePermitsIAE(boolean fair) {
424 >        PublicSemaphore s = new PublicSemaphore(10, fair);
425 >        try {
426 >            s.reducePermits(-1);
427 >            shouldThrow();
428 >        } catch (IllegalArgumentException success) {}
429      }
430  
389
431      /**
432 <     * Zero, negative, and positive initial values are allowed in constructor
432 >     * reducePermits reduces number of permits
433       */
434 <    public void testConstructor_fair() {
435 <        Semaphore s0 = new Semaphore(0, true);
436 <        assertEquals(0, s0.availablePermits());
437 <        assertTrue(s0.isFair());
438 <        Semaphore s1 = new Semaphore(-1, true);
439 <        assertEquals(-1, s1.availablePermits());
440 <        Semaphore s2 = new Semaphore(-1, true);
441 <        assertEquals(-1, s2.availablePermits());
434 >    public void testReducePermits()      { testReducePermits(false); }
435 >    public void testReducePermits_fair() { testReducePermits(true); }
436 >    public void testReducePermits(boolean fair) {
437 >        PublicSemaphore s = new PublicSemaphore(10, fair);
438 >        assertEquals(10, s.availablePermits());
439 >        s.reducePermits(0);
440 >        assertEquals(10, s.availablePermits());
441 >        s.reducePermits(1);
442 >        assertEquals(9, s.availablePermits());
443 >        s.reducePermits(10);
444 >        assertEquals(-1, s.availablePermits());
445 >        s.reducePermits(10);
446 >        assertEquals(-11, s.availablePermits());
447 >        s.reducePermits(0);
448 >        assertEquals(-11, s.availablePermits());
449      }
450  
451      /**
452 <     * tryAcquire succeeds when sufficient permits, else fails
453 <     */
454 <    public void testTryAcquireInSameThread_fair() {
455 <        Semaphore s = new Semaphore(2, true);
456 <        assertEquals(2, s.availablePermits());
457 <        assertTrue(s.tryAcquire());
458 <        assertTrue(s.tryAcquire());
459 <        assertEquals(0, s.availablePermits());
460 <        assertFalse(s.tryAcquire());
452 >     * a reserialized semaphore has same number of permits and
453 >     * fairness, but no queued threads
454 >     */
455 >    public void testSerialization()      { testSerialization(false); }
456 >    public void testSerialization_fair() { testSerialization(true); }
457 >    public void testSerialization(boolean fair) {
458 >        try {
459 >            Semaphore s = new Semaphore(3, fair);
460 >            s.acquire();
461 >            s.acquire();
462 >            s.release();
463 >
464 >            Semaphore clone = serialClone(s);
465 >            assertEquals(fair, s.isFair());
466 >            assertEquals(fair, clone.isFair());
467 >            assertEquals(2, s.availablePermits());
468 >            assertEquals(2, clone.availablePermits());
469 >            clone.acquire();
470 >            clone.acquire();
471 >            clone.release();
472 >            assertEquals(2, s.availablePermits());
473 >            assertEquals(1, clone.availablePermits());
474 >            assertFalse(s.hasQueuedThreads());
475 >            assertFalse(clone.hasQueuedThreads());
476 >        } catch (InterruptedException e) { threadUnexpectedException(e); }
477 >
478 >        {
479 >            PublicSemaphore s = new PublicSemaphore(0, fair);
480 >            Thread t = newStartedThread(new InterruptibleLockRunnable(s));
481 >            // waitForQueuedThreads(s); // suffers from "flicker", so ...
482 >            waitForQueuedThread(s, t);  // ... we use this instead
483 >            PublicSemaphore clone = serialClone(s);
484 >            assertEquals(fair, s.isFair());
485 >            assertEquals(fair, clone.isFair());
486 >            assertEquals(0, s.availablePermits());
487 >            assertEquals(0, clone.availablePermits());
488 >            assertTrue(s.hasQueuedThreads());
489 >            assertFalse(clone.hasQueuedThreads());
490 >            s.release();
491 >            awaitTermination(t);
492 >            assertFalse(s.hasQueuedThreads());
493 >            assertFalse(clone.hasQueuedThreads());
494 >        }
495      }
496  
497      /**
498       * tryAcquire(n) succeeds when sufficient permits, else fails
499       */
500 <    public void testTryAcquireNInSameThread_fair() {
501 <        Semaphore s = new Semaphore(2, true);
500 >    public void testTryAcquireNInSameThread()      { testTryAcquireNInSameThread(false); }
501 >    public void testTryAcquireNInSameThread_fair() { testTryAcquireNInSameThread(true); }
502 >    public void testTryAcquireNInSameThread(boolean fair) {
503 >        Semaphore s = new Semaphore(2, fair);
504 >        assertEquals(2, s.availablePermits());
505 >        assertFalse(s.tryAcquire(3));
506          assertEquals(2, s.availablePermits());
507          assertTrue(s.tryAcquire(2));
508          assertEquals(0, s.availablePermits());
509 <        assertFalse(s.tryAcquire());
510 <    }
511 <
426 <    /**
427 <     * Acquire and release of semaphore succeed if initially available
428 <     */
429 <    public void testAcquireReleaseInSameThread_fair()
430 <        throws InterruptedException {
431 <        Semaphore s = new Semaphore(1, true);
432 <        s.acquire();
433 <        s.release();
434 <        s.acquire();
435 <        s.release();
436 <        s.acquire();
437 <        s.release();
438 <        s.acquire();
439 <        s.release();
440 <        s.acquire();
441 <        s.release();
442 <        assertEquals(1, s.availablePermits());
509 >        assertFalse(s.tryAcquire(1));
510 >        assertFalse(s.tryAcquire(2));
511 >        assertEquals(0, s.availablePermits());
512      }
513  
514      /**
515 <     * Acquire(n) and release(n) of semaphore succeed if initially available
515 >     * acquire succeeds if permits available
516       */
517 <    public void testAcquireReleaseNInSameThread_fair()
518 <        throws InterruptedException {
519 <        Semaphore s = new Semaphore(1, true);
520 <        s.release(1);
521 <        s.acquire(1);
522 <        s.release(2);
523 <        s.acquire(2);
524 <        s.release(3);
525 <        s.acquire(3);
526 <        s.release(4);
527 <        s.acquire(4);
528 <        s.release(5);
529 <        s.acquire(5);
530 <        assertEquals(1, s.availablePermits());
531 <    }
532 <
533 <    /**
534 <     * Acquire(n) and release(n) of semaphore succeed if initially available
535 <     */
536 <    public void testAcquireUninterruptiblyReleaseNInSameThread_fair() {
537 <        Semaphore s = new Semaphore(1, true);
538 <        s.release(1);
539 <        s.acquireUninterruptibly(1);
540 <        s.release(2);
541 <        s.acquireUninterruptibly(2);
542 <        s.release(3);
543 <        s.acquireUninterruptibly(3);
475 <        s.release(4);
476 <        s.acquireUninterruptibly(4);
477 <        s.release(5);
478 <        s.acquireUninterruptibly(5);
479 <        assertEquals(1, s.availablePermits());
480 <    }
481 <
482 <    /**
483 <     * release(n) in one thread enables timed acquire(n) in another thread
484 <     */
485 <    public void testTimedAcquireReleaseNInSameThread_fair()
486 <        throws InterruptedException {
487 <        Semaphore s = new Semaphore(1, true);
488 <        s.release(1);
489 <        assertTrue(s.tryAcquire(1, SHORT_DELAY_MS, MILLISECONDS));
490 <        s.release(2);
491 <        assertTrue(s.tryAcquire(2, SHORT_DELAY_MS, MILLISECONDS));
492 <        s.release(3);
493 <        assertTrue(s.tryAcquire(3, SHORT_DELAY_MS, MILLISECONDS));
494 <        s.release(4);
495 <        assertTrue(s.tryAcquire(4, SHORT_DELAY_MS, MILLISECONDS));
496 <        s.release(5);
497 <        assertTrue(s.tryAcquire(5, SHORT_DELAY_MS, MILLISECONDS));
498 <        assertEquals(1, s.availablePermits());
499 <    }
500 <
501 <    /**
502 <     * release in one thread enables timed acquire in another thread
503 <     */
504 <    public void testTimedAcquireReleaseInSameThread_fair()
505 <        throws InterruptedException {
506 <        Semaphore s = new Semaphore(1, true);
507 <        assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
508 <        s.release();
509 <        assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
510 <        s.release();
511 <        assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
512 <        s.release();
513 <        assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
514 <        s.release();
515 <        assertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
516 <        s.release();
517 <        assertEquals(1, s.availablePermits());
517 >    public void testReleaseAcquireSameThread_acquire()       { testReleaseAcquireSameThread(false, AcquireMethod.acquire); }
518 >    public void testReleaseAcquireSameThread_acquire_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.acquire); }
519 >    public void testReleaseAcquireSameThread_acquireN()      { testReleaseAcquireSameThread(false, AcquireMethod.acquireN); }
520 >    public void testReleaseAcquireSameThread_acquireN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.acquireN); }
521 >    public void testReleaseAcquireSameThread_acquireUninterruptibly()       { testReleaseAcquireSameThread(false, AcquireMethod.acquireUninterruptibly); }
522 >    public void testReleaseAcquireSameThread_acquireUninterruptibly_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.acquireUninterruptibly); }
523 >    public void testReleaseAcquireSameThread_acquireUninterruptiblyN()      { testReleaseAcquireSameThread(false, AcquireMethod.acquireUninterruptibly); }
524 >    public void testReleaseAcquireSameThread_acquireUninterruptiblyN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.acquireUninterruptibly); }
525 >    public void testReleaseAcquireSameThread_tryAcquire()       { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquire); }
526 >    public void testReleaseAcquireSameThread_tryAcquire_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquire); }
527 >    public void testReleaseAcquireSameThread_tryAcquireN()      { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquireN); }
528 >    public void testReleaseAcquireSameThread_tryAcquireN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquireN); }
529 >    public void testReleaseAcquireSameThread_tryAcquireTimed()       { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquireTimed); }
530 >    public void testReleaseAcquireSameThread_tryAcquireTimed_fair()  { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquireTimed); }
531 >    public void testReleaseAcquireSameThread_tryAcquireTimedN()      { testReleaseAcquireSameThread(false, AcquireMethod.tryAcquireTimedN); }
532 >    public void testReleaseAcquireSameThread_tryAcquireTimedN_fair() { testReleaseAcquireSameThread(true, AcquireMethod.tryAcquireTimedN); }
533 >    public void testReleaseAcquireSameThread(boolean fair,
534 >                                             final AcquireMethod acquirer) {
535 >        Semaphore s = new Semaphore(1, fair);
536 >        for (int i = 1; i < 6; i++) {
537 >            s.release(i);
538 >            assertEquals(1 + i, s.availablePermits());
539 >            try {
540 >                acquirer.acquire(s, i);
541 >            } catch (InterruptedException e) { threadUnexpectedException(e); }
542 >            assertEquals(1, s.availablePermits());
543 >        }
544      }
545  
546      /**
547 <     * A release in one thread enables an acquire in another thread
547 >     * release in one thread enables acquire in another thread
548       */
549 <    public void testAcquireReleaseInDifferentThreads_fair()
550 <        throws InterruptedException {
551 <        final Semaphore s = new Semaphore(0, true);
552 <        Thread t = new Thread(new CheckedRunnable() {
553 <            public void realRun() throws InterruptedException {
554 <                s.acquire();
555 <                s.acquire();
556 <                s.acquire();
557 <                s.acquire();
558 <            }});
559 <
560 <        t.start();
561 <        Thread.sleep(SHORT_DELAY_MS);
562 <        s.release();
563 <        s.release();
564 <        s.release();
565 <        s.release();
566 <        s.release();
567 <        s.release();
568 <        t.join();
569 <        assertEquals(2, s.availablePermits());
549 >    public void testReleaseAcquireDifferentThreads_acquire()       { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquire); }
550 >    public void testReleaseAcquireDifferentThreads_acquire_fair()  { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquire); }
551 >    public void testReleaseAcquireDifferentThreads_acquireN()      { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquireN); }
552 >    public void testReleaseAcquireDifferentThreads_acquireN_fair() { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquireN); }
553 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptibly()       { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquireUninterruptibly); }
554 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptibly_fair()  { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquireUninterruptibly); }
555 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptiblyN()      { testReleaseAcquireDifferentThreads(false, AcquireMethod.acquireUninterruptibly); }
556 >    public void testReleaseAcquireDifferentThreads_acquireUninterruptiblyN_fair() { testReleaseAcquireDifferentThreads(true, AcquireMethod.acquireUninterruptibly); }
557 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimed()       { testReleaseAcquireDifferentThreads(false, AcquireMethod.tryAcquireTimed); }
558 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimed_fair()  { testReleaseAcquireDifferentThreads(true, AcquireMethod.tryAcquireTimed); }
559 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimedN()      { testReleaseAcquireDifferentThreads(false, AcquireMethod.tryAcquireTimedN); }
560 >    public void testReleaseAcquireDifferentThreads_tryAcquireTimedN_fair() { testReleaseAcquireDifferentThreads(true, AcquireMethod.tryAcquireTimedN); }
561 >    public void testReleaseAcquireDifferentThreads(boolean fair,
562 >                                                   final AcquireMethod acquirer) {
563 >        final Semaphore s = new Semaphore(0, fair);
564 >        final int rounds = 4;
565 >        long startTime = System.nanoTime();
566 >        Thread t = newStartedThread(new CheckedRunnable() {
567 >            public void realRun() throws InterruptedException {
568 >                for (int i = 0; i < rounds; i++) {
569 >                    assertFalse(s.hasQueuedThreads());
570 >                    if (i % 2 == 0)
571 >                        acquirer.acquire(s);
572 >                    else
573 >                        acquirer.acquire(s, 3);
574 >                }}});
575 >
576 >        for (int i = 0; i < rounds; i++) {
577 >            while (! (s.availablePermits() == 0 && s.hasQueuedThreads()))
578 >                Thread.yield();
579 >            assertTrue(t.isAlive());
580 >            if (i % 2 == 0)
581 >                s.release();
582 >            else
583 >                s.release(3);
584 >        }
585 >        awaitTermination(t);
586 >        assertEquals(0, s.availablePermits());
587 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
588      }
589  
590      /**
591 <     * release(n) in one thread enables acquire(n) in another thread
591 >     * fair locks are strictly FIFO
592       */
593 <    public void testAcquireReleaseNInDifferentThreads_fair()
594 <        throws InterruptedException {
595 <        final Semaphore s = new Semaphore(0, true);
596 <        Thread t = new Thread(new CheckedRunnable() {
597 <            public void realRun() throws InterruptedException {
598 <                s.acquire();
599 <                s.release(2);
556 <                s.acquire();
557 <            }});
558 <
559 <        t.start();
560 <        Thread.sleep(SHORT_DELAY_MS);
561 <        s.release(2);
562 <        s.acquire(2);
563 <        s.release(1);
564 <        t.join();
565 <    }
566 <
567 <    /**
568 <     * release(n) in one thread enables acquire(n) in another thread
569 <     */
570 <    public void testAcquireReleaseNInDifferentThreads_fair2()
571 <        throws InterruptedException {
572 <        final Semaphore s = new Semaphore(0, true);
573 <        Thread t = new Thread(new CheckedRunnable() {
574 <            public void realRun() throws InterruptedException {
575 <                s.acquire(2);
576 <                s.acquire(2);
577 <                s.release(4);
593 >    public void testFairLocksFifo() {
594 >        final PublicSemaphore s = new PublicSemaphore(1, true);
595 >        final CountDownLatch pleaseRelease = new CountDownLatch(1);
596 >        Thread t1 = newStartedThread(new CheckedRunnable() {
597 >            public void realRun() throws InterruptedException {
598 >                // Will block; permits are available, but not three
599 >                s.acquire(3);
600              }});
601  
602 <        t.start();
581 <        Thread.sleep(SHORT_DELAY_MS);
582 <        s.release(6);
583 <        s.acquire(2);
584 <        s.acquire(2);
585 <        s.release(2);
586 <        t.join();
587 <    }
588 <
589 <
590 <    /**
591 <     * release in one thread enables timed acquire in another thread
592 <     */
593 <    public void testTimedAcquireReleaseInDifferentThreads_fair()
594 <        throws InterruptedException {
595 <        final Semaphore s = new Semaphore(1, true);
596 <        Thread t = new Thread(new CheckedRunnable() {
597 <            public void realRun() throws InterruptedException {
598 <                threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
599 <                threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
600 <                threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
601 <                threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
602 <                threadAssertTrue(s.tryAcquire(SHORT_DELAY_MS, MILLISECONDS));
603 <            }});
602 >        waitForQueuedThread(s, t1);
603  
604 <        t.start();
605 <        s.release();
606 <        s.release();
607 <        s.release();
608 <        s.release();
609 <        s.release();
610 <        t.join();
612 <    }
604 >        Thread t2 = newStartedThread(new CheckedRunnable() {
605 >            public void realRun() throws InterruptedException {
606 >                // Will fail, even though 1 permit is available
607 >                assertFalse(
608 >                    s.tryAcquire(randomExpiredTimeout(), randomTimeUnit()));
609 >                assertFalse(
610 >                    s.tryAcquire(1, randomExpiredTimeout(), randomTimeUnit()));
611  
612 <    /**
613 <     * release(n) in one thread enables timed acquire(n) in another thread
616 <     */
617 <    public void testTimedAcquireReleaseNInDifferentThreads_fair()
618 <        throws InterruptedException {
619 <        final Semaphore s = new Semaphore(2, true);
620 <        Thread t = new Thread(new CheckedRunnable() {
621 <            public void realRun() throws InterruptedException {
622 <                threadAssertTrue(s.tryAcquire(2, SHORT_DELAY_MS, MILLISECONDS));
612 >                // untimed tryAcquire will barge and succeed
613 >                assertTrue(s.tryAcquire());
614                  s.release(2);
615 <                threadAssertTrue(s.tryAcquire(2, SHORT_DELAY_MS, MILLISECONDS));
616 <                s.release(2);
626 <            }});
627 <
628 <        t.start();
629 <        assertTrue(s.tryAcquire(2, SHORT_DELAY_MS, MILLISECONDS));
630 <        s.release(2);
631 <        assertTrue(s.tryAcquire(2, SHORT_DELAY_MS, MILLISECONDS));
632 <        s.release(2);
633 <        t.join();
634 <    }
615 >                assertTrue(s.tryAcquire(2));
616 >                s.release();
617  
618 <    /**
619 <     * A waiting acquire blocks interruptibly
638 <     */
639 <    public void testAcquire_InterruptedException_fair()
640 <        throws InterruptedException {
641 <        final Semaphore s = new Semaphore(0, true);
642 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
643 <            public void realRun() throws InterruptedException {
618 >                pleaseRelease.countDown();
619 >                // Will queue up behind t1, even though 1 permit is available
620                  s.acquire();
621              }});
622  
623 <        t.start();
624 <        Thread.sleep(SHORT_DELAY_MS);
625 <        t.interrupt();
626 <        t.join();
627 <    }
628 <
629 <    /**
654 <     * A waiting acquire(n) blocks interruptibly
655 <     */
656 <    public void testAcquireN_InterruptedException_fair()
657 <        throws InterruptedException {
658 <        final Semaphore s = new Semaphore(2, true);
659 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
660 <            public void realRun() throws InterruptedException {
661 <                s.acquire(3);
662 <            }});
663 <
664 <        t.start();
665 <        Thread.sleep(SHORT_DELAY_MS);
666 <        t.interrupt();
667 <        t.join();
668 <    }
669 <
670 <    /**
671 <     *  A waiting tryAcquire blocks interruptibly
672 <     */
673 <    public void testTryAcquire_InterruptedException_fair()
674 <        throws InterruptedException {
675 <        final Semaphore s = new Semaphore(0, true);
676 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
677 <            public void realRun() throws InterruptedException {
678 <                s.tryAcquire(MEDIUM_DELAY_MS, MILLISECONDS);
679 <            }});
680 <
681 <        t.start();
682 <        Thread.sleep(SHORT_DELAY_MS);
683 <        t.interrupt();
684 <        t.join();
685 <    }
686 <
687 <    /**
688 <     *  A waiting tryAcquire(n) blocks interruptibly
689 <     */
690 <    public void testTryAcquireN_InterruptedException_fair()
691 <        throws InterruptedException {
692 <        final Semaphore s = new Semaphore(1, true);
693 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
694 <            public void realRun() throws InterruptedException {
695 <                s.tryAcquire(4, MEDIUM_DELAY_MS, MILLISECONDS);
696 <            }});
697 <
698 <        t.start();
699 <        Thread.sleep(SHORT_DELAY_MS);
700 <        t.interrupt();
701 <        t.join();
702 <    }
703 <
704 <    /**
705 <     * getQueueLength reports number of waiting threads
706 <     */
707 <    public void testGetQueueLength_fair() throws InterruptedException {
708 <        final Semaphore lock = new Semaphore(1, true);
709 <        Thread t1 = new Thread(new InterruptedLockRunnable(lock));
710 <        Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
711 <        assertEquals(0, lock.getQueueLength());
712 <        lock.acquireUninterruptibly();
713 <        t1.start();
714 <        Thread.sleep(SHORT_DELAY_MS);
715 <        assertEquals(1, lock.getQueueLength());
716 <        t2.start();
717 <        Thread.sleep(SHORT_DELAY_MS);
718 <        assertEquals(2, lock.getQueueLength());
719 <        t1.interrupt();
720 <        Thread.sleep(SHORT_DELAY_MS);
721 <        assertEquals(1, lock.getQueueLength());
722 <        lock.release();
723 <        Thread.sleep(SHORT_DELAY_MS);
724 <        assertEquals(0, lock.getQueueLength());
725 <        t1.join();
726 <        t2.join();
727 <    }
728 <
729 <
730 <    /**
731 <     * a deserialized serialized semaphore has same number of permits
732 <     */
733 <    public void testSerialization_fair() throws Exception {
734 <        Semaphore l = new Semaphore(3, true);
735 <
736 <        l.acquire();
737 <        l.release();
738 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
739 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
740 <        out.writeObject(l);
741 <        out.close();
742 <
743 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
744 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
745 <        Semaphore r = (Semaphore) in.readObject();
746 <        assertEquals(3, r.availablePermits());
747 <        assertTrue(r.isFair());
748 <        r.acquire();
749 <        r.release();
623 >        await(pleaseRelease);
624 >        waitForQueuedThread(s, t2);
625 >        s.release(2);
626 >        awaitTermination(t1);
627 >        assertTrue(t2.isAlive());
628 >        s.release();
629 >        awaitTermination(t2);
630      }
631  
632      /**
633       * toString indicates current number of permits
634       */
635 <    public void testToString() {
636 <        Semaphore s = new Semaphore(0);
637 <        String us = s.toString();
638 <        assertTrue(us.indexOf("Permits = 0") >= 0);
639 <        s.release();
760 <        String s1 = s.toString();
761 <        assertTrue(s1.indexOf("Permits = 1") >= 0);
635 >    public void testToString()      { testToString(false); }
636 >    public void testToString_fair() { testToString(true); }
637 >    public void testToString(boolean fair) {
638 >        PublicSemaphore s = new PublicSemaphore(0, fair);
639 >        assertTrue(s.toString().contains("Permits = 0"));
640          s.release();
641 <        String s2 = s.toString();
642 <        assertTrue(s2.indexOf("Permits = 2") >= 0);
641 >        assertTrue(s.toString().contains("Permits = 1"));
642 >        s.release(2);
643 >        assertTrue(s.toString().contains("Permits = 3"));
644 >        s.reducePermits(5);
645 >        assertTrue(s.toString().contains("Permits = -2"));
646      }
647  
648   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines