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.35 by jsr166, Fri May 27 20:07:24 2011 UTC vs.
Revision 1.61 by jsr166, Fri Aug 4 03:30:21 2017 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines