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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines