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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines