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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines