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.41 by jsr166, Thu Nov 18 18:49:44 2010 UTC vs.
Revision 1.65 by jsr166, Tue Oct 6 00:36:55 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 {
27 +    static class Implementation implements CollectionImplementation {
28 +        public Class<?> klazz() { return LinkedTransferQueue.class; }
29 +        public Collection emptyCollection() { return new LinkedTransferQueue(); }
30 +        public Object makeElement(int i) { return i; }
31 +        public boolean isConcurrent() { return true; }
32 +        public boolean permitsNulls() { return false; }
33 +    }
34  
35      public static class Generic extends BlockingQueueTest {
36          protected BlockingQueue emptyCollection() {
# Line 32 | Line 39 | public class LinkedTransferQueueTest ext
39      }
40  
41      public static void main(String[] args) {
42 <        junit.textui.TestRunner.run(suite());
42 >        main(suite(), args);
43      }
44  
45      public static Test suite() {
46          return newTestSuite(LinkedTransferQueueTest.class,
47 <                            new Generic().testSuite());
48 <    }
42 <
43 <    void checkEmpty(BlockingQueue q) {
44 <        try {
45 <            assertTrue(q.isEmpty());
46 <            assertEquals(0, q.size());
47 <            assertNull(q.peek());
48 <            assertNull(q.poll());
49 <            assertNull(q.poll(0, MILLISECONDS));
50 <            assertEquals(q.toString(), "[]");
51 <            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
52 <            assertFalse(q.iterator().hasNext());
53 <            try {
54 <                q.element();
55 <                shouldThrow();
56 <            } catch (NoSuchElementException success) {}
57 <            try {
58 <                q.iterator().next();
59 <                shouldThrow();
60 <            } catch (NoSuchElementException success) {}
61 <            try {
62 <                q.remove();
63 <                shouldThrow();
64 <            } catch (NoSuchElementException success) {}
65 <        } catch (InterruptedException ie) {
66 <            threadUnexpectedException(ie);
67 <        }
47 >                            new Generic().testSuite(),
48 >                            CollectionTest.testSuite(new Implementation()));
49      }
50  
51      /**
# Line 92 | Line 73 | public class LinkedTransferQueueTest ext
73       * NullPointerException
74       */
75      public void testConstructor3() {
76 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
77          try {
78 <            Integer[] ints = new Integer[SIZE];
97 <            new LinkedTransferQueue(Arrays.asList(ints));
78 >            new LinkedTransferQueue(elements);
79              shouldThrow();
80          } catch (NullPointerException success) {}
81      }
# Line 104 | Line 85 | public class LinkedTransferQueueTest ext
85       * throws NullPointerException
86       */
87      public void testConstructor4() {
88 +        Integer[] ints = new Integer[SIZE];
89 +        for (int i = 0; i < SIZE - 1; ++i)
90 +            ints[i] = i;
91 +        Collection<Integer> elements = Arrays.asList(ints);
92          try {
93 <            Integer[] ints = new Integer[SIZE];
109 <            for (int i = 0; i < SIZE - 1; ++i) {
110 <                ints[i] = i;
111 <            }
112 <            new LinkedTransferQueue(Arrays.asList(ints));
93 >            new LinkedTransferQueue(elements);
94              shouldThrow();
95          } catch (NullPointerException success) {}
96      }
# Line 142 | Line 123 | public class LinkedTransferQueueTest ext
123       * remainingCapacity() always returns Integer.MAX_VALUE
124       */
125      public void testRemainingCapacity() {
126 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
126 >        BlockingQueue q = populatedQueue(SIZE);
127          for (int i = 0; i < SIZE; ++i) {
128              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
129              assertEquals(SIZE - i, q.size());
130 <            q.remove();
130 >            assertEquals(i, q.remove());
131          }
132          for (int i = 0; i < SIZE; ++i) {
133              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
134              assertEquals(i, q.size());
135 <            q.add(i);
135 >            assertTrue(q.add(i));
136          }
137      }
138  
139      /**
159     * offer(null) throws NullPointerException
160     */
161    public void testOfferNull() {
162        try {
163            LinkedTransferQueue q = new LinkedTransferQueue();
164            q.offer(null);
165            shouldThrow();
166        } catch (NullPointerException success) {}
167    }
168
169    /**
170     * add(null) throws NullPointerException
171     */
172    public void testAddNull() {
173        try {
174            LinkedTransferQueue q = new LinkedTransferQueue();
175            q.add(null);
176            shouldThrow();
177        } catch (NullPointerException success) {}
178    }
179
180    /**
181     * addAll(null) throws NullPointerException
182     */
183    public void testAddAll1() {
184        try {
185            LinkedTransferQueue q = new LinkedTransferQueue();
186            q.addAll(null);
187            shouldThrow();
188        } catch (NullPointerException success) {}
189    }
190
191    /**
140       * addAll(this) throws IllegalArgumentException
141       */
142      public void testAddAllSelf() {
143 +        LinkedTransferQueue q = populatedQueue(SIZE);
144          try {
196            LinkedTransferQueue q = populatedQueue(SIZE);
145              q.addAll(q);
146              shouldThrow();
147          } catch (IllegalArgumentException success) {}
148      }
149  
150      /**
203     * addAll of a collection with null elements throws NullPointerException
204     */
205    public void testAddAll2() {
206        try {
207            LinkedTransferQueue q = new LinkedTransferQueue();
208            Integer[] ints = new Integer[SIZE];
209            q.addAll(Arrays.asList(ints));
210            shouldThrow();
211        } catch (NullPointerException success) {}
212    }
213
214    /**
151       * addAll of a collection with any null elements throws
152       * NullPointerException after possibly adding some elements
153       */
154      public void testAddAll3() {
155 +        LinkedTransferQueue q = new LinkedTransferQueue();
156 +        Integer[] ints = new Integer[SIZE];
157 +        for (int i = 0; i < SIZE - 1; ++i)
158 +            ints[i] = i;
159          try {
220            LinkedTransferQueue q = new LinkedTransferQueue();
221            Integer[] ints = new Integer[SIZE];
222            for (int i = 0; i < SIZE - 1; ++i) {
223                ints[i] = i;
224            }
160              q.addAll(Arrays.asList(ints));
161              shouldThrow();
162          } catch (NullPointerException success) {}
# Line 245 | Line 180 | public class LinkedTransferQueueTest ext
180      }
181  
182      /**
248     * put(null) throws NullPointerException
249     */
250    public void testPutNull() throws InterruptedException {
251        try {
252            LinkedTransferQueue q = new LinkedTransferQueue();
253            q.put(null);
254            shouldThrow();
255        } catch (NullPointerException success) {}
256    }
257
258    /**
183       * all elements successfully put are contained
184       */
185      public void testPut() {
186          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
187          for (int i = 0; i < SIZE; ++i) {
188 <            assertEquals(q.size(), i);
188 >            assertEquals(i, q.size());
189              q.put(i);
190              assertTrue(q.contains(i));
191          }
# Line 281 | Line 205 | public class LinkedTransferQueueTest ext
205       * take removes existing elements until empty, then blocks interruptibly
206       */
207      public void testBlockingTake() throws InterruptedException {
208 <        final BlockingQueue<Integer> q = populatedQueue(SIZE);
209 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
208 >        final BlockingQueue q = populatedQueue(SIZE);
209 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
210          Thread t = newStartedThread(new CheckedRunnable() {
211              public void realRun() throws InterruptedException {
212                  for (int i = 0; i < SIZE; ++i) {
213 <                    assertEquals(i, (int) q.take());
213 >                    assertEquals(i, q.take());
214                  }
215 <                aboutToWait.countDown();
215 >
216 >                Thread.currentThread().interrupt();
217 >                try {
218 >                    q.take();
219 >                    shouldThrow();
220 >                } catch (InterruptedException success) {}
221 >                assertFalse(Thread.interrupted());
222 >
223 >                pleaseInterrupt.countDown();
224                  try {
225                      q.take();
226                      shouldThrow();
227                  } catch (InterruptedException success) {}
228 +                assertFalse(Thread.interrupted());
229              }});
230  
231 <        aboutToWait.await();
232 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
231 >        await(pleaseInterrupt);
232 >        assertThreadStaysAlive(t);
233          t.interrupt();
234 <        awaitTermination(t, MEDIUM_DELAY_MS);
302 <        checkEmpty(q);
234 >        awaitTermination(t);
235      }
236  
237      /**
# Line 332 | Line 264 | public class LinkedTransferQueueTest ext
264      public void testTimedPoll() throws InterruptedException {
265          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
266          for (int i = 0; i < SIZE; ++i) {
267 <            long t0 = System.nanoTime();
268 <            assertEquals(i, (int) q.poll(SMALL_DELAY_MS, MILLISECONDS));
269 <            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
270 <        }
271 <        long t0 = System.nanoTime();
272 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
273 <        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
267 >            long startTime = System.nanoTime();
268 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
269 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
270 >        }
271 >        long startTime = System.nanoTime();
272 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
273 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
274          checkEmpty(q);
275      }
276  
# Line 351 | Line 283 | public class LinkedTransferQueueTest ext
283          final CountDownLatch aboutToWait = new CountDownLatch(1);
284          Thread t = newStartedThread(new CheckedRunnable() {
285              public void realRun() throws InterruptedException {
286 +                long startTime = System.nanoTime();
287                  for (int i = 0; i < SIZE; ++i) {
355                    long t0 = System.nanoTime();
288                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
357                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
289                  }
359                long t0 = System.nanoTime();
290                  aboutToWait.countDown();
291                  try {
292 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
292 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
293                      shouldThrow();
294                  } catch (InterruptedException success) {
295 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
295 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
296                  }
297              }});
298  
299          aboutToWait.await();
300 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
300 >        waitForThreadToEnterWaitState(t, LONG_DELAY_MS);
301          t.interrupt();
302 <        awaitTermination(t, MEDIUM_DELAY_MS);
302 >        awaitTermination(t);
303          checkEmpty(q);
304      }
305  
# Line 383 | Line 313 | public class LinkedTransferQueueTest ext
313              public void realRun() throws InterruptedException {
314                  Thread.currentThread().interrupt();
315                  for (int i = 0; i < SIZE; ++i) {
316 <                    long t0 = System.nanoTime();
316 >                    long startTime = System.nanoTime();
317                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
318 <                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
318 >                    assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
319                  }
320                  try {
321                      q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
# Line 444 | Line 374 | public class LinkedTransferQueueTest ext
374      }
375  
376      /**
447     * remove(x) removes x and returns true if present
448     */
449    public void testRemoveElement() throws InterruptedException {
450        LinkedTransferQueue q = populatedQueue(SIZE);
451        for (int i = 1; i < SIZE; i += 2) {
452            assertTrue(q.remove(i));
453        }
454        for (int i = 0; i < SIZE; i += 2) {
455            assertTrue(q.remove(i));
456            assertFalse(q.remove(i + 1));
457        }
458        checkEmpty(q);
459    }
460
461    /**
377       * An add following remove(x) succeeds
378       */
379      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 574 | Line 489 | public class LinkedTransferQueueTest ext
489      }
490  
491      /**
577     * toArray(null) throws NullPointerException
578     */
579    public void testToArray_NullArg() {
580        LinkedTransferQueue q = populatedQueue(SIZE);
581        try {
582            q.toArray(null);
583            shouldThrow();
584        } catch (NullPointerException success) {}
585    }
586
587    /**
492       * toArray(incompatible array type) throws ArrayStoreException
493       */
494      public void testToArray1_BadArg() {
# Line 601 | Line 505 | public class LinkedTransferQueueTest ext
505      public void testIterator() throws InterruptedException {
506          LinkedTransferQueue q = populatedQueue(SIZE);
507          Iterator it = q.iterator();
508 <        int i = 0;
509 <        while (it.hasNext()) {
510 <            assertEquals(it.next(), i++);
511 <        }
508 >        int i;
509 >        for (i = 0; it.hasNext(); i++)
510 >            assertTrue(q.contains(it.next()));
511 >        assertEquals(i, SIZE);
512 >        assertIteratorExhausted(it);
513 >
514 >        it = q.iterator();
515 >        for (i = 0; it.hasNext(); i++)
516 >            assertEquals(it.next(), q.take());
517          assertEquals(i, SIZE);
518 +        assertIteratorExhausted(it);
519 +    }
520 +
521 +    /**
522 +     * iterator of empty collection has no elements
523 +     */
524 +    public void testEmptyIterator() {
525 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
526      }
527  
528      /**
# Line 667 | Line 584 | public class LinkedTransferQueueTest ext
584          LinkedTransferQueue q = populatedQueue(SIZE);
585          String s = q.toString();
586          for (int i = 0; i < SIZE; ++i) {
587 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
587 >            assertTrue(s.contains(String.valueOf(i)));
588          }
589      }
590  
# Line 676 | Line 593 | public class LinkedTransferQueueTest ext
593       */
594      public void testOfferInExecutor() {
595          final LinkedTransferQueue q = new LinkedTransferQueue();
596 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
597 <        ExecutorService executor = Executors.newFixedThreadPool(2);
596 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
597 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
598 >        try (PoolCleaner cleaner = cleaner(executor)) {
599  
600 <        executor.execute(new CheckedRunnable() {
601 <            public void realRun() throws InterruptedException {
602 <                threadsStarted.countDown();
603 <                threadsStarted.await();
604 <                assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
687 <            }});
688 <
689 <        executor.execute(new CheckedRunnable() {
690 <            public void realRun() throws InterruptedException {
691 <                threadsStarted.countDown();
692 <                threadsStarted.await();
693 <                assertSame(one, q.take());
694 <                checkEmpty(q);
695 <            }});
600 >            executor.execute(new CheckedRunnable() {
601 >                public void realRun() throws InterruptedException {
602 >                    threadsStarted.await();
603 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
604 >                }});
605  
606 <        joinPool(executor);
606 >            executor.execute(new CheckedRunnable() {
607 >                public void realRun() throws InterruptedException {
608 >                    threadsStarted.await();
609 >                    assertSame(one, q.take());
610 >                    checkEmpty(q);
611 >                }});
612 >        }
613      }
614  
615      /**
# Line 702 | Line 617 | public class LinkedTransferQueueTest ext
617       */
618      public void testPollInExecutor() {
619          final LinkedTransferQueue q = new LinkedTransferQueue();
620 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
621 <        ExecutorService executor = Executors.newFixedThreadPool(2);
622 <
708 <        executor.execute(new CheckedRunnable() {
709 <            public void realRun() throws InterruptedException {
710 <                assertNull(q.poll());
711 <                threadsStarted.countDown();
712 <                threadsStarted.await();
713 <                assertSame(one, q.poll(SMALL_DELAY_MS, MILLISECONDS));
714 <                checkEmpty(q);
715 <            }});
620 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
621 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
622 >        try (PoolCleaner cleaner = cleaner(executor)) {
623  
624 <        executor.execute(new CheckedRunnable() {
625 <            public void realRun() throws InterruptedException {
626 <                threadsStarted.countDown();
627 <                threadsStarted.await();
628 <                q.put(one);
629 <            }});
624 >            executor.execute(new CheckedRunnable() {
625 >                public void realRun() throws InterruptedException {
626 >                    assertNull(q.poll());
627 >                    threadsStarted.await();
628 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
629 >                    checkEmpty(q);
630 >                }});
631  
632 <        joinPool(executor);
632 >            executor.execute(new CheckedRunnable() {
633 >                public void realRun() throws InterruptedException {
634 >                    threadsStarted.await();
635 >                    q.put(one);
636 >                }});
637 >        }
638      }
639  
640      /**
641       * A deserialized serialized queue has same elements in same order
642       */
643      public void testSerialization() throws Exception {
644 <        LinkedTransferQueue q = populatedQueue(SIZE);
645 <
733 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
734 <        ObjectOutputStream out
735 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
736 <        out.writeObject(q);
737 <        out.close();
644 >        Queue x = populatedQueue(SIZE);
645 >        Queue y = serialClone(x);
646  
647 <        ByteArrayInputStream bin
648 <            = new ByteArrayInputStream(bout.toByteArray());
649 <        ObjectInputStream in
650 <            = new ObjectInputStream(new BufferedInputStream(bin));
651 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
652 <
653 <        assertEquals(q.size(), r.size());
746 <        assertEquals(q.toString(), r.toString());
747 <        assertTrue(Arrays.equals(q.toArray(), r.toArray()));
748 <        while (!q.isEmpty()) {
749 <            assertEquals(q.remove(), r.remove());
647 >        assertNotSame(y, x);
648 >        assertEquals(x.size(), y.size());
649 >        assertEquals(x.toString(), y.toString());
650 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
651 >        while (!x.isEmpty()) {
652 >            assertFalse(y.isEmpty());
653 >            assertEquals(x.remove(), y.remove());
654          }
655 <    }
752 <
753 <    /**
754 <     * drainTo(null) throws NullPointerException
755 <     */
756 <    public void testDrainToNull() {
757 <        LinkedTransferQueue q = populatedQueue(SIZE);
758 <        try {
759 <            q.drainTo(null);
760 <            shouldThrow();
761 <        } catch (NullPointerException success) {}
762 <    }
763 <
764 <    /**
765 <     * drainTo(this) throws IllegalArgumentException
766 <     */
767 <    public void testDrainToSelf() {
768 <        LinkedTransferQueue q = populatedQueue(SIZE);
769 <        try {
770 <            q.drainTo(q);
771 <            shouldThrow();
772 <        } catch (IllegalArgumentException success) {}
655 >        assertTrue(y.isEmpty());
656      }
657  
658      /**
# Line 779 | Line 662 | public class LinkedTransferQueueTest ext
662          LinkedTransferQueue q = populatedQueue(SIZE);
663          ArrayList l = new ArrayList();
664          q.drainTo(l);
665 <        assertEquals(q.size(), 0);
666 <        assertEquals(l.size(), SIZE);
665 >        assertEquals(0, q.size());
666 >        assertEquals(SIZE, l.size());
667          for (int i = 0; i < SIZE; ++i) {
668 <            assertEquals(l.get(i), i);
668 >            assertEquals(i, l.get(i));
669          }
670          q.add(zero);
671          q.add(one);
# Line 791 | Line 674 | public class LinkedTransferQueueTest ext
674          assertTrue(q.contains(one));
675          l.clear();
676          q.drainTo(l);
677 <        assertEquals(q.size(), 0);
678 <        assertEquals(l.size(), 2);
677 >        assertEquals(0, q.size());
678 >        assertEquals(2, l.size());
679          for (int i = 0; i < 2; ++i) {
680 <            assertEquals(l.get(i), i);
680 >            assertEquals(i, l.get(i));
681          }
682      }
683  
# Line 810 | Line 693 | public class LinkedTransferQueueTest ext
693          ArrayList l = new ArrayList();
694          q.drainTo(l);
695          assertTrue(l.size() >= SIZE);
696 <        for (int i = 0; i < SIZE; ++i) {
697 <            assertEquals(l.get(i), i);
815 <        }
696 >        for (int i = 0; i < SIZE; ++i)
697 >            assertEquals(i, l.get(i));
698          awaitTermination(t, MEDIUM_DELAY_MS);
699          assertTrue(q.size() + l.size() >= SIZE);
700      }
701  
702      /**
821     * drainTo(null, n) throws NullPointerException
822     */
823    public void testDrainToNullN() {
824        LinkedTransferQueue q = populatedQueue(SIZE);
825        try {
826            q.drainTo(null, SIZE);
827            shouldThrow();
828        } catch (NullPointerException success) {}
829    }
830
831    /**
832     * drainTo(this, n) throws IllegalArgumentException
833     */
834    public void testDrainToSelfN() {
835        LinkedTransferQueue q = populatedQueue(SIZE);
836        try {
837            q.drainTo(q, SIZE);
838            shouldThrow();
839        } catch (IllegalArgumentException success) {}
840    }
841
842    /**
703       * drainTo(c, n) empties first min(n, size) elements of queue into c
704       */
705      public void testDrainToN() {
# Line 851 | Line 711 | public class LinkedTransferQueueTest ext
711              ArrayList l = new ArrayList();
712              q.drainTo(l, i);
713              int k = (i < SIZE) ? i : SIZE;
714 <            assertEquals(l.size(), k);
715 <            assertEquals(q.size(), SIZE - k);
716 <            for (int j = 0; j < k; ++j) {
717 <                assertEquals(l.get(j), j);
718 <            }
859 <            while (q.poll() != null)
860 <                ;
714 >            assertEquals(k, l.size());
715 >            assertEquals(SIZE - k, q.size());
716 >            for (int j = 0; j < k; ++j)
717 >                assertEquals(j, l.get(j));
718 >            do {} while (q.poll() != null);
719          }
720      }
721  
# Line 867 | Line 725 | public class LinkedTransferQueueTest ext
725       */
726      public void testWaitingConsumer() throws InterruptedException {
727          final LinkedTransferQueue q = new LinkedTransferQueue();
728 <        assertEquals(q.getWaitingConsumerCount(), 0);
728 >        assertEquals(0, q.getWaitingConsumerCount());
729          assertFalse(q.hasWaitingConsumer());
730          final CountDownLatch threadStarted = new CountDownLatch(1);
731  
# Line 875 | Line 733 | public class LinkedTransferQueueTest ext
733              public void realRun() throws InterruptedException {
734                  threadStarted.countDown();
735                  assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
736 <                assertEquals(q.getWaitingConsumerCount(), 0);
736 >                assertEquals(0, q.getWaitingConsumerCount());
737                  assertFalse(q.hasWaitingConsumer());
738              }});
739  
740          threadStarted.await();
741          waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
742 <        assertEquals(q.getWaitingConsumerCount(), 1);
742 >        assertEquals(1, q.getWaitingConsumerCount());
743          assertTrue(q.hasWaitingConsumer());
744  
745          assertTrue(q.offer(one));
746 <        assertEquals(q.getWaitingConsumerCount(), 0);
746 >        assertEquals(0, q.getWaitingConsumerCount());
747          assertFalse(q.hasWaitingConsumer());
748  
749          awaitTermination(t, MEDIUM_DELAY_MS);
# Line 1009 | Line 867 | public class LinkedTransferQueueTest ext
867       * tryTransfer(null) throws NullPointerException
868       */
869      public void testTryTransfer1() {
870 +        final LinkedTransferQueue q = new LinkedTransferQueue();
871          try {
1013            final LinkedTransferQueue q = new LinkedTransferQueue();
872              q.tryTransfer(null);
873              shouldThrow();
874          } catch (NullPointerException success) {}
# Line 1072 | Line 930 | public class LinkedTransferQueueTest ext
930      }
931  
932      /**
933 <     * tryTransfer waits the amount given, and throws
1076 <     * InterruptedException when interrupted.
933 >     * tryTransfer blocks interruptibly if no takers
934       */
935      public void testTryTransfer5() throws InterruptedException {
936          final LinkedTransferQueue q = new LinkedTransferQueue();
937 <        final CountDownLatch threadStarted = new CountDownLatch(1);
937 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
938          assertTrue(q.isEmpty());
939  
940          Thread t = newStartedThread(new CheckedRunnable() {
941              public void realRun() throws InterruptedException {
942 <                long t0 = System.nanoTime();
1086 <                threadStarted.countDown();
942 >                Thread.currentThread().interrupt();
943                  try {
944                      q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
945                      shouldThrow();
946                  } catch (InterruptedException success) {}
947 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
948 <                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
947 >                assertFalse(Thread.interrupted());
948 >
949 >                pleaseInterrupt.countDown();
950 >                try {
951 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
952 >                    shouldThrow();
953 >                } catch (InterruptedException success) {}
954 >                assertFalse(Thread.interrupted());
955              }});
956  
957 <        threadStarted.await();
958 <        while (q.isEmpty())
1097 <            Thread.yield();
1098 <        Thread.sleep(SHORT_DELAY_MS);
957 >        await(pleaseInterrupt);
958 >        assertThreadStaysAlive(t);
959          t.interrupt();
960 <        awaitTermination(t, MEDIUM_DELAY_MS);
960 >        awaitTermination(t);
961          checkEmpty(q);
962      }
963  
# Line 1109 | Line 969 | public class LinkedTransferQueueTest ext
969  
970          Thread t = newStartedThread(new CheckedRunnable() {
971              public void realRun() throws InterruptedException {
972 <                long t0 = System.nanoTime();
972 >                long startTime = System.nanoTime();
973                  assertFalse(q.tryTransfer(new Object(),
974 <                                          SHORT_DELAY_MS, MILLISECONDS));
975 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
974 >                                          timeoutMillis(), MILLISECONDS));
975 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
976                  checkEmpty(q);
977              }});
978  
979 <        awaitTermination(t, MEDIUM_DELAY_MS);
979 >        awaitTermination(t);
980          checkEmpty(q);
981      }
982  
# Line 1151 | Line 1011 | public class LinkedTransferQueueTest ext
1011          final LinkedTransferQueue q = new LinkedTransferQueue();
1012          assertTrue(q.offer(four));
1013          assertEquals(1, q.size());
1014 <        long t0 = System.nanoTime();
1015 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1016 <        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
1014 >        long startTime = System.nanoTime();
1015 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1016 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1017          assertEquals(1, q.size());
1018          assertSame(four, q.poll());
1019          assertNull(q.poll());
# Line 1171 | Line 1031 | public class LinkedTransferQueueTest ext
1031          assertFalse(q.isEmpty());
1032          return q;
1033      }
1034 +
1035 +    /**
1036 +     * remove(null), contains(null) always return false
1037 +     */
1038 +    public void testNeverContainsNull() {
1039 +        Collection<?>[] qs = {
1040 +            new LinkedTransferQueue<Object>(),
1041 +            populatedQueue(2),
1042 +        };
1043 +
1044 +        for (Collection<?> q : qs) {
1045 +            assertFalse(q.contains(null));
1046 +            assertFalse(q.remove(null));
1047 +        }
1048 +    }
1049   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines