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.28 by jsr166, Thu Oct 28 22:20:47 2010 UTC vs.
Revision 1.69 by jsr166, Wed Jan 27 01:57:24 2021 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines