ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/LinkedTransferQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/LinkedTransferQueueTest.java (file contents):
Revision 1.30 by jsr166, Thu Oct 28 22:20:47 2010 UTC vs.
Revision 1.60 by jsr166, Fri May 15 18:21:19 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include John Vint
6   */
7  
8 < import java.io.BufferedInputStream;
9 < import java.io.BufferedOutputStream;
10 < import java.io.ByteArrayInputStream;
11 < import java.io.ByteArrayOutputStream;
12 < import java.io.ObjectInputStream;
13 < import java.io.ObjectOutputStream;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 >
10   import java.util.ArrayList;
11   import java.util.Arrays;
12 + import java.util.Collection;
13   import java.util.Iterator;
14   import java.util.List;
15   import java.util.NoSuchElementException;
16 < import java.util.concurrent.*;
17 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
18 < import static java.util.concurrent.TimeUnit.NANOSECONDS;
16 > import java.util.Queue;
17 > import java.util.concurrent.BlockingQueue;
18 > import java.util.concurrent.CountDownLatch;
19 > import java.util.concurrent.Executors;
20 > import java.util.concurrent.ExecutorService;
21 > import java.util.concurrent.LinkedTransferQueue;
22 >
23   import junit.framework.Test;
23 import junit.framework.TestSuite;
24  
25   @SuppressWarnings({"unchecked", "rawtypes"})
26   public class LinkedTransferQueueTest extends JSR166TestCase {
# Line 32 | Line 32 | public class LinkedTransferQueueTest ext
32      }
33  
34      public static void main(String[] args) {
35 <        junit.textui.TestRunner.run(suite());
35 >        main(suite(), args);
36      }
37  
38      public static Test suite() {
# Line 40 | Line 40 | public class LinkedTransferQueueTest ext
40                              new Generic().testSuite());
41      }
42  
43    void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
44        assertTrue(q.isEmpty());
45        assertEquals(0, q.size());
46        assertNull(q.peek());
47        assertNull(q.poll());
48        assertNull(q.poll(0, MILLISECONDS));
49        assertEquals(q.toString(), "[]");
50        assertTrue(Arrays.equals(q.toArray(), new Object[0]));
51        assertFalse(q.iterator().hasNext());
52        try {
53            q.element();
54            shouldThrow();
55        } catch (NoSuchElementException success) {}
56        try {
57            q.iterator().next();
58            shouldThrow();
59        } catch (NoSuchElementException success) {}
60        try {
61            q.remove();
62            shouldThrow();
63        } catch (NoSuchElementException success) {}
64    }
65
43      /**
44       * Constructor builds new queue with size being zero and empty
45       * being true
# Line 88 | Line 65 | public class LinkedTransferQueueTest ext
65       * NullPointerException
66       */
67      public void testConstructor3() {
68 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
69          try {
70 <            Integer[] ints = new Integer[SIZE];
93 <            new LinkedTransferQueue(Arrays.asList(ints));
70 >            new LinkedTransferQueue(elements);
71              shouldThrow();
72          } catch (NullPointerException success) {}
73      }
# Line 100 | Line 77 | public class LinkedTransferQueueTest ext
77       * throws NullPointerException
78       */
79      public void testConstructor4() {
80 +        Integer[] ints = new Integer[SIZE];
81 +        for (int i = 0; i < SIZE-1; ++i)
82 +            ints[i] = i;
83 +        Collection<Integer> elements = Arrays.asList(ints);
84          try {
85 <            Integer[] ints = new Integer[SIZE];
105 <            for (int i = 0; i < SIZE - 1; ++i) {
106 <                ints[i] = i;
107 <            }
108 <            new LinkedTransferQueue(Arrays.asList(ints));
85 >            new LinkedTransferQueue(elements);
86              shouldThrow();
87          } catch (NullPointerException success) {}
88      }
# Line 138 | Line 115 | public class LinkedTransferQueueTest ext
115       * remainingCapacity() always returns Integer.MAX_VALUE
116       */
117      public void testRemainingCapacity() {
118 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
118 >        BlockingQueue q = populatedQueue(SIZE);
119          for (int i = 0; i < SIZE; ++i) {
120              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
121              assertEquals(SIZE - i, q.size());
122 <            q.remove();
122 >            assertEquals(i, q.remove());
123          }
124          for (int i = 0; i < SIZE; ++i) {
125              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
126              assertEquals(i, q.size());
127 <            q.add(i);
127 >            assertTrue(q.add(i));
128          }
129      }
130  
131      /**
155     * offer(null) throws NullPointerException
156     */
157    public void testOfferNull() {
158        try {
159            LinkedTransferQueue q = new LinkedTransferQueue();
160            q.offer(null);
161            shouldThrow();
162        } catch (NullPointerException success) {}
163    }
164
165    /**
166     * add(null) throws NullPointerException
167     */
168    public void testAddNull() {
169        try {
170            LinkedTransferQueue q = new LinkedTransferQueue();
171            q.add(null);
172            shouldThrow();
173        } catch (NullPointerException success) {}
174    }
175
176    /**
177     * addAll(null) throws NullPointerException
178     */
179    public void testAddAll1() {
180        try {
181            LinkedTransferQueue q = new LinkedTransferQueue();
182            q.addAll(null);
183            shouldThrow();
184        } catch (NullPointerException success) {}
185    }
186
187    /**
132       * addAll(this) throws IllegalArgumentException
133       */
134      public void testAddAllSelf() {
135 +        LinkedTransferQueue q = populatedQueue(SIZE);
136          try {
192            LinkedTransferQueue q = populatedQueue(SIZE);
137              q.addAll(q);
138              shouldThrow();
139          } catch (IllegalArgumentException success) {}
140      }
141  
142      /**
199     * addAll of a collection with null elements throws NullPointerException
200     */
201    public void testAddAll2() {
202        try {
203            LinkedTransferQueue q = new LinkedTransferQueue();
204            Integer[] ints = new Integer[SIZE];
205            q.addAll(Arrays.asList(ints));
206            shouldThrow();
207        } catch (NullPointerException success) {}
208    }
209
210    /**
143       * addAll of a collection with any null elements throws
144       * NullPointerException after possibly adding some elements
145       */
146      public void testAddAll3() {
147 +        LinkedTransferQueue q = new LinkedTransferQueue();
148 +        Integer[] ints = new Integer[SIZE];
149 +        for (int i = 0; i < SIZE - 1; ++i)
150 +            ints[i] = i;
151          try {
216            LinkedTransferQueue q = new LinkedTransferQueue();
217            Integer[] ints = new Integer[SIZE];
218            for (int i = 0; i < SIZE - 1; ++i) {
219                ints[i] = i;
220            }
152              q.addAll(Arrays.asList(ints));
153              shouldThrow();
154          } catch (NullPointerException success) {}
# Line 241 | Line 172 | public class LinkedTransferQueueTest ext
172      }
173  
174      /**
244     * put(null) throws NullPointerException
245     */
246    public void testPutNull() throws InterruptedException {
247        try {
248            LinkedTransferQueue q = new LinkedTransferQueue();
249            q.put(null);
250            shouldThrow();
251        } catch (NullPointerException success) {}
252    }
253
254    /**
175       * all elements successfully put are contained
176       */
177      public void testPut() {
178          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
179          for (int i = 0; i < SIZE; ++i) {
180 <            assertEquals(q.size(), i);
180 >            assertEquals(i, q.size());
181              q.put(i);
182              assertTrue(q.contains(i));
183          }
# Line 277 | Line 197 | public class LinkedTransferQueueTest ext
197       * take removes existing elements until empty, then blocks interruptibly
198       */
199      public void testBlockingTake() throws InterruptedException {
200 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
201 <        Thread t = new Thread(new CheckedRunnable() {
200 >        final BlockingQueue q = populatedQueue(SIZE);
201 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
202 >        Thread t = newStartedThread(new CheckedRunnable() {
203              public void realRun() throws InterruptedException {
204                  for (int i = 0; i < SIZE; ++i) {
205 <                    assertEquals(i, (int) q.take());
205 >                    assertEquals(i, q.take());
206                  }
207 +
208 +                Thread.currentThread().interrupt();
209                  try {
210                      q.take();
211                      shouldThrow();
212                  } catch (InterruptedException success) {}
213 +                assertFalse(Thread.interrupted());
214 +
215 +                pleaseInterrupt.countDown();
216 +                try {
217 +                    q.take();
218 +                    shouldThrow();
219 +                } catch (InterruptedException success) {}
220 +                assertFalse(Thread.interrupted());
221              }});
222  
223 <        t.start();
224 <        Thread.sleep(SHORT_DELAY_MS);
223 >        await(pleaseInterrupt);
224 >        assertThreadStaysAlive(t);
225          t.interrupt();
226 <        awaitTermination(t, MEDIUM_DELAY_MS);
296 <        checkEmpty(q);
226 >        awaitTermination(t);
227      }
228  
229      /**
# Line 326 | Line 256 | public class LinkedTransferQueueTest ext
256      public void testTimedPoll() throws InterruptedException {
257          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
258          for (int i = 0; i < SIZE; ++i) {
259 <            long t0 = System.nanoTime();
259 >            long startTime = System.nanoTime();
260              assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
261 <            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
261 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
262          }
263 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
263 >        long startTime = System.nanoTime();
264 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
265 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
266          checkEmpty(q);
267      }
268  
# Line 339 | Line 271 | public class LinkedTransferQueueTest ext
271       * returning timeout status
272       */
273      public void testInterruptedTimedPoll() throws InterruptedException {
274 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
274 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
275 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
276          Thread t = newStartedThread(new CheckedRunnable() {
277              public void realRun() throws InterruptedException {
278                  for (int i = 0; i < SIZE; ++i) {
# Line 347 | Line 280 | public class LinkedTransferQueueTest ext
280                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
281                      assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
282                  }
283 +                long t0 = System.nanoTime();
284 +                aboutToWait.countDown();
285                  try {
286 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
286 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
287                      shouldThrow();
288 <                } catch (InterruptedException success) {}
288 >                } catch (InterruptedException success) {
289 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
290 >                }
291              }});
292  
293 <        Thread.sleep(SMALL_DELAY_MS);
293 >        aboutToWait.await();
294 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
295          t.interrupt();
296          awaitTermination(t, MEDIUM_DELAY_MS);
297          checkEmpty(q);
298      }
299  
300      /**
301 +     * timed poll after thread interrupted throws InterruptedException
302 +     * instead of returning timeout status
303 +     */
304 +    public void testTimedPollAfterInterrupt() throws InterruptedException {
305 +        final BlockingQueue<Integer> q = populatedQueue(SIZE);
306 +        Thread t = newStartedThread(new CheckedRunnable() {
307 +            public void realRun() throws InterruptedException {
308 +                Thread.currentThread().interrupt();
309 +                for (int i = 0; i < SIZE; ++i) {
310 +                    long t0 = System.nanoTime();
311 +                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
312 +                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
313 +                }
314 +                try {
315 +                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
316 +                    shouldThrow();
317 +                } catch (InterruptedException success) {}
318 +            }});
319 +
320 +        awaitTermination(t, MEDIUM_DELAY_MS);
321 +        checkEmpty(q);
322 +    }
323 +
324 +    /**
325       * peek returns next element, or null if empty
326       */
327      public void testPeek() throws InterruptedException {
# Line 406 | Line 368 | public class LinkedTransferQueueTest ext
368      }
369  
370      /**
409     * remove(x) removes x and returns true if present
410     */
411    public void testRemoveElement() throws InterruptedException {
412        LinkedTransferQueue q = populatedQueue(SIZE);
413        for (int i = 1; i < SIZE; i += 2) {
414            assertTrue(q.remove(i));
415        }
416        for (int i = 0; i < SIZE; i += 2) {
417            assertTrue(q.remove(i));
418            assertFalse(q.remove(i + 1));
419        }
420        checkEmpty(q);
421    }
422
423    /**
371       * An add following remove(x) succeeds
372       */
373      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 512 | Line 459 | public class LinkedTransferQueueTest ext
459      }
460  
461      /**
462 <     * toArray() contains all elements
462 >     * toArray() contains all elements in FIFO order
463       */
464 <    public void testToArray() throws InterruptedException {
464 >    public void testToArray() {
465          LinkedTransferQueue q = populatedQueue(SIZE);
466          Object[] o = q.toArray();
467          for (int i = 0; i < o.length; i++) {
468 <            assertEquals(o[i], q.take());
468 >            assertSame(o[i], q.poll());
469          }
470      }
471  
472      /**
473 <     * toArray(a) contains all elements
473 >     * toArray(a) contains all elements in FIFO order
474       */
475 <    public void testToArray2() throws InterruptedException {
475 >    public void testToArray2() {
476          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
477          Integer[] ints = new Integer[SIZE];
478 <        ints = q.toArray(ints);
478 >        Integer[] array = q.toArray(ints);
479 >        assertSame(ints, array);
480          for (int i = 0; i < ints.length; i++) {
481 <            assertEquals(ints[i], q.take());
481 >            assertSame(ints[i], q.poll());
482          }
483      }
484  
485      /**
486 <     * toArray(null) throws NullPointerException
539 <     */
540 <    public void testToArray_BadArg() {
541 <        LinkedTransferQueue q = populatedQueue(SIZE);
542 <        try {
543 <            Object o[] = q.toArray(null);
544 <            shouldThrow();
545 <        } catch (NullPointerException success) {}
546 <    }
547 <
548 <    /**
549 <     * toArray(incompatible array type) throws CCE
486 >     * toArray(incompatible array type) throws ArrayStoreException
487       */
488      public void testToArray1_BadArg() {
489          LinkedTransferQueue q = populatedQueue(SIZE);
490          try {
491 <            Object o[] = q.toArray(new String[10]);
491 >            q.toArray(new String[10]);
492              shouldThrow();
493          } catch (ArrayStoreException success) {}
494      }
# Line 562 | Line 499 | public class LinkedTransferQueueTest ext
499      public void testIterator() throws InterruptedException {
500          LinkedTransferQueue q = populatedQueue(SIZE);
501          Iterator it = q.iterator();
502 <        int i = 0;
503 <        while (it.hasNext()) {
504 <            assertEquals(it.next(), i++);
505 <        }
502 >        int i;
503 >        for (i = 0; it.hasNext(); i++)
504 >            assertTrue(q.contains(it.next()));
505 >        assertEquals(i, SIZE);
506 >        assertIteratorExhausted(it);
507 >
508 >        it = q.iterator();
509 >        for (i = 0; it.hasNext(); i++)
510 >            assertEquals(it.next(), q.take());
511          assertEquals(i, SIZE);
512 +        assertIteratorExhausted(it);
513 +    }
514 +
515 +    /**
516 +     * iterator of empty collection has no elements
517 +     */
518 +    public void testEmptyIterator() {
519 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
520      }
521  
522      /**
# Line 628 | Line 578 | public class LinkedTransferQueueTest ext
578          LinkedTransferQueue q = populatedQueue(SIZE);
579          String s = q.toString();
580          for (int i = 0; i < SIZE; ++i) {
581 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
581 >            assertTrue(s.contains(String.valueOf(i)));
582          }
583      }
584  
# Line 637 | Line 587 | public class LinkedTransferQueueTest ext
587       */
588      public void testOfferInExecutor() {
589          final LinkedTransferQueue q = new LinkedTransferQueue();
590 <        q.add(one);
641 <        q.add(two);
590 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
591          ExecutorService executor = Executors.newFixedThreadPool(2);
592  
593          executor.execute(new CheckedRunnable() {
594 <            public void realRun() {
595 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
594 >            public void realRun() throws InterruptedException {
595 >                threadsStarted.await();
596 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
597              }});
598  
599          executor.execute(new CheckedRunnable() {
600              public void realRun() throws InterruptedException {
601 <                Thread.sleep(SMALL_DELAY_MS);
601 >                threadsStarted.await();
602                  assertSame(one, q.take());
603 +                checkEmpty(q);
604              }});
605  
606          joinPool(executor);
# Line 660 | Line 611 | public class LinkedTransferQueueTest ext
611       */
612      public void testPollInExecutor() {
613          final LinkedTransferQueue q = new LinkedTransferQueue();
614 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
615          ExecutorService executor = Executors.newFixedThreadPool(2);
616  
617          executor.execute(new CheckedRunnable() {
618              public void realRun() throws InterruptedException {
619                  assertNull(q.poll());
620 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
621 <                assertTrue(q.isEmpty());
620 >                threadsStarted.await();
621 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
622 >                checkEmpty(q);
623              }});
624  
625          executor.execute(new CheckedRunnable() {
626              public void realRun() throws InterruptedException {
627 <                Thread.sleep(SMALL_DELAY_MS);
627 >                threadsStarted.await();
628                  q.put(one);
629              }});
630  
# Line 682 | Line 635 | public class LinkedTransferQueueTest ext
635       * A deserialized serialized queue has same elements in same order
636       */
637      public void testSerialization() throws Exception {
638 <        LinkedTransferQueue q = populatedQueue(SIZE);
639 <
687 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
688 <        ObjectOutputStream out
689 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
690 <        out.writeObject(q);
691 <        out.close();
692 <
693 <        ByteArrayInputStream bin
694 <            = new ByteArrayInputStream(bout.toByteArray());
695 <        ObjectInputStream in
696 <            = new ObjectInputStream(new BufferedInputStream(bin));
697 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
638 >        Queue x = populatedQueue(SIZE);
639 >        Queue y = serialClone(x);
640  
641 <        assertEquals(q.size(), r.size());
642 <        while (!q.isEmpty()) {
643 <            assertEquals(q.remove(), r.remove());
641 >        assertNotSame(y, x);
642 >        assertEquals(x.size(), y.size());
643 >        assertEquals(x.toString(), y.toString());
644 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
645 >        while (!x.isEmpty()) {
646 >            assertFalse(y.isEmpty());
647 >            assertEquals(x.remove(), y.remove());
648          }
649 <    }
704 <
705 <    /**
706 <     * drainTo(null) throws NullPointerException
707 <     */
708 <    public void testDrainToNull() {
709 <        LinkedTransferQueue q = populatedQueue(SIZE);
710 <        try {
711 <            q.drainTo(null);
712 <            shouldThrow();
713 <        } catch (NullPointerException success) {}
714 <    }
715 <
716 <    /**
717 <     * drainTo(this) throws IllegalArgumentException
718 <     */
719 <    public void testDrainToSelf() {
720 <        LinkedTransferQueue q = populatedQueue(SIZE);
721 <        try {
722 <            q.drainTo(q);
723 <            shouldThrow();
724 <        } catch (IllegalArgumentException success) {}
649 >        assertTrue(y.isEmpty());
650      }
651  
652      /**
# Line 731 | Line 656 | public class LinkedTransferQueueTest ext
656          LinkedTransferQueue q = populatedQueue(SIZE);
657          ArrayList l = new ArrayList();
658          q.drainTo(l);
659 <        assertEquals(q.size(), 0);
660 <        assertEquals(l.size(), SIZE);
659 >        assertEquals(0, q.size());
660 >        assertEquals(SIZE, l.size());
661          for (int i = 0; i < SIZE; ++i) {
662 <            assertEquals(l.get(i), i);
662 >            assertEquals(i, l.get(i));
663          }
664          q.add(zero);
665          q.add(one);
# Line 743 | Line 668 | public class LinkedTransferQueueTest ext
668          assertTrue(q.contains(one));
669          l.clear();
670          q.drainTo(l);
671 <        assertEquals(q.size(), 0);
672 <        assertEquals(l.size(), 2);
671 >        assertEquals(0, q.size());
672 >        assertEquals(2, l.size());
673          for (int i = 0; i < 2; ++i) {
674 <            assertEquals(l.get(i), i);
674 >            assertEquals(i, l.get(i));
675          }
676      }
677  
# Line 762 | Line 687 | public class LinkedTransferQueueTest ext
687          ArrayList l = new ArrayList();
688          q.drainTo(l);
689          assertTrue(l.size() >= SIZE);
690 <        for (int i = 0; i < SIZE; ++i) {
691 <            assertEquals(l.get(i), i);
767 <        }
690 >        for (int i = 0; i < SIZE; ++i)
691 >            assertEquals(i, l.get(i));
692          awaitTermination(t, MEDIUM_DELAY_MS);
693          assertTrue(q.size() + l.size() >= SIZE);
694      }
695  
696      /**
773     * drainTo(null, n) throws NullPointerException
774     */
775    public void testDrainToNullN() {
776        LinkedTransferQueue q = populatedQueue(SIZE);
777        try {
778            q.drainTo(null, SIZE);
779            shouldThrow();
780        } catch (NullPointerException success) {}
781    }
782
783    /**
784     * drainTo(this, n) throws IllegalArgumentException
785     */
786    public void testDrainToSelfN() {
787        LinkedTransferQueue q = populatedQueue(SIZE);
788        try {
789            q.drainTo(q, SIZE);
790            shouldThrow();
791        } catch (IllegalArgumentException success) {}
792    }
793
794    /**
697       * drainTo(c, n) empties first min(n, size) elements of queue into c
698       */
699      public void testDrainToN() {
# Line 803 | Line 705 | public class LinkedTransferQueueTest ext
705              ArrayList l = new ArrayList();
706              q.drainTo(l, i);
707              int k = (i < SIZE) ? i : SIZE;
708 <            assertEquals(l.size(), k);
709 <            assertEquals(q.size(), SIZE - k);
710 <            for (int j = 0; j < k; ++j) {
711 <                assertEquals(l.get(j), j);
712 <            }
811 <            while (q.poll() != null)
812 <                ;
708 >            assertEquals(k, l.size());
709 >            assertEquals(SIZE - k, q.size());
710 >            for (int j = 0; j < k; ++j)
711 >                assertEquals(j, l.get(j));
712 >            do {} while (q.poll() != null);
713          }
714      }
715  
# Line 819 | Line 719 | public class LinkedTransferQueueTest ext
719       */
720      public void testWaitingConsumer() throws InterruptedException {
721          final LinkedTransferQueue q = new LinkedTransferQueue();
722 <        assertEquals(q.getWaitingConsumerCount(), 0);
722 >        assertEquals(0, q.getWaitingConsumerCount());
723          assertFalse(q.hasWaitingConsumer());
724 +        final CountDownLatch threadStarted = new CountDownLatch(1);
725  
726          Thread t = newStartedThread(new CheckedRunnable() {
727              public void realRun() throws InterruptedException {
728 <                Thread.sleep(SMALL_DELAY_MS);
729 <                assertTrue(q.hasWaitingConsumer());
730 <                assertEquals(q.getWaitingConsumerCount(), 1);
830 <                assertTrue(q.offer(one));
728 >                threadStarted.countDown();
729 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
730 >                assertEquals(0, q.getWaitingConsumerCount());
731                  assertFalse(q.hasWaitingConsumer());
832                assertEquals(q.getWaitingConsumerCount(), 0);
732              }});
733  
734 <        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
735 <        assertEquals(q.getWaitingConsumerCount(), 0);
734 >        threadStarted.await();
735 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
736 >        assertEquals(1, q.getWaitingConsumerCount());
737 >        assertTrue(q.hasWaitingConsumer());
738 >
739 >        assertTrue(q.offer(one));
740 >        assertEquals(0, q.getWaitingConsumerCount());
741          assertFalse(q.hasWaitingConsumer());
742 +
743          awaitTermination(t, MEDIUM_DELAY_MS);
744      }
745  
# Line 856 | Line 761 | public class LinkedTransferQueueTest ext
761      public void testTransfer2() throws InterruptedException {
762          final LinkedTransferQueue<Integer> q
763              = new LinkedTransferQueue<Integer>();
764 +        final CountDownLatch threadStarted = new CountDownLatch(1);
765  
766          Thread t = newStartedThread(new CheckedRunnable() {
767              public void realRun() throws InterruptedException {
768 <                q.transfer(SIZE);
769 <                assertTrue(q.isEmpty());
768 >                threadStarted.countDown();
769 >                q.transfer(five);
770 >                checkEmpty(q);
771              }});
772  
773 <        Thread.sleep(SHORT_DELAY_MS);
773 >        threadStarted.await();
774 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
775          assertEquals(1, q.size());
776 <        assertEquals(SIZE, (int) q.poll());
777 <        assertTrue(q.isEmpty());
776 >        assertSame(five, q.poll());
777 >        checkEmpty(q);
778          awaitTermination(t, MEDIUM_DELAY_MS);
779      }
780  
# Line 879 | Line 787 | public class LinkedTransferQueueTest ext
787  
788          Thread first = newStartedThread(new CheckedRunnable() {
789              public void realRun() throws InterruptedException {
790 <                Integer i = SIZE + 1;
791 <                q.transfer(i);
884 <                assertTrue(!q.contains(i));
790 >                q.transfer(four);
791 >                assertTrue(!q.contains(four));
792                  assertEquals(1, q.size());
793              }});
794  
795          Thread interruptedThread = newStartedThread(
796              new CheckedInterruptedRunnable() {
797                  public void realRun() throws InterruptedException {
798 <                    while (q.size() == 0)
798 >                    while (q.isEmpty())
799                          Thread.yield();
800 <                    q.transfer(SIZE);
800 >                    q.transfer(five);
801                  }});
802  
803          while (q.size() < 2)
804              Thread.yield();
805          assertEquals(2, q.size());
806 <        assertEquals(SIZE + 1, (int) q.poll());
806 >        assertSame(four, q.poll());
807          first.join();
808          assertEquals(1, q.size());
809          interruptedThread.interrupt();
810          interruptedThread.join();
811 <        assertEquals(0, q.size());
905 <        assertTrue(q.isEmpty());
811 >        checkEmpty(q);
812      }
813  
814      /**
# Line 919 | Line 825 | public class LinkedTransferQueueTest ext
825                  assertSame(three, q.poll());
826              }});
827  
828 <        Thread.sleep(SHORT_DELAY_MS);
828 >        while (q.isEmpty())
829 >            Thread.yield();
830 >        assertFalse(q.isEmpty());
831 >        assertEquals(1, q.size());
832          assertTrue(q.offer(three));
833          assertSame(four, q.poll());
834          awaitTermination(t, MEDIUM_DELAY_MS);
# Line 935 | Line 844 | public class LinkedTransferQueueTest ext
844  
845          Thread t = newStartedThread(new CheckedRunnable() {
846              public void realRun() throws InterruptedException {
847 <                q.transfer(SIZE);
847 >                q.transfer(four);
848                  checkEmpty(q);
849              }});
850  
851 <        Thread.sleep(SHORT_DELAY_MS);
852 <        assertEquals(SIZE, (int) q.take());
851 >        while (q.isEmpty())
852 >            Thread.yield();
853 >        assertFalse(q.isEmpty());
854 >        assertEquals(1, q.size());
855 >        assertSame(four, q.take());
856          checkEmpty(q);
857          awaitTermination(t, MEDIUM_DELAY_MS);
858      }
# Line 949 | Line 861 | public class LinkedTransferQueueTest ext
861       * tryTransfer(null) throws NullPointerException
862       */
863      public void testTryTransfer1() {
864 +        final LinkedTransferQueue q = new LinkedTransferQueue();
865          try {
953            final LinkedTransferQueue q = new LinkedTransferQueue();
866              q.tryTransfer(null);
867              shouldThrow();
868          } catch (NullPointerException success) {}
# Line 980 | Line 892 | public class LinkedTransferQueueTest ext
892                  while (! q.hasWaitingConsumer())
893                      Thread.yield();
894                  assertTrue(q.hasWaitingConsumer());
895 <                assertTrue(q.isEmpty());
984 <                assertEquals(q.size(), 0);
895 >                checkEmpty(q);
896                  assertTrue(q.tryTransfer(hotPotato));
897              }});
898  
# Line 1003 | Line 914 | public class LinkedTransferQueueTest ext
914                  while (! q.hasWaitingConsumer())
915                      Thread.yield();
916                  assertTrue(q.hasWaitingConsumer());
917 <                assertTrue(q.isEmpty());
1007 <                assertEquals(q.size(), 0);
917 >                checkEmpty(q);
918                  assertTrue(q.tryTransfer(hotPotato));
919              }});
920  
# Line 1014 | Line 924 | public class LinkedTransferQueueTest ext
924      }
925  
926      /**
927 <     * tryTransfer waits the amount given if interrupted, and
1018 <     * throws interrupted exception
927 >     * tryTransfer blocks interruptibly if no takers
928       */
929      public void testTryTransfer5() throws InterruptedException {
930          final LinkedTransferQueue q = new LinkedTransferQueue();
931 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
932 +        assertTrue(q.isEmpty());
933  
934 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
934 >        Thread t = newStartedThread(new CheckedRunnable() {
935              public void realRun() throws InterruptedException {
936 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
936 >                Thread.currentThread().interrupt();
937 >                try {
938 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
939 >                    shouldThrow();
940 >                } catch (InterruptedException success) {}
941 >                assertFalse(Thread.interrupted());
942 >
943 >                pleaseInterrupt.countDown();
944 >                try {
945 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
946 >                    shouldThrow();
947 >                } catch (InterruptedException success) {}
948 >                assertFalse(Thread.interrupted());
949              }});
950  
951 <        Thread.sleep(SMALL_DELAY_MS);
952 <        toInterrupt.interrupt();
953 <        toInterrupt.join();
951 >        await(pleaseInterrupt);
952 >        assertThreadStaysAlive(t);
953 >        t.interrupt();
954 >        awaitTermination(t);
955 >        checkEmpty(q);
956      }
957  
958      /**
959 <     * tryTransfer gives up after the timeout and return false
959 >     * tryTransfer gives up after the timeout and returns false
960       */
961      public void testTryTransfer6() throws InterruptedException {
962          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 1040 | Line 965 | public class LinkedTransferQueueTest ext
965              public void realRun() throws InterruptedException {
966                  long t0 = System.nanoTime();
967                  assertFalse(q.tryTransfer(new Object(),
968 <                                          SHORT_DELAY_MS, MILLISECONDS));
969 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
968 >                                          timeoutMillis(), MILLISECONDS));
969 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
970 >                checkEmpty(q);
971              }});
972  
973 <        checkEmpty(q);
1048 <        awaitTermination(t, MEDIUM_DELAY_MS);
973 >        awaitTermination(t);
974          checkEmpty(q);
975      }
976  
# Line 1060 | Line 985 | public class LinkedTransferQueueTest ext
985          Thread t = newStartedThread(new CheckedRunnable() {
986              public void realRun() throws InterruptedException {
987                  assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
988 <                assertTrue(q.isEmpty());
988 >                checkEmpty(q);
989              }});
990  
991 <        Thread.sleep(SHORT_DELAY_MS);
991 >        while (q.size() != 2)
992 >            Thread.yield();
993          assertEquals(2, q.size());
994          assertSame(four, q.poll());
995          assertSame(five, q.poll());
# Line 1072 | Line 998 | public class LinkedTransferQueueTest ext
998      }
999  
1000      /**
1001 <     * tryTransfer attempts to enqueue into the q and fails returning
1002 <     * false not enqueueing and the successive poll is null
1001 >     * tryTransfer attempts to enqueue into the queue and fails
1002 >     * returning false not enqueueing and the successive poll is null
1003       */
1004      public void testTryTransfer8() throws InterruptedException {
1005          final LinkedTransferQueue q = new LinkedTransferQueue();
1006          assertTrue(q.offer(four));
1007          assertEquals(1, q.size());
1008 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1008 >        long t0 = System.nanoTime();
1009 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1010 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1011          assertEquals(1, q.size());
1012          assertSame(four, q.poll());
1013          assertNull(q.poll());
# Line 1088 | Line 1016 | public class LinkedTransferQueueTest ext
1016  
1017      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1018          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1019 <        assertTrue(q.isEmpty());
1019 >        checkEmpty(q);
1020          for (int i = 0; i < n; i++) {
1021              assertEquals(i, q.size());
1022              assertTrue(q.offer(i));
# Line 1097 | Line 1025 | public class LinkedTransferQueueTest ext
1025          assertFalse(q.isEmpty());
1026          return q;
1027      }
1028 +
1029 +    /**
1030 +     * remove(null), contains(null) always return false
1031 +     */
1032 +    public void testNeverContainsNull() {
1033 +        Collection<?>[] qs = {
1034 +            new LinkedTransferQueue<Object>(),
1035 +            populatedQueue(2),
1036 +        };
1037 +
1038 +        for (Collection<?> q : qs) {
1039 +            assertFalse(q.contains(null));
1040 +            assertFalse(q.remove(null));
1041 +        }
1042 +    }
1043   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines