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.28 by jsr166, Thu Oct 28 17:57:26 2010 UTC vs.
Revision 1.81 by jsr166, Mon May 28 21:19:50 2018 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include John Vint
6   */
7  
8 < import java.io.BufferedInputStream;
9 < import java.io.BufferedOutputStream;
10 < import java.io.ByteArrayInputStream;
11 < import java.io.ByteArrayOutputStream;
12 < import java.io.ObjectInputStream;
13 < import java.io.ObjectOutputStream;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 >
10   import java.util.ArrayList;
11   import java.util.Arrays;
12 + import java.util.Collection;
13   import java.util.Iterator;
14   import java.util.List;
15   import java.util.NoSuchElementException;
16 < import java.util.concurrent.*;
17 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
18 < import static java.util.concurrent.TimeUnit.NANOSECONDS;
16 > import java.util.Queue;
17 > import java.util.concurrent.BlockingQueue;
18 > import java.util.concurrent.Callable;
19 > import java.util.concurrent.CountDownLatch;
20 > import java.util.concurrent.Executors;
21 > import java.util.concurrent.ExecutorService;
22 > import java.util.concurrent.LinkedTransferQueue;
23 >
24   import junit.framework.Test;
23 import junit.framework.TestSuite;
25  
26   @SuppressWarnings({"unchecked", "rawtypes"})
27   public class LinkedTransferQueueTest extends JSR166TestCase {
27
28      public static class Generic extends BlockingQueueTest {
29          protected BlockingQueue emptyCollection() {
30              return new LinkedTransferQueue();
# Line 32 | Line 32 | public class LinkedTransferQueueTest ext
32      }
33  
34      public static void main(String[] args) {
35 <        junit.textui.TestRunner.run(suite());
35 >        main(suite(), args);
36      }
37  
38      public static Test suite() {
39 +        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 277 | Line 205 | public class LinkedTransferQueueTest ext
205       * take removes existing elements until empty, then blocks interruptibly
206       */
207      public void testBlockingTake() throws InterruptedException {
208 <        final 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();
296 <        checkEmpty(q);
232 >        awaitTermination(t);
233      }
234  
235      /**
# Line 309 | 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 321 | 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 <            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
268 <        }
269 <        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 339 | 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 <                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
288 <                }
287 >
288 >                Thread.currentThread().interrupt();
289 >                try {
290 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
291 >                    shouldThrow();
292 >                } catch (InterruptedException success) {}
293 >                assertFalse(Thread.interrupted());
294 >
295 >                pleaseInterrupt.countDown();
296                  try {
297                      q.poll(LONG_DELAY_MS, MILLISECONDS);
298                      shouldThrow();
299                  } catch (InterruptedException success) {}
300 +                assertFalse(Thread.interrupted());
301 +
302 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
303              }});
304  
305 <        Thread.sleep(SMALL_DELAY_MS);
305 >        await(pleaseInterrupt);
306 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
307          t.interrupt();
308 <        t.join();
308 >        awaitTermination(t);
309 >        checkEmpty(q);
310 >    }
311 >
312 >    /**
313 >     * timed poll after thread interrupted throws InterruptedException
314 >     * instead of returning timeout status
315 >     */
316 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
317 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
318 >        Thread t = newStartedThread(new CheckedRunnable() {
319 >            public void realRun() throws InterruptedException {
320 >                long startTime = System.nanoTime();
321 >                Thread.currentThread().interrupt();
322 >                for (int i = 0; i < SIZE; ++i)
323 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
324 >                try {
325 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
326 >                    shouldThrow();
327 >                } catch (InterruptedException success) {}
328 >                assertFalse(Thread.interrupted());
329 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
330 >            }});
331 >
332 >        awaitTermination(t);
333          checkEmpty(q);
334      }
335  
# Line 406 | Line 380 | public class LinkedTransferQueueTest ext
380      }
381  
382      /**
409     * remove(x) removes x and returns true if present
410     */
411    public void testRemoveElement() throws InterruptedException {
412        LinkedTransferQueue q = populatedQueue(SIZE);
413        for (int i = 1; i < SIZE; i += 2) {
414            assertTrue(q.remove(i));
415        }
416        for (int i = 0; i < SIZE; i += 2) {
417            assertTrue(q.remove(i));
418            assertFalse(q.remove(i + 1));
419        }
420        checkEmpty(q);
421    }
422
423    /**
383       * An add following remove(x) succeeds
384       */
385      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 466 | Line 425 | public class LinkedTransferQueueTest ext
425       */
426      public void testContainsAll() {
427          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
428 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
428 >        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
429          for (int i = 0; i < SIZE; ++i) {
430              assertTrue(q.containsAll(p));
431              assertFalse(p.containsAll(q));
# Line 512 | Line 471 | public class LinkedTransferQueueTest ext
471      }
472  
473      /**
474 <     * toArray() contains all elements
474 >     * toArray() contains all elements in FIFO order
475       */
476 <    public void testToArray() throws InterruptedException {
476 >    public void testToArray() {
477          LinkedTransferQueue q = populatedQueue(SIZE);
478 <        Object[] o = q.toArray();
479 <        for (int i = 0; i < o.length; i++) {
480 <            assertEquals(o[i], q.take());
481 <        }
478 >        Object[] a = q.toArray();
479 >        assertSame(Object[].class, a.getClass());
480 >        for (Object o : a)
481 >            assertSame(o, q.poll());
482 >        assertTrue(q.isEmpty());
483      }
484  
485      /**
486 <     * toArray(a) contains all elements
486 >     * toArray(a) contains all elements in FIFO order
487       */
488 <    public void testToArray2() throws InterruptedException {
488 >    public void testToArray2() {
489          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
490          Integer[] ints = new Integer[SIZE];
491 <        ints = q.toArray(ints);
492 <        for (int i = 0; i < ints.length; i++) {
493 <            assertEquals(ints[i], q.take());
494 <        }
495 <    }
536 <
537 <    /**
538 <     * toArray(null) throws NullPointerException
539 <     */
540 <    public void testToArray_BadArg() {
541 <        LinkedTransferQueue q = populatedQueue(SIZE);
542 <        try {
543 <            Object o[] = q.toArray(null);
544 <            shouldThrow();
545 <        } catch (NullPointerException success) {}
491 >        Integer[] array = q.toArray(ints);
492 >        assertSame(ints, array);
493 >        for (Integer o : ints)
494 >            assertSame(o, q.poll());
495 >        assertTrue(q.isEmpty());
496      }
497  
498      /**
499 <     * toArray(incompatible array type) throws CCE
499 >     * toArray(incompatible array type) throws ArrayStoreException
500       */
501      public void testToArray1_BadArg() {
502          LinkedTransferQueue q = populatedQueue(SIZE);
503          try {
504 <            Object o[] = q.toArray(new String[10]);
504 >            q.toArray(new String[10]);
505              shouldThrow();
506          } catch (ArrayStoreException success) {}
507      }
# Line 562 | Line 512 | public class LinkedTransferQueueTest ext
512      public void testIterator() throws InterruptedException {
513          LinkedTransferQueue q = populatedQueue(SIZE);
514          Iterator it = q.iterator();
515 <        int i = 0;
516 <        while (it.hasNext()) {
517 <            assertEquals(it.next(), i++);
518 <        }
515 >        int i;
516 >        for (i = 0; it.hasNext(); i++)
517 >            assertTrue(q.contains(it.next()));
518 >        assertEquals(i, SIZE);
519 >        assertIteratorExhausted(it);
520 >
521 >        it = q.iterator();
522 >        for (i = 0; it.hasNext(); i++)
523 >            assertEquals(it.next(), q.take());
524          assertEquals(i, SIZE);
525 +        assertIteratorExhausted(it);
526 +    }
527 +
528 +    /**
529 +     * iterator of empty collection has no elements
530 +     */
531 +    public void testEmptyIterator() {
532 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
533      }
534  
535      /**
# Line 592 | Line 555 | public class LinkedTransferQueueTest ext
555       * iterator ordering is FIFO
556       */
557      public void testIteratorOrdering() {
558 <        final LinkedTransferQueue<Integer> q
596 <            = new LinkedTransferQueue<Integer>();
558 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
559          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
560          q.add(one);
561          q.add(two);
# Line 628 | Line 590 | public class LinkedTransferQueueTest ext
590          LinkedTransferQueue q = populatedQueue(SIZE);
591          String s = q.toString();
592          for (int i = 0; i < SIZE; ++i) {
593 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
593 >            assertTrue(s.contains(String.valueOf(i)));
594          }
595      }
596  
# Line 637 | Line 599 | public class LinkedTransferQueueTest ext
599       */
600      public void testOfferInExecutor() {
601          final LinkedTransferQueue q = new LinkedTransferQueue();
602 <        q.add(one);
603 <        q.add(two);
604 <        ExecutorService executor = Executors.newFixedThreadPool(2);
602 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
603 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
604 >        try (PoolCleaner cleaner = cleaner(executor)) {
605  
606 <        executor.execute(new CheckedRunnable() {
607 <            public void realRun() {
608 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
609 <            }});
610 <
611 <        executor.execute(new CheckedRunnable() {
612 <            public void realRun() throws InterruptedException {
651 <                Thread.sleep(SMALL_DELAY_MS);
652 <                assertSame(one, q.take());
653 <            }});
606 >            executor.execute(new CheckedRunnable() {
607 >                public void realRun() throws InterruptedException {
608 >                    threadsStarted.await();
609 >                    long startTime = System.nanoTime();
610 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
611 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
612 >                }});
613  
614 <        joinPool(executor);
614 >            executor.execute(new CheckedRunnable() {
615 >                public void realRun() throws InterruptedException {
616 >                    threadsStarted.await();
617 >                    assertSame(one, q.take());
618 >                    checkEmpty(q);
619 >                }});
620 >        }
621      }
622  
623      /**
# Line 660 | Line 625 | public class LinkedTransferQueueTest ext
625       */
626      public void testPollInExecutor() {
627          final LinkedTransferQueue q = new LinkedTransferQueue();
628 <        ExecutorService executor = Executors.newFixedThreadPool(2);
628 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
629 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
630 >        try (PoolCleaner cleaner = cleaner(executor)) {
631  
632 <        executor.execute(new CheckedRunnable() {
633 <            public void realRun() throws InterruptedException {
634 <                assertNull(q.poll());
635 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
636 <                assertTrue(q.isEmpty());
637 <            }});
638 <
639 <        executor.execute(new CheckedRunnable() {
640 <            public void realRun() throws InterruptedException {
674 <                Thread.sleep(SMALL_DELAY_MS);
675 <                q.put(one);
676 <            }});
632 >            executor.execute(new CheckedRunnable() {
633 >                public void realRun() throws InterruptedException {
634 >                    assertNull(q.poll());
635 >                    threadsStarted.await();
636 >                    long startTime = System.nanoTime();
637 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
638 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
639 >                    checkEmpty(q);
640 >                }});
641  
642 <        joinPool(executor);
642 >            executor.execute(new CheckedRunnable() {
643 >                public void realRun() throws InterruptedException {
644 >                    threadsStarted.await();
645 >                    q.put(one);
646 >                }});
647 >        }
648      }
649  
650      /**
651 <     * A deserialized serialized queue has same elements in same order
651 >     * A deserialized/reserialized queue has same elements in same order
652       */
653      public void testSerialization() throws Exception {
654 <        LinkedTransferQueue q = populatedQueue(SIZE);
655 <
687 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
688 <        ObjectOutputStream out
689 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
690 <        out.writeObject(q);
691 <        out.close();
692 <
693 <        ByteArrayInputStream bin
694 <            = new ByteArrayInputStream(bout.toByteArray());
695 <        ObjectInputStream in
696 <            = new ObjectInputStream(new BufferedInputStream(bin));
697 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
654 >        Queue x = populatedQueue(SIZE);
655 >        Queue y = serialClone(x);
656  
657 <        assertEquals(q.size(), r.size());
658 <        while (!q.isEmpty()) {
659 <            assertEquals(q.remove(), r.remove());
657 >        assertNotSame(y, x);
658 >        assertEquals(x.size(), y.size());
659 >        assertEquals(x.toString(), y.toString());
660 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
661 >        while (!x.isEmpty()) {
662 >            assertFalse(y.isEmpty());
663 >            assertEquals(x.remove(), y.remove());
664          }
665 <    }
704 <
705 <    /**
706 <     * drainTo(null) throws NullPointerException
707 <     */
708 <    public void testDrainToNull() {
709 <        LinkedTransferQueue q = populatedQueue(SIZE);
710 <        try {
711 <            q.drainTo(null);
712 <            shouldThrow();
713 <        } catch (NullPointerException success) {}
714 <    }
715 <
716 <    /**
717 <     * drainTo(this) throws IllegalArgumentException
718 <     */
719 <    public void testDrainToSelf() {
720 <        LinkedTransferQueue q = populatedQueue(SIZE);
721 <        try {
722 <            q.drainTo(q);
723 <            shouldThrow();
724 <        } catch (IllegalArgumentException success) {}
665 >        assertTrue(y.isEmpty());
666      }
667  
668      /**
# Line 731 | Line 672 | public class LinkedTransferQueueTest ext
672          LinkedTransferQueue q = populatedQueue(SIZE);
673          ArrayList l = new ArrayList();
674          q.drainTo(l);
675 <        assertEquals(q.size(), 0);
676 <        assertEquals(l.size(), SIZE);
675 >        assertEquals(0, q.size());
676 >        assertEquals(SIZE, l.size());
677          for (int i = 0; i < SIZE; ++i) {
678 <            assertEquals(l.get(i), i);
678 >            assertEquals(i, l.get(i));
679          }
680          q.add(zero);
681          q.add(one);
# Line 743 | Line 684 | public class LinkedTransferQueueTest ext
684          assertTrue(q.contains(one));
685          l.clear();
686          q.drainTo(l);
687 <        assertEquals(q.size(), 0);
688 <        assertEquals(l.size(), 2);
687 >        assertEquals(0, q.size());
688 >        assertEquals(2, l.size());
689          for (int i = 0; i < 2; ++i) {
690 <            assertEquals(l.get(i), i);
690 >            assertEquals(i, l.get(i));
691          }
692      }
693  
# Line 762 | Line 703 | public class LinkedTransferQueueTest ext
703          ArrayList l = new ArrayList();
704          q.drainTo(l);
705          assertTrue(l.size() >= SIZE);
706 <        for (int i = 0; i < SIZE; ++i) {
707 <            assertEquals(l.get(i), i);
708 <        }
768 <        t.join();
706 >        for (int i = 0; i < SIZE; ++i)
707 >            assertEquals(i, l.get(i));
708 >        awaitTermination(t);
709          assertTrue(q.size() + l.size() >= SIZE);
710      }
711  
712      /**
773     * drainTo(null, n) throws NullPointerException
774     */
775    public void testDrainToNullN() {
776        LinkedTransferQueue q = populatedQueue(SIZE);
777        try {
778            q.drainTo(null, SIZE);
779            shouldThrow();
780        } catch (NullPointerException success) {}
781    }
782
783    /**
784     * drainTo(this, n) throws IllegalArgumentException
785     */
786    public void testDrainToSelfN() {
787        LinkedTransferQueue q = populatedQueue(SIZE);
788        try {
789            q.drainTo(q, SIZE);
790            shouldThrow();
791        } catch (IllegalArgumentException success) {}
792    }
793
794    /**
713       * drainTo(c, n) empties first min(n, size) elements of queue into c
714       */
715      public void testDrainToN() {
# Line 803 | Line 721 | public class LinkedTransferQueueTest ext
721              ArrayList l = new ArrayList();
722              q.drainTo(l, i);
723              int k = (i < SIZE) ? i : SIZE;
724 <            assertEquals(l.size(), k);
725 <            assertEquals(q.size(), SIZE - k);
726 <            for (int j = 0; j < k; ++j) {
727 <                assertEquals(l.get(j), j);
728 <            }
811 <            while (q.poll() != null)
812 <                ;
724 >            assertEquals(k, l.size());
725 >            assertEquals(SIZE - k, q.size());
726 >            for (int j = 0; j < k; ++j)
727 >                assertEquals(j, l.get(j));
728 >            do {} while (q.poll() != null);
729          }
730      }
731  
# Line 819 | Line 735 | public class LinkedTransferQueueTest ext
735       */
736      public void testWaitingConsumer() throws InterruptedException {
737          final LinkedTransferQueue q = new LinkedTransferQueue();
738 <        assertEquals(q.getWaitingConsumerCount(), 0);
738 >        assertEquals(0, q.getWaitingConsumerCount());
739          assertFalse(q.hasWaitingConsumer());
740 +        final CountDownLatch threadStarted = new CountDownLatch(1);
741  
742          Thread t = newStartedThread(new CheckedRunnable() {
743              public void realRun() throws InterruptedException {
744 <                Thread.sleep(SMALL_DELAY_MS);
745 <                assertTrue(q.hasWaitingConsumer());
746 <                assertEquals(q.getWaitingConsumerCount(), 1);
747 <                assertTrue(q.offer(one));
744 >                threadStarted.countDown();
745 >                long startTime = System.nanoTime();
746 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
747 >                assertEquals(0, q.getWaitingConsumerCount());
748                  assertFalse(q.hasWaitingConsumer());
749 <                assertEquals(q.getWaitingConsumerCount(), 0);
749 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
750              }});
751  
752 <        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
753 <        assertEquals(q.getWaitingConsumerCount(), 0);
752 >        threadStarted.await();
753 >        Callable<Boolean> oneConsumer
754 >            = new Callable<Boolean>() { public Boolean call() {
755 >                return q.hasWaitingConsumer()
756 >                && q.getWaitingConsumerCount() == 1; }};
757 >        waitForThreadToEnterWaitState(t, oneConsumer);
758 >
759 >        assertTrue(q.offer(one));
760 >        assertEquals(0, q.getWaitingConsumerCount());
761          assertFalse(q.hasWaitingConsumer());
762 <        t.join();
762 >
763 >        awaitTermination(t);
764      }
765  
766      /**
# Line 850 | Line 775 | public class LinkedTransferQueueTest ext
775      }
776  
777      /**
778 <     * transfer waits until a poll occurs. The transfered element
779 <     * is returned by this associated poll.
778 >     * transfer waits until a poll occurs. The transferred element
779 >     * is returned by the associated poll.
780       */
781      public void testTransfer2() throws InterruptedException {
782 <        final LinkedTransferQueue<Integer> q
783 <            = new LinkedTransferQueue<Integer>();
782 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
783 >        final CountDownLatch threadStarted = new CountDownLatch(1);
784  
785          Thread t = newStartedThread(new CheckedRunnable() {
786              public void realRun() throws InterruptedException {
787 <                q.transfer(SIZE);
788 <                assertTrue(q.isEmpty());
787 >                threadStarted.countDown();
788 >                q.transfer(five);
789 >                checkEmpty(q);
790              }});
791  
792 <        Thread.sleep(SHORT_DELAY_MS);
793 <        assertEquals(1, q.size());
794 <        assertEquals(SIZE, (int) q.poll());
795 <        assertTrue(q.isEmpty());
796 <        t.join();
792 >        threadStarted.await();
793 >        Callable<Boolean> oneElement
794 >            = new Callable<Boolean>() { public Boolean call() {
795 >                return !q.isEmpty() && q.size() == 1; }};
796 >        waitForThreadToEnterWaitState(t, oneElement);
797 >
798 >        assertSame(five, q.poll());
799 >        checkEmpty(q);
800 >        awaitTermination(t);
801      }
802  
803      /**
804       * transfer waits until a poll occurs, and then transfers in fifo order
805       */
806      public void testTransfer3() throws InterruptedException {
807 <        final LinkedTransferQueue<Integer> q
878 <            = new LinkedTransferQueue<Integer>();
807 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
808  
809          Thread first = newStartedThread(new CheckedRunnable() {
810              public void realRun() throws InterruptedException {
811 <                Integer i = SIZE + 1;
812 <                q.transfer(i);
884 <                assertTrue(!q.contains(i));
811 >                q.transfer(four);
812 >                assertFalse(q.contains(four));
813                  assertEquals(1, q.size());
814              }});
815  
816          Thread interruptedThread = newStartedThread(
817              new CheckedInterruptedRunnable() {
818                  public void realRun() throws InterruptedException {
819 <                    while (q.size() == 0)
819 >                    while (q.isEmpty())
820                          Thread.yield();
821 <                    q.transfer(SIZE);
821 >                    q.transfer(five);
822                  }});
823  
824          while (q.size() < 2)
825              Thread.yield();
826          assertEquals(2, q.size());
827 <        assertEquals(SIZE + 1, (int) q.poll());
827 >        assertSame(four, q.poll());
828          first.join();
829          assertEquals(1, q.size());
830          interruptedThread.interrupt();
831          interruptedThread.join();
832 <        assertEquals(0, q.size());
905 <        assertTrue(q.isEmpty());
832 >        checkEmpty(q);
833      }
834  
835      /**
# Line 919 | Line 846 | public class LinkedTransferQueueTest ext
846                  assertSame(three, q.poll());
847              }});
848  
849 <        Thread.sleep(SHORT_DELAY_MS);
849 >        while (q.isEmpty())
850 >            Thread.yield();
851 >        assertFalse(q.isEmpty());
852 >        assertEquals(1, q.size());
853          assertTrue(q.offer(three));
854          assertSame(four, q.poll());
855 <        t.join();
855 >        awaitTermination(t);
856      }
857  
858      /**
859 <     * transfer waits until a take occurs. The transfered element
860 <     * is returned by this associated take.
859 >     * transfer waits until a take occurs. The transferred element
860 >     * is returned by the associated take.
861       */
862      public void testTransfer5() throws InterruptedException {
863 <        final LinkedTransferQueue<Integer> q
934 <            = new LinkedTransferQueue<Integer>();
863 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
864  
865          Thread t = newStartedThread(new CheckedRunnable() {
866              public void realRun() throws InterruptedException {
867 <                q.transfer(SIZE);
867 >                q.transfer(four);
868                  checkEmpty(q);
869              }});
870  
871 <        Thread.sleep(SHORT_DELAY_MS);
872 <        assertEquals(SIZE, (int) q.take());
871 >        while (q.isEmpty())
872 >            Thread.yield();
873 >        assertFalse(q.isEmpty());
874 >        assertEquals(1, q.size());
875 >        assertSame(four, q.take());
876          checkEmpty(q);
877 <        t.join();
877 >        awaitTermination(t);
878      }
879  
880      /**
881       * tryTransfer(null) throws NullPointerException
882       */
883      public void testTryTransfer1() {
884 +        final LinkedTransferQueue q = new LinkedTransferQueue();
885          try {
953            final LinkedTransferQueue q = new LinkedTransferQueue();
886              q.tryTransfer(null);
887              shouldThrow();
888          } catch (NullPointerException success) {}
# Line 980 | Line 912 | public class LinkedTransferQueueTest ext
912                  while (! q.hasWaitingConsumer())
913                      Thread.yield();
914                  assertTrue(q.hasWaitingConsumer());
915 <                assertTrue(q.isEmpty());
984 <                assertEquals(q.size(), 0);
915 >                checkEmpty(q);
916                  assertTrue(q.tryTransfer(hotPotato));
917              }});
918  
919 <        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
919 >        long startTime = System.nanoTime();
920 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
921 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
922          checkEmpty(q);
923 <        t.join();
923 >        awaitTermination(t);
924      }
925  
926      /**
# Line 1003 | Line 936 | public class LinkedTransferQueueTest ext
936                  while (! q.hasWaitingConsumer())
937                      Thread.yield();
938                  assertTrue(q.hasWaitingConsumer());
939 <                assertTrue(q.isEmpty());
1007 <                assertEquals(q.size(), 0);
939 >                checkEmpty(q);
940                  assertTrue(q.tryTransfer(hotPotato));
941              }});
942  
943          assertSame(q.take(), hotPotato);
944          checkEmpty(q);
945 <        t.join();
945 >        awaitTermination(t);
946      }
947  
948      /**
949 <     * tryTransfer waits the amount given if interrupted, and
1018 <     * throws interrupted exception
949 >     * tryTransfer blocks interruptibly if no takers
950       */
951      public void testTryTransfer5() throws InterruptedException {
952          final LinkedTransferQueue q = new LinkedTransferQueue();
953 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
954 +        assertTrue(q.isEmpty());
955  
956 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
956 >        Thread t = newStartedThread(new CheckedRunnable() {
957              public void realRun() throws InterruptedException {
958 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
958 >                long startTime = System.nanoTime();
959 >                Thread.currentThread().interrupt();
960 >                try {
961 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
962 >                    shouldThrow();
963 >                } catch (InterruptedException success) {}
964 >                assertFalse(Thread.interrupted());
965 >
966 >                pleaseInterrupt.countDown();
967 >                try {
968 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
969 >                    shouldThrow();
970 >                } catch (InterruptedException success) {}
971 >                assertFalse(Thread.interrupted());
972 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
973              }});
974  
975 <        Thread.sleep(SMALL_DELAY_MS);
976 <        toInterrupt.interrupt();
977 <        toInterrupt.join();
975 >        await(pleaseInterrupt);
976 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
977 >        t.interrupt();
978 >        awaitTermination(t);
979 >        checkEmpty(q);
980      }
981  
982      /**
983 <     * tryTransfer gives up after the timeout and return false
983 >     * tryTransfer gives up after the timeout and returns false
984       */
985      public void testTryTransfer6() throws InterruptedException {
986          final LinkedTransferQueue q = new LinkedTransferQueue();
987  
988          Thread t = newStartedThread(new CheckedRunnable() {
989              public void realRun() throws InterruptedException {
990 <                long t0 = System.nanoTime();
990 >                long startTime = System.nanoTime();
991                  assertFalse(q.tryTransfer(new Object(),
992 <                                          SHORT_DELAY_MS, MILLISECONDS));
993 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
992 >                                          timeoutMillis(), MILLISECONDS));
993 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
994 >                checkEmpty(q);
995              }});
996  
997 <        checkEmpty(q);
1048 <        awaitTermination(t, MEDIUM_DELAY_MS);
997 >        awaitTermination(t);
998          checkEmpty(q);
999      }
1000  
# Line 1059 | Line 1008 | public class LinkedTransferQueueTest ext
1008  
1009          Thread t = newStartedThread(new CheckedRunnable() {
1010              public void realRun() throws InterruptedException {
1011 <                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1012 <                assertTrue(q.isEmpty());
1011 >                long startTime = System.nanoTime();
1012 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1013 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1014 >                checkEmpty(q);
1015              }});
1016  
1017 <        Thread.sleep(SHORT_DELAY_MS);
1017 >        while (q.size() != 2)
1018 >            Thread.yield();
1019          assertEquals(2, q.size());
1020          assertSame(four, q.poll());
1021          assertSame(five, q.poll());
1022          checkEmpty(q);
1023 <        t.join();
1023 >        awaitTermination(t);
1024      }
1025  
1026      /**
1027 <     * tryTransfer attempts to enqueue into the q and fails returning
1028 <     * false not enqueueing and the successive poll is null
1027 >     * tryTransfer attempts to enqueue into the queue and fails
1028 >     * returning false not enqueueing and the successive poll is null
1029       */
1030      public void testTryTransfer8() throws InterruptedException {
1031          final LinkedTransferQueue q = new LinkedTransferQueue();
1032          assertTrue(q.offer(four));
1033          assertEquals(1, q.size());
1034 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1034 >        long startTime = System.nanoTime();
1035 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1036 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1037          assertEquals(1, q.size());
1038          assertSame(four, q.poll());
1039          assertNull(q.poll());
# Line 1087 | Line 1041 | public class LinkedTransferQueueTest ext
1041      }
1042  
1043      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1044 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1045 <        assertTrue(q.isEmpty());
1044 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1045 >        checkEmpty(q);
1046          for (int i = 0; i < n; i++) {
1047              assertEquals(i, q.size());
1048              assertTrue(q.offer(i));
# Line 1097 | Line 1051 | public class LinkedTransferQueueTest ext
1051          assertFalse(q.isEmpty());
1052          return q;
1053      }
1054 +
1055 +    /**
1056 +     * remove(null), contains(null) always return false
1057 +     */
1058 +    public void testNeverContainsNull() {
1059 +        Collection<?>[] qs = {
1060 +            new LinkedTransferQueue<Object>(),
1061 +            populatedQueue(2),
1062 +        };
1063 +
1064 +        for (Collection<?> q : qs) {
1065 +            assertFalse(q.contains(null));
1066 +            assertFalse(q.remove(null));
1067 +        }
1068 +    }
1069   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines