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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines