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.27 by jsr166, Thu Oct 28 17:22:13 2010 UTC vs.
Revision 1.77 by jsr166, Sun May 14 00:56:43 2017 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 +        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 <    }
42 <
43 <    void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
44 <        assertTrue(q.isEmpty());
45 <        assertEquals(0, q.size());
46 <        assertNull(q.peek());
47 <        assertNull(q.poll());
48 <        assertNull(q.poll(0, MILLISECONDS));
49 <        assertEquals(q.toString(), "[]");
50 <        assertTrue(Arrays.equals(q.toArray(), new Object[0]));
51 <        assertFalse(q.iterator().hasNext());
52 <        try {
53 <            q.element();
54 <            shouldThrow();
55 <        } catch (NoSuchElementException success) {}
56 <        try {
57 <            q.iterator().next();
58 <            shouldThrow();
59 <        } catch (NoSuchElementException success) {}
60 <        try {
61 <            q.remove();
62 <            shouldThrow();
63 <        } catch (NoSuchElementException success) {}
47 >                            new Generic().testSuite(),
48 >                            CollectionTest.testSuite(new Implementation()));
49      }
50  
51      /**
# Line 88 | 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];
93 <            new LinkedTransferQueue(Arrays.asList(ints));
78 >            new LinkedTransferQueue(elements);
79              shouldThrow();
80          } catch (NullPointerException success) {}
81      }
# Line 100 | 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];
105 <            for (int i = 0; i < SIZE - 1; ++i) {
106 <                ints[i] = i;
107 <            }
108 <            new LinkedTransferQueue(Arrays.asList(ints));
93 >            new LinkedTransferQueue(elements);
94              shouldThrow();
95          } catch (NullPointerException success) {}
96      }
# Line 138 | 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      /**
155     * offer(null) throws NullPointerException
156     */
157    public void testOfferNull() {
158        try {
159            LinkedTransferQueue q = new LinkedTransferQueue();
160            q.offer(null);
161            shouldThrow();
162        } catch (NullPointerException success) {}
163    }
164
165    /**
166     * add(null) throws NullPointerException
167     */
168    public void testAddNull() {
169        try {
170            LinkedTransferQueue q = new LinkedTransferQueue();
171            q.add(null);
172            shouldThrow();
173        } catch (NullPointerException success) {}
174    }
175
176    /**
177     * addAll(null) throws NullPointerException
178     */
179    public void testAddAll1() {
180        try {
181            LinkedTransferQueue q = new LinkedTransferQueue();
182            q.addAll(null);
183            shouldThrow();
184        } catch (NullPointerException success) {}
185    }
186
187    /**
140       * addAll(this) throws IllegalArgumentException
141       */
142      public void testAddAllSelf() {
143 +        LinkedTransferQueue q = populatedQueue(SIZE);
144          try {
192            LinkedTransferQueue q = populatedQueue(SIZE);
145              q.addAll(q);
146              shouldThrow();
147          } catch (IllegalArgumentException success) {}
148      }
149  
150      /**
199     * addAll of a collection with null elements throws NullPointerException
200     */
201    public void testAddAll2() {
202        try {
203            LinkedTransferQueue q = new LinkedTransferQueue();
204            Integer[] ints = new Integer[SIZE];
205            q.addAll(Arrays.asList(ints));
206            shouldThrow();
207        } catch (NullPointerException success) {}
208    }
209
210    /**
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 {
216            LinkedTransferQueue q = new LinkedTransferQueue();
217            Integer[] ints = new Integer[SIZE];
218            for (int i = 0; i < SIZE - 1; ++i) {
219                ints[i] = i;
220            }
160              q.addAll(Arrays.asList(ints));
161              shouldThrow();
162          } catch (NullPointerException success) {}
# Line 241 | Line 180 | public class LinkedTransferQueueTest ext
180      }
181  
182      /**
244     * put(null) throws NullPointerException
245     */
246    public void testPutNull() throws InterruptedException {
247        try {
248            LinkedTransferQueue q = new LinkedTransferQueue();
249            q.put(null);
250            shouldThrow();
251        } catch (NullPointerException success) {}
252    }
253
254    /**
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 274 | Line 202 | public class LinkedTransferQueueTest ext
202      }
203  
204      /**
205 <     * take blocks interruptibly when empty
278 <     */
279 <    public void testTakeFromEmpty() throws InterruptedException {
280 <        final LinkedTransferQueue q = new LinkedTransferQueue();
281 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
282 <            public void realRun() throws InterruptedException {
283 <                q.take();
284 <            }});
285 <        Thread.sleep(SHORT_DELAY_MS);
286 <        t.interrupt();
287 <        t.join();
288 <    }
289 <
290 <    /**
291 <     * Take removes existing elements until empty, then blocks interruptibly
205 >     * take removes existing elements until empty, then blocks interruptibly
206       */
207      public void testBlockingTake() throws InterruptedException {
208 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
209 <        Thread t = new Thread(new CheckedRunnable() {
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 <                }
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 <        t.start();
230 <        Thread.sleep(SHORT_DELAY_MS);
229 >        await(pleaseInterrupt);
230 >        assertThreadBlocks(t, Thread.State.WAITING);
231          t.interrupt();
232 <        t.join();
310 <        checkEmpty(q);
232 >        awaitTermination(t);
233      }
234  
235      /**
# Line 323 | Line 245 | public class LinkedTransferQueueTest ext
245      }
246  
247      /**
248 <     * timed pool with zero timeout succeeds when non-empty, else times out
248 >     * timed poll with zero timeout succeeds when non-empty, else times out
249       */
250      public void testTimedPoll0() throws InterruptedException {
251          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 335 | Line 257 | public class LinkedTransferQueueTest ext
257      }
258  
259      /**
260 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
260 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
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();
264 >        long startTime = System.nanoTime();
265 >        for (int i = 0; i < SIZE; ++i)
266              assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
267 <            long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
268 <            assertTrue(millisElapsed < SMALL_DELAY_MS);
269 <        }
270 <        assertNull(q.poll(SHORT_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 354 | Line 277 | public class LinkedTransferQueueTest ext
277       * returning timeout status
278       */
279      public void testInterruptedTimedPoll() throws InterruptedException {
280 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
280 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
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 <                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
288 <                    assertTrue(millisElapsed < SMALL_DELAY_MS);
365 <                }
287 >
288 >                pleaseInterrupt.countDown();
289                  try {
290                      q.poll(LONG_DELAY_MS, MILLISECONDS);
291                      shouldThrow();
292                  } catch (InterruptedException success) {}
293 +                assertFalse(Thread.interrupted());
294 +
295 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
296              }});
297  
298 <        Thread.sleep(SMALL_DELAY_MS);
298 >        await(pleaseInterrupt);
299 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
300          t.interrupt();
301 <        t.join();
301 >        awaitTermination(t);
302 >        checkEmpty(q);
303 >    }
304 >
305 >    /**
306 >     * timed poll after thread interrupted throws InterruptedException
307 >     * instead of returning timeout status
308 >     */
309 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
310 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
311 >        Thread t = newStartedThread(new CheckedRunnable() {
312 >            public void realRun() throws InterruptedException {
313 >                long startTime = System.nanoTime();
314 >                Thread.currentThread().interrupt();
315 >                for (int i = 0; i < SIZE; ++i)
316 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
317 >                try {
318 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
319 >                    shouldThrow();
320 >                } catch (InterruptedException success) {}
321 >                assertFalse(Thread.interrupted());
322 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
323 >            }});
324 >
325 >        awaitTermination(t);
326          checkEmpty(q);
327      }
328  
# Line 422 | Line 373 | public class LinkedTransferQueueTest ext
373      }
374  
375      /**
425     * remove(x) removes x and returns true if present
426     */
427    public void testRemoveElement() throws InterruptedException {
428        LinkedTransferQueue q = populatedQueue(SIZE);
429        for (int i = 1; i < SIZE; i += 2) {
430            assertTrue(q.remove(i));
431        }
432        for (int i = 0; i < SIZE; i += 2) {
433            assertTrue(q.remove(i));
434            assertFalse(q.remove(i + 1));
435        }
436        checkEmpty(q);
437    }
438
439    /**
376       * An add following remove(x) succeeds
377       */
378      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 482 | Line 418 | public class LinkedTransferQueueTest ext
418       */
419      public void testContainsAll() {
420          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
421 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
421 >        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
422          for (int i = 0; i < SIZE; ++i) {
423              assertTrue(q.containsAll(p));
424              assertFalse(p.containsAll(q));
# Line 528 | Line 464 | public class LinkedTransferQueueTest ext
464      }
465  
466      /**
467 <     * toArray() contains all elements
467 >     * toArray() contains all elements in FIFO order
468       */
469 <    public void testToArray() throws InterruptedException {
469 >    public void testToArray() {
470          LinkedTransferQueue q = populatedQueue(SIZE);
471          Object[] o = q.toArray();
472          for (int i = 0; i < o.length; i++) {
473 <            assertEquals(o[i], q.take());
473 >            assertSame(o[i], q.poll());
474          }
475      }
476  
477      /**
478 <     * toArray(a) contains all elements
478 >     * toArray(a) contains all elements in FIFO order
479       */
480 <    public void testToArray2() throws InterruptedException {
480 >    public void testToArray2() {
481          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
482          Integer[] ints = new Integer[SIZE];
483 <        ints = q.toArray(ints);
483 >        Integer[] array = q.toArray(ints);
484 >        assertSame(ints, array);
485          for (int i = 0; i < ints.length; i++) {
486 <            assertEquals(ints[i], q.take());
486 >            assertSame(ints[i], q.poll());
487          }
488      }
489  
490      /**
491 <     * toArray(null) throws NullPointerException
555 <     */
556 <    public void testToArray_BadArg() {
557 <        LinkedTransferQueue q = populatedQueue(SIZE);
558 <        try {
559 <            Object o[] = q.toArray(null);
560 <            shouldThrow();
561 <        } catch (NullPointerException success) {}
562 <    }
563 <
564 <    /**
565 <     * toArray(incompatible array type) throws CCE
491 >     * toArray(incompatible array type) throws ArrayStoreException
492       */
493      public void testToArray1_BadArg() {
494          LinkedTransferQueue q = populatedQueue(SIZE);
495          try {
496 <            Object o[] = q.toArray(new String[10]);
496 >            q.toArray(new String[10]);
497              shouldThrow();
498          } catch (ArrayStoreException success) {}
499      }
# Line 578 | Line 504 | public class LinkedTransferQueueTest ext
504      public void testIterator() throws InterruptedException {
505          LinkedTransferQueue q = populatedQueue(SIZE);
506          Iterator it = q.iterator();
507 <        int i = 0;
508 <        while (it.hasNext()) {
509 <            assertEquals(it.next(), i++);
510 <        }
507 >        int i;
508 >        for (i = 0; it.hasNext(); i++)
509 >            assertTrue(q.contains(it.next()));
510 >        assertEquals(i, SIZE);
511 >        assertIteratorExhausted(it);
512 >
513 >        it = q.iterator();
514 >        for (i = 0; it.hasNext(); i++)
515 >            assertEquals(it.next(), q.take());
516          assertEquals(i, SIZE);
517 +        assertIteratorExhausted(it);
518 +    }
519 +
520 +    /**
521 +     * iterator of empty collection has no elements
522 +     */
523 +    public void testEmptyIterator() {
524 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
525      }
526  
527      /**
# Line 608 | Line 547 | public class LinkedTransferQueueTest ext
547       * iterator ordering is FIFO
548       */
549      public void testIteratorOrdering() {
550 <        final LinkedTransferQueue<Integer> q
612 <            = new LinkedTransferQueue<Integer>();
550 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
551          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
552          q.add(one);
553          q.add(two);
# Line 644 | Line 582 | public class LinkedTransferQueueTest ext
582          LinkedTransferQueue q = populatedQueue(SIZE);
583          String s = q.toString();
584          for (int i = 0; i < SIZE; ++i) {
585 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
585 >            assertTrue(s.contains(String.valueOf(i)));
586          }
587      }
588  
# Line 653 | Line 591 | public class LinkedTransferQueueTest ext
591       */
592      public void testOfferInExecutor() {
593          final LinkedTransferQueue q = new LinkedTransferQueue();
594 <        q.add(one);
595 <        q.add(two);
596 <        ExecutorService executor = Executors.newFixedThreadPool(2);
594 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
595 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
596 >        try (PoolCleaner cleaner = cleaner(executor)) {
597  
598 <        executor.execute(new CheckedRunnable() {
599 <            public void realRun() {
600 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
601 <            }});
602 <
603 <        executor.execute(new CheckedRunnable() {
604 <            public void realRun() throws InterruptedException {
667 <                Thread.sleep(SMALL_DELAY_MS);
668 <                assertSame(one, q.take());
669 <            }});
598 >            executor.execute(new CheckedRunnable() {
599 >                public void realRun() throws InterruptedException {
600 >                    threadsStarted.await();
601 >                    long startTime = System.nanoTime();
602 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
603 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
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 676 | Line 617 | public class LinkedTransferQueueTest ext
617       */
618      public void testPollInExecutor() {
619          final LinkedTransferQueue q = new LinkedTransferQueue();
620 <        ExecutorService executor = Executors.newFixedThreadPool(2);
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 <                assertNull(q.poll());
627 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
628 <                assertTrue(q.isEmpty());
629 <            }});
630 <
631 <        executor.execute(new CheckedRunnable() {
632 <            public void realRun() throws InterruptedException {
690 <                Thread.sleep(SMALL_DELAY_MS);
691 <                q.put(one);
692 <            }});
624 >            executor.execute(new CheckedRunnable() {
625 >                public void realRun() throws InterruptedException {
626 >                    assertNull(q.poll());
627 >                    threadsStarted.await();
628 >                    long startTime = System.nanoTime();
629 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
630 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
631 >                    checkEmpty(q);
632 >                }});
633  
634 <        joinPool(executor);
634 >            executor.execute(new CheckedRunnable() {
635 >                public void realRun() throws InterruptedException {
636 >                    threadsStarted.await();
637 >                    q.put(one);
638 >                }});
639 >        }
640      }
641  
642      /**
643       * A deserialized serialized queue has same elements in same order
644       */
645      public void testSerialization() throws Exception {
646 <        LinkedTransferQueue q = populatedQueue(SIZE);
647 <
703 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
704 <        ObjectOutputStream out
705 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
706 <        out.writeObject(q);
707 <        out.close();
708 <
709 <        ByteArrayInputStream bin
710 <            = new ByteArrayInputStream(bout.toByteArray());
711 <        ObjectInputStream in
712 <            = new ObjectInputStream(new BufferedInputStream(bin));
713 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
646 >        Queue x = populatedQueue(SIZE);
647 >        Queue y = serialClone(x);
648  
649 <        assertEquals(q.size(), r.size());
650 <        while (!q.isEmpty()) {
651 <            assertEquals(q.remove(), r.remove());
649 >        assertNotSame(y, x);
650 >        assertEquals(x.size(), y.size());
651 >        assertEquals(x.toString(), y.toString());
652 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
653 >        while (!x.isEmpty()) {
654 >            assertFalse(y.isEmpty());
655 >            assertEquals(x.remove(), y.remove());
656          }
657 <    }
720 <
721 <    /**
722 <     * drainTo(null) throws NullPointerException
723 <     */
724 <    public void testDrainToNull() {
725 <        LinkedTransferQueue q = populatedQueue(SIZE);
726 <        try {
727 <            q.drainTo(null);
728 <            shouldThrow();
729 <        } catch (NullPointerException success) {}
730 <    }
731 <
732 <    /**
733 <     * drainTo(this) throws IllegalArgumentException
734 <     */
735 <    public void testDrainToSelf() {
736 <        LinkedTransferQueue q = populatedQueue(SIZE);
737 <        try {
738 <            q.drainTo(q);
739 <            shouldThrow();
740 <        } catch (IllegalArgumentException success) {}
657 >        assertTrue(y.isEmpty());
658      }
659  
660      /**
# Line 747 | Line 664 | public class LinkedTransferQueueTest ext
664          LinkedTransferQueue q = populatedQueue(SIZE);
665          ArrayList l = new ArrayList();
666          q.drainTo(l);
667 <        assertEquals(q.size(), 0);
668 <        assertEquals(l.size(), SIZE);
667 >        assertEquals(0, q.size());
668 >        assertEquals(SIZE, l.size());
669          for (int i = 0; i < SIZE; ++i) {
670 <            assertEquals(l.get(i), i);
670 >            assertEquals(i, l.get(i));
671          }
672          q.add(zero);
673          q.add(one);
# Line 759 | Line 676 | public class LinkedTransferQueueTest ext
676          assertTrue(q.contains(one));
677          l.clear();
678          q.drainTo(l);
679 <        assertEquals(q.size(), 0);
680 <        assertEquals(l.size(), 2);
679 >        assertEquals(0, q.size());
680 >        assertEquals(2, l.size());
681          for (int i = 0; i < 2; ++i) {
682 <            assertEquals(l.get(i), i);
682 >            assertEquals(i, l.get(i));
683          }
684      }
685  
# Line 778 | Line 695 | public class LinkedTransferQueueTest ext
695          ArrayList l = new ArrayList();
696          q.drainTo(l);
697          assertTrue(l.size() >= SIZE);
698 <        for (int i = 0; i < SIZE; ++i) {
699 <            assertEquals(l.get(i), i);
700 <        }
784 <        t.join();
698 >        for (int i = 0; i < SIZE; ++i)
699 >            assertEquals(i, l.get(i));
700 >        awaitTermination(t);
701          assertTrue(q.size() + l.size() >= SIZE);
702      }
703  
704      /**
789     * drainTo(null, n) throws NullPointerException
790     */
791    public void testDrainToNullN() {
792        LinkedTransferQueue q = populatedQueue(SIZE);
793        try {
794            q.drainTo(null, SIZE);
795            shouldThrow();
796        } catch (NullPointerException success) {}
797    }
798
799    /**
800     * drainTo(this, n) throws IllegalArgumentException
801     */
802    public void testDrainToSelfN() {
803        LinkedTransferQueue q = populatedQueue(SIZE);
804        try {
805            q.drainTo(q, SIZE);
806            shouldThrow();
807        } catch (IllegalArgumentException success) {}
808    }
809
810    /**
705       * drainTo(c, n) empties first min(n, size) elements of queue into c
706       */
707      public void testDrainToN() {
# Line 819 | Line 713 | public class LinkedTransferQueueTest ext
713              ArrayList l = new ArrayList();
714              q.drainTo(l, i);
715              int k = (i < SIZE) ? i : SIZE;
716 <            assertEquals(l.size(), k);
717 <            assertEquals(q.size(), SIZE - k);
718 <            for (int j = 0; j < k; ++j) {
719 <                assertEquals(l.get(j), j);
720 <            }
827 <            while (q.poll() != null)
828 <                ;
716 >            assertEquals(k, l.size());
717 >            assertEquals(SIZE - k, q.size());
718 >            for (int j = 0; j < k; ++j)
719 >                assertEquals(j, l.get(j));
720 >            do {} while (q.poll() != null);
721          }
722      }
723  
# Line 835 | Line 727 | public class LinkedTransferQueueTest ext
727       */
728      public void testWaitingConsumer() throws InterruptedException {
729          final LinkedTransferQueue q = new LinkedTransferQueue();
730 <        assertEquals(q.getWaitingConsumerCount(), 0);
730 >        assertEquals(0, q.getWaitingConsumerCount());
731          assertFalse(q.hasWaitingConsumer());
732 +        final CountDownLatch threadStarted = new CountDownLatch(1);
733  
734          Thread t = newStartedThread(new CheckedRunnable() {
735              public void realRun() throws InterruptedException {
736 <                Thread.sleep(SMALL_DELAY_MS);
737 <                assertTrue(q.hasWaitingConsumer());
738 <                assertEquals(q.getWaitingConsumerCount(), 1);
739 <                assertTrue(q.offer(one));
736 >                threadStarted.countDown();
737 >                long startTime = System.nanoTime();
738 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
739 >                assertEquals(0, q.getWaitingConsumerCount());
740                  assertFalse(q.hasWaitingConsumer());
741 <                assertEquals(q.getWaitingConsumerCount(), 0);
741 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
742              }});
743  
744 <        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
745 <        assertEquals(q.getWaitingConsumerCount(), 0);
744 >        threadStarted.await();
745 >        Callable<Boolean> oneConsumer
746 >            = new Callable<Boolean>() { public Boolean call() {
747 >                return q.hasWaitingConsumer()
748 >                && q.getWaitingConsumerCount() == 1; }};
749 >        waitForThreadToEnterWaitState(t, oneConsumer);
750 >
751 >        assertTrue(q.offer(one));
752 >        assertEquals(0, q.getWaitingConsumerCount());
753          assertFalse(q.hasWaitingConsumer());
754 <        t.join();
754 >
755 >        awaitTermination(t);
756      }
757  
758      /**
# Line 867 | Line 768 | public class LinkedTransferQueueTest ext
768  
769      /**
770       * transfer waits until a poll occurs. The transfered element
771 <     * is returned by this associated poll.
771 >     * is returned by the associated poll.
772       */
773      public void testTransfer2() throws InterruptedException {
774 <        final LinkedTransferQueue<Integer> q
775 <            = new LinkedTransferQueue<Integer>();
774 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
775 >        final CountDownLatch threadStarted = new CountDownLatch(1);
776  
777          Thread t = newStartedThread(new CheckedRunnable() {
778              public void realRun() throws InterruptedException {
779 <                q.transfer(SIZE);
780 <                assertTrue(q.isEmpty());
779 >                threadStarted.countDown();
780 >                q.transfer(five);
781 >                checkEmpty(q);
782              }});
783  
784 <        Thread.sleep(SHORT_DELAY_MS);
785 <        assertEquals(1, q.size());
786 <        assertEquals(SIZE, (int) q.poll());
787 <        assertTrue(q.isEmpty());
788 <        t.join();
784 >        threadStarted.await();
785 >        Callable<Boolean> oneElement
786 >            = new Callable<Boolean>() { public Boolean call() {
787 >                return !q.isEmpty() && q.size() == 1; }};
788 >        waitForThreadToEnterWaitState(t, oneElement);
789 >
790 >        assertSame(five, q.poll());
791 >        checkEmpty(q);
792 >        awaitTermination(t);
793      }
794  
795      /**
796       * transfer waits until a poll occurs, and then transfers in fifo order
797       */
798      public void testTransfer3() throws InterruptedException {
799 <        final LinkedTransferQueue<Integer> q
894 <            = new LinkedTransferQueue<Integer>();
799 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
800  
801          Thread first = newStartedThread(new CheckedRunnable() {
802              public void realRun() throws InterruptedException {
803 <                Integer i = SIZE + 1;
804 <                q.transfer(i);
900 <                assertTrue(!q.contains(i));
803 >                q.transfer(four);
804 >                assertFalse(q.contains(four));
805                  assertEquals(1, q.size());
806              }});
807  
808          Thread interruptedThread = newStartedThread(
809              new CheckedInterruptedRunnable() {
810                  public void realRun() throws InterruptedException {
811 <                    while (q.size() == 0)
811 >                    while (q.isEmpty())
812                          Thread.yield();
813 <                    q.transfer(SIZE);
813 >                    q.transfer(five);
814                  }});
815  
816          while (q.size() < 2)
817              Thread.yield();
818          assertEquals(2, q.size());
819 <        assertEquals(SIZE + 1, (int) q.poll());
819 >        assertSame(four, q.poll());
820          first.join();
821          assertEquals(1, q.size());
822          interruptedThread.interrupt();
823          interruptedThread.join();
824 <        assertEquals(0, q.size());
921 <        assertTrue(q.isEmpty());
824 >        checkEmpty(q);
825      }
826  
827      /**
# Line 935 | Line 838 | public class LinkedTransferQueueTest ext
838                  assertSame(three, q.poll());
839              }});
840  
841 <        Thread.sleep(SHORT_DELAY_MS);
841 >        while (q.isEmpty())
842 >            Thread.yield();
843 >        assertFalse(q.isEmpty());
844 >        assertEquals(1, q.size());
845          assertTrue(q.offer(three));
846          assertSame(four, q.poll());
847 <        t.join();
847 >        awaitTermination(t);
848      }
849  
850      /**
851       * transfer waits until a take occurs. The transfered element
852 <     * is returned by this associated take.
852 >     * is returned by the associated take.
853       */
854      public void testTransfer5() throws InterruptedException {
855 <        final LinkedTransferQueue<Integer> q
950 <            = new LinkedTransferQueue<Integer>();
855 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
856  
857          Thread t = newStartedThread(new CheckedRunnable() {
858              public void realRun() throws InterruptedException {
859 <                q.transfer(SIZE);
859 >                q.transfer(four);
860                  checkEmpty(q);
861              }});
862  
863 <        Thread.sleep(SHORT_DELAY_MS);
864 <        assertEquals(SIZE, (int) q.take());
863 >        while (q.isEmpty())
864 >            Thread.yield();
865 >        assertFalse(q.isEmpty());
866 >        assertEquals(1, q.size());
867 >        assertSame(four, q.take());
868          checkEmpty(q);
869 <        t.join();
869 >        awaitTermination(t);
870      }
871  
872      /**
873       * tryTransfer(null) throws NullPointerException
874       */
875      public void testTryTransfer1() {
876 +        final LinkedTransferQueue q = new LinkedTransferQueue();
877          try {
969            final LinkedTransferQueue q = new LinkedTransferQueue();
878              q.tryTransfer(null);
879              shouldThrow();
880          } catch (NullPointerException success) {}
# Line 996 | Line 904 | public class LinkedTransferQueueTest ext
904                  while (! q.hasWaitingConsumer())
905                      Thread.yield();
906                  assertTrue(q.hasWaitingConsumer());
907 <                assertTrue(q.isEmpty());
1000 <                assertEquals(q.size(), 0);
907 >                checkEmpty(q);
908                  assertTrue(q.tryTransfer(hotPotato));
909              }});
910  
911 <        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
911 >        long startTime = System.nanoTime();
912 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
913 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
914          checkEmpty(q);
915 <        t.join();
915 >        awaitTermination(t);
916      }
917  
918      /**
# Line 1019 | Line 928 | public class LinkedTransferQueueTest ext
928                  while (! q.hasWaitingConsumer())
929                      Thread.yield();
930                  assertTrue(q.hasWaitingConsumer());
931 <                assertTrue(q.isEmpty());
1023 <                assertEquals(q.size(), 0);
931 >                checkEmpty(q);
932                  assertTrue(q.tryTransfer(hotPotato));
933              }});
934  
935          assertSame(q.take(), hotPotato);
936          checkEmpty(q);
937 <        t.join();
937 >        awaitTermination(t);
938      }
939  
940      /**
941 <     * tryTransfer waits the amount given if interrupted, and
1034 <     * throws interrupted exception
941 >     * tryTransfer blocks interruptibly if no takers
942       */
943      public void testTryTransfer5() throws InterruptedException {
944          final LinkedTransferQueue q = new LinkedTransferQueue();
945 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
946 +        assertTrue(q.isEmpty());
947  
948 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
948 >        Thread t = newStartedThread(new CheckedRunnable() {
949              public void realRun() throws InterruptedException {
950 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
950 >                long startTime = System.nanoTime();
951 >                Thread.currentThread().interrupt();
952 >                try {
953 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
954 >                    shouldThrow();
955 >                } catch (InterruptedException success) {}
956 >                assertFalse(Thread.interrupted());
957 >
958 >                pleaseInterrupt.countDown();
959 >                try {
960 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
961 >                    shouldThrow();
962 >                } catch (InterruptedException success) {}
963 >                assertFalse(Thread.interrupted());
964 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
965              }});
966  
967 <        Thread.sleep(SMALL_DELAY_MS);
968 <        toInterrupt.interrupt();
969 <        toInterrupt.join();
967 >        await(pleaseInterrupt);
968 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
969 >        t.interrupt();
970 >        awaitTermination(t);
971 >        checkEmpty(q);
972      }
973  
974      /**
975 <     * tryTransfer gives up after the timeout and return false
975 >     * tryTransfer gives up after the timeout and returns false
976       */
977      public void testTryTransfer6() throws InterruptedException {
978          final LinkedTransferQueue q = new LinkedTransferQueue();
979  
980          Thread t = newStartedThread(new CheckedRunnable() {
981              public void realRun() throws InterruptedException {
982 <                long t0 = System.nanoTime();
982 >                long startTime = System.nanoTime();
983                  assertFalse(q.tryTransfer(new Object(),
984 <                                          SHORT_DELAY_MS, MILLISECONDS));
985 <                long elapsed = NANOSECONDS.toMillis(System.nanoTime() - t0);
986 <                assertTrue(elapsed >= SHORT_DELAY_MS);
984 >                                          timeoutMillis(), MILLISECONDS));
985 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
986 >                checkEmpty(q);
987              }});
988  
989 <        checkEmpty(q);
1065 <        awaitTermination(t, MEDIUM_DELAY_MS);
989 >        awaitTermination(t);
990          checkEmpty(q);
991      }
992  
# Line 1076 | Line 1000 | public class LinkedTransferQueueTest ext
1000  
1001          Thread t = newStartedThread(new CheckedRunnable() {
1002              public void realRun() throws InterruptedException {
1003 <                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1004 <                assertTrue(q.isEmpty());
1003 >                long startTime = System.nanoTime();
1004 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1005 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1006 >                checkEmpty(q);
1007              }});
1008  
1009 <        Thread.sleep(SHORT_DELAY_MS);
1009 >        while (q.size() != 2)
1010 >            Thread.yield();
1011          assertEquals(2, q.size());
1012          assertSame(four, q.poll());
1013          assertSame(five, q.poll());
1014          checkEmpty(q);
1015 <        t.join();
1015 >        awaitTermination(t);
1016      }
1017  
1018      /**
1019 <     * tryTransfer attempts to enqueue into the q and fails returning
1020 <     * false not enqueueing and the successive poll is null
1019 >     * tryTransfer attempts to enqueue into the queue and fails
1020 >     * returning false not enqueueing and the successive poll is null
1021       */
1022      public void testTryTransfer8() throws InterruptedException {
1023          final LinkedTransferQueue q = new LinkedTransferQueue();
1024          assertTrue(q.offer(four));
1025          assertEquals(1, q.size());
1026 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1026 >        long startTime = System.nanoTime();
1027 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1028 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1029          assertEquals(1, q.size());
1030          assertSame(four, q.poll());
1031          assertNull(q.poll());
# Line 1104 | Line 1033 | public class LinkedTransferQueueTest ext
1033      }
1034  
1035      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1036 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1037 <        assertTrue(q.isEmpty());
1036 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1037 >        checkEmpty(q);
1038          for (int i = 0; i < n; i++) {
1039              assertEquals(i, q.size());
1040              assertTrue(q.offer(i));
# Line 1114 | Line 1043 | public class LinkedTransferQueueTest ext
1043          assertFalse(q.isEmpty());
1044          return q;
1045      }
1046 +
1047 +    /**
1048 +     * remove(null), contains(null) always return false
1049 +     */
1050 +    public void testNeverContainsNull() {
1051 +        Collection<?>[] qs = {
1052 +            new LinkedTransferQueue<Object>(),
1053 +            populatedQueue(2),
1054 +        };
1055 +
1056 +        for (Collection<?> q : qs) {
1057 +            assertFalse(q.contains(null));
1058 +            assertFalse(q.remove(null));
1059 +        }
1060 +    }
1061   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines