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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines