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.32 by jsr166, Thu Apr 14 22:55:08 2011 UTC vs.
Revision 1.43 by jsr166, Wed Dec 31 16:44:02 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines