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.22 by jsr166, Tue Dec 1 06:03:49 2009 UTC vs.
Revision 1.71 by jsr166, Sat Mar 18 20:42:20 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;
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;
22 import junit.framework.TestSuite;
25  
26   @SuppressWarnings({"unchecked", "rawtypes"})
27   public class LinkedTransferQueueTest extends JSR166TestCase {
28 +    public static class Generic extends BlockingQueueTest {
29 +        protected BlockingQueue emptyCollection() {
30 +            return new LinkedTransferQueue();
31 +        }
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 new TestSuite(LinkedTransferQueueTest.class);
40 <    }
41 <
42 <    void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
43 <        assertTrue(q.isEmpty());
44 <        assertEquals(0, q.size());
45 <        assertNull(q.peek());
46 <        assertNull(q.poll());
47 <        assertNull(q.poll(0, MILLISECONDS));
48 <        assertEquals(q.toString(), "[]");
42 <        assertTrue(Arrays.equals(q.toArray(), new Object[0]));
43 <        assertFalse(q.iterator().hasNext());
44 <        try {
45 <            q.element();
46 <            shouldThrow();
47 <        } catch (NoSuchElementException success) {}
48 <        try {
49 <            q.iterator().next();
50 <            shouldThrow();
51 <        } catch (NoSuchElementException success) {}
52 <        try {
53 <            q.remove();
54 <            shouldThrow();
55 <        } catch (NoSuchElementException success) {}
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 80 | 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];
85 <            new LinkedTransferQueue(Arrays.asList(ints));
78 >            new LinkedTransferQueue(elements);
79              shouldThrow();
80          } catch (NullPointerException success) {}
81      }
# Line 92 | 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];
97 <            for (int i = 0; i < SIZE - 1; ++i) {
98 <                ints[i] = i;
99 <            }
100 <            new LinkedTransferQueue(Arrays.asList(ints));
93 >            new LinkedTransferQueue(elements);
94              shouldThrow();
95          } catch (NullPointerException success) {}
96      }
# Line 130 | 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      /**
147     * offer(null) throws NullPointerException
148     */
149    public void testOfferNull() {
150        try {
151            LinkedTransferQueue q = new LinkedTransferQueue();
152            q.offer(null);
153            shouldThrow();
154        } catch (NullPointerException success) {}
155    }
156
157    /**
158     * add(null) throws NullPointerException
159     */
160    public void testAddNull() {
161        try {
162            LinkedTransferQueue q = new LinkedTransferQueue();
163            q.add(null);
164            shouldThrow();
165        } catch (NullPointerException success) {}
166    }
167
168    /**
169     * addAll(null) throws NullPointerException
170     */
171    public void testAddAll1() {
172        try {
173            LinkedTransferQueue q = new LinkedTransferQueue();
174            q.addAll(null);
175            shouldThrow();
176        } catch (NullPointerException success) {}
177    }
178
179    /**
140       * addAll(this) throws IllegalArgumentException
141       */
142      public void testAddAllSelf() {
143 +        LinkedTransferQueue q = populatedQueue(SIZE);
144          try {
184            LinkedTransferQueue q = populatedQueue(SIZE);
145              q.addAll(q);
146              shouldThrow();
147          } catch (IllegalArgumentException success) {}
148      }
149  
150      /**
191     * addAll of a collection with null elements throws NullPointerException
192     */
193    public void testAddAll2() {
194        try {
195            LinkedTransferQueue q = new LinkedTransferQueue();
196            Integer[] ints = new Integer[SIZE];
197            q.addAll(Arrays.asList(ints));
198            shouldThrow();
199        } catch (NullPointerException success) {}
200    }
201
202    /**
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 {
208            LinkedTransferQueue q = new LinkedTransferQueue();
209            Integer[] ints = new Integer[SIZE];
210            for (int i = 0; i < SIZE - 1; ++i) {
211                ints[i] = i;
212            }
160              q.addAll(Arrays.asList(ints));
161              shouldThrow();
162          } catch (NullPointerException success) {}
# Line 233 | Line 180 | public class LinkedTransferQueueTest ext
180      }
181  
182      /**
236     * put(null) throws NullPointerException
237     */
238    public void testPutNull() throws InterruptedException {
239        try {
240            LinkedTransferQueue q = new LinkedTransferQueue();
241            q.put(null);
242            shouldThrow();
243        } catch (NullPointerException success) {}
244    }
245
246    /**
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 266 | Line 202 | public class LinkedTransferQueueTest ext
202      }
203  
204      /**
205 <     * take blocks interruptibly when empty
270 <     */
271 <    public void testTakeFromEmpty() throws InterruptedException {
272 <        final LinkedTransferQueue q = new LinkedTransferQueue();
273 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
274 <            public void realRun() throws InterruptedException {
275 <                q.take();
276 <            }});
277 <        Thread.sleep(SHORT_DELAY_MS);
278 <        t.interrupt();
279 <        t.join();
280 <    }
281 <
282 <    /**
283 <     * 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());
213 >                    assertEquals(i, q.take());
214                  }
215 +
216 +                Thread.currentThread().interrupt();
217                  try {
218                      q.take();
219                      shouldThrow();
220                  } catch (InterruptedException success) {}
221 +                assertFalse(Thread.interrupted());
222 +
223 +                pleaseInterrupt.countDown();
224 +                try {
225 +                    q.take();
226 +                    shouldThrow();
227 +                } catch (InterruptedException success) {}
228 +                assertFalse(Thread.interrupted());
229              }});
230  
231 <        t.start();
232 <        Thread.sleep(SHORT_DELAY_MS);
231 >        await(pleaseInterrupt);
232 >        assertThreadStaysAlive(t);
233          t.interrupt();
234 <        t.join();
302 <        checkEmpty(q);
234 >        awaitTermination(t);
235      }
236  
237      /**
# Line 315 | Line 247 | public class LinkedTransferQueueTest ext
247      }
248  
249      /**
250 <     * timed pool with zero timeout succeeds when non-empty, else times out
250 >     * timed poll with zero timeout succeeds when non-empty, else times out
251       */
252      public void testTimedPoll0() throws InterruptedException {
253          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 327 | Line 259 | public class LinkedTransferQueueTest ext
259      }
260  
261      /**
262 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
262 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
263       */
264      public void testTimedPoll() throws InterruptedException {
265          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
266 <        for (int i = 0; i < SIZE; ++i) {
267 <            long t0 = System.nanoTime();
266 >        long startTime = System.nanoTime();
267 >        for (int i = 0; i < SIZE; ++i)
268              assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
269 <            long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
270 <            assertTrue(millisElapsed < SMALL_DELAY_MS);
271 <        }
272 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
269 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
270 >
271 >        startTime = System.nanoTime();
272 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
273 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
274          checkEmpty(q);
275      }
276  
# Line 346 | Line 279 | public class LinkedTransferQueueTest ext
279       * returning timeout status
280       */
281      public void testInterruptedTimedPoll() throws InterruptedException {
282 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
282 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
283 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
284          Thread t = newStartedThread(new CheckedRunnable() {
285              public void realRun() throws InterruptedException {
286 <                for (int i = 0; i < SIZE; ++i) {
287 <                    long t0 = System.nanoTime();
288 <                    threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
289 <                                                       MILLISECONDS));
356 <                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
357 <                    assertTrue(millisElapsed < SMALL_DELAY_MS);
358 <                }
286 >                long startTime = System.nanoTime();
287 >                for (int i = 0; i < SIZE; ++i)
288 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
289 >                aboutToWait.countDown();
290                  try {
291                      q.poll(LONG_DELAY_MS, MILLISECONDS);
292                      shouldThrow();
293                  } catch (InterruptedException success) {}
294 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
295              }});
296  
297 <        Thread.sleep(SMALL_DELAY_MS);
297 >        aboutToWait.await();
298 >        waitForThreadToEnterWaitState(t);
299          t.interrupt();
300 <        t.join();
300 >        awaitTermination(t);
301          checkEmpty(q);
302      }
303  
304      /**
305 <     * timed poll before a delayed offer fails; after offer succeeds;
306 <     * on interruption throws
305 >     * timed poll after thread interrupted throws InterruptedException
306 >     * instead of returning timeout status
307       */
308 <    public void testTimedPollWithOffer() throws InterruptedException {
309 <        final LinkedTransferQueue q = new LinkedTransferQueue();
310 <        Thread t = new Thread(new CheckedRunnable() {
308 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
309 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
310 >        Thread t = newStartedThread(new CheckedRunnable() {
311              public void realRun() throws InterruptedException {
312 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
313 <                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
312 >                long startTime = System.nanoTime();
313 >                Thread.currentThread().interrupt();
314 >                for (int i = 0; i < SIZE; ++i)
315 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
316                  try {
317                      q.poll(LONG_DELAY_MS, MILLISECONDS);
318                      shouldThrow();
319                  } catch (InterruptedException success) {}
320 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
321              }});
322  
323 <        t.start();
324 <        Thread.sleep(SMALL_DELAY_MS);
389 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
390 <        t.interrupt();
391 <        t.join();
323 >        awaitTermination(t);
324 >        checkEmpty(q);
325      }
326  
327      /**
# Line 438 | Line 371 | public class LinkedTransferQueueTest ext
371      }
372  
373      /**
441     * remove(x) removes x and returns true if present
442     */
443    public void testRemoveElement() throws InterruptedException {
444        LinkedTransferQueue q = populatedQueue(SIZE);
445        for (int i = 1; i < SIZE; i += 2) {
446            assertTrue(q.remove(i));
447        }
448        for (int i = 0; i < SIZE; i += 2) {
449            assertTrue(q.remove(i));
450            assertFalse(q.remove(i + 1));
451        }
452        checkEmpty(q);
453    }
454
455    /**
374       * An add following remove(x) succeeds
375       */
376      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 462 | Line 380 | public class LinkedTransferQueueTest ext
380          assertTrue(q.remove(one));
381          assertTrue(q.remove(two));
382          assertTrue(q.add(three));
383 <        assertTrue(q.take() == three);
383 >        assertSame(q.take(), three);
384      }
385  
386      /**
# Line 498 | Line 416 | public class LinkedTransferQueueTest ext
416       */
417      public void testContainsAll() {
418          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
419 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
419 >        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
420          for (int i = 0; i < SIZE; ++i) {
421              assertTrue(q.containsAll(p));
422              assertFalse(p.containsAll(q));
# Line 544 | Line 462 | public class LinkedTransferQueueTest ext
462      }
463  
464      /**
465 <     * toArray() contains all elements
465 >     * toArray() contains all elements in FIFO order
466       */
467 <    public void testToArray() throws InterruptedException {
467 >    public void testToArray() {
468          LinkedTransferQueue q = populatedQueue(SIZE);
469          Object[] o = q.toArray();
470          for (int i = 0; i < o.length; i++) {
471 <            assertEquals(o[i], q.take());
471 >            assertSame(o[i], q.poll());
472          }
473      }
474  
475      /**
476 <     * toArray(a) contains all elements
476 >     * toArray(a) contains all elements in FIFO order
477       */
478 <    public void testToArray2() throws InterruptedException {
478 >    public void testToArray2() {
479          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
480          Integer[] ints = new Integer[SIZE];
481 <        ints = q.toArray(ints);
481 >        Integer[] array = q.toArray(ints);
482 >        assertSame(ints, array);
483          for (int i = 0; i < ints.length; i++) {
484 <            assertEquals(ints[i], q.take());
484 >            assertSame(ints[i], q.poll());
485          }
486      }
487  
488      /**
489 <     * toArray(null) throws NullPointerException
571 <     */
572 <    public void testToArray_BadArg() {
573 <        LinkedTransferQueue q = populatedQueue(SIZE);
574 <        try {
575 <            Object o[] = q.toArray(null);
576 <            shouldThrow();
577 <        } catch (NullPointerException success) {}
578 <    }
579 <
580 <    /**
581 <     * toArray(incompatible array type) throws CCE
489 >     * toArray(incompatible array type) throws ArrayStoreException
490       */
491      public void testToArray1_BadArg() {
492          LinkedTransferQueue q = populatedQueue(SIZE);
493          try {
494 <            Object o[] = q.toArray(new String[10]);
494 >            q.toArray(new String[10]);
495              shouldThrow();
496          } catch (ArrayStoreException success) {}
497      }
# Line 594 | Line 502 | public class LinkedTransferQueueTest ext
502      public void testIterator() throws InterruptedException {
503          LinkedTransferQueue q = populatedQueue(SIZE);
504          Iterator it = q.iterator();
505 <        int i = 0;
506 <        while (it.hasNext()) {
507 <            assertEquals(it.next(), i++);
508 <        }
505 >        int i;
506 >        for (i = 0; it.hasNext(); i++)
507 >            assertTrue(q.contains(it.next()));
508 >        assertEquals(i, SIZE);
509 >        assertIteratorExhausted(it);
510 >
511 >        it = q.iterator();
512 >        for (i = 0; it.hasNext(); i++)
513 >            assertEquals(it.next(), q.take());
514          assertEquals(i, SIZE);
515 +        assertIteratorExhausted(it);
516 +    }
517 +
518 +    /**
519 +     * iterator of empty collection has no elements
520 +     */
521 +    public void testEmptyIterator() {
522 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
523      }
524  
525      /**
# Line 615 | Line 536 | public class LinkedTransferQueueTest ext
536          it.remove();
537  
538          it = q.iterator();
539 <        assertEquals(it.next(), one);
540 <        assertEquals(it.next(), three);
539 >        assertSame(it.next(), one);
540 >        assertSame(it.next(), three);
541          assertFalse(it.hasNext());
542      }
543  
# Line 624 | Line 545 | public class LinkedTransferQueueTest ext
545       * iterator ordering is FIFO
546       */
547      public void testIteratorOrdering() {
548 <        final LinkedTransferQueue<Integer> q
628 <            = new LinkedTransferQueue<Integer>();
548 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
549          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
550          q.add(one);
551          q.add(two);
# Line 660 | Line 580 | public class LinkedTransferQueueTest ext
580          LinkedTransferQueue q = populatedQueue(SIZE);
581          String s = q.toString();
582          for (int i = 0; i < SIZE; ++i) {
583 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
583 >            assertTrue(s.contains(String.valueOf(i)));
584          }
585      }
586  
# Line 669 | Line 589 | public class LinkedTransferQueueTest ext
589       */
590      public void testOfferInExecutor() {
591          final LinkedTransferQueue q = new LinkedTransferQueue();
592 <        q.add(one);
593 <        q.add(two);
594 <        ExecutorService executor = Executors.newFixedThreadPool(2);
675 <
676 <        executor.execute(new CheckedRunnable() {
677 <            public void realRun() {
678 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
679 <                                         MILLISECONDS));
680 <            }});
592 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
593 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
594 >        try (PoolCleaner cleaner = cleaner(executor)) {
595  
596 <        executor.execute(new CheckedRunnable() {
597 <            public void realRun() throws InterruptedException {
598 <                Thread.sleep(SMALL_DELAY_MS);
599 <                threadAssertEquals(one, q.take());
600 <            }});
596 >            executor.execute(new CheckedRunnable() {
597 >                public void realRun() throws InterruptedException {
598 >                    threadsStarted.await();
599 >                    long startTime = System.nanoTime();
600 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
601 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
602 >                }});
603  
604 <        joinPool(executor);
604 >            executor.execute(new CheckedRunnable() {
605 >                public void realRun() throws InterruptedException {
606 >                    threadsStarted.await();
607 >                    assertSame(one, q.take());
608 >                    checkEmpty(q);
609 >                }});
610 >        }
611      }
612  
613      /**
# Line 693 | Line 615 | public class LinkedTransferQueueTest ext
615       */
616      public void testPollInExecutor() {
617          final LinkedTransferQueue q = new LinkedTransferQueue();
618 <        ExecutorService executor = Executors.newFixedThreadPool(2);
618 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
619 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
620 >        try (PoolCleaner cleaner = cleaner(executor)) {
621  
622 <        executor.execute(new CheckedRunnable() {
623 <            public void realRun() throws InterruptedException {
624 <                assertNull(q.poll());
625 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
626 <                assertTrue(q.isEmpty());
627 <            }});
628 <
629 <        executor.execute(new CheckedRunnable() {
630 <            public void realRun() throws InterruptedException {
707 <                Thread.sleep(SMALL_DELAY_MS);
708 <                q.put(one);
709 <            }});
622 >            executor.execute(new CheckedRunnable() {
623 >                public void realRun() throws InterruptedException {
624 >                    assertNull(q.poll());
625 >                    threadsStarted.await();
626 >                    long startTime = System.nanoTime();
627 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
628 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
629 >                    checkEmpty(q);
630 >                }});
631  
632 <        joinPool(executor);
632 >            executor.execute(new CheckedRunnable() {
633 >                public void realRun() throws InterruptedException {
634 >                    threadsStarted.await();
635 >                    q.put(one);
636 >                }});
637 >        }
638      }
639  
640      /**
641       * A deserialized serialized queue has same elements in same order
642       */
643      public void testSerialization() throws Exception {
644 <        LinkedTransferQueue q = populatedQueue(SIZE);
645 <
720 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
721 <        ObjectOutputStream out
722 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
723 <        out.writeObject(q);
724 <        out.close();
644 >        Queue x = populatedQueue(SIZE);
645 >        Queue y = serialClone(x);
646  
647 <        ByteArrayInputStream bin
648 <            = new ByteArrayInputStream(bout.toByteArray());
649 <        ObjectInputStream in
650 <            = new ObjectInputStream(new BufferedInputStream(bin));
651 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
652 <
653 <        assertEquals(q.size(), r.size());
733 <        while (!q.isEmpty()) {
734 <            assertEquals(q.remove(), r.remove());
647 >        assertNotSame(y, x);
648 >        assertEquals(x.size(), y.size());
649 >        assertEquals(x.toString(), y.toString());
650 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
651 >        while (!x.isEmpty()) {
652 >            assertFalse(y.isEmpty());
653 >            assertEquals(x.remove(), y.remove());
654          }
655 <    }
737 <
738 <    /**
739 <     * drainTo(null) throws NullPointerException
740 <     */
741 <    public void testDrainToNull() {
742 <        LinkedTransferQueue q = populatedQueue(SIZE);
743 <        try {
744 <            q.drainTo(null);
745 <            shouldThrow();
746 <        } catch (NullPointerException success) {}
747 <    }
748 <
749 <    /**
750 <     * drainTo(this) throws IllegalArgumentException
751 <     */
752 <    public void testDrainToSelf() {
753 <        LinkedTransferQueue q = populatedQueue(SIZE);
754 <        try {
755 <            q.drainTo(q);
756 <            shouldThrow();
757 <        } catch (IllegalArgumentException success) {}
655 >        assertTrue(y.isEmpty());
656      }
657  
658      /**
# Line 764 | Line 662 | public class LinkedTransferQueueTest ext
662          LinkedTransferQueue q = populatedQueue(SIZE);
663          ArrayList l = new ArrayList();
664          q.drainTo(l);
665 <        assertEquals(q.size(), 0);
666 <        assertEquals(l.size(), SIZE);
665 >        assertEquals(0, q.size());
666 >        assertEquals(SIZE, l.size());
667          for (int i = 0; i < SIZE; ++i) {
668 <            assertEquals(l.get(i), i);
668 >            assertEquals(i, l.get(i));
669          }
670          q.add(zero);
671          q.add(one);
# Line 776 | Line 674 | public class LinkedTransferQueueTest ext
674          assertTrue(q.contains(one));
675          l.clear();
676          q.drainTo(l);
677 <        assertEquals(q.size(), 0);
678 <        assertEquals(l.size(), 2);
677 >        assertEquals(0, q.size());
678 >        assertEquals(2, l.size());
679          for (int i = 0; i < 2; ++i) {
680 <            assertEquals(l.get(i), i);
680 >            assertEquals(i, l.get(i));
681          }
682      }
683  
# Line 795 | Line 693 | public class LinkedTransferQueueTest ext
693          ArrayList l = new ArrayList();
694          q.drainTo(l);
695          assertTrue(l.size() >= SIZE);
696 <        for (int i = 0; i < SIZE; ++i) {
697 <            assertEquals(l.get(i), i);
698 <        }
801 <        t.join();
696 >        for (int i = 0; i < SIZE; ++i)
697 >            assertEquals(i, l.get(i));
698 >        awaitTermination(t);
699          assertTrue(q.size() + l.size() >= SIZE);
700      }
701  
702      /**
703 <     * drainTo(null, n) throws NullPointerException
807 <     */
808 <    public void testDrainToNullN() {
809 <        LinkedTransferQueue q = populatedQueue(SIZE);
810 <        try {
811 <            q.drainTo(null, SIZE);
812 <            shouldThrow();
813 <        } catch (NullPointerException success) {}
814 <    }
815 <
816 <    /**
817 <     * drainTo(this, n) throws IllegalArgumentException
818 <     */
819 <    public void testDrainToSelfN() {
820 <        LinkedTransferQueue q = populatedQueue(SIZE);
821 <        try {
822 <            q.drainTo(q, SIZE);
823 <            shouldThrow();
824 <        } catch (IllegalArgumentException success) {}
825 <    }
826 <
827 <    /**
828 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
703 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
704       */
705      public void testDrainToN() {
706          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 836 | Line 711 | public class LinkedTransferQueueTest ext
711              ArrayList l = new ArrayList();
712              q.drainTo(l, i);
713              int k = (i < SIZE) ? i : SIZE;
714 <            assertEquals(l.size(), k);
715 <            assertEquals(q.size(), SIZE - k);
716 <            for (int j = 0; j < k; ++j) {
717 <                assertEquals(l.get(j), j);
718 <            }
844 <            while (q.poll() != null)
845 <                ;
714 >            assertEquals(k, l.size());
715 >            assertEquals(SIZE - k, q.size());
716 >            for (int j = 0; j < k; ++j)
717 >                assertEquals(j, l.get(j));
718 >            do {} while (q.poll() != null);
719          }
720      }
721  
# Line 852 | Line 725 | public class LinkedTransferQueueTest ext
725       */
726      public void testWaitingConsumer() throws InterruptedException {
727          final LinkedTransferQueue q = new LinkedTransferQueue();
728 <        assertEquals(q.getWaitingConsumerCount(), 0);
728 >        assertEquals(0, q.getWaitingConsumerCount());
729          assertFalse(q.hasWaitingConsumer());
730 +        final CountDownLatch threadStarted = new CountDownLatch(1);
731  
732          Thread t = newStartedThread(new CheckedRunnable() {
733              public void realRun() throws InterruptedException {
734 <                Thread.sleep(SMALL_DELAY_MS);
735 <                assertTrue(q.hasWaitingConsumer());
736 <                assertEquals(q.getWaitingConsumerCount(), 1);
737 <                assertTrue(q.offer(one));
734 >                threadStarted.countDown();
735 >                long startTime = System.nanoTime();
736 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
737 >                assertEquals(0, q.getWaitingConsumerCount());
738                  assertFalse(q.hasWaitingConsumer());
739 <                assertEquals(q.getWaitingConsumerCount(), 0);
739 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
740              }});
741  
742 <        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
743 <        assertEquals(q.getWaitingConsumerCount(), 0);
742 >        threadStarted.await();
743 >        Callable<Boolean> oneConsumer
744 >            = new Callable<Boolean>() { public Boolean call() {
745 >                return q.hasWaitingConsumer()
746 >                && q.getWaitingConsumerCount() == 1; }};
747 >        waitForThreadToEnterWaitState(t, oneConsumer);
748 >
749 >        assertTrue(q.offer(one));
750 >        assertEquals(0, q.getWaitingConsumerCount());
751          assertFalse(q.hasWaitingConsumer());
752 <        t.join();
752 >
753 >        awaitTermination(t);
754      }
755  
756      /**
# Line 884 | Line 766 | public class LinkedTransferQueueTest ext
766  
767      /**
768       * transfer waits until a poll occurs. The transfered element
769 <     * is returned by this associated poll.
769 >     * is returned by the associated poll.
770       */
771      public void testTransfer2() throws InterruptedException {
772 <        final LinkedTransferQueue<Integer> q
773 <            = new LinkedTransferQueue<Integer>();
772 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
773 >        final CountDownLatch threadStarted = new CountDownLatch(1);
774  
775          Thread t = newStartedThread(new CheckedRunnable() {
776              public void realRun() throws InterruptedException {
777 <                q.transfer(SIZE);
778 <                threadAssertTrue(q.isEmpty());
777 >                threadStarted.countDown();
778 >                q.transfer(five);
779 >                checkEmpty(q);
780              }});
781  
782 <        Thread.sleep(SHORT_DELAY_MS);
783 <        assertEquals(1, q.size());
784 <        assertEquals(SIZE, (int) q.poll());
785 <        assertTrue(q.isEmpty());
786 <        t.join();
782 >        threadStarted.await();
783 >        Callable<Boolean> oneElement
784 >            = new Callable<Boolean>() { public Boolean call() {
785 >                return !q.isEmpty() && q.size() == 1; }};
786 >        waitForThreadToEnterWaitState(t, oneElement);
787 >
788 >        assertSame(five, q.poll());
789 >        checkEmpty(q);
790 >        awaitTermination(t);
791      }
792  
793      /**
794       * transfer waits until a poll occurs, and then transfers in fifo order
795       */
796      public void testTransfer3() throws InterruptedException {
797 <        final LinkedTransferQueue<Integer> q
911 <            = new LinkedTransferQueue<Integer>();
797 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
798  
799          Thread first = newStartedThread(new CheckedRunnable() {
800              public void realRun() throws InterruptedException {
801 <                Integer i = SIZE + 1;
802 <                q.transfer(i);
803 <                threadAssertTrue(!q.contains(i));
918 <                threadAssertEquals(1, q.size());
801 >                q.transfer(four);
802 >                assertFalse(q.contains(four));
803 >                assertEquals(1, q.size());
804              }});
805  
806          Thread interruptedThread = newStartedThread(
807              new CheckedInterruptedRunnable() {
808                  public void realRun() throws InterruptedException {
809 <                    while (q.size() == 0)
809 >                    while (q.isEmpty())
810                          Thread.yield();
811 <                    q.transfer(SIZE);
811 >                    q.transfer(five);
812                  }});
813  
814          while (q.size() < 2)
815              Thread.yield();
816          assertEquals(2, q.size());
817 <        assertEquals(SIZE + 1, (int) q.poll());
817 >        assertSame(four, q.poll());
818          first.join();
819          assertEquals(1, q.size());
820          interruptedThread.interrupt();
821          interruptedThread.join();
822 <        assertEquals(0, q.size());
938 <        assertTrue(q.isEmpty());
822 >        checkEmpty(q);
823      }
824  
825      /**
# Line 948 | Line 832 | public class LinkedTransferQueueTest ext
832          Thread t = newStartedThread(new CheckedRunnable() {
833              public void realRun() throws InterruptedException {
834                  q.transfer(four);
835 <                threadAssertFalse(q.contains(four));
836 <                threadAssertEquals(three, q.poll());
835 >                assertFalse(q.contains(four));
836 >                assertSame(three, q.poll());
837              }});
838  
839 <        Thread.sleep(SHORT_DELAY_MS);
839 >        while (q.isEmpty())
840 >            Thread.yield();
841 >        assertFalse(q.isEmpty());
842 >        assertEquals(1, q.size());
843          assertTrue(q.offer(three));
844 <        assertEquals(four, q.poll());
845 <        t.join();
844 >        assertSame(four, q.poll());
845 >        awaitTermination(t);
846      }
847  
848      /**
849       * transfer waits until a take occurs. The transfered element
850 <     * is returned by this associated take.
850 >     * is returned by the associated take.
851       */
852      public void testTransfer5() throws InterruptedException {
853 <        final LinkedTransferQueue<Integer> q
967 <            = new LinkedTransferQueue<Integer>();
853 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
854  
855          Thread t = newStartedThread(new CheckedRunnable() {
856              public void realRun() throws InterruptedException {
857 <                q.transfer(SIZE);
857 >                q.transfer(four);
858                  checkEmpty(q);
859              }});
860  
861 <        Thread.sleep(SHORT_DELAY_MS);
862 <        assertEquals(SIZE, (int) q.take());
861 >        while (q.isEmpty())
862 >            Thread.yield();
863 >        assertFalse(q.isEmpty());
864 >        assertEquals(1, q.size());
865 >        assertSame(four, q.take());
866          checkEmpty(q);
867 <        t.join();
867 >        awaitTermination(t);
868      }
869  
870      /**
871       * tryTransfer(null) throws NullPointerException
872       */
873      public void testTryTransfer1() {
874 +        final LinkedTransferQueue q = new LinkedTransferQueue();
875          try {
986            final LinkedTransferQueue q = new LinkedTransferQueue();
876              q.tryTransfer(null);
877              shouldThrow();
878          } catch (NullPointerException success) {}
# Line 1012 | Line 901 | public class LinkedTransferQueueTest ext
901              public void realRun() {
902                  while (! q.hasWaitingConsumer())
903                      Thread.yield();
904 <                threadAssertTrue(q.hasWaitingConsumer());
905 <                threadAssertTrue(q.isEmpty());
906 <                threadAssertTrue(q.size() == 0);
1018 <                threadAssertTrue(q.tryTransfer(hotPotato));
904 >                assertTrue(q.hasWaitingConsumer());
905 >                checkEmpty(q);
906 >                assertTrue(q.tryTransfer(hotPotato));
907              }});
908  
909 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
909 >        long startTime = System.nanoTime();
910 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
911 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
912          checkEmpty(q);
913 <        t.join();
913 >        awaitTermination(t);
914      }
915  
916      /**
# Line 1035 | Line 925 | public class LinkedTransferQueueTest ext
925              public void realRun() {
926                  while (! q.hasWaitingConsumer())
927                      Thread.yield();
928 <                threadAssertTrue(q.hasWaitingConsumer());
929 <                threadAssertTrue(q.isEmpty());
930 <                threadAssertTrue(q.size() == 0);
1041 <                threadAssertTrue(q.tryTransfer(hotPotato));
928 >                assertTrue(q.hasWaitingConsumer());
929 >                checkEmpty(q);
930 >                assertTrue(q.tryTransfer(hotPotato));
931              }});
932  
933 <        assertTrue(q.take() == hotPotato);
933 >        assertSame(q.take(), hotPotato);
934          checkEmpty(q);
935 <        t.join();
935 >        awaitTermination(t);
936      }
937  
938      /**
939 <     * tryTransfer waits the amount given if interrupted, and
1051 <     * throws interrupted exception
939 >     * tryTransfer blocks interruptibly if no takers
940       */
941      public void testTryTransfer5() throws InterruptedException {
942          final LinkedTransferQueue q = new LinkedTransferQueue();
943 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
944 +        assertTrue(q.isEmpty());
945  
946 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
946 >        Thread t = newStartedThread(new CheckedRunnable() {
947              public void realRun() throws InterruptedException {
948 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
948 >                long startTime = System.nanoTime();
949 >                Thread.currentThread().interrupt();
950 >                try {
951 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
952 >                    shouldThrow();
953 >                } catch (InterruptedException success) {}
954 >                assertFalse(Thread.interrupted());
955 >
956 >                pleaseInterrupt.countDown();
957 >                try {
958 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
959 >                    shouldThrow();
960 >                } catch (InterruptedException success) {}
961 >                assertFalse(Thread.interrupted());
962 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
963              }});
964  
965 <        Thread.sleep(SMALL_DELAY_MS);
966 <        toInterrupt.interrupt();
967 <        toInterrupt.join();
965 >        await(pleaseInterrupt);
966 >        assertThreadStaysAlive(t);
967 >        t.interrupt();
968 >        awaitTermination(t);
969 >        checkEmpty(q);
970      }
971  
972      /**
973 <     * tryTransfer gives up after the timeout and return false
973 >     * tryTransfer gives up after the timeout and returns false
974       */
975      public void testTryTransfer6() throws InterruptedException {
976          final LinkedTransferQueue q = new LinkedTransferQueue();
977  
978          Thread t = newStartedThread(new CheckedRunnable() {
979              public void realRun() throws InterruptedException {
980 <                threadAssertFalse
981 <                    (q.tryTransfer(new Object(),
982 <                                   SHORT_DELAY_MS, MILLISECONDS));
980 >                long startTime = System.nanoTime();
981 >                assertFalse(q.tryTransfer(new Object(),
982 >                                          timeoutMillis(), MILLISECONDS));
983 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
984 >                checkEmpty(q);
985              }});
986  
987 <        Thread.sleep(SMALL_DELAY_MS);
987 >        awaitTermination(t);
988          checkEmpty(q);
1081        t.join();
989      }
990  
991      /**
# Line 1091 | Line 998 | public class LinkedTransferQueueTest ext
998  
999          Thread t = newStartedThread(new CheckedRunnable() {
1000              public void realRun() throws InterruptedException {
1001 <                threadAssertTrue(q.tryTransfer(five,
1002 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
1003 <                threadAssertTrue(q.isEmpty());
1001 >                long startTime = System.nanoTime();
1002 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1003 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1004 >                checkEmpty(q);
1005              }});
1006  
1007 <        Thread.sleep(SHORT_DELAY_MS);
1007 >        while (q.size() != 2)
1008 >            Thread.yield();
1009          assertEquals(2, q.size());
1010 <        assertEquals(four, q.poll());
1011 <        assertEquals(five, q.poll());
1010 >        assertSame(four, q.poll());
1011 >        assertSame(five, q.poll());
1012          checkEmpty(q);
1013 <        t.join();
1013 >        awaitTermination(t);
1014      }
1015  
1016      /**
1017 <     * tryTransfer attempts to enqueue into the q and fails returning
1018 <     * false not enqueueing and the successive poll is null
1017 >     * tryTransfer attempts to enqueue into the queue and fails
1018 >     * returning false not enqueueing and the successive poll is null
1019       */
1020      public void testTryTransfer8() throws InterruptedException {
1021          final LinkedTransferQueue q = new LinkedTransferQueue();
1022          assertTrue(q.offer(four));
1023          assertEquals(1, q.size());
1024 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1024 >        long startTime = System.nanoTime();
1025 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1026 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1027          assertEquals(1, q.size());
1028 <        assertEquals(four, q.poll());
1028 >        assertSame(four, q.poll());
1029          assertNull(q.poll());
1030          checkEmpty(q);
1031      }
1032  
1033      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1034 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1035 <        assertTrue(q.isEmpty());
1034 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1035 >        checkEmpty(q);
1036          for (int i = 0; i < n; i++) {
1037              assertEquals(i, q.size());
1038              assertTrue(q.offer(i));
# Line 1130 | Line 1041 | public class LinkedTransferQueueTest ext
1041          assertFalse(q.isEmpty());
1042          return q;
1043      }
1044 +
1045 +    /**
1046 +     * remove(null), contains(null) always return false
1047 +     */
1048 +    public void testNeverContainsNull() {
1049 +        Collection<?>[] qs = {
1050 +            new LinkedTransferQueue<Object>(),
1051 +            populatedQueue(2),
1052 +        };
1053 +
1054 +        for (Collection<?> q : qs) {
1055 +            assertFalse(q.contains(null));
1056 +            assertFalse(q.remove(null));
1057 +        }
1058 +    }
1059   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines