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.32 by jsr166, Fri Oct 29 06:21:16 2010 UTC vs.
Revision 1.81 by jsr166, Mon May 28 21:19:50 2018 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 >        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) {
285 <                    long t0 = System.nanoTime();
284 >                long startTime = System.nanoTime();
285 >                for (int i = 0; i < SIZE; i++)
286                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
287 <                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
288 <                }
289 <                aboutToWait.countDown();
287 >
288 >                Thread.currentThread().interrupt();
289 >                try {
290 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
291 >                    shouldThrow();
292 >                } catch (InterruptedException success) {}
293 >                assertFalse(Thread.interrupted());
294 >
295 >                pleaseInterrupt.countDown();
296                  try {
297 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
297 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
298                      shouldThrow();
299                  } catch (InterruptedException success) {}
300 +                assertFalse(Thread.interrupted());
301 +
302 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
303              }});
304  
305 <        aboutToWait.await();
306 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
305 >        await(pleaseInterrupt);
306 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
307          t.interrupt();
308 <        awaitTermination(t, MEDIUM_DELAY_MS);
308 >        awaitTermination(t);
309          checkEmpty(q);
310      }
311  
# Line 378 | Line 317 | public class LinkedTransferQueueTest ext
317          final BlockingQueue<Integer> q = populatedQueue(SIZE);
318          Thread t = newStartedThread(new CheckedRunnable() {
319              public void realRun() throws InterruptedException {
320 +                long startTime = System.nanoTime();
321                  Thread.currentThread().interrupt();
322 <                for (int i = 0; i < SIZE; ++i) {
383 <                    long t0 = System.nanoTime();
322 >                for (int i = 0; i < SIZE; ++i)
323                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
385                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
386                }
324                  try {
325 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
325 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
326                      shouldThrow();
327                  } catch (InterruptedException success) {}
328 +                assertFalse(Thread.interrupted());
329 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
330              }});
331  
332 <        awaitTermination(t, MEDIUM_DELAY_MS);
332 >        awaitTermination(t);
333          checkEmpty(q);
334      }
335  
# Line 441 | Line 380 | public class LinkedTransferQueueTest ext
380      }
381  
382      /**
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    /**
383       * An add following remove(x) succeeds
384       */
385      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 501 | Line 425 | public class LinkedTransferQueueTest ext
425       */
426      public void testContainsAll() {
427          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
428 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
428 >        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
429          for (int i = 0; i < SIZE; ++i) {
430              assertTrue(q.containsAll(p));
431              assertFalse(p.containsAll(q));
# Line 547 | Line 471 | public class LinkedTransferQueueTest ext
471      }
472  
473      /**
474 <     * toArray() contains all elements
474 >     * toArray() contains all elements in FIFO order
475       */
476 <    public void testToArray() throws InterruptedException {
476 >    public void testToArray() {
477          LinkedTransferQueue q = populatedQueue(SIZE);
478 <        Object[] o = q.toArray();
479 <        for (int i = 0; i < o.length; i++) {
480 <            assertEquals(o[i], q.take());
481 <        }
478 >        Object[] a = q.toArray();
479 >        assertSame(Object[].class, a.getClass());
480 >        for (Object o : a)
481 >            assertSame(o, q.poll());
482 >        assertTrue(q.isEmpty());
483      }
484  
485      /**
486 <     * toArray(a) contains all elements
486 >     * toArray(a) contains all elements in FIFO order
487       */
488 <    public void testToArray2() throws InterruptedException {
488 >    public void testToArray2() {
489          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
490          Integer[] ints = new Integer[SIZE];
491 <        ints = q.toArray(ints);
492 <        for (int i = 0; i < ints.length; i++) {
493 <            assertEquals(ints[i], q.take());
494 <        }
495 <    }
571 <
572 <    /**
573 <     * 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) {}
491 >        Integer[] array = q.toArray(ints);
492 >        assertSame(ints, array);
493 >        for (Integer o : ints)
494 >            assertSame(o, q.poll());
495 >        assertTrue(q.isEmpty());
496      }
497  
498      /**
499 <     * toArray(incompatible array type) throws CCE
499 >     * toArray(incompatible array type) throws ArrayStoreException
500       */
501      public void testToArray1_BadArg() {
502          LinkedTransferQueue q = populatedQueue(SIZE);
503          try {
504 <            Object o[] = q.toArray(new String[10]);
504 >            q.toArray(new String[10]);
505              shouldThrow();
506          } catch (ArrayStoreException success) {}
507      }
# Line 597 | Line 512 | public class LinkedTransferQueueTest ext
512      public void testIterator() throws InterruptedException {
513          LinkedTransferQueue q = populatedQueue(SIZE);
514          Iterator it = q.iterator();
515 <        int i = 0;
516 <        while (it.hasNext()) {
517 <            assertEquals(it.next(), i++);
603 <        }
515 >        int i;
516 >        for (i = 0; it.hasNext(); i++)
517 >            assertTrue(q.contains(it.next()));
518          assertEquals(i, SIZE);
519 +        assertIteratorExhausted(it);
520 +
521 +        it = q.iterator();
522 +        for (i = 0; it.hasNext(); i++)
523 +            assertEquals(it.next(), q.take());
524 +        assertEquals(i, SIZE);
525 +        assertIteratorExhausted(it);
526 +    }
527 +
528 +    /**
529 +     * iterator of empty collection has no elements
530 +     */
531 +    public void testEmptyIterator() {
532 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
533      }
534  
535      /**
# Line 627 | Line 555 | public class LinkedTransferQueueTest ext
555       * iterator ordering is FIFO
556       */
557      public void testIteratorOrdering() {
558 <        final LinkedTransferQueue<Integer> q
631 <            = new LinkedTransferQueue<Integer>();
558 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
559          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
560          q.add(one);
561          q.add(two);
# Line 663 | Line 590 | public class LinkedTransferQueueTest ext
590          LinkedTransferQueue q = populatedQueue(SIZE);
591          String s = q.toString();
592          for (int i = 0; i < SIZE; ++i) {
593 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
593 >            assertTrue(s.contains(String.valueOf(i)));
594          }
595      }
596  
# Line 672 | Line 599 | public class LinkedTransferQueueTest ext
599       */
600      public void testOfferInExecutor() {
601          final LinkedTransferQueue q = new LinkedTransferQueue();
602 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
603 <        ExecutorService executor = Executors.newFixedThreadPool(2);
604 <
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 <            }});
602 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
603 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
604 >        try (PoolCleaner cleaner = cleaner(executor)) {
605  
606 <        executor.execute(new CheckedRunnable() {
607 <            public void realRun() throws InterruptedException {
608 <                threadsStarted.countDown();
609 <                threadsStarted.await();
610 <                assertSame(one, q.take());
611 <                checkEmpty(q);
612 <            }});
606 >            executor.execute(new CheckedRunnable() {
607 >                public void realRun() throws InterruptedException {
608 >                    threadsStarted.await();
609 >                    long startTime = System.nanoTime();
610 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
611 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
612 >                }});
613  
614 <        joinPool(executor);
614 >            executor.execute(new CheckedRunnable() {
615 >                public void realRun() throws InterruptedException {
616 >                    threadsStarted.await();
617 >                    assertSame(one, q.take());
618 >                    checkEmpty(q);
619 >                }});
620 >        }
621      }
622  
623      /**
# Line 698 | Line 625 | public class LinkedTransferQueueTest ext
625       */
626      public void testPollInExecutor() {
627          final LinkedTransferQueue q = new LinkedTransferQueue();
628 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
629 <        ExecutorService executor = Executors.newFixedThreadPool(2);
628 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
629 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
630 >        try (PoolCleaner cleaner = cleaner(executor)) {
631  
632 <        executor.execute(new CheckedRunnable() {
633 <            public void realRun() throws InterruptedException {
634 <                assertNull(q.poll());
635 <                threadsStarted.countDown();
636 <                threadsStarted.await();
637 <                assertSame(one, q.poll(SMALL_DELAY_MS, MILLISECONDS));
638 <                checkEmpty(q);
639 <            }});
640 <
713 <        executor.execute(new CheckedRunnable() {
714 <            public void realRun() throws InterruptedException {
715 <                threadsStarted.countDown();
716 <                threadsStarted.await();
717 <                q.put(one);
718 <            }});
632 >            executor.execute(new CheckedRunnable() {
633 >                public void realRun() throws InterruptedException {
634 >                    assertNull(q.poll());
635 >                    threadsStarted.await();
636 >                    long startTime = System.nanoTime();
637 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
638 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
639 >                    checkEmpty(q);
640 >                }});
641  
642 <        joinPool(executor);
642 >            executor.execute(new CheckedRunnable() {
643 >                public void realRun() throws InterruptedException {
644 >                    threadsStarted.await();
645 >                    q.put(one);
646 >                }});
647 >        }
648      }
649  
650      /**
651 <     * A deserialized serialized queue has same elements in same order
651 >     * A deserialized/reserialized queue has same elements in same order
652       */
653      public void testSerialization() throws Exception {
654 <        LinkedTransferQueue q = populatedQueue(SIZE);
654 >        Queue x = populatedQueue(SIZE);
655 >        Queue y = serialClone(x);
656  
657 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
658 <        ObjectOutputStream out
659 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
660 <        out.writeObject(q);
661 <        out.close();
662 <
663 <        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 <        assertEquals(q.toString(), r.toString());
743 <        assertTrue(Arrays.equals(q.toArray(), r.toArray()));
744 <        while (!q.isEmpty()) {
745 <            assertEquals(q.remove(), r.remove());
657 >        assertNotSame(y, x);
658 >        assertEquals(x.size(), y.size());
659 >        assertEquals(x.toString(), y.toString());
660 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
661 >        while (!x.isEmpty()) {
662 >            assertFalse(y.isEmpty());
663 >            assertEquals(x.remove(), y.remove());
664          }
665 <    }
748 <
749 <    /**
750 <     * drainTo(null) throws NullPointerException
751 <     */
752 <    public void testDrainToNull() {
753 <        LinkedTransferQueue q = populatedQueue(SIZE);
754 <        try {
755 <            q.drainTo(null);
756 <            shouldThrow();
757 <        } catch (NullPointerException success) {}
758 <    }
759 <
760 <    /**
761 <     * drainTo(this) throws IllegalArgumentException
762 <     */
763 <    public void testDrainToSelf() {
764 <        LinkedTransferQueue q = populatedQueue(SIZE);
765 <        try {
766 <            q.drainTo(q);
767 <            shouldThrow();
768 <        } catch (IllegalArgumentException success) {}
665 >        assertTrue(y.isEmpty());
666      }
667  
668      /**
# Line 775 | Line 672 | public class LinkedTransferQueueTest ext
672          LinkedTransferQueue q = populatedQueue(SIZE);
673          ArrayList l = new ArrayList();
674          q.drainTo(l);
675 <        assertEquals(q.size(), 0);
676 <        assertEquals(l.size(), SIZE);
675 >        assertEquals(0, q.size());
676 >        assertEquals(SIZE, l.size());
677          for (int i = 0; i < SIZE; ++i) {
678 <            assertEquals(l.get(i), i);
678 >            assertEquals(i, l.get(i));
679          }
680          q.add(zero);
681          q.add(one);
# Line 787 | Line 684 | public class LinkedTransferQueueTest ext
684          assertTrue(q.contains(one));
685          l.clear();
686          q.drainTo(l);
687 <        assertEquals(q.size(), 0);
688 <        assertEquals(l.size(), 2);
687 >        assertEquals(0, q.size());
688 >        assertEquals(2, l.size());
689          for (int i = 0; i < 2; ++i) {
690 <            assertEquals(l.get(i), i);
690 >            assertEquals(i, l.get(i));
691          }
692      }
693  
# Line 806 | Line 703 | public class LinkedTransferQueueTest ext
703          ArrayList l = new ArrayList();
704          q.drainTo(l);
705          assertTrue(l.size() >= SIZE);
706 <        for (int i = 0; i < SIZE; ++i) {
707 <            assertEquals(l.get(i), i);
708 <        }
812 <        awaitTermination(t, MEDIUM_DELAY_MS);
706 >        for (int i = 0; i < SIZE; ++i)
707 >            assertEquals(i, l.get(i));
708 >        awaitTermination(t);
709          assertTrue(q.size() + l.size() >= SIZE);
710      }
711  
712      /**
817     * drainTo(null, n) throws NullPointerException
818     */
819    public void testDrainToNullN() {
820        LinkedTransferQueue q = populatedQueue(SIZE);
821        try {
822            q.drainTo(null, SIZE);
823            shouldThrow();
824        } catch (NullPointerException success) {}
825    }
826
827    /**
828     * drainTo(this, n) throws IllegalArgumentException
829     */
830    public void testDrainToSelfN() {
831        LinkedTransferQueue q = populatedQueue(SIZE);
832        try {
833            q.drainTo(q, SIZE);
834            shouldThrow();
835        } catch (IllegalArgumentException success) {}
836    }
837
838    /**
713       * drainTo(c, n) empties first min(n, size) elements of queue into c
714       */
715      public void testDrainToN() {
# Line 847 | Line 721 | public class LinkedTransferQueueTest ext
721              ArrayList l = new ArrayList();
722              q.drainTo(l, i);
723              int k = (i < SIZE) ? i : SIZE;
724 <            assertEquals(l.size(), k);
725 <            assertEquals(q.size(), SIZE - k);
726 <            for (int j = 0; j < k; ++j) {
727 <                assertEquals(l.get(j), j);
728 <            }
855 <            while (q.poll() != null)
856 <                ;
724 >            assertEquals(k, l.size());
725 >            assertEquals(SIZE - k, q.size());
726 >            for (int j = 0; j < k; ++j)
727 >                assertEquals(j, l.get(j));
728 >            do {} while (q.poll() != null);
729          }
730      }
731  
# Line 863 | Line 735 | public class LinkedTransferQueueTest ext
735       */
736      public void testWaitingConsumer() throws InterruptedException {
737          final LinkedTransferQueue q = new LinkedTransferQueue();
738 <        assertEquals(q.getWaitingConsumerCount(), 0);
738 >        assertEquals(0, q.getWaitingConsumerCount());
739          assertFalse(q.hasWaitingConsumer());
740          final CountDownLatch threadStarted = new CountDownLatch(1);
741  
742          Thread t = newStartedThread(new CheckedRunnable() {
743              public void realRun() throws InterruptedException {
744                  threadStarted.countDown();
745 +                long startTime = System.nanoTime();
746                  assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
747 <                assertEquals(q.getWaitingConsumerCount(), 0);
747 >                assertEquals(0, q.getWaitingConsumerCount());
748                  assertFalse(q.hasWaitingConsumer());
749 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
750              }});
751  
752          threadStarted.await();
753 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
754 <        assertEquals(q.getWaitingConsumerCount(), 1);
755 <        assertTrue(q.hasWaitingConsumer());
753 >        Callable<Boolean> oneConsumer
754 >            = new Callable<Boolean>() { public Boolean call() {
755 >                return q.hasWaitingConsumer()
756 >                && q.getWaitingConsumerCount() == 1; }};
757 >        waitForThreadToEnterWaitState(t, oneConsumer);
758  
759          assertTrue(q.offer(one));
760 <        assertEquals(q.getWaitingConsumerCount(), 0);
760 >        assertEquals(0, q.getWaitingConsumerCount());
761          assertFalse(q.hasWaitingConsumer());
762  
763 <        awaitTermination(t, MEDIUM_DELAY_MS);
763 >        awaitTermination(t);
764      }
765  
766      /**
# Line 899 | Line 775 | public class LinkedTransferQueueTest ext
775      }
776  
777      /**
778 <     * transfer waits until a poll occurs. The transfered element
779 <     * is returned by this associated poll.
778 >     * transfer waits until a poll occurs. The transferred element
779 >     * is returned by the associated poll.
780       */
781      public void testTransfer2() throws InterruptedException {
782 <        final LinkedTransferQueue<Integer> q
907 <            = new LinkedTransferQueue<Integer>();
782 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
783          final CountDownLatch threadStarted = new CountDownLatch(1);
784  
785          Thread t = newStartedThread(new CheckedRunnable() {
786              public void realRun() throws InterruptedException {
787                  threadStarted.countDown();
788 <                q.transfer(SIZE);
788 >                q.transfer(five);
789                  checkEmpty(q);
790              }});
791  
792          threadStarted.await();
793 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
794 <        assertTrue(t.isAlive());
795 <        assertEquals(1, q.size());
796 <        assertEquals(SIZE, (int) q.poll());
793 >        Callable<Boolean> oneElement
794 >            = new Callable<Boolean>() { public Boolean call() {
795 >                return !q.isEmpty() && q.size() == 1; }};
796 >        waitForThreadToEnterWaitState(t, oneElement);
797 >
798 >        assertSame(five, q.poll());
799          checkEmpty(q);
800 <        awaitTermination(t, MEDIUM_DELAY_MS);
800 >        awaitTermination(t);
801      }
802  
803      /**
804       * transfer waits until a poll occurs, and then transfers in fifo order
805       */
806      public void testTransfer3() throws InterruptedException {
807 <        final LinkedTransferQueue<Integer> q
931 <            = new LinkedTransferQueue<Integer>();
807 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
808  
809          Thread first = newStartedThread(new CheckedRunnable() {
810              public void realRun() throws InterruptedException {
811                  q.transfer(four);
812 <                assertTrue(!q.contains(four));
812 >                assertFalse(q.contains(four));
813                  assertEquals(1, q.size());
814              }});
815  
# Line 976 | Line 852 | public class LinkedTransferQueueTest ext
852          assertEquals(1, q.size());
853          assertTrue(q.offer(three));
854          assertSame(four, q.poll());
855 <        awaitTermination(t, MEDIUM_DELAY_MS);
855 >        awaitTermination(t);
856      }
857  
858      /**
859 <     * transfer waits until a take occurs. The transfered element
860 <     * is returned by this associated take.
859 >     * transfer waits until a take occurs. The transferred element
860 >     * is returned by the associated take.
861       */
862      public void testTransfer5() throws InterruptedException {
863 <        final LinkedTransferQueue<Integer> q
988 <            = new LinkedTransferQueue<Integer>();
863 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
864  
865          Thread t = newStartedThread(new CheckedRunnable() {
866              public void realRun() throws InterruptedException {
# Line 999 | Line 874 | public class LinkedTransferQueueTest ext
874          assertEquals(1, q.size());
875          assertSame(four, q.take());
876          checkEmpty(q);
877 <        awaitTermination(t, MEDIUM_DELAY_MS);
877 >        awaitTermination(t);
878      }
879  
880      /**
881       * tryTransfer(null) throws NullPointerException
882       */
883      public void testTryTransfer1() {
884 +        final LinkedTransferQueue q = new LinkedTransferQueue();
885          try {
1010            final LinkedTransferQueue q = new LinkedTransferQueue();
886              q.tryTransfer(null);
887              shouldThrow();
888          } catch (NullPointerException success) {}
# Line 1041 | Line 916 | public class LinkedTransferQueueTest ext
916                  assertTrue(q.tryTransfer(hotPotato));
917              }});
918  
919 <        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
919 >        long startTime = System.nanoTime();
920 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
921 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
922          checkEmpty(q);
923 <        awaitTermination(t, MEDIUM_DELAY_MS);
923 >        awaitTermination(t);
924      }
925  
926      /**
# Line 1065 | Line 942 | public class LinkedTransferQueueTest ext
942  
943          assertSame(q.take(), hotPotato);
944          checkEmpty(q);
945 <        awaitTermination(t, MEDIUM_DELAY_MS);
945 >        awaitTermination(t);
946      }
947  
948      /**
949 <     * tryTransfer waits the amount given if interrupted, and
1073 <     * throws interrupted exception
949 >     * tryTransfer blocks interruptibly if no takers
950       */
951      public void testTryTransfer5() throws InterruptedException {
952          final LinkedTransferQueue q = new LinkedTransferQueue();
953 <        final CountDownLatch threadStarted = new CountDownLatch(1);
953 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
954 >        assertTrue(q.isEmpty());
955  
956          Thread t = newStartedThread(new CheckedRunnable() {
957              public void realRun() throws InterruptedException {
958 <                long t0 = System.nanoTime();
959 <                threadStarted.countDown();
958 >                long startTime = System.nanoTime();
959 >                Thread.currentThread().interrupt();
960                  try {
961                      q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
962                      shouldThrow();
963                  } catch (InterruptedException success) {}
964 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
964 >                assertFalse(Thread.interrupted());
965 >
966 >                pleaseInterrupt.countDown();
967 >                try {
968 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
969 >                    shouldThrow();
970 >                } catch (InterruptedException success) {}
971 >                assertFalse(Thread.interrupted());
972 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
973              }});
974  
975 <        threadStarted.await();
976 <        Thread.sleep(SHORT_DELAY_MS);
975 >        await(pleaseInterrupt);
976 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
977          t.interrupt();
978 <        awaitTermination(t, MEDIUM_DELAY_MS);
978 >        awaitTermination(t);
979          checkEmpty(q);
980      }
981  
982      /**
983 <     * tryTransfer gives up after the timeout and return false
983 >     * tryTransfer gives up after the timeout and returns false
984       */
985      public void testTryTransfer6() throws InterruptedException {
986          final LinkedTransferQueue q = new LinkedTransferQueue();
987  
988          Thread t = newStartedThread(new CheckedRunnable() {
989              public void realRun() throws InterruptedException {
990 <                long t0 = System.nanoTime();
990 >                long startTime = System.nanoTime();
991                  assertFalse(q.tryTransfer(new Object(),
992 <                                          SHORT_DELAY_MS, MILLISECONDS));
993 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
992 >                                          timeoutMillis(), MILLISECONDS));
993 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
994                  checkEmpty(q);
995              }});
996  
997 <        awaitTermination(t, MEDIUM_DELAY_MS);
997 >        awaitTermination(t);
998          checkEmpty(q);
999      }
1000  
# Line 1123 | Line 1008 | public class LinkedTransferQueueTest ext
1008  
1009          Thread t = newStartedThread(new CheckedRunnable() {
1010              public void realRun() throws InterruptedException {
1011 <                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1011 >                long startTime = System.nanoTime();
1012 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1013 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1014                  checkEmpty(q);
1015              }});
1016  
# Line 1133 | Line 1020 | public class LinkedTransferQueueTest ext
1020          assertSame(four, q.poll());
1021          assertSame(five, q.poll());
1022          checkEmpty(q);
1023 <        awaitTermination(t, MEDIUM_DELAY_MS);
1023 >        awaitTermination(t);
1024      }
1025  
1026      /**
1027 <     * tryTransfer attempts to enqueue into the q and fails returning
1028 <     * false not enqueueing and the successive poll is null
1027 >     * tryTransfer attempts to enqueue into the queue and fails
1028 >     * returning false not enqueueing and the successive poll is null
1029       */
1030      public void testTryTransfer8() throws InterruptedException {
1031          final LinkedTransferQueue q = new LinkedTransferQueue();
1032          assertTrue(q.offer(four));
1033          assertEquals(1, q.size());
1034 <        long t0 = System.nanoTime();
1035 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1036 <        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
1034 >        long startTime = System.nanoTime();
1035 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1036 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1037          assertEquals(1, q.size());
1038          assertSame(four, q.poll());
1039          assertNull(q.poll());
# Line 1154 | Line 1041 | public class LinkedTransferQueueTest ext
1041      }
1042  
1043      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1044 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1044 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1045          checkEmpty(q);
1046          for (int i = 0; i < n; i++) {
1047              assertEquals(i, q.size());
# Line 1164 | Line 1051 | public class LinkedTransferQueueTest ext
1051          assertFalse(q.isEmpty());
1052          return q;
1053      }
1054 +
1055 +    /**
1056 +     * remove(null), contains(null) always return false
1057 +     */
1058 +    public void testNeverContainsNull() {
1059 +        Collection<?>[] qs = {
1060 +            new LinkedTransferQueue<Object>(),
1061 +            populatedQueue(2),
1062 +        };
1063 +
1064 +        for (Collection<?> q : qs) {
1065 +            assertFalse(q.contains(null));
1066 +            assertFalse(q.remove(null));
1067 +        }
1068 +    }
1069   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines