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.55 by jsr166, Sat May 13 22:38:09 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 >
22 > import junit.framework.Test;
23  
24   public class SynchronousQueueTest extends JSR166TestCase {
25  
# Line 27 | Line 36 | public class SynchronousQueueTest extend
36      }
37  
38      public static void main(String[] args) {
39 <        junit.textui.TestRunner.run(suite());
39 >        main(suite(), args);
40      }
41  
42      public static Test suite() {
# Line 50 | Line 59 | public class SynchronousQueueTest extend
59      }
60  
61      /**
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    /**
62       * offer fails if no active taker
63       */
64 <    public void testOffer() {
65 <        SynchronousQueue q = new SynchronousQueue();
64 >    public void testOffer()      { testOffer(false); }
65 >    public void testOffer_fair() { testOffer(true); }
66 >    public void testOffer(boolean fair) {
67 >        SynchronousQueue q = new SynchronousQueue(fair);
68          assertFalse(q.offer(one));
69      }
70  
71      /**
72 <     * add throws ISE if no active taker
72 >     * add throws IllegalStateException if no active taker
73       */
74 <    public void testAdd() {
74 >    public void testAdd()      { testAdd(false); }
75 >    public void testAdd_fair() { testAdd(true); }
76 >    public void testAdd(boolean fair) {
77 >        SynchronousQueue q = new SynchronousQueue(fair);
78 >        assertEquals(0, q.remainingCapacity());
79          try {
87            SynchronousQueue q = new SynchronousQueue();
88            assertEquals(0, q.remainingCapacity());
80              q.add(one);
81              shouldThrow();
82          } catch (IllegalStateException success) {}
83      }
84  
85      /**
86 <     * addAll(null) throws NPE
86 >     * addAll(this) throws IllegalArgumentException
87       */
88 <    public void testAddAll1() {
88 >    public void testAddAll_self()      { testAddAll_self(false); }
89 >    public void testAddAll_self_fair() { testAddAll_self(true); }
90 >    public void testAddAll_self(boolean fair) {
91 >        SynchronousQueue q = new SynchronousQueue(fair);
92          try {
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();
93              q.addAll(q);
94              shouldThrow();
95          } catch (IllegalArgumentException success) {}
96      }
97  
98      /**
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    /**
99       * addAll throws ISE if no active taker
100       */
101 <    public void testAddAll4() {
101 >    public void testAddAll_ISE()      { testAddAll_ISE(false); }
102 >    public void testAddAll_ISE_fair() { testAddAll_ISE(true); }
103 >    public void testAddAll_ISE(boolean fair) {
104 >        SynchronousQueue q = new SynchronousQueue(fair);
105 >        Integer[] ints = new Integer[1];
106 >        for (int i = 0; i < ints.length; i++)
107 >            ints[i] = i;
108 >        Collection<Integer> coll = Arrays.asList(ints);
109          try {
110 <            SynchronousQueue q = new SynchronousQueue();
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));
110 >            q.addAll(coll);
111              shouldThrow();
112          } catch (IllegalStateException success) {}
113      }
114  
115      /**
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    /**
116       * put blocks interruptibly if no active taker
117       */
118      public void testBlockingPut()      { testBlockingPut(false); }
# Line 176 | Line 138 | public class SynchronousQueueTest extend
138              }});
139  
140          await(pleaseInterrupt);
141 <        assertThreadStaysAlive(t);
141 >        assertThreadBlocks(t, Thread.State.WAITING);
142          t.interrupt();
143          awaitTermination(t);
144          assertEquals(0, q.remainingCapacity());
# Line 205 | Line 167 | public class SynchronousQueueTest extend
167              }});
168  
169          await(pleaseTake);
170 <        assertEquals(q.remainingCapacity(), 0);
170 >        assertEquals(0, q.remainingCapacity());
171          try { assertSame(one, q.take()); }
172          catch (InterruptedException e) { threadUnexpectedException(e); }
173  
174          await(pleaseInterrupt);
175 <        assertThreadStaysAlive(t);
175 >        assertThreadBlocks(t, Thread.State.WAITING);
176          t.interrupt();
177          awaitTermination(t);
178 <        assertEquals(q.remainingCapacity(), 0);
178 >        assertEquals(0, q.remainingCapacity());
179      }
180  
181      /**
# Line 237 | Line 199 | public class SynchronousQueueTest extend
199              }});
200  
201          await(pleaseInterrupt);
202 <        assertThreadStaysAlive(t);
202 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
203          t.interrupt();
204          awaitTermination(t);
205      }
# Line 245 | Line 207 | public class SynchronousQueueTest extend
207      /**
208       * poll return null if no active putter
209       */
210 <    public void testPoll() {
211 <        SynchronousQueue q = new SynchronousQueue();
210 >    public void testPoll()      { testPoll(false); }
211 >    public void testPoll_fair() { testPoll(true); }
212 >    public void testPoll(boolean fair) {
213 >        final SynchronousQueue q = new SynchronousQueue(fair);
214          assertNull(q.poll());
215      }
216  
217      /**
218       * timed poll with zero timeout times out if no active putter
219       */
220 <    public void testTimedPoll0() throws InterruptedException {
221 <        SynchronousQueue q = new SynchronousQueue();
222 <        assertNull(q.poll(0, MILLISECONDS));
220 >    public void testTimedPoll0()      { testTimedPoll0(false); }
221 >    public void testTimedPoll0_fair() { testTimedPoll0(true); }
222 >    public void testTimedPoll0(boolean fair) {
223 >        final SynchronousQueue q = new SynchronousQueue(fair);
224 >        try { assertNull(q.poll(0, MILLISECONDS)); }
225 >        catch (InterruptedException e) { threadUnexpectedException(e); }
226      }
227  
228      /**
229       * timed poll with nonzero timeout times out if no active putter
230       */
231 <    public void testTimedPoll() throws InterruptedException {
232 <        SynchronousQueue q = new SynchronousQueue();
231 >    public void testTimedPoll()      { testTimedPoll(false); }
232 >    public void testTimedPoll_fair() { testTimedPoll(true); }
233 >    public void testTimedPoll(boolean fair) {
234 >        final SynchronousQueue q = new SynchronousQueue(fair);
235          long startTime = System.nanoTime();
236 <        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
236 >        try { assertNull(q.poll(timeoutMillis(), MILLISECONDS)); }
237 >        catch (InterruptedException e) { threadUnexpectedException(e); }
238          assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
239      }
240  
# Line 272 | Line 242 | public class SynchronousQueueTest extend
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()      { testTimedPollWithOffer(false); }
246 >    public void testTimedPollWithOffer_fair() { testTimedPollWithOffer(true); }
247 >    public void testTimedPollWithOffer(boolean fair) {
248 >        final SynchronousQueue q = new SynchronousQueue(fair);
249          final CountDownLatch pleaseOffer = new CountDownLatch(1);
250 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
251          Thread t = newStartedThread(new CheckedRunnable() {
252              public void realRun() throws InterruptedException {
253 <                long t0 = System.nanoTime();
254 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
255 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
253 >                long startTime = System.nanoTime();
254 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
255 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
256  
257                  pleaseOffer.countDown();
258 <                t0 = System.nanoTime();
258 >                startTime = System.nanoTime();
259                  assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
287                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
260  
261 <                t0 = System.nanoTime();
261 >                Thread.currentThread().interrupt();
262 >                try {
263 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
264 >                    shouldThrow();
265 >                } catch (InterruptedException success) {}
266 >                assertFalse(Thread.interrupted());
267 >
268 >                pleaseInterrupt.countDown();
269                  try {
270                      q.poll(LONG_DELAY_MS, MILLISECONDS);
271                      shouldThrow();
272                  } catch (InterruptedException success) {}
273 <                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
273 >                assertFalse(Thread.interrupted());
274 >
275 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
276              }});
277  
278 <        assertTrue(pleaseOffer.await(MEDIUM_DELAY_MS, MILLISECONDS));
279 <        long t0 = System.nanoTime();
280 <        assertTrue(q.offer(zero, LONG_DELAY_MS, MILLISECONDS));
281 <        assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
278 >        await(pleaseOffer);
279 >        long startTime = System.nanoTime();
280 >        try { assertTrue(q.offer(zero, LONG_DELAY_MS, MILLISECONDS)); }
281 >        catch (InterruptedException e) { threadUnexpectedException(e); }
282 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
283  
284 +        await(pleaseInterrupt);
285 +        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
286          t.interrupt();
287 <        awaitTermination(t, MEDIUM_DELAY_MS);
287 >        awaitTermination(t);
288      }
289  
290      /**
291       * peek() returns null if no active putter
292       */
293 <    public void testPeek() {
294 <        SynchronousQueue q = new SynchronousQueue();
293 >    public void testPeek()      { testPeek(false); }
294 >    public void testPeek_fair() { testPeek(true); }
295 >    public void testPeek(boolean fair) {
296 >        final SynchronousQueue q = new SynchronousQueue(fair);
297          assertNull(q.peek());
298      }
299  
300      /**
301 <     * element() throws NSEE if no active putter
301 >     * element() throws NoSuchElementException if no active putter
302       */
303 <    public void testElement() {
304 <        SynchronousQueue q = new SynchronousQueue();
303 >    public void testElement()      { testElement(false); }
304 >    public void testElement_fair() { testElement(true); }
305 >    public void testElement(boolean fair) {
306 >        final SynchronousQueue q = new SynchronousQueue(fair);
307          try {
308              q.element();
309              shouldThrow();
# Line 323 | Line 311 | public class SynchronousQueueTest extend
311      }
312  
313      /**
314 <     * remove() throws NSEE if no active putter
314 >     * remove() throws NoSuchElementException if no active putter
315       */
316 <    public void testRemove() {
317 <        SynchronousQueue q = new SynchronousQueue();
316 >    public void testRemove()      { testRemove(false); }
317 >    public void testRemove_fair() { testRemove(true); }
318 >    public void testRemove(boolean fair) {
319 >        final SynchronousQueue q = new SynchronousQueue(fair);
320          try {
321              q.remove();
322              shouldThrow();
# Line 334 | Line 324 | public class SynchronousQueueTest extend
324      }
325  
326      /**
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    /**
327       * contains returns false
328       */
329 <    public void testContains() {
330 <        SynchronousQueue q = new SynchronousQueue();
329 >    public void testContains()      { testContains(false); }
330 >    public void testContains_fair() { testContains(true); }
331 >    public void testContains(boolean fair) {
332 >        final SynchronousQueue q = new SynchronousQueue(fair);
333          assertFalse(q.contains(zero));
334      }
335  
336      /**
337       * clear ensures isEmpty
338       */
339 <    public void testClear() {
340 <        SynchronousQueue q = new SynchronousQueue();
339 >    public void testClear()      { testClear(false); }
340 >    public void testClear_fair() { testClear(true); }
341 >    public void testClear(boolean fair) {
342 >        final SynchronousQueue q = new SynchronousQueue(fair);
343          q.clear();
344          assertTrue(q.isEmpty());
345      }
# Line 362 | Line 347 | public class SynchronousQueueTest extend
347      /**
348       * containsAll returns false unless empty
349       */
350 <    public void testContainsAll() {
351 <        SynchronousQueue q = new SynchronousQueue();
350 >    public void testContainsAll()      { testContainsAll(false); }
351 >    public void testContainsAll_fair() { testContainsAll(true); }
352 >    public void testContainsAll(boolean fair) {
353 >        final SynchronousQueue q = new SynchronousQueue(fair);
354          Integer[] empty = new Integer[0];
355          assertTrue(q.containsAll(Arrays.asList(empty)));
356          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 373 | Line 360 | public class SynchronousQueueTest extend
360      /**
361       * retainAll returns false
362       */
363 <    public void testRetainAll() {
364 <        SynchronousQueue q = new SynchronousQueue();
363 >    public void testRetainAll()      { testRetainAll(false); }
364 >    public void testRetainAll_fair() { testRetainAll(true); }
365 >    public void testRetainAll(boolean fair) {
366 >        final SynchronousQueue q = new SynchronousQueue(fair);
367          Integer[] empty = new Integer[0];
368          assertFalse(q.retainAll(Arrays.asList(empty)));
369          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 384 | Line 373 | public class SynchronousQueueTest extend
373      /**
374       * removeAll returns false
375       */
376 <    public void testRemoveAll() {
377 <        SynchronousQueue q = new SynchronousQueue();
376 >    public void testRemoveAll()      { testRemoveAll(false); }
377 >    public void testRemoveAll_fair() { testRemoveAll(true); }
378 >    public void testRemoveAll(boolean fair) {
379 >        final SynchronousQueue q = new SynchronousQueue(fair);
380          Integer[] empty = new Integer[0];
381          assertFalse(q.removeAll(Arrays.asList(empty)));
382          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 395 | Line 386 | public class SynchronousQueueTest extend
386      /**
387       * toArray is empty
388       */
389 <    public void testToArray() {
390 <        SynchronousQueue q = new SynchronousQueue();
389 >    public void testToArray()      { testToArray(false); }
390 >    public void testToArray_fair() { testToArray(true); }
391 >    public void testToArray(boolean fair) {
392 >        final SynchronousQueue q = new SynchronousQueue(fair);
393          Object[] o = q.toArray();
394 <        assertEquals(o.length, 0);
394 >        assertEquals(0, o.length);
395      }
396  
397      /**
398 <     * toArray(a) is nulled at position 0
398 >     * toArray(Integer array) returns its argument with the first
399 >     * element (if present) nulled out
400       */
401 <    public void testToArray2() {
402 <        SynchronousQueue q = new SynchronousQueue();
403 <        Integer[] ints = new Integer[1];
404 <        assertNull(ints[0]);
401 >    public void testToArray2()      { testToArray2(false); }
402 >    public void testToArray2_fair() { testToArray2(true); }
403 >    public void testToArray2(boolean fair) {
404 >        final SynchronousQueue<Integer> q = new SynchronousQueue<>(fair);
405 >        Integer[] a;
406 >
407 >        a = new Integer[0];
408 >        assertSame(a, q.toArray(a));
409 >
410 >        a = new Integer[3];
411 >        Arrays.fill(a, 42);
412 >        assertSame(a, q.toArray(a));
413 >        assertNull(a[0]);
414 >        for (int i = 1; i < a.length; i++)
415 >            assertEquals(42, (int) a[i]);
416      }
417  
418      /**
419       * toArray(null) throws NPE
420       */
421 <    public void testToArray_BadArg() {
422 <        SynchronousQueue q = new SynchronousQueue();
421 >    public void testToArray_null()      { testToArray_null(false); }
422 >    public void testToArray_null_fair() { testToArray_null(true); }
423 >    public void testToArray_null(boolean fair) {
424 >        final SynchronousQueue q = new SynchronousQueue(fair);
425          try {
426 <            Object o[] = q.toArray(null);
426 >            Object[] o = q.toArray(null);
427              shouldThrow();
428          } catch (NullPointerException success) {}
429      }
# Line 424 | Line 431 | public class SynchronousQueueTest extend
431      /**
432       * iterator does not traverse any elements
433       */
434 <    public void testIterator() {
435 <        SynchronousQueue q = new SynchronousQueue();
436 <        Iterator it = q.iterator();
437 <        assertFalse(it.hasNext());
431 <        try {
432 <            Object x = it.next();
433 <            shouldThrow();
434 <        } catch (NoSuchElementException success) {}
434 >    public void testIterator()      { testIterator(false); }
435 >    public void testIterator_fair() { testIterator(true); }
436 >    public void testIterator(boolean fair) {
437 >        assertIteratorExhausted(new SynchronousQueue(fair).iterator());
438      }
439  
440      /**
441       * iterator remove throws ISE
442       */
443 <    public void testIteratorRemove() {
444 <        SynchronousQueue q = new SynchronousQueue();
443 >    public void testIteratorRemove()      { testIteratorRemove(false); }
444 >    public void testIteratorRemove_fair() { testIteratorRemove(true); }
445 >    public void testIteratorRemove(boolean fair) {
446 >        final SynchronousQueue q = new SynchronousQueue(fair);
447          Iterator it = q.iterator();
448          try {
449              it.remove();
# Line 449 | Line 454 | public class SynchronousQueueTest extend
454      /**
455       * toString returns a non-null string
456       */
457 <    public void testToString() {
458 <        SynchronousQueue q = new SynchronousQueue();
457 >    public void testToString()      { testToString(false); }
458 >    public void testToString_fair() { testToString(true); }
459 >    public void testToString(boolean fair) {
460 >        final SynchronousQueue q = new SynchronousQueue(fair);
461          String s = q.toString();
462          assertNotNull(s);
463      }
# Line 458 | Line 465 | public class SynchronousQueueTest extend
465      /**
466       * offer transfers elements across Executor tasks
467       */
468 <    public void testOfferInExecutor() {
469 <        final SynchronousQueue q = new SynchronousQueue();
470 <        ExecutorService executor = Executors.newFixedThreadPool(2);
468 >    public void testOfferInExecutor()      { testOfferInExecutor(false); }
469 >    public void testOfferInExecutor_fair() { testOfferInExecutor(true); }
470 >    public void testOfferInExecutor(boolean fair) {
471 >        final SynchronousQueue q = new SynchronousQueue(fair);
472          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
473 +        final ExecutorService executor = Executors.newFixedThreadPool(2);
474 +        try (PoolCleaner cleaner = cleaner(executor)) {
475  
476 <        executor.execute(new CheckedRunnable() {
477 <            public void realRun() throws InterruptedException {
478 <                assertFalse(q.offer(one));
479 <                threadsStarted.await();
480 <                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
481 <                assertEquals(0, q.remainingCapacity());
482 <            }});
483 <
484 <        executor.execute(new CheckedRunnable() {
485 <            public void realRun() throws InterruptedException {
486 <                threadsStarted.await();
487 <                assertSame(one, q.take());
488 <            }});
489 <
480 <        joinPool(executor);
476 >            executor.execute(new CheckedRunnable() {
477 >                public void realRun() throws InterruptedException {
478 >                    assertFalse(q.offer(one));
479 >                    threadsStarted.await();
480 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
481 >                    assertEquals(0, q.remainingCapacity());
482 >                }});
483 >
484 >            executor.execute(new CheckedRunnable() {
485 >                public void realRun() throws InterruptedException {
486 >                    threadsStarted.await();
487 >                    assertSame(one, q.take());
488 >                }});
489 >        }
490      }
491  
492      /**
493       * timed poll retrieves elements across Executor threads
494       */
495 <    public void testPollInExecutor() {
496 <        final SynchronousQueue q = new SynchronousQueue();
495 >    public void testPollInExecutor()      { testPollInExecutor(false); }
496 >    public void testPollInExecutor_fair() { testPollInExecutor(true); }
497 >    public void testPollInExecutor(boolean fair) {
498 >        final SynchronousQueue q = new SynchronousQueue(fair);
499          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
500 <        ExecutorService executor = Executors.newFixedThreadPool(2);
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 <        joinPool(executor);
500 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
501 >        try (PoolCleaner cleaner = cleaner(executor)) {
502 >            executor.execute(new CheckedRunnable() {
503 >                public void realRun() throws InterruptedException {
504 >                    assertNull(q.poll());
505 >                    threadsStarted.await();
506 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
507 >                    assertTrue(q.isEmpty());
508 >                }});
509 >
510 >            executor.execute(new CheckedRunnable() {
511 >                public void realRun() throws InterruptedException {
512 >                    threadsStarted.await();
513 >                    q.put(one);
514 >                }});
515 >        }
516      }
517  
518      /**
519       * a deserialized serialized queue is usable
520       */
521 <    public void testSerialization() throws Exception {
522 <        SynchronousQueue q = new SynchronousQueue();
523 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
524 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
525 <        out.writeObject(q);
526 <        out.close();
527 <
528 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
529 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
530 <        SynchronousQueue r = (SynchronousQueue)in.readObject();
531 <        assertEquals(q.size(), r.size());
532 <        while (!q.isEmpty())
533 <            assertEquals(q.remove(), r.remove());
534 <    }
535 <
536 <    /**
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) {}
521 >    public void testSerialization() {
522 >        final SynchronousQueue x = new SynchronousQueue();
523 >        final SynchronousQueue y = new SynchronousQueue(false);
524 >        final SynchronousQueue z = new SynchronousQueue(true);
525 >        assertSerialEquals(x, y);
526 >        assertNotSerialEquals(x, z);
527 >        SynchronousQueue[] qs = { x, y, z };
528 >        for (SynchronousQueue q : qs) {
529 >            SynchronousQueue clone = serialClone(q);
530 >            assertNotSame(q, clone);
531 >            assertSerialEquals(q, clone);
532 >            assertTrue(clone.isEmpty());
533 >            assertEquals(0, clone.size());
534 >            assertEquals(0, clone.remainingCapacity());
535 >            assertFalse(clone.offer(zero));
536 >        }
537      }
538  
539      /**
540       * drainTo(c) of empty queue doesn't transfer elements
541       */
542 <    public void testDrainTo() {
543 <        SynchronousQueue q = new SynchronousQueue();
542 >    public void testDrainTo()      { testDrainTo(false); }
543 >    public void testDrainTo_fair() { testDrainTo(true); }
544 >    public void testDrainTo(boolean fair) {
545 >        final SynchronousQueue q = new SynchronousQueue(fair);
546          ArrayList l = new ArrayList();
547          q.drainTo(l);
548 <        assertEquals(q.size(), 0);
549 <        assertEquals(l.size(), 0);
548 >        assertEquals(0, q.size());
549 >        assertEquals(0, l.size());
550      }
551  
552      /**
553       * drainTo empties queue, unblocking a waiting put.
554       */
555 <    public void testDrainToWithActivePut() throws InterruptedException {
556 <        final SynchronousQueue q = new SynchronousQueue();
555 >    public void testDrainToWithActivePut()      { testDrainToWithActivePut(false); }
556 >    public void testDrainToWithActivePut_fair() { testDrainToWithActivePut(true); }
557 >    public void testDrainToWithActivePut(boolean fair) {
558 >        final SynchronousQueue q = new SynchronousQueue(fair);
559          Thread t = newStartedThread(new CheckedRunnable() {
560              public void realRun() throws InterruptedException {
561                  q.put(one);
# Line 573 | Line 569 | public class SynchronousQueueTest extend
569                  fail("timed out");
570              Thread.yield();
571          }
572 <        assertTrue(l.size() == 1);
572 >        assertEquals(1, l.size());
573          assertSame(one, l.get(0));
574          awaitTermination(t);
575      }
576  
577      /**
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    /**
578       * drainTo(c, n) empties up to n elements of queue into c
579       */
580      public void testDrainToN() throws InterruptedException {
# Line 616 | Line 590 | public class SynchronousQueueTest extend
590              }});
591  
592          ArrayList l = new ArrayList();
593 <        delay(SHORT_DELAY_MS);
594 <        q.drainTo(l, 1);
593 >        int drained;
594 >        while ((drained = q.drainTo(l, 1)) == 0) Thread.yield();
595 >        assertEquals(1, drained);
596          assertEquals(1, l.size());
597 <        q.drainTo(l, 1);
597 >        while ((drained = q.drainTo(l, 1)) == 0) Thread.yield();
598 >        assertEquals(1, drained);
599          assertEquals(2, l.size());
600          assertTrue(l.contains(one));
601          assertTrue(l.contains(two));
# Line 627 | Line 603 | public class SynchronousQueueTest extend
603          awaitTermination(t2);
604      }
605  
606 +    /**
607 +     * remove(null), contains(null) always return false
608 +     */
609 +    public void testNeverContainsNull() {
610 +        Collection<?> q = new SynchronousQueue();
611 +        assertFalse(q.contains(null));
612 +        assertFalse(q.remove(null));
613 +    }
614 +
615   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines