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

Comparing jsr166/src/test/tck/SynchronousQueueTest.java (file contents):
Revision 1.26 by jsr166, Sat Oct 9 19:30:35 2010 UTC vs.
Revision 1.41 by jsr166, Thu Dec 8 19:09:58 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.*;
10 > import java.util.Arrays;
11 > import java.util.ArrayList;
12 > import java.util.Collection;
13 > import java.util.Iterator;
14 > import java.util.NoSuchElementException;
15 > import java.util.Queue;
16 > import java.util.concurrent.BlockingQueue;
17 > import java.util.concurrent.CountDownLatch;
18 > import java.util.concurrent.Executors;
19 > import java.util.concurrent.ExecutorService;
20 > import java.util.concurrent.SynchronousQueue;
21   import static java.util.concurrent.TimeUnit.MILLISECONDS;
13 import java.io.*;
22  
23   public class SynchronousQueueTest extends JSR166TestCase {
24  
# Line 37 | Line 45 | public class SynchronousQueueTest extend
45      }
46  
47      /**
48 <     * A SynchronousQueue is both empty and full
48 >     * Any SynchronousQueue is both empty and full
49       */
50 <    public void testEmptyFull() {
51 <        SynchronousQueue q = new SynchronousQueue();
50 >    public void testEmptyFull()      { testEmptyFull(false); }
51 >    public void testEmptyFull_fair() { testEmptyFull(true); }
52 >    public void testEmptyFull(boolean fair) {
53 >        final SynchronousQueue q = new SynchronousQueue(fair);
54          assertTrue(q.isEmpty());
55          assertEquals(0, q.size());
56          assertEquals(0, q.remainingCapacity());
# Line 48 | Line 58 | public class SynchronousQueueTest extend
58      }
59  
60      /**
51     * A fair SynchronousQueue is both empty and full
52     */
53    public void testFairEmptyFull() {
54        SynchronousQueue q = new SynchronousQueue(true);
55        assertTrue(q.isEmpty());
56        assertEquals(0, q.size());
57        assertEquals(0, q.remainingCapacity());
58        assertFalse(q.offer(zero));
59    }
60
61    /**
62     * offer(null) throws NPE
63     */
64    public void testOfferNull() {
65        try {
66            SynchronousQueue q = new SynchronousQueue();
67            q.offer(null);
68            shouldThrow();
69        } catch (NullPointerException success) {}
70    }
71
72    /**
73     * add(null) throws NPE
74     */
75    public void testAddNull() {
76        try {
77            SynchronousQueue q = new SynchronousQueue();
78            q.add(null);
79            shouldThrow();
80        } catch (NullPointerException success) {}
81    }
82
83    /**
61       * offer fails if no active taker
62       */
63 <    public void testOffer() {
64 <        SynchronousQueue q = new SynchronousQueue();
63 >    public void testOffer()      { testOffer(false); }
64 >    public void testOffer_fair() { testOffer(true); }
65 >    public void testOffer(boolean fair) {
66 >        SynchronousQueue q = new SynchronousQueue(fair);
67          assertFalse(q.offer(one));
68      }
69  
70      /**
71 <     * add throws ISE if no active taker
71 >     * add throws IllegalStateException if no active taker
72       */
73 <    public void testAdd() {
73 >    public void testAdd()      { testAdd(false); }
74 >    public void testAdd_fair() { testAdd(true); }
75 >    public void testAdd(boolean fair) {
76 >        SynchronousQueue q = new SynchronousQueue(fair);
77 >        assertEquals(0, q.remainingCapacity());
78          try {
96            SynchronousQueue q = new SynchronousQueue();
97            assertEquals(0, q.remainingCapacity());
79              q.add(one);
80              shouldThrow();
81          } catch (IllegalStateException success) {}
82      }
83  
84      /**
85 <     * addAll(null) throws NPE
85 >     * addAll(this) throws IllegalArgumentException
86       */
87 <    public void testAddAll1() {
87 >    public void testAddAll_self()      { testAddAll_self(false); }
88 >    public void testAddAll_self_fair() { testAddAll_self(true); }
89 >    public void testAddAll_self(boolean fair) {
90 >        SynchronousQueue q = new SynchronousQueue(fair);
91          try {
108            SynchronousQueue q = new SynchronousQueue();
109            q.addAll(null);
110            shouldThrow();
111        } catch (NullPointerException success) {}
112    }
113
114    /**
115     * addAll(this) throws IAE
116     */
117    public void testAddAllSelf() {
118        try {
119            SynchronousQueue q = new SynchronousQueue();
92              q.addAll(q);
93              shouldThrow();
94          } catch (IllegalArgumentException success) {}
95      }
96  
97      /**
126     * addAll of a collection with null elements throws NPE
127     */
128    public void testAddAll2() {
129        try {
130            SynchronousQueue q = new SynchronousQueue();
131            Integer[] ints = new Integer[1];
132            q.addAll(Arrays.asList(ints));
133            shouldThrow();
134        } catch (NullPointerException success) {}
135    }
136
137    /**
98       * addAll throws ISE if no active taker
99       */
100 <    public void testAddAll4() {
100 >    public void testAddAll_ISE()      { testAddAll_ISE(false); }
101 >    public void testAddAll_ISE_fair() { testAddAll_ISE(true); }
102 >    public void testAddAll_ISE(boolean fair) {
103 >        SynchronousQueue q = new SynchronousQueue(fair);
104 >        Integer[] ints = new Integer[1];
105 >        for (int i = 0; i < ints.length; i++)
106 >            ints[i] = i;
107 >        Collection<Integer> coll = Arrays.asList(ints);
108          try {
109 <            SynchronousQueue q = new SynchronousQueue();
143 <            Integer[] ints = new Integer[1];
144 <            for (int i = 0; i < 1; ++i)
145 <                ints[i] = new Integer(i);
146 <            q.addAll(Arrays.asList(ints));
109 >            q.addAll(coll);
110              shouldThrow();
111          } catch (IllegalStateException success) {}
112      }
113  
114      /**
152     * put(null) throws NPE
153     */
154    public void testPutNull() throws InterruptedException {
155        try {
156            SynchronousQueue q = new SynchronousQueue();
157            q.put(null);
158            shouldThrow();
159        } catch (NullPointerException success) {}
160     }
161
162    /**
115       * put blocks interruptibly if no active taker
116       */
117 <    public void testBlockingPut() throws InterruptedException {
118 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
119 <            public void realRun() throws InterruptedException {
120 <                SynchronousQueue q = new SynchronousQueue();
121 <                q.put(zero);
122 <            }});
171 <
172 <        t.start();
173 <        Thread.sleep(SHORT_DELAY_MS);
174 <        t.interrupt();
175 <        t.join();
176 <    }
177 <
178 <    /**
179 <     * put blocks waiting for take
180 <     */
181 <    public void testPutWithTake() throws InterruptedException {
182 <        final SynchronousQueue q = new SynchronousQueue();
183 <        Thread t = new Thread(new CheckedRunnable() {
117 >    public void testBlockingPut()      { testBlockingPut(false); }
118 >    public void testBlockingPut_fair() { testBlockingPut(true); }
119 >    public void testBlockingPut(boolean fair) {
120 >        final SynchronousQueue q = new SynchronousQueue(fair);
121 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
122 >        Thread t = newStartedThread(new CheckedRunnable() {
123              public void realRun() throws InterruptedException {
124 <                int added = 0;
124 >                Thread.currentThread().interrupt();
125                  try {
126 <                    while (true) {
127 <                        q.put(added);
128 <                        ++added;
129 <                    }
191 <                } catch (InterruptedException success) {
192 <                    assertEquals(1, added);
193 <                }
194 <            }});
195 <
196 <        t.start();
197 <        Thread.sleep(SHORT_DELAY_MS);
198 <        assertEquals(0, q.take());
199 <        Thread.sleep(SHORT_DELAY_MS);
200 <        t.interrupt();
201 <        t.join();
202 <    }
203 <
204 <    /**
205 <     * timed offer times out if elements not taken
206 <     */
207 <    public void testTimedOffer() throws InterruptedException {
208 <        final SynchronousQueue q = new SynchronousQueue();
209 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
210 <            public void realRun() throws InterruptedException {
211 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
212 <                q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
213 <            }});
214 <
215 <        t.start();
216 <        Thread.sleep(SMALL_DELAY_MS);
217 <        t.interrupt();
218 <        t.join();
219 <    }
220 <
126 >                    q.put(99);
127 >                    shouldThrow();
128 >                } catch (InterruptedException success) {}
129 >                assertFalse(Thread.interrupted());
130  
131 <    /**
132 <     * take blocks interruptibly when empty
133 <     */
134 <    public void testTakeFromEmpty() throws InterruptedException {
135 <        final SynchronousQueue q = new SynchronousQueue();
136 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
228 <            public void realRun() throws InterruptedException {
229 <                q.take();
131 >                pleaseInterrupt.countDown();
132 >                try {
133 >                    q.put(99);
134 >                    shouldThrow();
135 >                } catch (InterruptedException success) {}
136 >                assertFalse(Thread.interrupted());
137              }});
138  
139 <        t.start();
140 <        Thread.sleep(SHORT_DELAY_MS);
139 >        await(pleaseInterrupt);
140 >        assertThreadStaysAlive(t);
141          t.interrupt();
142 <        t.join();
142 >        awaitTermination(t);
143 >        assertEquals(0, q.remainingCapacity());
144      }
145  
238
146      /**
147 <     * put blocks interruptibly if no active taker
147 >     * put blocks interruptibly waiting for take
148       */
149 <    public void testFairBlockingPut() throws InterruptedException {
150 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
149 >    public void testPutWithTake()      { testPutWithTake(false); }
150 >    public void testPutWithTake_fair() { testPutWithTake(true); }
151 >    public void testPutWithTake(boolean fair) {
152 >        final SynchronousQueue q = new SynchronousQueue(fair);
153 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
154 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
155 >        Thread t = newStartedThread(new CheckedRunnable() {
156              public void realRun() throws InterruptedException {
157 <                SynchronousQueue q = new SynchronousQueue(true);
158 <                q.put(zero);
247 <            }});
248 <
249 <        t.start();
250 <        Thread.sleep(SHORT_DELAY_MS);
251 <        t.interrupt();
252 <        t.join();
253 <    }
157 >                pleaseTake.countDown();
158 >                q.put(one);
159  
160 <    /**
256 <     * put blocks waiting for take
257 <     */
258 <    public void testFairPutWithTake() throws InterruptedException {
259 <        final SynchronousQueue q = new SynchronousQueue(true);
260 <        Thread t = new Thread(new CheckedRunnable() {
261 <            public void realRun() throws InterruptedException {
262 <                int added = 0;
160 >                pleaseInterrupt.countDown();
161                  try {
162 <                    while (true) {
163 <                        q.put(added);
164 <                        ++added;
165 <                    }
268 <                } catch (InterruptedException success) {
269 <                    assertEquals(1, added);
270 <                }
162 >                    q.put(99);
163 >                    shouldThrow();
164 >                } catch (InterruptedException success) {}
165 >                assertFalse(Thread.interrupted());
166              }});
167  
168 <        t.start();
169 <        Thread.sleep(SHORT_DELAY_MS);
170 <        assertEquals(0, q.take());
171 <        Thread.sleep(SHORT_DELAY_MS);
277 <        t.interrupt();
278 <        t.join();
279 <    }
280 <
281 <    /**
282 <     * timed offer times out if elements not taken
283 <     */
284 <    public void testFairTimedOffer() throws InterruptedException {
285 <        final SynchronousQueue q = new SynchronousQueue(true);
286 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
287 <            public void realRun() throws InterruptedException {
288 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
289 <                q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
290 <            }});
168 >        await(pleaseTake);
169 >        assertEquals(0, q.remainingCapacity());
170 >        try { assertSame(one, q.take()); }
171 >        catch (InterruptedException e) { threadUnexpectedException(e); }
172  
173 <        t.start();
174 <        Thread.sleep(SMALL_DELAY_MS);
173 >        await(pleaseInterrupt);
174 >        assertThreadStaysAlive(t);
175          t.interrupt();
176 <        t.join();
176 >        awaitTermination(t);
177 >        assertEquals(0, q.remainingCapacity());
178      }
179  
298
180      /**
181 <     * take blocks interruptibly when empty
181 >     * timed offer times out if elements not taken
182       */
183 <    public void testFairTakeFromEmpty() throws InterruptedException {
184 <        final SynchronousQueue q = new SynchronousQueue(true);
185 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
186 <            public void realRun() throws InterruptedException {
187 <                q.take();
183 >    public void testTimedOffer()      { testTimedOffer(false); }
184 >    public void testTimedOffer_fair() { testTimedOffer(true); }
185 >    public void testTimedOffer(boolean fair) {
186 >        final SynchronousQueue q = new SynchronousQueue(fair);
187 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
188 >        Thread t = newStartedThread(new CheckedRunnable() {
189 >            public void realRun() throws InterruptedException {
190 >                long startTime = System.nanoTime();
191 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
192 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
193 >                pleaseInterrupt.countDown();
194 >                try {
195 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
196 >                    shouldThrow();
197 >                } catch (InterruptedException success) {}
198              }});
199  
200 <        t.start();
201 <        Thread.sleep(SHORT_DELAY_MS);
200 >        await(pleaseInterrupt);
201 >        assertThreadStaysAlive(t);
202          t.interrupt();
203 <        t.join();
203 >        awaitTermination(t);
204      }
205  
206      /**
207 <     * poll fails unless active taker
207 >     * poll return null if no active putter
208       */
209 <    public void testPoll() {
210 <        SynchronousQueue q = new SynchronousQueue();
209 >    public void testPoll()      { testPoll(false); }
210 >    public void testPoll_fair() { testPoll(true); }
211 >    public void testPoll(boolean fair) {
212 >        final SynchronousQueue q = new SynchronousQueue(fair);
213          assertNull(q.poll());
214      }
215  
216      /**
217 <     * timed pool with zero timeout times out if no active taker
217 >     * timed poll with zero timeout times out if no active putter
218       */
219 <    public void testTimedPoll0() throws InterruptedException {
220 <        SynchronousQueue q = new SynchronousQueue();
221 <        assertNull(q.poll(0, MILLISECONDS));
219 >    public void testTimedPoll0()      { testTimedPoll0(false); }
220 >    public void testTimedPoll0_fair() { testTimedPoll0(true); }
221 >    public void testTimedPoll0(boolean fair) {
222 >        final SynchronousQueue q = new SynchronousQueue(fair);
223 >        try { assertNull(q.poll(0, MILLISECONDS)); }
224 >        catch (InterruptedException e) { threadUnexpectedException(e); }
225      }
226  
227      /**
228 <     * timed pool with nonzero timeout times out if no active taker
228 >     * timed poll with nonzero timeout times out if no active putter
229       */
230 <    public void testTimedPoll() throws InterruptedException {
231 <        SynchronousQueue q = new SynchronousQueue();
232 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
230 >    public void testTimedPoll()      { testTimedPoll(false); }
231 >    public void testTimedPoll_fair() { testTimedPoll(true); }
232 >    public void testTimedPoll(boolean fair) {
233 >        final SynchronousQueue q = new SynchronousQueue(fair);
234 >        long startTime = System.nanoTime();
235 >        try { assertNull(q.poll(timeoutMillis(), MILLISECONDS)); }
236 >        catch (InterruptedException e) { threadUnexpectedException(e); }
237 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
238      }
239  
240      /**
241 <     * Interrupted timed poll throws InterruptedException instead of
242 <     * returning timeout status
241 >     * timed poll before a delayed offer times out, returning null;
242 >     * after offer succeeds; on interruption throws
243       */
244 <    public void testInterruptedTimedPoll() throws InterruptedException {
245 <        final SynchronousQueue q = new SynchronousQueue();
246 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
244 >    public void testTimedPollWithOffer()      { testTimedPollWithOffer(false); }
245 >    public void testTimedPollWithOffer_fair() { testTimedPollWithOffer(true); }
246 >    public void testTimedPollWithOffer(boolean fair) {
247 >        final SynchronousQueue q = new SynchronousQueue(fair);
248 >        final CountDownLatch pleaseOffer = new CountDownLatch(1);
249 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
250 >        Thread t = newStartedThread(new CheckedRunnable() {
251              public void realRun() throws InterruptedException {
252 <                q.poll(SMALL_DELAY_MS, MILLISECONDS);
253 <            }});
254 <
350 <        t.start();
351 <        Thread.sleep(SHORT_DELAY_MS);
352 <        t.interrupt();
353 <        t.join();
354 <    }
252 >                long startTime = System.nanoTime();
253 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
254 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
255  
256 <    /**
257 <     * Interrupted timed poll throws InterruptedException instead of
258 <     * returning timeout status
259 <     */
360 <    public void testFairInterruptedTimedPoll() throws InterruptedException {
361 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
362 <            public void realRun() throws InterruptedException {
363 <                SynchronousQueue q = new SynchronousQueue(true);
364 <                q.poll(SMALL_DELAY_MS, MILLISECONDS);
365 <            }});
256 >                pleaseOffer.countDown();
257 >                startTime = System.nanoTime();
258 >                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
259 >                assertTrue(millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
260  
261 <        t.start();
262 <        Thread.sleep(SHORT_DELAY_MS);
263 <        t.interrupt();
264 <        t.join();
265 <    }
261 >                Thread.currentThread().interrupt();
262 >                try {
263 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
264 >                    shouldThrow();
265 >                } catch (InterruptedException success) {}
266 >                assertFalse(Thread.interrupted());
267  
268 <    /**
374 <     * timed poll before a delayed offer fails; after offer succeeds;
375 <     * on interruption throws
376 <     */
377 <    public void testFairTimedPollWithOffer() throws InterruptedException {
378 <        final SynchronousQueue q = new SynchronousQueue(true);
379 <        Thread t = new Thread(new CheckedRunnable() {
380 <            public void realRun() throws InterruptedException {
268 >                pleaseInterrupt.countDown();
269                  try {
382                    assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
383                    assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
270                      q.poll(LONG_DELAY_MS, MILLISECONDS);
271 <                    threadShouldThrow();
271 >                    shouldThrow();
272                  } catch (InterruptedException success) {}
273 +                assertFalse(Thread.interrupted());
274              }});
275  
276 <        t.start();
277 <        Thread.sleep(SMALL_DELAY_MS);
278 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
276 >        await(pleaseOffer);
277 >        long startTime = System.nanoTime();
278 >        try { assertTrue(q.offer(zero, LONG_DELAY_MS, MILLISECONDS)); }
279 >        catch (InterruptedException e) { threadUnexpectedException(e); }
280 >        assertTrue(millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
281 >
282 >        await(pleaseInterrupt);
283 >        assertThreadStaysAlive(t);
284          t.interrupt();
285 <        t.join();
285 >        awaitTermination(t);
286      }
287  
396
288      /**
289 <     * peek returns null
289 >     * peek() returns null if no active putter
290       */
291 <    public void testPeek() {
292 <        SynchronousQueue q = new SynchronousQueue();
291 >    public void testPeek()      { testPeek(false); }
292 >    public void testPeek_fair() { testPeek(true); }
293 >    public void testPeek(boolean fair) {
294 >        final SynchronousQueue q = new SynchronousQueue(fair);
295          assertNull(q.peek());
296      }
297  
298      /**
299 <     * element throws NSEE
299 >     * element() throws NoSuchElementException if no active putter
300       */
301 <    public void testElement() {
302 <        SynchronousQueue q = new SynchronousQueue();
301 >    public void testElement()      { testElement(false); }
302 >    public void testElement_fair() { testElement(true); }
303 >    public void testElement(boolean fair) {
304 >        final SynchronousQueue q = new SynchronousQueue(fair);
305          try {
306              q.element();
307              shouldThrow();
# Line 414 | Line 309 | public class SynchronousQueueTest extend
309      }
310  
311      /**
312 <     * remove throws NSEE if no active taker
312 >     * remove() throws NoSuchElementException if no active putter
313       */
314 <    public void testRemove() {
315 <        SynchronousQueue q = new SynchronousQueue();
314 >    public void testRemove()      { testRemove(false); }
315 >    public void testRemove_fair() { testRemove(true); }
316 >    public void testRemove(boolean fair) {
317 >        final SynchronousQueue q = new SynchronousQueue(fair);
318          try {
319              q.remove();
320              shouldThrow();
# Line 425 | Line 322 | public class SynchronousQueueTest extend
322      }
323  
324      /**
428     * remove(x) returns false
429     */
430    public void testRemoveElement() {
431        SynchronousQueue q = new SynchronousQueue();
432        assertFalse(q.remove(zero));
433        assertTrue(q.isEmpty());
434    }
435
436    /**
325       * contains returns false
326       */
327 <    public void testContains() {
328 <        SynchronousQueue q = new SynchronousQueue();
327 >    public void testContains()      { testContains(false); }
328 >    public void testContains_fair() { testContains(true); }
329 >    public void testContains(boolean fair) {
330 >        final SynchronousQueue q = new SynchronousQueue(fair);
331          assertFalse(q.contains(zero));
332      }
333  
334      /**
335       * clear ensures isEmpty
336       */
337 <    public void testClear() {
338 <        SynchronousQueue q = new SynchronousQueue();
337 >    public void testClear()      { testClear(false); }
338 >    public void testClear_fair() { testClear(true); }
339 >    public void testClear(boolean fair) {
340 >        final SynchronousQueue q = new SynchronousQueue(fair);
341          q.clear();
342          assertTrue(q.isEmpty());
343      }
# Line 453 | Line 345 | public class SynchronousQueueTest extend
345      /**
346       * containsAll returns false unless empty
347       */
348 <    public void testContainsAll() {
349 <        SynchronousQueue q = new SynchronousQueue();
348 >    public void testContainsAll()      { testContainsAll(false); }
349 >    public void testContainsAll_fair() { testContainsAll(true); }
350 >    public void testContainsAll(boolean fair) {
351 >        final SynchronousQueue q = new SynchronousQueue(fair);
352          Integer[] empty = new Integer[0];
353          assertTrue(q.containsAll(Arrays.asList(empty)));
354          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 464 | Line 358 | public class SynchronousQueueTest extend
358      /**
359       * retainAll returns false
360       */
361 <    public void testRetainAll() {
362 <        SynchronousQueue q = new SynchronousQueue();
361 >    public void testRetainAll()      { testRetainAll(false); }
362 >    public void testRetainAll_fair() { testRetainAll(true); }
363 >    public void testRetainAll(boolean fair) {
364 >        final SynchronousQueue q = new SynchronousQueue(fair);
365          Integer[] empty = new Integer[0];
366          assertFalse(q.retainAll(Arrays.asList(empty)));
367          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 475 | Line 371 | public class SynchronousQueueTest extend
371      /**
372       * removeAll returns false
373       */
374 <    public void testRemoveAll() {
375 <        SynchronousQueue q = new SynchronousQueue();
374 >    public void testRemoveAll()      { testRemoveAll(false); }
375 >    public void testRemoveAll_fair() { testRemoveAll(true); }
376 >    public void testRemoveAll(boolean fair) {
377 >        final SynchronousQueue q = new SynchronousQueue(fair);
378          Integer[] empty = new Integer[0];
379          assertFalse(q.removeAll(Arrays.asList(empty)));
380          Integer[] ints = new Integer[1]; ints[0] = zero;
381          assertFalse(q.containsAll(Arrays.asList(ints)));
382      }
383  
486
384      /**
385       * toArray is empty
386       */
387 <    public void testToArray() {
388 <        SynchronousQueue q = new SynchronousQueue();
387 >    public void testToArray()      { testToArray(false); }
388 >    public void testToArray_fair() { testToArray(true); }
389 >    public void testToArray(boolean fair) {
390 >        final SynchronousQueue q = new SynchronousQueue(fair);
391          Object[] o = q.toArray();
392 <        assertEquals(o.length, 0);
392 >        assertEquals(0, o.length);
393      }
394  
395      /**
396 <     * toArray(a) is nulled at position 0
396 >     * toArray(Integer array) returns its argument with the first
397 >     * element (if present) nulled out
398       */
399 <    public void testToArray2() {
400 <        SynchronousQueue q = new SynchronousQueue();
401 <        Integer[] ints = new Integer[1];
402 <        assertNull(ints[0]);
399 >    public void testToArray2()      { testToArray2(false); }
400 >    public void testToArray2_fair() { testToArray2(true); }
401 >    public void testToArray2(boolean fair) {
402 >        final SynchronousQueue<Integer> q
403 >            = new SynchronousQueue<Integer>(fair);
404 >        Integer[] a;
405 >
406 >        a = new Integer[0];
407 >        assertSame(a, q.toArray(a));
408 >
409 >        a = new Integer[3];
410 >        Arrays.fill(a, 42);
411 >        assertSame(a, q.toArray(a));
412 >        assertNull(a[0]);
413 >        for (int i = 1; i < a.length; i++)
414 >            assertEquals(42, (int) a[i]);
415      }
416  
417      /**
418       * toArray(null) throws NPE
419       */
420 <    public void testToArray_BadArg() {
421 <        SynchronousQueue q = new SynchronousQueue();
420 >    public void testToArray_null()      { testToArray_null(false); }
421 >    public void testToArray_null_fair() { testToArray_null(true); }
422 >    public void testToArray_null(boolean fair) {
423 >        final SynchronousQueue q = new SynchronousQueue(fair);
424          try {
425              Object o[] = q.toArray(null);
426              shouldThrow();
427          } catch (NullPointerException success) {}
428      }
429  
516
430      /**
431       * iterator does not traverse any elements
432       */
433 <    public void testIterator() {
434 <        SynchronousQueue q = new SynchronousQueue();
433 >    public void testIterator()      { testIterator(false); }
434 >    public void testIterator_fair() { testIterator(true); }
435 >    public void testIterator(boolean fair) {
436 >        final SynchronousQueue q = new SynchronousQueue(fair);
437          Iterator it = q.iterator();
438          assertFalse(it.hasNext());
439          try {
# Line 530 | Line 445 | public class SynchronousQueueTest extend
445      /**
446       * iterator remove throws ISE
447       */
448 <    public void testIteratorRemove() {
449 <        SynchronousQueue q = new SynchronousQueue();
448 >    public void testIteratorRemove()      { testIteratorRemove(false); }
449 >    public void testIteratorRemove_fair() { testIteratorRemove(true); }
450 >    public void testIteratorRemove(boolean fair) {
451 >        final SynchronousQueue q = new SynchronousQueue(fair);
452          Iterator it = q.iterator();
453          try {
454              it.remove();
# Line 542 | Line 459 | public class SynchronousQueueTest extend
459      /**
460       * toString returns a non-null string
461       */
462 <    public void testToString() {
463 <        SynchronousQueue q = new SynchronousQueue();
462 >    public void testToString()      { testToString(false); }
463 >    public void testToString_fair() { testToString(true); }
464 >    public void testToString(boolean fair) {
465 >        final SynchronousQueue q = new SynchronousQueue(fair);
466          String s = q.toString();
467          assertNotNull(s);
468      }
469  
551
470      /**
471       * offer transfers elements across Executor tasks
472       */
473 <    public void testOfferInExecutor() {
474 <        final SynchronousQueue q = new SynchronousQueue();
473 >    public void testOfferInExecutor()      { testOfferInExecutor(false); }
474 >    public void testOfferInExecutor_fair() { testOfferInExecutor(true); }
475 >    public void testOfferInExecutor(boolean fair) {
476 >        final SynchronousQueue q = new SynchronousQueue(fair);
477          ExecutorService executor = Executors.newFixedThreadPool(2);
478 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
479  
480          executor.execute(new CheckedRunnable() {
481              public void realRun() throws InterruptedException {
482                  assertFalse(q.offer(one));
483 <                assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
483 >                threadsStarted.await();
484 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
485                  assertEquals(0, q.remainingCapacity());
486              }});
487  
488          executor.execute(new CheckedRunnable() {
489              public void realRun() throws InterruptedException {
490 <                Thread.sleep(SMALL_DELAY_MS);
490 >                threadsStarted.await();
491                  assertSame(one, q.take());
492              }});
493  
# Line 573 | Line 495 | public class SynchronousQueueTest extend
495      }
496  
497      /**
498 <     * poll retrieves elements across Executor threads
498 >     * timed poll retrieves elements across Executor threads
499       */
500 <    public void testPollInExecutor() {
501 <        final SynchronousQueue q = new SynchronousQueue();
500 >    public void testPollInExecutor()      { testPollInExecutor(false); }
501 >    public void testPollInExecutor_fair() { testPollInExecutor(true); }
502 >    public void testPollInExecutor(boolean fair) {
503 >        final SynchronousQueue q = new SynchronousQueue(fair);
504 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
505          ExecutorService executor = Executors.newFixedThreadPool(2);
506          executor.execute(new CheckedRunnable() {
507              public void realRun() throws InterruptedException {
508                  assertNull(q.poll());
509 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
509 >                threadsStarted.await();
510 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
511                  assertTrue(q.isEmpty());
512              }});
513  
514          executor.execute(new CheckedRunnable() {
515              public void realRun() throws InterruptedException {
516 <                Thread.sleep(SHORT_DELAY_MS);
516 >                threadsStarted.await();
517                  q.put(one);
518              }});
519  
# Line 597 | Line 523 | public class SynchronousQueueTest extend
523      /**
524       * a deserialized serialized queue is usable
525       */
526 <    public void testSerialization() throws Exception {
527 <        SynchronousQueue q = new SynchronousQueue();
528 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
529 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
530 <        out.writeObject(q);
531 <        out.close();
532 <
533 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
534 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
535 <        SynchronousQueue r = (SynchronousQueue)in.readObject();
536 <        assertEquals(q.size(), r.size());
537 <        while (!q.isEmpty())
538 <            assertEquals(q.remove(), r.remove());
539 <    }
540 <
541 <    /**
616 <     * drainTo(null) throws NPE
617 <     */
618 <    public void testDrainToNull() {
619 <        SynchronousQueue q = new SynchronousQueue();
620 <        try {
621 <            q.drainTo(null);
622 <            shouldThrow();
623 <        } catch (NullPointerException success) {}
624 <    }
625 <
626 <    /**
627 <     * drainTo(this) throws IAE
628 <     */
629 <    public void testDrainToSelf() {
630 <        SynchronousQueue q = new SynchronousQueue();
631 <        try {
632 <            q.drainTo(q);
633 <            shouldThrow();
634 <        } catch (IllegalArgumentException success) {}
526 >    public void testSerialization() {
527 >        final SynchronousQueue x = new SynchronousQueue();
528 >        final SynchronousQueue y = new SynchronousQueue(false);
529 >        final SynchronousQueue z = new SynchronousQueue(true);
530 >        assertSerialEquals(x, y);
531 >        assertNotSerialEquals(x, z);
532 >        SynchronousQueue[] qs = { x, y, z };
533 >        for (SynchronousQueue q : qs) {
534 >            SynchronousQueue clone = serialClone(q);
535 >            assertNotSame(q, clone);
536 >            assertSerialEquals(q, clone);
537 >            assertTrue(clone.isEmpty());
538 >            assertEquals(0, clone.size());
539 >            assertEquals(0, clone.remainingCapacity());
540 >            assertFalse(clone.offer(zero));
541 >        }
542      }
543  
544      /**
545       * drainTo(c) of empty queue doesn't transfer elements
546       */
547 <    public void testDrainTo() {
548 <        SynchronousQueue q = new SynchronousQueue();
547 >    public void testDrainTo()      { testDrainTo(false); }
548 >    public void testDrainTo_fair() { testDrainTo(true); }
549 >    public void testDrainTo(boolean fair) {
550 >        final SynchronousQueue q = new SynchronousQueue(fair);
551          ArrayList l = new ArrayList();
552          q.drainTo(l);
553 <        assertEquals(q.size(), 0);
554 <        assertEquals(l.size(), 0);
553 >        assertEquals(0, q.size());
554 >        assertEquals(0, l.size());
555      }
556  
557      /**
558       * drainTo empties queue, unblocking a waiting put.
559       */
560 <    public void testDrainToWithActivePut() throws InterruptedException {
561 <        final SynchronousQueue q = new SynchronousQueue();
562 <        Thread t = new Thread(new CheckedRunnable() {
560 >    public void testDrainToWithActivePut()      { testDrainToWithActivePut(false); }
561 >    public void testDrainToWithActivePut_fair() { testDrainToWithActivePut(true); }
562 >    public void testDrainToWithActivePut(boolean fair) {
563 >        final SynchronousQueue q = new SynchronousQueue(fair);
564 >        Thread t = newStartedThread(new CheckedRunnable() {
565              public void realRun() throws InterruptedException {
566 <                q.put(new Integer(1));
566 >                q.put(one);
567              }});
568  
658        t.start();
569          ArrayList l = new ArrayList();
570 <        Thread.sleep(SHORT_DELAY_MS);
571 <        q.drainTo(l);
572 <        assertTrue(l.size() <= 1);
573 <        if (l.size() > 0)
574 <            assertEquals(l.get(0), new Integer(1));
575 <        t.join();
576 <        assertTrue(l.size() <= 1);
577 <    }
578 <
579 <    /**
670 <     * drainTo(null, n) throws NPE
671 <     */
672 <    public void testDrainToNullN() {
673 <        SynchronousQueue q = new SynchronousQueue();
674 <        try {
675 <            q.drainTo(null, 0);
676 <            shouldThrow();
677 <        } catch (NullPointerException success) {}
678 <    }
679 <
680 <    /**
681 <     * drainTo(this, n) throws IAE
682 <     */
683 <    public void testDrainToSelfN() {
684 <        SynchronousQueue q = new SynchronousQueue();
685 <        try {
686 <            q.drainTo(q, 0);
687 <            shouldThrow();
688 <        } catch (IllegalArgumentException success) {}
570 >        long startTime = System.nanoTime();
571 >        while (l.isEmpty()) {
572 >            q.drainTo(l);
573 >            if (millisElapsedSince(startTime) > LONG_DELAY_MS)
574 >                fail("timed out");
575 >            Thread.yield();
576 >        }
577 >        assertTrue(l.size() == 1);
578 >        assertSame(one, l.get(0));
579 >        awaitTermination(t);
580      }
581  
582      /**
# Line 693 | Line 584 | public class SynchronousQueueTest extend
584       */
585      public void testDrainToN() throws InterruptedException {
586          final SynchronousQueue q = new SynchronousQueue();
587 <        Thread t1 = new Thread(new CheckedRunnable() {
587 >        Thread t1 = newStartedThread(new CheckedRunnable() {
588              public void realRun() throws InterruptedException {
589                  q.put(one);
590              }});
591  
592 <        Thread t2 = new Thread(new CheckedRunnable() {
592 >        Thread t2 = newStartedThread(new CheckedRunnable() {
593              public void realRun() throws InterruptedException {
594                  q.put(two);
595              }});
596  
706        t1.start();
707        t2.start();
597          ArrayList l = new ArrayList();
598 <        Thread.sleep(SHORT_DELAY_MS);
598 >        delay(SHORT_DELAY_MS);
599          q.drainTo(l, 1);
600          assertEquals(1, l.size());
601          q.drainTo(l, 1);
602          assertEquals(2, l.size());
603          assertTrue(l.contains(one));
604          assertTrue(l.contains(two));
605 <        t1.join();
606 <        t2.join();
605 >        awaitTermination(t1);
606 >        awaitTermination(t2);
607      }
608  
609   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines