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.31 by jsr166, Thu Oct 28 22:42:05 2010 UTC vs.
Revision 1.84 by jsr166, Fri Sep 6 22:43:50 2019 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.Callable;
19 > import java.util.concurrent.CountDownLatch;
20 > import java.util.concurrent.Executors;
21 > import java.util.concurrent.ExecutorService;
22 > import java.util.concurrent.LinkedTransferQueue;
23 >
24   import junit.framework.Test;
23 import junit.framework.TestSuite;
25  
26   @SuppressWarnings({"unchecked", "rawtypes"})
27   public class LinkedTransferQueueTest extends JSR166TestCase {
27
28      public static class Generic extends BlockingQueueTest {
29          protected BlockingQueue emptyCollection() {
30              return new LinkedTransferQueue();
# 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() {
39 <        return newTestSuite(LinkedTransferQueueTest.class,
40 <                            new Generic().testSuite());
41 <    }
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);
39 >        class Implementation implements CollectionImplementation {
40 >            public Class<?> klazz() { return LinkedTransferQueue.class; }
41 >            public Collection emptyCollection() { return new LinkedTransferQueue(); }
42 >            public Object makeElement(int i) { return i; }
43 >            public boolean isConcurrent() { return true; }
44 >            public boolean permitsNulls() { return false; }
45          }
46 +        return newTestSuite(LinkedTransferQueueTest.class,
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>();
186 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
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());
214 <                }
291 <                aboutToWait.countDown();
212 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
213 >
214 >                Thread.currentThread().interrupt();
215                  try {
216                      q.take();
217                      shouldThrow();
218                  } catch (InterruptedException success) {}
219 +                assertFalse(Thread.interrupted());
220 +
221 +                pleaseInterrupt.countDown();
222 +                try {
223 +                    q.take();
224 +                    shouldThrow();
225 +                } catch (InterruptedException success) {}
226 +                assertFalse(Thread.interrupted());
227              }});
228  
229 <        aboutToWait.await();
230 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
229 >        await(pleaseInterrupt);
230 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
231          t.interrupt();
232 <        awaitTermination(t, MEDIUM_DELAY_MS);
302 <        checkEmpty(q);
232 >        awaitTermination(t);
233      }
234  
235      /**
# Line 331 | Line 261 | public class LinkedTransferQueueTest ext
261       */
262      public void testTimedPoll() throws InterruptedException {
263          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
264 <        for (int i = 0; i < SIZE; ++i) {
265 <            long t0 = System.nanoTime();
266 <            assertEquals(i, (int) q.poll(SMALL_DELAY_MS, MILLISECONDS));
267 <            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
268 <        }
269 <        long t0 = System.nanoTime();
270 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
271 <        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
264 >        long startTime = System.nanoTime();
265 >        for (int i = 0; i < SIZE; ++i)
266 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
267 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
268 >
269 >        startTime = System.nanoTime();
270 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
271 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
272          checkEmpty(q);
273      }
274  
# Line 348 | Line 278 | public class LinkedTransferQueueTest ext
278       */
279      public void testInterruptedTimedPoll() throws InterruptedException {
280          final BlockingQueue<Integer> q = populatedQueue(SIZE);
281 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
281 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
282          Thread t = newStartedThread(new CheckedRunnable() {
283              public void realRun() throws InterruptedException {
284 <                for (int i = 0; i < SIZE; ++i) {
355 <                    long t0 = System.nanoTime();
284 >                for (int i = 0; i < SIZE; i++)
285                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
286 <                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
287 <                }
288 <                aboutToWait.countDown();
286 >
287 >                Thread.currentThread().interrupt();
288 >                try {
289 >                    q.poll(randomTimeout(), randomTimeUnit());
290 >                    shouldThrow();
291 >                } catch (InterruptedException success) {}
292 >                assertFalse(Thread.interrupted());
293 >
294 >                pleaseInterrupt.countDown();
295                  try {
296 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
296 >                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
297                      shouldThrow();
298                  } catch (InterruptedException success) {}
299 +                assertFalse(Thread.interrupted());
300              }});
301  
302 <        aboutToWait.await();
303 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
302 >        await(pleaseInterrupt);
303 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
304          t.interrupt();
305 <        awaitTermination(t, MEDIUM_DELAY_MS);
305 >        awaitTermination(t);
306          checkEmpty(q);
307      }
308  
# Line 379 | Line 315 | public class LinkedTransferQueueTest ext
315          Thread t = newStartedThread(new CheckedRunnable() {
316              public void realRun() throws InterruptedException {
317                  Thread.currentThread().interrupt();
318 <                for (int i = 0; i < SIZE; ++i) {
319 <                    long t0 = System.nanoTime();
384 <                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
385 <                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
386 <                }
318 >                for (int i = 0; i < SIZE; ++i)
319 >                    assertEquals(i, (int) q.poll(randomTimeout(), randomTimeUnit()));
320                  try {
321 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
321 >                    q.poll(randomTimeout(), randomTimeUnit());
322                      shouldThrow();
323                  } catch (InterruptedException success) {}
324 +                assertFalse(Thread.interrupted());
325              }});
326  
327 <        awaitTermination(t, MEDIUM_DELAY_MS);
327 >        awaitTermination(t);
328          checkEmpty(q);
329      }
330  
# Line 441 | Line 375 | public class LinkedTransferQueueTest ext
375      }
376  
377      /**
444     * remove(x) removes x and returns true if present
445     */
446    public void testRemoveElement() throws InterruptedException {
447        LinkedTransferQueue q = populatedQueue(SIZE);
448        for (int i = 1; i < SIZE; i += 2) {
449            assertTrue(q.remove(i));
450        }
451        for (int i = 0; i < SIZE; i += 2) {
452            assertTrue(q.remove(i));
453            assertFalse(q.remove(i + 1));
454        }
455        checkEmpty(q);
456    }
457
458    /**
378       * An add following remove(x) succeeds
379       */
380      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 501 | Line 420 | public class LinkedTransferQueueTest ext
420       */
421      public void testContainsAll() {
422          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
423 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
423 >        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
424          for (int i = 0; i < SIZE; ++i) {
425              assertTrue(q.containsAll(p));
426              assertFalse(p.containsAll(q));
# Line 547 | Line 466 | public class LinkedTransferQueueTest ext
466      }
467  
468      /**
469 <     * toArray() contains all elements
469 >     * toArray() contains all elements in FIFO order
470       */
471 <    public void testToArray() throws InterruptedException {
471 >    public void testToArray() {
472          LinkedTransferQueue q = populatedQueue(SIZE);
473 <        Object[] o = q.toArray();
474 <        for (int i = 0; i < o.length; i++) {
475 <            assertEquals(o[i], q.take());
476 <        }
473 >        Object[] a = q.toArray();
474 >        assertSame(Object[].class, a.getClass());
475 >        for (Object o : a)
476 >            assertSame(o, q.poll());
477 >        assertTrue(q.isEmpty());
478      }
479  
480      /**
481 <     * toArray(a) contains all elements
481 >     * toArray(a) contains all elements in FIFO order
482       */
483 <    public void testToArray2() throws InterruptedException {
483 >    public void testToArray2() {
484          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
485          Integer[] ints = new Integer[SIZE];
486 <        ints = q.toArray(ints);
487 <        for (int i = 0; i < ints.length; i++) {
488 <            assertEquals(ints[i], q.take());
489 <        }
486 >        Integer[] array = q.toArray(ints);
487 >        assertSame(ints, array);
488 >        for (Integer o : ints)
489 >            assertSame(o, q.poll());
490 >        assertTrue(q.isEmpty());
491      }
492  
493      /**
494 <     * toArray(null) throws NullPointerException
574 <     */
575 <    public void testToArray_BadArg() {
576 <        LinkedTransferQueue q = populatedQueue(SIZE);
577 <        try {
578 <            Object o[] = q.toArray(null);
579 <            shouldThrow();
580 <        } catch (NullPointerException success) {}
581 <    }
582 <
583 <    /**
584 <     * toArray(incompatible array type) throws CCE
494 >     * toArray(incompatible array type) throws ArrayStoreException
495       */
496      public void testToArray1_BadArg() {
497          LinkedTransferQueue q = populatedQueue(SIZE);
498          try {
499 <            Object o[] = q.toArray(new String[10]);
499 >            q.toArray(new String[10]);
500              shouldThrow();
501          } catch (ArrayStoreException success) {}
502      }
# Line 597 | Line 507 | public class LinkedTransferQueueTest ext
507      public void testIterator() throws InterruptedException {
508          LinkedTransferQueue q = populatedQueue(SIZE);
509          Iterator it = q.iterator();
510 <        int i = 0;
511 <        while (it.hasNext()) {
512 <            assertEquals(it.next(), i++);
513 <        }
510 >        int i;
511 >        for (i = 0; it.hasNext(); i++)
512 >            assertTrue(q.contains(it.next()));
513 >        assertEquals(i, SIZE);
514 >        assertIteratorExhausted(it);
515 >
516 >        it = q.iterator();
517 >        for (i = 0; it.hasNext(); i++)
518 >            assertEquals(it.next(), q.take());
519          assertEquals(i, SIZE);
520 +        assertIteratorExhausted(it);
521 +    }
522 +
523 +    /**
524 +     * iterator of empty collection has no elements
525 +     */
526 +    public void testEmptyIterator() {
527 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
528      }
529  
530      /**
# Line 627 | Line 550 | public class LinkedTransferQueueTest ext
550       * iterator ordering is FIFO
551       */
552      public void testIteratorOrdering() {
553 <        final LinkedTransferQueue<Integer> q
631 <            = new LinkedTransferQueue<Integer>();
553 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
554          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
555          q.add(one);
556          q.add(two);
# Line 663 | Line 585 | public class LinkedTransferQueueTest ext
585          LinkedTransferQueue q = populatedQueue(SIZE);
586          String s = q.toString();
587          for (int i = 0; i < SIZE; ++i) {
588 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
588 >            assertTrue(s.contains(String.valueOf(i)));
589          }
590      }
591  
# Line 672 | Line 594 | public class LinkedTransferQueueTest ext
594       */
595      public void testOfferInExecutor() {
596          final LinkedTransferQueue q = new LinkedTransferQueue();
597 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
598 <        ExecutorService executor = Executors.newFixedThreadPool(2);
599 <
678 <        executor.execute(new CheckedRunnable() {
679 <            public void realRun() throws InterruptedException {
680 <                threadsStarted.countDown();
681 <                threadsStarted.await();
682 <                assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
683 <            }});
597 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
598 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
599 >        try (PoolCleaner cleaner = cleaner(executor)) {
600  
601 <        executor.execute(new CheckedRunnable() {
602 <            public void realRun() throws InterruptedException {
603 <                threadsStarted.countDown();
604 <                threadsStarted.await();
605 <                assertSame(one, q.take());
606 <                checkEmpty(q);
607 <            }});
601 >            executor.execute(new CheckedRunnable() {
602 >                public void realRun() throws InterruptedException {
603 >                    threadsStarted.await();
604 >                    long startTime = System.nanoTime();
605 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
606 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
607 >                }});
608  
609 <        joinPool(executor);
609 >            executor.execute(new CheckedRunnable() {
610 >                public void realRun() throws InterruptedException {
611 >                    threadsStarted.await();
612 >                    assertSame(one, q.take());
613 >                    checkEmpty(q);
614 >                }});
615 >        }
616      }
617  
618      /**
# Line 698 | Line 620 | public class LinkedTransferQueueTest ext
620       */
621      public void testPollInExecutor() {
622          final LinkedTransferQueue q = new LinkedTransferQueue();
623 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
624 <        ExecutorService executor = Executors.newFixedThreadPool(2);
625 <
704 <        executor.execute(new CheckedRunnable() {
705 <            public void realRun() throws InterruptedException {
706 <                assertNull(q.poll());
707 <                threadsStarted.countDown();
708 <                threadsStarted.await();
709 <                assertSame(one, q.poll(SMALL_DELAY_MS, MILLISECONDS));
710 <                checkEmpty(q);
711 <            }});
623 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
624 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
625 >        try (PoolCleaner cleaner = cleaner(executor)) {
626  
627 <        executor.execute(new CheckedRunnable() {
628 <            public void realRun() throws InterruptedException {
629 <                threadsStarted.countDown();
630 <                threadsStarted.await();
631 <                q.put(one);
632 <            }});
627 >            executor.execute(new CheckedRunnable() {
628 >                public void realRun() throws InterruptedException {
629 >                    assertNull(q.poll());
630 >                    threadsStarted.await();
631 >                    long startTime = System.nanoTime();
632 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
633 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
634 >                    checkEmpty(q);
635 >                }});
636  
637 <        joinPool(executor);
637 >            executor.execute(new CheckedRunnable() {
638 >                public void realRun() throws InterruptedException {
639 >                    threadsStarted.await();
640 >                    q.put(one);
641 >                }});
642 >        }
643      }
644  
645      /**
646 <     * A deserialized serialized queue has same elements in same order
646 >     * A deserialized/reserialized queue has same elements in same order
647       */
648      public void testSerialization() throws Exception {
649 <        LinkedTransferQueue q = populatedQueue(SIZE);
649 >        Queue x = populatedQueue(SIZE);
650 >        Queue y = serialClone(x);
651  
652 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
653 <        ObjectOutputStream out
654 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
655 <        out.writeObject(q);
656 <        out.close();
657 <
658 <        ByteArrayInputStream bin
736 <            = new ByteArrayInputStream(bout.toByteArray());
737 <        ObjectInputStream in
738 <            = new ObjectInputStream(new BufferedInputStream(bin));
739 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
740 <
741 <        assertEquals(q.size(), r.size());
742 <        while (!q.isEmpty()) {
743 <            assertEquals(q.remove(), r.remove());
652 >        assertNotSame(y, x);
653 >        assertEquals(x.size(), y.size());
654 >        assertEquals(x.toString(), y.toString());
655 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
656 >        while (!x.isEmpty()) {
657 >            assertFalse(y.isEmpty());
658 >            assertEquals(x.remove(), y.remove());
659          }
660 <    }
746 <
747 <    /**
748 <     * drainTo(null) throws NullPointerException
749 <     */
750 <    public void testDrainToNull() {
751 <        LinkedTransferQueue q = populatedQueue(SIZE);
752 <        try {
753 <            q.drainTo(null);
754 <            shouldThrow();
755 <        } catch (NullPointerException success) {}
756 <    }
757 <
758 <    /**
759 <     * drainTo(this) throws IllegalArgumentException
760 <     */
761 <    public void testDrainToSelf() {
762 <        LinkedTransferQueue q = populatedQueue(SIZE);
763 <        try {
764 <            q.drainTo(q);
765 <            shouldThrow();
766 <        } catch (IllegalArgumentException success) {}
660 >        assertTrue(y.isEmpty());
661      }
662  
663      /**
# Line 773 | Line 667 | public class LinkedTransferQueueTest ext
667          LinkedTransferQueue q = populatedQueue(SIZE);
668          ArrayList l = new ArrayList();
669          q.drainTo(l);
670 <        assertEquals(q.size(), 0);
671 <        assertEquals(l.size(), SIZE);
670 >        assertEquals(0, q.size());
671 >        assertEquals(SIZE, l.size());
672          for (int i = 0; i < SIZE; ++i) {
673 <            assertEquals(l.get(i), i);
673 >            assertEquals(i, l.get(i));
674          }
675          q.add(zero);
676          q.add(one);
# Line 785 | Line 679 | public class LinkedTransferQueueTest ext
679          assertTrue(q.contains(one));
680          l.clear();
681          q.drainTo(l);
682 <        assertEquals(q.size(), 0);
683 <        assertEquals(l.size(), 2);
682 >        assertEquals(0, q.size());
683 >        assertEquals(2, l.size());
684          for (int i = 0; i < 2; ++i) {
685 <            assertEquals(l.get(i), i);
685 >            assertEquals(i, l.get(i));
686          }
687      }
688  
# Line 804 | Line 698 | public class LinkedTransferQueueTest ext
698          ArrayList l = new ArrayList();
699          q.drainTo(l);
700          assertTrue(l.size() >= SIZE);
701 <        for (int i = 0; i < SIZE; ++i) {
702 <            assertEquals(l.get(i), i);
703 <        }
810 <        awaitTermination(t, MEDIUM_DELAY_MS);
701 >        for (int i = 0; i < SIZE; ++i)
702 >            assertEquals(i, l.get(i));
703 >        awaitTermination(t);
704          assertTrue(q.size() + l.size() >= SIZE);
705      }
706  
707      /**
815     * drainTo(null, n) throws NullPointerException
816     */
817    public void testDrainToNullN() {
818        LinkedTransferQueue q = populatedQueue(SIZE);
819        try {
820            q.drainTo(null, SIZE);
821            shouldThrow();
822        } catch (NullPointerException success) {}
823    }
824
825    /**
826     * drainTo(this, n) throws IllegalArgumentException
827     */
828    public void testDrainToSelfN() {
829        LinkedTransferQueue q = populatedQueue(SIZE);
830        try {
831            q.drainTo(q, SIZE);
832            shouldThrow();
833        } catch (IllegalArgumentException success) {}
834    }
835
836    /**
708       * drainTo(c, n) empties first min(n, size) elements of queue into c
709       */
710      public void testDrainToN() {
# Line 845 | Line 716 | public class LinkedTransferQueueTest ext
716              ArrayList l = new ArrayList();
717              q.drainTo(l, i);
718              int k = (i < SIZE) ? i : SIZE;
719 <            assertEquals(l.size(), k);
720 <            assertEquals(q.size(), SIZE - k);
721 <            for (int j = 0; j < k; ++j) {
722 <                assertEquals(l.get(j), j);
723 <            }
853 <            while (q.poll() != null)
854 <                ;
719 >            assertEquals(k, l.size());
720 >            assertEquals(SIZE - k, q.size());
721 >            for (int j = 0; j < k; ++j)
722 >                assertEquals(j, l.get(j));
723 >            do {} while (q.poll() != null);
724          }
725      }
726  
# Line 861 | Line 730 | public class LinkedTransferQueueTest ext
730       */
731      public void testWaitingConsumer() throws InterruptedException {
732          final LinkedTransferQueue q = new LinkedTransferQueue();
733 <        assertEquals(q.getWaitingConsumerCount(), 0);
733 >        assertEquals(0, q.getWaitingConsumerCount());
734          assertFalse(q.hasWaitingConsumer());
735          final CountDownLatch threadStarted = new CountDownLatch(1);
736  
737          Thread t = newStartedThread(new CheckedRunnable() {
738              public void realRun() throws InterruptedException {
739                  threadStarted.countDown();
740 +                long startTime = System.nanoTime();
741                  assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
742 <                assertEquals(q.getWaitingConsumerCount(), 0);
742 >                assertEquals(0, q.getWaitingConsumerCount());
743                  assertFalse(q.hasWaitingConsumer());
744 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
745              }});
746  
747          threadStarted.await();
748 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
749 <        assertEquals(q.getWaitingConsumerCount(), 1);
750 <        assertTrue(q.hasWaitingConsumer());
748 >        Callable<Boolean> oneConsumer
749 >            = new Callable<Boolean>() { public Boolean call() {
750 >                return q.hasWaitingConsumer()
751 >                && q.getWaitingConsumerCount() == 1; }};
752 >        waitForThreadToEnterWaitState(t, oneConsumer);
753  
754          assertTrue(q.offer(one));
755 <        assertEquals(q.getWaitingConsumerCount(), 0);
755 >        assertEquals(0, q.getWaitingConsumerCount());
756          assertFalse(q.hasWaitingConsumer());
757  
758 <        awaitTermination(t, MEDIUM_DELAY_MS);
758 >        awaitTermination(t);
759      }
760  
761      /**
# Line 897 | Line 770 | public class LinkedTransferQueueTest ext
770      }
771  
772      /**
773 <     * transfer waits until a poll occurs. The transfered element
774 <     * is returned by this associated poll.
773 >     * transfer waits until a poll occurs. The transferred element
774 >     * is returned by the associated poll.
775       */
776      public void testTransfer2() throws InterruptedException {
777 <        final LinkedTransferQueue<Integer> q
905 <            = new LinkedTransferQueue<Integer>();
777 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
778          final CountDownLatch threadStarted = new CountDownLatch(1);
779  
780          Thread t = newStartedThread(new CheckedRunnable() {
781              public void realRun() throws InterruptedException {
782                  threadStarted.countDown();
783 <                q.transfer(SIZE);
783 >                q.transfer(five);
784                  checkEmpty(q);
785              }});
786  
787          threadStarted.await();
788 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
789 <        assertTrue(t.isAlive());
790 <        assertEquals(1, q.size());
791 <        assertEquals(SIZE, (int) q.poll());
788 >        Callable<Boolean> oneElement
789 >            = new Callable<Boolean>() { public Boolean call() {
790 >                return !q.isEmpty() && q.size() == 1; }};
791 >        waitForThreadToEnterWaitState(t, oneElement);
792 >
793 >        assertSame(five, q.poll());
794          checkEmpty(q);
795 <        awaitTermination(t, MEDIUM_DELAY_MS);
795 >        awaitTermination(t);
796      }
797  
798      /**
799       * transfer waits until a poll occurs, and then transfers in fifo order
800       */
801      public void testTransfer3() throws InterruptedException {
802 <        final LinkedTransferQueue<Integer> q
929 <            = new LinkedTransferQueue<Integer>();
802 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
803  
804          Thread first = newStartedThread(new CheckedRunnable() {
805              public void realRun() throws InterruptedException {
806 <                Integer i = SIZE + 1;
807 <                q.transfer(i);
935 <                assertTrue(!q.contains(i));
806 >                q.transfer(four);
807 >                assertFalse(q.contains(four));
808                  assertEquals(1, q.size());
809              }});
810  
811          Thread interruptedThread = newStartedThread(
812              new CheckedInterruptedRunnable() {
813                  public void realRun() throws InterruptedException {
814 <                    while (q.size() == 0)
814 >                    while (q.isEmpty())
815                          Thread.yield();
816 <                    q.transfer(SIZE);
816 >                    q.transfer(five);
817                  }});
818  
819          while (q.size() < 2)
820              Thread.yield();
821          assertEquals(2, q.size());
822 <        assertEquals(SIZE + 1, (int) q.poll());
822 >        assertSame(four, q.poll());
823          first.join();
824          assertEquals(1, q.size());
825          interruptedThread.interrupt();
# Line 975 | Line 847 | public class LinkedTransferQueueTest ext
847          assertEquals(1, q.size());
848          assertTrue(q.offer(three));
849          assertSame(four, q.poll());
850 <        awaitTermination(t, MEDIUM_DELAY_MS);
850 >        awaitTermination(t);
851      }
852  
853      /**
854 <     * transfer waits until a take occurs. The transfered element
855 <     * is returned by this associated take.
854 >     * transfer waits until a take occurs. The transferred element
855 >     * is returned by the associated take.
856       */
857      public void testTransfer5() throws InterruptedException {
858 <        final LinkedTransferQueue<Integer> q
987 <            = new LinkedTransferQueue<Integer>();
858 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
859  
860          Thread t = newStartedThread(new CheckedRunnable() {
861              public void realRun() throws InterruptedException {
# Line 998 | Line 869 | public class LinkedTransferQueueTest ext
869          assertEquals(1, q.size());
870          assertSame(four, q.take());
871          checkEmpty(q);
872 <        awaitTermination(t, MEDIUM_DELAY_MS);
872 >        awaitTermination(t);
873      }
874  
875      /**
876       * tryTransfer(null) throws NullPointerException
877       */
878      public void testTryTransfer1() {
879 +        final LinkedTransferQueue q = new LinkedTransferQueue();
880          try {
1009            final LinkedTransferQueue q = new LinkedTransferQueue();
881              q.tryTransfer(null);
882              shouldThrow();
883          } catch (NullPointerException success) {}
# Line 1040 | Line 911 | public class LinkedTransferQueueTest ext
911                  assertTrue(q.tryTransfer(hotPotato));
912              }});
913  
914 <        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
914 >        long startTime = System.nanoTime();
915 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
916 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
917          checkEmpty(q);
918 <        awaitTermination(t, MEDIUM_DELAY_MS);
918 >        awaitTermination(t);
919      }
920  
921      /**
# Line 1064 | Line 937 | public class LinkedTransferQueueTest ext
937  
938          assertSame(q.take(), hotPotato);
939          checkEmpty(q);
940 <        awaitTermination(t, MEDIUM_DELAY_MS);
940 >        awaitTermination(t);
941      }
942  
943      /**
944 <     * tryTransfer waits the amount given if interrupted, and
1072 <     * throws interrupted exception
944 >     * tryTransfer blocks interruptibly if no takers
945       */
946      public void testTryTransfer5() throws InterruptedException {
947          final LinkedTransferQueue q = new LinkedTransferQueue();
948 <        final CountDownLatch threadStarted = new CountDownLatch(1);
948 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
949 >        assertTrue(q.isEmpty());
950  
951          Thread t = newStartedThread(new CheckedRunnable() {
952              public void realRun() throws InterruptedException {
953 <                long t0 = System.nanoTime();
954 <                threadStarted.countDown();
953 >                long startTime = System.nanoTime();
954 >                Thread.currentThread().interrupt();
955 >                try {
956 >                    q.tryTransfer(new Object(), randomTimeout(), randomTimeUnit());
957 >                    shouldThrow();
958 >                } catch (InterruptedException success) {}
959 >                assertFalse(Thread.interrupted());
960 >
961 >                pleaseInterrupt.countDown();
962                  try {
963                      q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
964                      shouldThrow();
965                  } catch (InterruptedException success) {}
966 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
966 >                assertFalse(Thread.interrupted());
967 >
968 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
969              }});
970  
971 <        threadStarted.await();
972 <        Thread.sleep(SHORT_DELAY_MS);
971 >        await(pleaseInterrupt);
972 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
973          t.interrupt();
974 <        awaitTermination(t, MEDIUM_DELAY_MS);
974 >        awaitTermination(t);
975          checkEmpty(q);
976      }
977  
978      /**
979 <     * tryTransfer gives up after the timeout and return false
979 >     * tryTransfer gives up after the timeout and returns false
980       */
981      public void testTryTransfer6() throws InterruptedException {
982          final LinkedTransferQueue q = new LinkedTransferQueue();
983  
984          Thread t = newStartedThread(new CheckedRunnable() {
985              public void realRun() throws InterruptedException {
986 <                long t0 = System.nanoTime();
986 >                long startTime = System.nanoTime();
987                  assertFalse(q.tryTransfer(new Object(),
988 <                                          SHORT_DELAY_MS, MILLISECONDS));
989 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
988 >                                          timeoutMillis(), MILLISECONDS));
989 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
990 >                checkEmpty(q);
991              }});
992  
993 <        checkEmpty(q);
1111 <        awaitTermination(t, MEDIUM_DELAY_MS);
993 >        awaitTermination(t);
994          checkEmpty(q);
995      }
996  
# Line 1122 | Line 1004 | public class LinkedTransferQueueTest ext
1004  
1005          Thread t = newStartedThread(new CheckedRunnable() {
1006              public void realRun() throws InterruptedException {
1007 <                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1007 >                long startTime = System.nanoTime();
1008 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1009 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1010                  checkEmpty(q);
1011              }});
1012  
1013 <        Thread.sleep(SHORT_DELAY_MS);
1013 >        while (q.size() != 2)
1014 >            Thread.yield();
1015          assertEquals(2, q.size());
1016          assertSame(four, q.poll());
1017          assertSame(five, q.poll());
1018          checkEmpty(q);
1019 <        awaitTermination(t, MEDIUM_DELAY_MS);
1019 >        awaitTermination(t);
1020      }
1021  
1022      /**
1023 <     * tryTransfer attempts to enqueue into the q and fails returning
1024 <     * false not enqueueing and the successive poll is null
1023 >     * tryTransfer attempts to enqueue into the queue and fails
1024 >     * returning false not enqueueing and the successive poll is null
1025       */
1026      public void testTryTransfer8() throws InterruptedException {
1027          final LinkedTransferQueue q = new LinkedTransferQueue();
1028          assertTrue(q.offer(four));
1029          assertEquals(1, q.size());
1030 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1030 >        long startTime = System.nanoTime();
1031 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1032 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1033          assertEquals(1, q.size());
1034          assertSame(four, q.poll());
1035          assertNull(q.poll());
# Line 1150 | Line 1037 | public class LinkedTransferQueueTest ext
1037      }
1038  
1039      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1040 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1040 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1041          checkEmpty(q);
1042          for (int i = 0; i < n; i++) {
1043              assertEquals(i, q.size());
# Line 1160 | Line 1047 | public class LinkedTransferQueueTest ext
1047          assertFalse(q.isEmpty());
1048          return q;
1049      }
1050 +
1051 +    /**
1052 +     * remove(null), contains(null) always return false
1053 +     */
1054 +    public void testNeverContainsNull() {
1055 +        Collection<?>[] qs = {
1056 +            new LinkedTransferQueue<Object>(),
1057 +            populatedQueue(2),
1058 +        };
1059 +
1060 +        for (Collection<?> q : qs) {
1061 +            assertFalse(q.contains(null));
1062 +            assertFalse(q.remove(null));
1063 +        }
1064 +    }
1065   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines