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.58 by jsr166, Sun May 14 04:02:06 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      /**
117     * 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    /**
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();
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 234 | Line 203 | public class SynchronousQueueTest extend
203                      q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
204                      shouldThrow();
205                  } catch (InterruptedException success) {}
206 +                assertFalse(Thread.interrupted());
207              }});
208  
209          await(pleaseInterrupt);
210 <        assertThreadStaysAlive(t);
210 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
211          t.interrupt();
212          awaitTermination(t);
213      }
# Line 245 | Line 215 | public class SynchronousQueueTest extend
215      /**
216       * poll return null if no active putter
217       */
218 <    public void testPoll() {
219 <        SynchronousQueue q = new SynchronousQueue();
218 >    public void testPoll()      { testPoll(false); }
219 >    public void testPoll_fair() { testPoll(true); }
220 >    public void testPoll(boolean fair) {
221 >        final SynchronousQueue q = new SynchronousQueue(fair);
222          assertNull(q.poll());
223      }
224  
225      /**
226       * timed poll with zero timeout times out if no active putter
227       */
228 <    public void testTimedPoll0() throws InterruptedException {
229 <        SynchronousQueue q = new SynchronousQueue();
230 <        assertNull(q.poll(0, MILLISECONDS));
228 >    public void testTimedPoll0()      { testTimedPoll0(false); }
229 >    public void testTimedPoll0_fair() { testTimedPoll0(true); }
230 >    public void testTimedPoll0(boolean fair) {
231 >        final SynchronousQueue q = new SynchronousQueue(fair);
232 >        try { assertNull(q.poll(0, MILLISECONDS)); }
233 >        catch (InterruptedException e) { threadUnexpectedException(e); }
234      }
235  
236      /**
237       * timed poll with nonzero timeout times out if no active putter
238       */
239 <    public void testTimedPoll() throws InterruptedException {
240 <        SynchronousQueue q = new SynchronousQueue();
241 <        long startTime = System.nanoTime();
242 <        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
239 >    public void testTimedPoll() {
240 >        final boolean fair = ThreadLocalRandom.current().nextBoolean();
241 >        final SynchronousQueue q = new SynchronousQueue(fair);
242 >        final long startTime = System.nanoTime();
243 >        try { assertNull(q.poll(timeoutMillis(), MILLISECONDS)); }
244 >        catch (InterruptedException e) { threadUnexpectedException(e); }
245          assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
246      }
247  
# Line 272 | Line 249 | public class SynchronousQueueTest extend
249       * timed poll before a delayed offer times out, returning null;
250       * after offer succeeds; on interruption throws
251       */
252 <    public void testFairTimedPollWithOffer() throws InterruptedException {
253 <        final SynchronousQueue q = new SynchronousQueue(true);
252 >    public void testTimedPollWithOffer() {
253 >        final boolean fair = ThreadLocalRandom.current().nextBoolean();
254 >        final SynchronousQueue q = new SynchronousQueue(fair);
255          final CountDownLatch pleaseOffer = new CountDownLatch(1);
256 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
257          Thread t = newStartedThread(new CheckedRunnable() {
258              public void realRun() throws InterruptedException {
259 <                long t0 = System.nanoTime();
260 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
261 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
259 >                long startTime = System.nanoTime();
260 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
261 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
262  
263                  pleaseOffer.countDown();
264 <                t0 = System.nanoTime();
264 >                startTime = System.nanoTime();
265                  assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
287                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
266  
267 <                t0 = System.nanoTime();
267 >                Thread.currentThread().interrupt();
268 >                try {
269 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
270 >                    shouldThrow();
271 >                } catch (InterruptedException success) {}
272 >                assertFalse(Thread.interrupted());
273 >
274 >                pleaseInterrupt.countDown();
275                  try {
276                      q.poll(LONG_DELAY_MS, MILLISECONDS);
277                      shouldThrow();
278                  } catch (InterruptedException success) {}
279 <                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
279 >                assertFalse(Thread.interrupted());
280 >
281 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
282              }});
283  
284 <        assertTrue(pleaseOffer.await(MEDIUM_DELAY_MS, MILLISECONDS));
285 <        long t0 = System.nanoTime();
286 <        assertTrue(q.offer(zero, LONG_DELAY_MS, MILLISECONDS));
287 <        assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
284 >        await(pleaseOffer);
285 >        long startTime = System.nanoTime();
286 >        try { assertTrue(q.offer(zero, LONG_DELAY_MS, MILLISECONDS)); }
287 >        catch (InterruptedException e) { threadUnexpectedException(e); }
288 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
289  
290 +        await(pleaseInterrupt);
291 +        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
292          t.interrupt();
293 <        awaitTermination(t, MEDIUM_DELAY_MS);
293 >        awaitTermination(t);
294      }
295  
296      /**
297       * peek() returns null if no active putter
298       */
299 <    public void testPeek() {
300 <        SynchronousQueue q = new SynchronousQueue();
299 >    public void testPeek()      { testPeek(false); }
300 >    public void testPeek_fair() { testPeek(true); }
301 >    public void testPeek(boolean fair) {
302 >        final SynchronousQueue q = new SynchronousQueue(fair);
303          assertNull(q.peek());
304      }
305  
306      /**
307 <     * element() throws NSEE if no active putter
307 >     * element() throws NoSuchElementException if no active putter
308       */
309 <    public void testElement() {
310 <        SynchronousQueue q = new SynchronousQueue();
309 >    public void testElement()      { testElement(false); }
310 >    public void testElement_fair() { testElement(true); }
311 >    public void testElement(boolean fair) {
312 >        final SynchronousQueue q = new SynchronousQueue(fair);
313          try {
314              q.element();
315              shouldThrow();
# Line 323 | Line 317 | public class SynchronousQueueTest extend
317      }
318  
319      /**
320 <     * remove() throws NSEE if no active putter
320 >     * remove() throws NoSuchElementException if no active putter
321       */
322 <    public void testRemove() {
323 <        SynchronousQueue q = new SynchronousQueue();
322 >    public void testRemove()      { testRemove(false); }
323 >    public void testRemove_fair() { testRemove(true); }
324 >    public void testRemove(boolean fair) {
325 >        final SynchronousQueue q = new SynchronousQueue(fair);
326          try {
327              q.remove();
328              shouldThrow();
# Line 334 | Line 330 | public class SynchronousQueueTest extend
330      }
331  
332      /**
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    /**
333       * contains returns false
334       */
335 <    public void testContains() {
336 <        SynchronousQueue q = new SynchronousQueue();
335 >    public void testContains()      { testContains(false); }
336 >    public void testContains_fair() { testContains(true); }
337 >    public void testContains(boolean fair) {
338 >        final SynchronousQueue q = new SynchronousQueue(fair);
339          assertFalse(q.contains(zero));
340      }
341  
342      /**
343       * clear ensures isEmpty
344       */
345 <    public void testClear() {
346 <        SynchronousQueue q = new SynchronousQueue();
345 >    public void testClear()      { testClear(false); }
346 >    public void testClear_fair() { testClear(true); }
347 >    public void testClear(boolean fair) {
348 >        final SynchronousQueue q = new SynchronousQueue(fair);
349          q.clear();
350          assertTrue(q.isEmpty());
351      }
# Line 362 | Line 353 | public class SynchronousQueueTest extend
353      /**
354       * containsAll returns false unless empty
355       */
356 <    public void testContainsAll() {
357 <        SynchronousQueue q = new SynchronousQueue();
356 >    public void testContainsAll()      { testContainsAll(false); }
357 >    public void testContainsAll_fair() { testContainsAll(true); }
358 >    public void testContainsAll(boolean fair) {
359 >        final SynchronousQueue q = new SynchronousQueue(fair);
360          Integer[] empty = new Integer[0];
361          assertTrue(q.containsAll(Arrays.asList(empty)));
362          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 373 | Line 366 | public class SynchronousQueueTest extend
366      /**
367       * retainAll returns false
368       */
369 <    public void testRetainAll() {
370 <        SynchronousQueue q = new SynchronousQueue();
369 >    public void testRetainAll()      { testRetainAll(false); }
370 >    public void testRetainAll_fair() { testRetainAll(true); }
371 >    public void testRetainAll(boolean fair) {
372 >        final SynchronousQueue q = new SynchronousQueue(fair);
373          Integer[] empty = new Integer[0];
374          assertFalse(q.retainAll(Arrays.asList(empty)));
375          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 384 | Line 379 | public class SynchronousQueueTest extend
379      /**
380       * removeAll returns false
381       */
382 <    public void testRemoveAll() {
383 <        SynchronousQueue q = new SynchronousQueue();
382 >    public void testRemoveAll()      { testRemoveAll(false); }
383 >    public void testRemoveAll_fair() { testRemoveAll(true); }
384 >    public void testRemoveAll(boolean fair) {
385 >        final SynchronousQueue q = new SynchronousQueue(fair);
386          Integer[] empty = new Integer[0];
387          assertFalse(q.removeAll(Arrays.asList(empty)));
388          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 395 | Line 392 | public class SynchronousQueueTest extend
392      /**
393       * toArray is empty
394       */
395 <    public void testToArray() {
396 <        SynchronousQueue q = new SynchronousQueue();
395 >    public void testToArray()      { testToArray(false); }
396 >    public void testToArray_fair() { testToArray(true); }
397 >    public void testToArray(boolean fair) {
398 >        final SynchronousQueue q = new SynchronousQueue(fair);
399          Object[] o = q.toArray();
400 <        assertEquals(o.length, 0);
400 >        assertEquals(0, o.length);
401      }
402  
403      /**
404 <     * toArray(a) is nulled at position 0
404 >     * toArray(Integer array) returns its argument with the first
405 >     * element (if present) nulled out
406       */
407 <    public void testToArray2() {
408 <        SynchronousQueue q = new SynchronousQueue();
409 <        Integer[] ints = new Integer[1];
410 <        assertNull(ints[0]);
407 >    public void testToArray2()      { testToArray2(false); }
408 >    public void testToArray2_fair() { testToArray2(true); }
409 >    public void testToArray2(boolean fair) {
410 >        final SynchronousQueue<Integer> q = new SynchronousQueue<>(fair);
411 >        Integer[] a;
412 >
413 >        a = new Integer[0];
414 >        assertSame(a, q.toArray(a));
415 >
416 >        a = new Integer[3];
417 >        Arrays.fill(a, 42);
418 >        assertSame(a, q.toArray(a));
419 >        assertNull(a[0]);
420 >        for (int i = 1; i < a.length; i++)
421 >            assertEquals(42, (int) a[i]);
422      }
423  
424      /**
425       * toArray(null) throws NPE
426       */
427 <    public void testToArray_BadArg() {
428 <        SynchronousQueue q = new SynchronousQueue();
427 >    public void testToArray_null()      { testToArray_null(false); }
428 >    public void testToArray_null_fair() { testToArray_null(true); }
429 >    public void testToArray_null(boolean fair) {
430 >        final SynchronousQueue q = new SynchronousQueue(fair);
431          try {
432 <            Object o[] = q.toArray(null);
432 >            Object[] o = q.toArray(null);
433              shouldThrow();
434          } catch (NullPointerException success) {}
435      }
# Line 424 | Line 437 | public class SynchronousQueueTest extend
437      /**
438       * iterator does not traverse any elements
439       */
440 <    public void testIterator() {
441 <        SynchronousQueue q = new SynchronousQueue();
442 <        Iterator it = q.iterator();
443 <        assertFalse(it.hasNext());
431 <        try {
432 <            Object x = it.next();
433 <            shouldThrow();
434 <        } catch (NoSuchElementException success) {}
440 >    public void testIterator()      { testIterator(false); }
441 >    public void testIterator_fair() { testIterator(true); }
442 >    public void testIterator(boolean fair) {
443 >        assertIteratorExhausted(new SynchronousQueue(fair).iterator());
444      }
445  
446      /**
447       * iterator remove throws ISE
448       */
449 <    public void testIteratorRemove() {
450 <        SynchronousQueue q = new SynchronousQueue();
449 >    public void testIteratorRemove()      { testIteratorRemove(false); }
450 >    public void testIteratorRemove_fair() { testIteratorRemove(true); }
451 >    public void testIteratorRemove(boolean fair) {
452 >        final SynchronousQueue q = new SynchronousQueue(fair);
453          Iterator it = q.iterator();
454          try {
455              it.remove();
# Line 449 | Line 460 | public class SynchronousQueueTest extend
460      /**
461       * toString returns a non-null string
462       */
463 <    public void testToString() {
464 <        SynchronousQueue q = new SynchronousQueue();
463 >    public void testToString()      { testToString(false); }
464 >    public void testToString_fair() { testToString(true); }
465 >    public void testToString(boolean fair) {
466 >        final SynchronousQueue q = new SynchronousQueue(fair);
467          String s = q.toString();
468          assertNotNull(s);
469      }
# Line 458 | Line 471 | public class SynchronousQueueTest extend
471      /**
472       * offer transfers elements across Executor tasks
473       */
474 <    public void testOfferInExecutor() {
475 <        final SynchronousQueue q = new SynchronousQueue();
476 <        ExecutorService executor = Executors.newFixedThreadPool(2);
474 >    public void testOfferInExecutor()      { testOfferInExecutor(false); }
475 >    public void testOfferInExecutor_fair() { testOfferInExecutor(true); }
476 >    public void testOfferInExecutor(boolean fair) {
477 >        final SynchronousQueue q = new SynchronousQueue(fair);
478          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
479 +        final ExecutorService executor = Executors.newFixedThreadPool(2);
480 +        try (PoolCleaner cleaner = cleaner(executor)) {
481  
482 <        executor.execute(new CheckedRunnable() {
483 <            public void realRun() throws InterruptedException {
484 <                assertFalse(q.offer(one));
485 <                threadsStarted.await();
486 <                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
487 <                assertEquals(0, q.remainingCapacity());
488 <            }});
489 <
490 <        executor.execute(new CheckedRunnable() {
491 <            public void realRun() throws InterruptedException {
492 <                threadsStarted.await();
493 <                assertSame(one, q.take());
494 <            }});
495 <
480 <        joinPool(executor);
482 >            executor.execute(new CheckedRunnable() {
483 >                public void realRun() throws InterruptedException {
484 >                    assertFalse(q.offer(one));
485 >                    threadsStarted.await();
486 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
487 >                    assertEquals(0, q.remainingCapacity());
488 >                }});
489 >
490 >            executor.execute(new CheckedRunnable() {
491 >                public void realRun() throws InterruptedException {
492 >                    threadsStarted.await();
493 >                    assertSame(one, q.take());
494 >                }});
495 >        }
496      }
497  
498      /**
499       * timed poll retrieves elements across Executor threads
500       */
501 <    public void testPollInExecutor() {
502 <        final SynchronousQueue q = new SynchronousQueue();
501 >    public void testPollInExecutor()      { testPollInExecutor(false); }
502 >    public void testPollInExecutor_fair() { testPollInExecutor(true); }
503 >    public void testPollInExecutor(boolean fair) {
504 >        final SynchronousQueue q = new SynchronousQueue(fair);
505          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
506 <        ExecutorService executor = Executors.newFixedThreadPool(2);
507 <        executor.execute(new CheckedRunnable() {
508 <            public void realRun() throws InterruptedException {
509 <                assertNull(q.poll());
510 <                threadsStarted.await();
511 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
512 <                assertTrue(q.isEmpty());
513 <            }});
514 <
515 <        executor.execute(new CheckedRunnable() {
516 <            public void realRun() throws InterruptedException {
517 <                threadsStarted.await();
518 <                q.put(one);
519 <            }});
520 <
521 <        joinPool(executor);
506 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
507 >        try (PoolCleaner cleaner = cleaner(executor)) {
508 >            executor.execute(new CheckedRunnable() {
509 >                public void realRun() throws InterruptedException {
510 >                    assertNull(q.poll());
511 >                    threadsStarted.await();
512 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
513 >                    assertTrue(q.isEmpty());
514 >                }});
515 >
516 >            executor.execute(new CheckedRunnable() {
517 >                public void realRun() throws InterruptedException {
518 >                    threadsStarted.await();
519 >                    q.put(one);
520 >                }});
521 >        }
522      }
523  
524      /**
525       * a deserialized serialized queue is usable
526       */
527 <    public void testSerialization() throws Exception {
528 <        SynchronousQueue q = new SynchronousQueue();
529 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
530 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
531 <        out.writeObject(q);
532 <        out.close();
533 <
534 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
535 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
536 <        SynchronousQueue r = (SynchronousQueue)in.readObject();
537 <        assertEquals(q.size(), r.size());
538 <        while (!q.isEmpty())
539 <            assertEquals(q.remove(), r.remove());
540 <    }
541 <
542 <    /**
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) {}
534 <    }
535 <
536 <    /**
537 <     * drainTo(this) throws IAE
538 <     */
539 <    public void testDrainToSelf() {
540 <        SynchronousQueue q = new SynchronousQueue();
541 <        try {
542 <            q.drainTo(q);
543 <            shouldThrow();
544 <        } catch (IllegalArgumentException success) {}
527 >    public void testSerialization() {
528 >        final SynchronousQueue x = new SynchronousQueue();
529 >        final SynchronousQueue y = new SynchronousQueue(false);
530 >        final SynchronousQueue z = new SynchronousQueue(true);
531 >        assertSerialEquals(x, y);
532 >        assertNotSerialEquals(x, z);
533 >        SynchronousQueue[] qs = { x, y, z };
534 >        for (SynchronousQueue q : qs) {
535 >            SynchronousQueue clone = serialClone(q);
536 >            assertNotSame(q, clone);
537 >            assertSerialEquals(q, clone);
538 >            assertTrue(clone.isEmpty());
539 >            assertEquals(0, clone.size());
540 >            assertEquals(0, clone.remainingCapacity());
541 >            assertFalse(clone.offer(zero));
542 >        }
543      }
544  
545      /**
546       * drainTo(c) of empty queue doesn't transfer elements
547       */
548 <    public void testDrainTo() {
549 <        SynchronousQueue q = new SynchronousQueue();
548 >    public void testDrainTo()      { testDrainTo(false); }
549 >    public void testDrainTo_fair() { testDrainTo(true); }
550 >    public void testDrainTo(boolean fair) {
551 >        final SynchronousQueue q = new SynchronousQueue(fair);
552          ArrayList l = new ArrayList();
553          q.drainTo(l);
554 <        assertEquals(q.size(), 0);
555 <        assertEquals(l.size(), 0);
554 >        assertEquals(0, q.size());
555 >        assertEquals(0, l.size());
556      }
557  
558      /**
559       * drainTo empties queue, unblocking a waiting put.
560       */
561 <    public void testDrainToWithActivePut() throws InterruptedException {
562 <        final SynchronousQueue q = new SynchronousQueue();
561 >    public void testDrainToWithActivePut()      { testDrainToWithActivePut(false); }
562 >    public void testDrainToWithActivePut_fair() { testDrainToWithActivePut(true); }
563 >    public void testDrainToWithActivePut(boolean fair) {
564 >        final SynchronousQueue q = new SynchronousQueue(fair);
565          Thread t = newStartedThread(new CheckedRunnable() {
566              public void realRun() throws InterruptedException {
567                  q.put(one);
# Line 573 | Line 575 | public class SynchronousQueueTest extend
575                  fail("timed out");
576              Thread.yield();
577          }
578 <        assertTrue(l.size() == 1);
578 >        assertEquals(1, l.size());
579          assertSame(one, l.get(0));
580          awaitTermination(t);
581      }
582  
583      /**
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    /**
584       * drainTo(c, n) empties up to n elements of queue into c
585       */
586      public void testDrainToN() throws InterruptedException {
# Line 616 | Line 596 | public class SynchronousQueueTest extend
596              }});
597  
598          ArrayList l = new ArrayList();
599 <        delay(SHORT_DELAY_MS);
600 <        q.drainTo(l, 1);
599 >        int drained;
600 >        while ((drained = q.drainTo(l, 1)) == 0) Thread.yield();
601 >        assertEquals(1, drained);
602          assertEquals(1, l.size());
603 <        q.drainTo(l, 1);
603 >        while ((drained = q.drainTo(l, 1)) == 0) Thread.yield();
604 >        assertEquals(1, drained);
605          assertEquals(2, l.size());
606          assertTrue(l.contains(one));
607          assertTrue(l.contains(two));
# Line 627 | Line 609 | public class SynchronousQueueTest extend
609          awaitTermination(t2);
610      }
611  
612 +    /**
613 +     * remove(null), contains(null) always return false
614 +     */
615 +    public void testNeverContainsNull() {
616 +        Collection<?> q = new SynchronousQueue();
617 +        assertFalse(q.contains(null));
618 +        assertFalse(q.remove(null));
619 +    }
620 +
621   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines