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.67 by jsr166, Mon Dec 16 22:55:54 2019 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 q = new SynchronousQueue(fair);
55          assertTrue(q.isEmpty());
56          assertEquals(0, q.size());
57          assertEquals(0, q.remainingCapacity());
# Line 48 | Line 59 | public class SynchronousQueueTest extend
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 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 q = new SynchronousQueue(fair);
78 >        assertEquals(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 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
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 <    /**
138 <     * addAll throws ISE if no active taker
99 >     * addAll throws IllegalStateException if no active taker
100       */
101 <    public void testAddAll4() {
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 q = new SynchronousQueue(fair);
105 >        Integer[] ints = new Integer[1];
106 >        for (int i = 0; i < ints.length; i++)
107 >            ints[i] = i;
108 >        Collection<Integer> coll = Arrays.asList(ints);
109          try {
110 <            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));
110 >            q.addAll(coll);
111              shouldThrow();
112          } catch (IllegalStateException success) {}
113      }
114  
115      /**
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    /**
116       * put blocks interruptibly if no active taker
117       */
118 <    public void testBlockingPut() throws InterruptedException {
119 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
120 <            public void realRun() throws InterruptedException {
121 <                SynchronousQueue q = new SynchronousQueue();
122 <                q.put(zero);
123 <            }});
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() {
118 >    public void testBlockingPut()      { testBlockingPut(false); }
119 >    public void testBlockingPut_fair() { testBlockingPut(true); }
120 >    public void testBlockingPut(boolean fair) {
121 >        final SynchronousQueue q = new SynchronousQueue(fair);
122 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
123 >        Thread t = newStartedThread(new CheckedRunnable() {
124              public void realRun() throws InterruptedException {
125 <                int added = 0;
125 >                Thread.currentThread().interrupt();
126                  try {
127 <                    while (true) {
128 <                        q.put(added);
129 <                        ++added;
130 <                    }
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 <
127 >                    q.put(99);
128 >                    shouldThrow();
129 >                } catch (InterruptedException success) {}
130 >                assertFalse(Thread.interrupted());
131  
132 <    /**
133 <     * take blocks interruptibly when empty
134 <     */
135 <    public void testTakeFromEmpty() throws InterruptedException {
136 <        final SynchronousQueue q = new SynchronousQueue();
137 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
228 <            public void realRun() throws InterruptedException {
229 <                q.take();
132 >                pleaseInterrupt.countDown();
133 >                try {
134 >                    q.put(99);
135 >                    shouldThrow();
136 >                } catch (InterruptedException success) {}
137 >                assertFalse(Thread.interrupted());
138              }});
139  
140 <        t.start();
141 <        Thread.sleep(SHORT_DELAY_MS);
140 >        await(pleaseInterrupt);
141 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
142          t.interrupt();
143 <        t.join();
143 >        awaitTermination(t);
144 >        assertEquals(0, q.remainingCapacity());
145      }
146  
238
147      /**
148 <     * put blocks interruptibly if no active taker
148 >     * put blocks interruptibly waiting for take
149       */
150 <    public void testFairBlockingPut() throws InterruptedException {
151 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
150 >    public void testPutWithTake()      { testPutWithTake(false); }
151 >    public void testPutWithTake_fair() { testPutWithTake(true); }
152 >    public void testPutWithTake(boolean fair) {
153 >        final SynchronousQueue q = new SynchronousQueue(fair);
154 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
155 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
156 >        Thread t = newStartedThread(new CheckedRunnable() {
157              public void realRun() throws InterruptedException {
158 <                SynchronousQueue q = new SynchronousQueue(true);
159 <                q.put(zero);
247 <            }});
158 >                pleaseTake.countDown();
159 >                q.put(one);
160  
161 <        t.start();
162 <        Thread.sleep(SHORT_DELAY_MS);
163 <        t.interrupt();
164 <        t.join();
165 <    }
161 >                Thread.currentThread().interrupt();
162 >                try {
163 >                    q.put(99);
164 >                    shouldThrow();
165 >                } catch (InterruptedException success) {}
166 >                assertFalse(Thread.interrupted());
167  
168 <    /**
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;
168 >                pleaseInterrupt.countDown();
169                  try {
170 <                    while (true) {
171 <                        q.put(added);
172 <                        ++added;
173 <                    }
268 <                } catch (InterruptedException success) {
269 <                    assertEquals(1, added);
270 <                }
170 >                    q.put(99);
171 >                    shouldThrow();
172 >                } catch (InterruptedException success) {}
173 >                assertFalse(Thread.interrupted());
174              }});
175  
176 <        t.start();
177 <        Thread.sleep(SHORT_DELAY_MS);
178 <        assertEquals(0, q.take());
179 <        Thread.sleep(SHORT_DELAY_MS);
176 >        await(pleaseTake);
177 >        assertEquals(0, q.remainingCapacity());
178 >        try { assertSame(one, q.take()); }
179 >        catch (InterruptedException e) { threadUnexpectedException(e); }
180 >
181 >        await(pleaseInterrupt);
182 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
183          t.interrupt();
184 <        t.join();
184 >        awaitTermination(t);
185 >        assertEquals(0, q.remainingCapacity());
186      }
187  
188      /**
189       * timed offer times out if elements not taken
190       */
191 <    public void testFairTimedOffer() throws InterruptedException {
192 <        final SynchronousQueue q = new SynchronousQueue(true);
193 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
191 >    public void testTimedOffer() {
192 >        final boolean fair = randomBoolean();
193 >        final SynchronousQueue q = new SynchronousQueue(fair);
194 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
195 >        Thread t = newStartedThread(new CheckedRunnable() {
196              public void realRun() throws InterruptedException {
197 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
289 <                q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
290 <            }});
197 >                long startTime = System.nanoTime();
198  
199 <        t.start();
200 <        Thread.sleep(SMALL_DELAY_MS);
294 <        t.interrupt();
295 <        t.join();
296 <    }
199 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
200 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
201  
202 +                Thread.currentThread().interrupt();
203 +                try {
204 +                    q.offer(new Object(), randomTimeout(), randomTimeUnit());
205 +                    shouldThrow();
206 +                } catch (InterruptedException success) {}
207 +                assertFalse(Thread.interrupted());
208  
209 <    /**
210 <     * take blocks interruptibly when empty
211 <     */
212 <    public void testFairTakeFromEmpty() throws InterruptedException {
213 <        final SynchronousQueue q = new SynchronousQueue(true);
214 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
305 <            public void realRun() throws InterruptedException {
306 <                q.take();
209 >                pleaseInterrupt.countDown();
210 >                try {
211 >                    q.offer(new Object(), LONGER_DELAY_MS, MILLISECONDS);
212 >                    shouldThrow();
213 >                } catch (InterruptedException success) {}
214 >                assertFalse(Thread.interrupted());
215              }});
216  
217 <        t.start();
218 <        Thread.sleep(SHORT_DELAY_MS);
217 >        await(pleaseInterrupt);
218 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
219          t.interrupt();
220 <        t.join();
220 >        awaitTermination(t);
221      }
222  
223      /**
224 <     * poll fails unless active taker
224 >     * poll return null if no active putter
225       */
226 <    public void testPoll() {
227 <        SynchronousQueue q = new SynchronousQueue();
226 >    public void testPoll()      { testPoll(false); }
227 >    public void testPoll_fair() { testPoll(true); }
228 >    public void testPoll(boolean fair) {
229 >        final SynchronousQueue q = new SynchronousQueue(fair);
230          assertNull(q.poll());
231      }
232  
233      /**
234 <     * timed pool with zero timeout times out if no active taker
234 >     * timed poll with zero timeout times out if no active putter
235       */
236 <    public void testTimedPoll0() throws InterruptedException {
237 <        SynchronousQueue q = new SynchronousQueue();
238 <        assertNull(q.poll(0, MILLISECONDS));
236 >    public void testTimedPoll0()      { testTimedPoll0(false); }
237 >    public void testTimedPoll0_fair() { testTimedPoll0(true); }
238 >    public void testTimedPoll0(boolean fair) {
239 >        final SynchronousQueue q = new SynchronousQueue(fair);
240 >        try { assertNull(q.poll(0, MILLISECONDS)); }
241 >        catch (InterruptedException e) { threadUnexpectedException(e); }
242      }
243  
244      /**
245 <     * timed pool with nonzero timeout times out if no active taker
245 >     * timed poll with nonzero timeout times out if no active putter
246       */
247 <    public void testTimedPoll() throws InterruptedException {
248 <        SynchronousQueue q = new SynchronousQueue();
249 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
247 >    public void testTimedPoll() {
248 >        final boolean fair = randomBoolean();
249 >        final SynchronousQueue q = new SynchronousQueue(fair);
250 >        final long startTime = System.nanoTime();
251 >        try { assertNull(q.poll(timeoutMillis(), MILLISECONDS)); }
252 >        catch (InterruptedException e) { threadUnexpectedException(e); }
253 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
254      }
255  
256      /**
257 <     * Interrupted timed poll throws InterruptedException instead of
258 <     * returning timeout status
257 >     * timed poll before a delayed offer times out, returning null;
258 >     * after offer succeeds; on interruption throws
259       */
260 <    public void testInterruptedTimedPoll() throws InterruptedException {
261 <        final SynchronousQueue q = new SynchronousQueue();
262 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
260 >    public void testTimedPollWithOffer() {
261 >        final boolean fair = randomBoolean();
262 >        final SynchronousQueue q = new SynchronousQueue(fair);
263 >        final CountDownLatch pleaseOffer = new CountDownLatch(1);
264 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
265 >        Thread t = newStartedThread(new CheckedRunnable() {
266              public void realRun() throws InterruptedException {
267 <                q.poll(SMALL_DELAY_MS, MILLISECONDS);
268 <            }});
267 >                long startTime = System.nanoTime();
268 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
269 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
270  
271 <        t.start();
272 <        Thread.sleep(SHORT_DELAY_MS);
273 <        t.interrupt();
353 <        t.join();
354 <    }
271 >                pleaseOffer.countDown();
272 >                startTime = System.nanoTime();
273 >                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
274  
275 <    /**
276 <     * Interrupted timed poll throws InterruptedException instead of
277 <     * returning timeout status
278 <     */
279 <    public void testFairInterruptedTimedPoll() throws InterruptedException {
280 <        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 <            }});
366 <
367 <        t.start();
368 <        Thread.sleep(SHORT_DELAY_MS);
369 <        t.interrupt();
370 <        t.join();
371 <    }
275 >                Thread.currentThread().interrupt();
276 >                try {
277 >                    q.poll(randomTimeout(), randomTimeUnit());
278 >                    shouldThrow();
279 >                } catch (InterruptedException success) {}
280 >                assertFalse(Thread.interrupted());
281  
282 <    /**
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 {
282 >                pleaseInterrupt.countDown();
283                  try {
382                    assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
383                    assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
284                      q.poll(LONG_DELAY_MS, MILLISECONDS);
285 <                    threadShouldThrow();
285 >                    shouldThrow();
286                  } catch (InterruptedException success) {}
287 +                assertFalse(Thread.interrupted());
288 +
289 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
290              }});
291  
292 <        t.start();
293 <        Thread.sleep(SMALL_DELAY_MS);
294 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
292 >        await(pleaseOffer);
293 >        long startTime = System.nanoTime();
294 >        try { assertTrue(q.offer(zero, LONG_DELAY_MS, MILLISECONDS)); }
295 >        catch (InterruptedException e) { threadUnexpectedException(e); }
296 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
297 >
298 >        await(pleaseInterrupt);
299 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
300          t.interrupt();
301 <        t.join();
301 >        awaitTermination(t);
302      }
303  
396
304      /**
305 <     * peek returns null
305 >     * peek() returns null if no active putter
306       */
307 <    public void testPeek() {
308 <        SynchronousQueue q = new SynchronousQueue();
307 >    public void testPeek()      { testPeek(false); }
308 >    public void testPeek_fair() { testPeek(true); }
309 >    public void testPeek(boolean fair) {
310 >        final SynchronousQueue q = new SynchronousQueue(fair);
311          assertNull(q.peek());
312      }
313  
314      /**
315 <     * element throws NSEE
315 >     * element() throws NoSuchElementException if no active putter
316       */
317 <    public void testElement() {
318 <        SynchronousQueue q = new SynchronousQueue();
317 >    public void testElement()      { testElement(false); }
318 >    public void testElement_fair() { testElement(true); }
319 >    public void testElement(boolean fair) {
320 >        final SynchronousQueue q = new SynchronousQueue(fair);
321          try {
322              q.element();
323              shouldThrow();
# Line 414 | Line 325 | public class SynchronousQueueTest extend
325      }
326  
327      /**
328 <     * remove throws NSEE if no active taker
328 >     * remove() throws NoSuchElementException if no active putter
329       */
330 <    public void testRemove() {
331 <        SynchronousQueue q = new SynchronousQueue();
330 >    public void testRemove()      { testRemove(false); }
331 >    public void testRemove_fair() { testRemove(true); }
332 >    public void testRemove(boolean fair) {
333 >        final SynchronousQueue q = new SynchronousQueue(fair);
334          try {
335              q.remove();
336              shouldThrow();
# Line 425 | Line 338 | public class SynchronousQueueTest extend
338      }
339  
340      /**
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    /**
341       * contains returns false
342       */
343 <    public void testContains() {
344 <        SynchronousQueue q = new SynchronousQueue();
343 >    public void testContains()      { testContains(false); }
344 >    public void testContains_fair() { testContains(true); }
345 >    public void testContains(boolean fair) {
346 >        final SynchronousQueue q = new SynchronousQueue(fair);
347          assertFalse(q.contains(zero));
348      }
349  
350      /**
351       * clear ensures isEmpty
352       */
353 <    public void testClear() {
354 <        SynchronousQueue q = new SynchronousQueue();
353 >    public void testClear()      { testClear(false); }
354 >    public void testClear_fair() { testClear(true); }
355 >    public void testClear(boolean fair) {
356 >        final SynchronousQueue q = new SynchronousQueue(fair);
357          q.clear();
358          assertTrue(q.isEmpty());
359      }
# Line 453 | Line 361 | public class SynchronousQueueTest extend
361      /**
362       * containsAll returns false unless empty
363       */
364 <    public void testContainsAll() {
365 <        SynchronousQueue q = new SynchronousQueue();
364 >    public void testContainsAll()      { testContainsAll(false); }
365 >    public void testContainsAll_fair() { testContainsAll(true); }
366 >    public void testContainsAll(boolean fair) {
367 >        final SynchronousQueue q = new SynchronousQueue(fair);
368          Integer[] empty = new Integer[0];
369          assertTrue(q.containsAll(Arrays.asList(empty)));
370          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 464 | Line 374 | public class SynchronousQueueTest extend
374      /**
375       * retainAll returns false
376       */
377 <    public void testRetainAll() {
378 <        SynchronousQueue q = new SynchronousQueue();
377 >    public void testRetainAll()      { testRetainAll(false); }
378 >    public void testRetainAll_fair() { testRetainAll(true); }
379 >    public void testRetainAll(boolean fair) {
380 >        final SynchronousQueue q = new SynchronousQueue(fair);
381          Integer[] empty = new Integer[0];
382          assertFalse(q.retainAll(Arrays.asList(empty)));
383          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 475 | Line 387 | public class SynchronousQueueTest extend
387      /**
388       * removeAll returns false
389       */
390 <    public void testRemoveAll() {
391 <        SynchronousQueue q = new SynchronousQueue();
390 >    public void testRemoveAll()      { testRemoveAll(false); }
391 >    public void testRemoveAll_fair() { testRemoveAll(true); }
392 >    public void testRemoveAll(boolean fair) {
393 >        final SynchronousQueue q = new SynchronousQueue(fair);
394          Integer[] empty = new Integer[0];
395          assertFalse(q.removeAll(Arrays.asList(empty)));
396          Integer[] ints = new Integer[1]; ints[0] = zero;
397          assertFalse(q.containsAll(Arrays.asList(ints)));
398      }
399  
486
400      /**
401       * toArray is empty
402       */
403 <    public void testToArray() {
404 <        SynchronousQueue q = new SynchronousQueue();
403 >    public void testToArray()      { testToArray(false); }
404 >    public void testToArray_fair() { testToArray(true); }
405 >    public void testToArray(boolean fair) {
406 >        final SynchronousQueue q = new SynchronousQueue(fair);
407          Object[] o = q.toArray();
408 <        assertEquals(o.length, 0);
408 >        assertEquals(0, o.length);
409      }
410  
411      /**
412 <     * toArray(a) is nulled at position 0
412 >     * toArray(Integer array) returns its argument with the first
413 >     * element (if present) nulled out
414       */
415 <    public void testToArray2() {
416 <        SynchronousQueue q = new SynchronousQueue();
417 <        Integer[] ints = new Integer[1];
418 <        assertNull(ints[0]);
415 >    public void testToArray2()      { testToArray2(false); }
416 >    public void testToArray2_fair() { testToArray2(true); }
417 >    public void testToArray2(boolean fair) {
418 >        final SynchronousQueue<Integer> q = new SynchronousQueue<>(fair);
419 >        Integer[] a;
420 >
421 >        a = new Integer[0];
422 >        assertSame(a, q.toArray(a));
423 >
424 >        a = new Integer[3];
425 >        Arrays.fill(a, 42);
426 >        assertSame(a, q.toArray(a));
427 >        assertNull(a[0]);
428 >        for (int i = 1; i < a.length; i++)
429 >            assertEquals(42, (int) a[i]);
430      }
431  
432      /**
433       * toArray(null) throws NPE
434       */
435 <    public void testToArray_BadArg() {
436 <        SynchronousQueue q = new SynchronousQueue();
435 >    public void testToArray_null()      { testToArray_null(false); }
436 >    public void testToArray_null_fair() { testToArray_null(true); }
437 >    public void testToArray_null(boolean fair) {
438 >        final SynchronousQueue q = new SynchronousQueue(fair);
439          try {
440 <            Object o[] = q.toArray(null);
440 >            Object[] unused = q.toArray((Object[])null);
441              shouldThrow();
442          } catch (NullPointerException success) {}
443      }
444  
516
445      /**
446       * iterator does not traverse any elements
447       */
448 <    public void testIterator() {
449 <        SynchronousQueue q = new SynchronousQueue();
450 <        Iterator it = q.iterator();
451 <        assertFalse(it.hasNext());
524 <        try {
525 <            Object x = it.next();
526 <            shouldThrow();
527 <        } catch (NoSuchElementException success) {}
448 >    public void testIterator()      { testIterator(false); }
449 >    public void testIterator_fair() { testIterator(true); }
450 >    public void testIterator(boolean fair) {
451 >        assertIteratorExhausted(new SynchronousQueue(fair).iterator());
452      }
453  
454      /**
455 <     * iterator remove throws ISE
455 >     * iterator remove throws IllegalStateException
456       */
457 <    public void testIteratorRemove() {
458 <        SynchronousQueue q = new SynchronousQueue();
457 >    public void testIteratorRemove()      { testIteratorRemove(false); }
458 >    public void testIteratorRemove_fair() { testIteratorRemove(true); }
459 >    public void testIteratorRemove(boolean fair) {
460 >        final SynchronousQueue q = new SynchronousQueue(fair);
461          Iterator it = q.iterator();
462          try {
463              it.remove();
# Line 542 | Line 468 | public class SynchronousQueueTest extend
468      /**
469       * toString returns a non-null string
470       */
471 <    public void testToString() {
472 <        SynchronousQueue q = new SynchronousQueue();
471 >    public void testToString()      { testToString(false); }
472 >    public void testToString_fair() { testToString(true); }
473 >    public void testToString(boolean fair) {
474 >        final SynchronousQueue q = new SynchronousQueue(fair);
475          String s = q.toString();
476          assertNotNull(s);
477      }
478  
551
479      /**
480       * offer transfers elements across Executor tasks
481       */
482 <    public void testOfferInExecutor() {
483 <        final SynchronousQueue q = new SynchronousQueue();
484 <        ExecutorService executor = Executors.newFixedThreadPool(2);
485 <
486 <        executor.execute(new CheckedRunnable() {
487 <            public void realRun() throws InterruptedException {
488 <                assertFalse(q.offer(one));
489 <                assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
490 <                assertEquals(0, q.remainingCapacity());
491 <            }});
492 <
493 <        executor.execute(new CheckedRunnable() {
494 <            public void realRun() throws InterruptedException {
495 <                Thread.sleep(SMALL_DELAY_MS);
496 <                assertSame(one, q.take());
497 <            }});
498 <
499 <        joinPool(executor);
500 <    }
501 <
502 <    /**
503 <     * poll retrieves elements across Executor threads
577 <     */
578 <    public void testPollInExecutor() {
579 <        final SynchronousQueue q = new SynchronousQueue();
580 <        ExecutorService executor = Executors.newFixedThreadPool(2);
581 <        executor.execute(new CheckedRunnable() {
582 <            public void realRun() throws InterruptedException {
583 <                assertNull(q.poll());
584 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
585 <                assertTrue(q.isEmpty());
586 <            }});
587 <
588 <        executor.execute(new CheckedRunnable() {
589 <            public void realRun() throws InterruptedException {
590 <                Thread.sleep(SHORT_DELAY_MS);
591 <                q.put(one);
592 <            }});
593 <
594 <        joinPool(executor);
595 <    }
596 <
597 <    /**
598 <     * a deserialized serialized queue is usable
599 <     */
600 <    public void testSerialization() throws Exception {
601 <        SynchronousQueue q = new SynchronousQueue();
602 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
603 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
604 <        out.writeObject(q);
605 <        out.close();
606 <
607 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
608 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
609 <        SynchronousQueue r = (SynchronousQueue)in.readObject();
610 <        assertEquals(q.size(), r.size());
611 <        while (!q.isEmpty())
612 <            assertEquals(q.remove(), r.remove());
482 >    public void testOfferInExecutor()      { testOfferInExecutor(false); }
483 >    public void testOfferInExecutor_fair() { testOfferInExecutor(true); }
484 >    public void testOfferInExecutor(boolean fair) {
485 >        final SynchronousQueue q = new SynchronousQueue(fair);
486 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
487 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
488 >        try (PoolCleaner cleaner = cleaner(executor)) {
489 >
490 >            executor.execute(new CheckedRunnable() {
491 >                public void realRun() throws InterruptedException {
492 >                    assertFalse(q.offer(one));
493 >                    threadsStarted.await();
494 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
495 >                    assertEquals(0, q.remainingCapacity());
496 >                }});
497 >
498 >            executor.execute(new CheckedRunnable() {
499 >                public void realRun() throws InterruptedException {
500 >                    threadsStarted.await();
501 >                    assertSame(one, q.take());
502 >                }});
503 >        }
504      }
505  
506      /**
507 <     * drainTo(null) throws NPE
507 >     * timed poll retrieves elements across Executor threads
508       */
509 <    public void testDrainToNull() {
510 <        SynchronousQueue q = new SynchronousQueue();
511 <        try {
512 <            q.drainTo(null);
513 <            shouldThrow();
514 <        } catch (NullPointerException success) {}
509 >    public void testPollInExecutor()      { testPollInExecutor(false); }
510 >    public void testPollInExecutor_fair() { testPollInExecutor(true); }
511 >    public void testPollInExecutor(boolean fair) {
512 >        final SynchronousQueue q = new SynchronousQueue(fair);
513 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
514 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
515 >        try (PoolCleaner cleaner = cleaner(executor)) {
516 >            executor.execute(new CheckedRunnable() {
517 >                public void realRun() throws InterruptedException {
518 >                    assertNull(q.poll());
519 >                    threadsStarted.await();
520 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
521 >                    assertTrue(q.isEmpty());
522 >                }});
523 >
524 >            executor.execute(new CheckedRunnable() {
525 >                public void realRun() throws InterruptedException {
526 >                    threadsStarted.await();
527 >                    q.put(one);
528 >                }});
529 >        }
530      }
531  
532      /**
533 <     * drainTo(this) throws IAE
533 >     * a deserialized/reserialized queue is usable
534       */
535 <    public void testDrainToSelf() {
536 <        SynchronousQueue q = new SynchronousQueue();
537 <        try {
538 <            q.drainTo(q);
539 <            shouldThrow();
540 <        } catch (IllegalArgumentException success) {}
535 >    public void testSerialization() {
536 >        final SynchronousQueue x = new SynchronousQueue();
537 >        final SynchronousQueue y = new SynchronousQueue(false);
538 >        final SynchronousQueue z = new SynchronousQueue(true);
539 >        assertSerialEquals(x, y);
540 >        assertNotSerialEquals(x, z);
541 >        SynchronousQueue[] qs = { x, y, z };
542 >        for (SynchronousQueue q : qs) {
543 >            SynchronousQueue clone = serialClone(q);
544 >            assertNotSame(q, clone);
545 >            assertSerialEquals(q, clone);
546 >            assertTrue(clone.isEmpty());
547 >            assertEquals(0, clone.size());
548 >            assertEquals(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();
556 >    public void testDrainTo()      { testDrainTo(false); }
557 >    public void testDrainTo_fair() { testDrainTo(true); }
558 >    public void testDrainTo(boolean fair) {
559 >        final SynchronousQueue q = new SynchronousQueue(fair);
560          ArrayList l = new ArrayList();
561          q.drainTo(l);
562 <        assertEquals(q.size(), 0);
563 <        assertEquals(l.size(), 0);
562 >        assertEquals(0, q.size());
563 >        assertEquals(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 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  
658        t.start();
578          ArrayList l = new ArrayList();
579 <        Thread.sleep(SHORT_DELAY_MS);
580 <        q.drainTo(l);
581 <        assertTrue(l.size() <= 1);
582 <        if (l.size() > 0)
583 <            assertEquals(l.get(0), new Integer(1));
584 <        t.join();
585 <        assertTrue(l.size() <= 1);
586 <    }
587 <
588 <    /**
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) {}
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 >        assertEquals(1, l.size());
587 >        assertSame(one, l.get(0));
588 >        awaitTermination(t);
589      }
590  
591      /**
# Line 693 | Line 593 | public class SynchronousQueueTest extend
593       */
594      public void testDrainToN() throws InterruptedException {
595          final SynchronousQueue q = new SynchronousQueue();
596 <        Thread t1 = new Thread(new CheckedRunnable() {
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  
706        t1.start();
707        t2.start();
606          ArrayList l = new ArrayList();
607 <        Thread.sleep(SHORT_DELAY_MS);
608 <        q.drainTo(l, 1);
607 >        int drained;
608 >        while ((drained = q.drainTo(l, 1)) == 0) Thread.yield();
609 >        assertEquals(1, drained);
610          assertEquals(1, l.size());
611 <        q.drainTo(l, 1);
611 >        while ((drained = q.drainTo(l, 1)) == 0) Thread.yield();
612 >        assertEquals(1, drained);
613          assertEquals(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