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.44 by jsr166, Wed Dec 31 19:05:43 2014 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 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
96 <     */
97 <    public void testAddAll1() {
98 <        try {
99 <            SynchronousQueue q = new SynchronousQueue();
100 <            q.addAll(null);
101 <            shouldThrow();
102 <        } catch (NullPointerException success) {}
103 <    }
104 <
105 <    /**
106 <     * addAll(this) throws IAE
86 >     * addAll(this) throws IllegalArgumentException
87       */
88 <    public void testAddAllSelf() {
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 {
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 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  
# Line 213 | Line 175 | public class SynchronousQueueTest extend
175          assertThreadStaysAlive(t);
176          t.interrupt();
177          awaitTermination(t);
178 <        assertEquals(q.remainingCapacity(), 0);
178 >        assertEquals(0, q.remainingCapacity());
179      }
180  
181      /**
# 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));
260 <                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
260 >                assertTrue(millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
261  
262 <                t0 = System.nanoTime();
262 >                Thread.currentThread().interrupt();
263                  try {
264                      q.poll(LONG_DELAY_MS, MILLISECONDS);
265                      shouldThrow();
266                  } catch (InterruptedException success) {}
267 <                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
267 >                assertFalse(Thread.interrupted());
268 >
269 >                pleaseInterrupt.countDown();
270 >                try {
271 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
272 >                    shouldThrow();
273 >                } catch (InterruptedException success) {}
274 >                assertFalse(Thread.interrupted());
275              }});
276  
277 <        assertTrue(pleaseOffer.await(MEDIUM_DELAY_MS, MILLISECONDS));
278 <        long t0 = System.nanoTime();
279 <        assertTrue(q.offer(zero, LONG_DELAY_MS, MILLISECONDS));
280 <        assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
277 >        await(pleaseOffer);
278 >        long startTime = System.nanoTime();
279 >        try { assertTrue(q.offer(zero, LONG_DELAY_MS, MILLISECONDS)); }
280 >        catch (InterruptedException e) { threadUnexpectedException(e); }
281 >        assertTrue(millisElapsedSince(startTime) < MEDIUM_DELAY_MS);
282  
283 +        await(pleaseInterrupt);
284 +        assertThreadStaysAlive(t);
285          t.interrupt();
286 <        awaitTermination(t, MEDIUM_DELAY_MS);
286 >        awaitTermination(t);
287      }
288  
289      /**
290       * peek() returns null if no active putter
291       */
292 <    public void testPeek() {
293 <        SynchronousQueue q = new SynchronousQueue();
292 >    public void testPeek()      { testPeek(false); }
293 >    public void testPeek_fair() { testPeek(true); }
294 >    public void testPeek(boolean fair) {
295 >        final SynchronousQueue q = new SynchronousQueue(fair);
296          assertNull(q.peek());
297      }
298  
299      /**
300 <     * element() throws NSEE if no active putter
300 >     * element() throws NoSuchElementException if no active putter
301       */
302 <    public void testElement() {
303 <        SynchronousQueue q = new SynchronousQueue();
302 >    public void testElement()      { testElement(false); }
303 >    public void testElement_fair() { testElement(true); }
304 >    public void testElement(boolean fair) {
305 >        final SynchronousQueue q = new SynchronousQueue(fair);
306          try {
307              q.element();
308              shouldThrow();
# Line 323 | Line 310 | public class SynchronousQueueTest extend
310      }
311  
312      /**
313 <     * remove() throws NSEE if no active putter
313 >     * remove() throws NoSuchElementException if no active putter
314       */
315 <    public void testRemove() {
316 <        SynchronousQueue q = new SynchronousQueue();
315 >    public void testRemove()      { testRemove(false); }
316 >    public void testRemove_fair() { testRemove(true); }
317 >    public void testRemove(boolean fair) {
318 >        final SynchronousQueue q = new SynchronousQueue(fair);
319          try {
320              q.remove();
321              shouldThrow();
# Line 334 | Line 323 | public class SynchronousQueueTest extend
323      }
324  
325      /**
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 –    /**
326       * contains returns false
327       */
328 <    public void testContains() {
329 <        SynchronousQueue q = new SynchronousQueue();
328 >    public void testContains()      { testContains(false); }
329 >    public void testContains_fair() { testContains(true); }
330 >    public void testContains(boolean fair) {
331 >        final SynchronousQueue q = new SynchronousQueue(fair);
332          assertFalse(q.contains(zero));
333      }
334  
335      /**
336       * clear ensures isEmpty
337       */
338 <    public void testClear() {
339 <        SynchronousQueue q = new SynchronousQueue();
338 >    public void testClear()      { testClear(false); }
339 >    public void testClear_fair() { testClear(true); }
340 >    public void testClear(boolean fair) {
341 >        final SynchronousQueue q = new SynchronousQueue(fair);
342          q.clear();
343          assertTrue(q.isEmpty());
344      }
# Line 362 | Line 346 | public class SynchronousQueueTest extend
346      /**
347       * containsAll returns false unless empty
348       */
349 <    public void testContainsAll() {
350 <        SynchronousQueue q = new SynchronousQueue();
349 >    public void testContainsAll()      { testContainsAll(false); }
350 >    public void testContainsAll_fair() { testContainsAll(true); }
351 >    public void testContainsAll(boolean fair) {
352 >        final SynchronousQueue q = new SynchronousQueue(fair);
353          Integer[] empty = new Integer[0];
354          assertTrue(q.containsAll(Arrays.asList(empty)));
355          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 373 | Line 359 | public class SynchronousQueueTest extend
359      /**
360       * retainAll returns false
361       */
362 <    public void testRetainAll() {
363 <        SynchronousQueue q = new SynchronousQueue();
362 >    public void testRetainAll()      { testRetainAll(false); }
363 >    public void testRetainAll_fair() { testRetainAll(true); }
364 >    public void testRetainAll(boolean fair) {
365 >        final SynchronousQueue q = new SynchronousQueue(fair);
366          Integer[] empty = new Integer[0];
367          assertFalse(q.retainAll(Arrays.asList(empty)));
368          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 384 | Line 372 | public class SynchronousQueueTest extend
372      /**
373       * removeAll returns false
374       */
375 <    public void testRemoveAll() {
376 <        SynchronousQueue q = new SynchronousQueue();
375 >    public void testRemoveAll()      { testRemoveAll(false); }
376 >    public void testRemoveAll_fair() { testRemoveAll(true); }
377 >    public void testRemoveAll(boolean fair) {
378 >        final SynchronousQueue q = new SynchronousQueue(fair);
379          Integer[] empty = new Integer[0];
380          assertFalse(q.removeAll(Arrays.asList(empty)));
381          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 395 | Line 385 | public class SynchronousQueueTest extend
385      /**
386       * toArray is empty
387       */
388 <    public void testToArray() {
389 <        SynchronousQueue q = new SynchronousQueue();
388 >    public void testToArray()      { testToArray(false); }
389 >    public void testToArray_fair() { testToArray(true); }
390 >    public void testToArray(boolean fair) {
391 >        final SynchronousQueue q = new SynchronousQueue(fair);
392          Object[] o = q.toArray();
393 <        assertEquals(o.length, 0);
393 >        assertEquals(0, o.length);
394      }
395  
396      /**
397 <     * toArray(a) is nulled at position 0
397 >     * toArray(Integer array) returns its argument with the first
398 >     * element (if present) nulled out
399       */
400 <    public void testToArray2() {
401 <        SynchronousQueue q = new SynchronousQueue();
402 <        Integer[] ints = new Integer[1];
403 <        assertNull(ints[0]);
400 >    public void testToArray2()      { testToArray2(false); }
401 >    public void testToArray2_fair() { testToArray2(true); }
402 >    public void testToArray2(boolean fair) {
403 >        final SynchronousQueue<Integer> q
404 >            = new SynchronousQueue<Integer>(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);
427              shouldThrow();
# 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();
434 >    public void testIterator()      { testIterator(false); }
435 >    public void testIterator_fair() { testIterator(true); }
436 >    public void testIterator(boolean fair) {
437 >        final SynchronousQueue q = new SynchronousQueue(fair);
438          Iterator it = q.iterator();
439          assertFalse(it.hasNext());
440          try {
# Line 437 | Line 446 | public class SynchronousQueueTest extend
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();
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          ExecutorService executor = Executors.newFixedThreadPool(2);
479          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
480  
# Line 483 | Line 498 | public class SynchronousQueueTest extend
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() {
# Line 507 | Line 524 | public class SynchronousQueueTest extend
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 579 | Line 581 | public class SynchronousQueueTest extend
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 627 | Line 607 | public class SynchronousQueueTest extend
607          awaitTermination(t2);
608      }
609  
610 +    /**
611 +     * remove(null), contains(null) always return false
612 +     */
613 +    public void testNeverContainsNull() {
614 +        Collection<?> q = new SynchronousQueue();
615 +        assertFalse(q.contains(null));
616 +        assertFalse(q.remove(null));
617 +    }
618 +
619   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines