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.38 by jsr166, Thu Nov 4 01:04:54 2010 UTC vs.
Revision 1.60 by jsr166, Fri May 15 18:21:19 2015 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.CountDownLatch;
19 > import java.util.concurrent.Executors;
20 > import java.util.concurrent.ExecutorService;
21 > import java.util.concurrent.LinkedTransferQueue;
22 >
23   import junit.framework.Test;
23 import junit.framework.TestSuite;
24  
25   @SuppressWarnings({"unchecked", "rawtypes"})
26   public class LinkedTransferQueueTest extends JSR166TestCase {
# 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() {
# Line 40 | Line 40 | public class LinkedTransferQueueTest ext
40                              new Generic().testSuite());
41      }
42  
43    void checkEmpty(BlockingQueue q) {
44        try {
45            assertTrue(q.isEmpty());
46            assertEquals(0, q.size());
47            assertNull(q.peek());
48            assertNull(q.poll());
49            assertNull(q.poll(0, MILLISECONDS));
50            assertEquals(q.toString(), "[]");
51            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
52            assertFalse(q.iterator().hasNext());
53            try {
54                q.element();
55                shouldThrow();
56            } catch (NoSuchElementException success) {}
57            try {
58                q.iterator().next();
59                shouldThrow();
60            } catch (NoSuchElementException success) {}
61            try {
62                q.remove();
63                shouldThrow();
64            } catch (NoSuchElementException success) {}
65        } catch (InterruptedException ie) {
66            threadUnexpectedException(ie);
67        }
68    }
69
43      /**
44       * Constructor builds new queue with size being zero and empty
45       * being true
# Line 92 | Line 65 | public class LinkedTransferQueueTest ext
65       * NullPointerException
66       */
67      public void testConstructor3() {
68 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
69          try {
70 <            Integer[] ints = new Integer[SIZE];
97 <            new LinkedTransferQueue(Arrays.asList(ints));
70 >            new LinkedTransferQueue(elements);
71              shouldThrow();
72          } catch (NullPointerException success) {}
73      }
# Line 104 | Line 77 | public class LinkedTransferQueueTest ext
77       * throws NullPointerException
78       */
79      public void testConstructor4() {
80 +        Integer[] ints = new Integer[SIZE];
81 +        for (int i = 0; i < SIZE-1; ++i)
82 +            ints[i] = i;
83 +        Collection<Integer> elements = Arrays.asList(ints);
84          try {
85 <            Integer[] ints = new Integer[SIZE];
109 <            for (int i = 0; i < SIZE - 1; ++i) {
110 <                ints[i] = i;
111 <            }
112 <            new LinkedTransferQueue(Arrays.asList(ints));
85 >            new LinkedTransferQueue(elements);
86              shouldThrow();
87          } catch (NullPointerException success) {}
88      }
# Line 142 | Line 115 | public class LinkedTransferQueueTest ext
115       * remainingCapacity() always returns Integer.MAX_VALUE
116       */
117      public void testRemainingCapacity() {
118 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
118 >        BlockingQueue q = populatedQueue(SIZE);
119          for (int i = 0; i < SIZE; ++i) {
120              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
121              assertEquals(SIZE - i, q.size());
122 <            q.remove();
122 >            assertEquals(i, q.remove());
123          }
124          for (int i = 0; i < SIZE; ++i) {
125              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
126              assertEquals(i, q.size());
127 <            q.add(i);
127 >            assertTrue(q.add(i));
128          }
129      }
130  
131      /**
159     * offer(null) throws NullPointerException
160     */
161    public void testOfferNull() {
162        try {
163            LinkedTransferQueue q = new LinkedTransferQueue();
164            q.offer(null);
165            shouldThrow();
166        } catch (NullPointerException success) {}
167    }
168
169    /**
170     * add(null) throws NullPointerException
171     */
172    public void testAddNull() {
173        try {
174            LinkedTransferQueue q = new LinkedTransferQueue();
175            q.add(null);
176            shouldThrow();
177        } catch (NullPointerException success) {}
178    }
179
180    /**
181     * addAll(null) throws NullPointerException
182     */
183    public void testAddAll1() {
184        try {
185            LinkedTransferQueue q = new LinkedTransferQueue();
186            q.addAll(null);
187            shouldThrow();
188        } catch (NullPointerException success) {}
189    }
190
191    /**
132       * addAll(this) throws IllegalArgumentException
133       */
134      public void testAddAllSelf() {
135 +        LinkedTransferQueue q = populatedQueue(SIZE);
136          try {
196            LinkedTransferQueue q = populatedQueue(SIZE);
137              q.addAll(q);
138              shouldThrow();
139          } catch (IllegalArgumentException success) {}
140      }
141  
142      /**
203     * addAll of a collection with null elements throws NullPointerException
204     */
205    public void testAddAll2() {
206        try {
207            LinkedTransferQueue q = new LinkedTransferQueue();
208            Integer[] ints = new Integer[SIZE];
209            q.addAll(Arrays.asList(ints));
210            shouldThrow();
211        } catch (NullPointerException success) {}
212    }
213
214    /**
143       * addAll of a collection with any null elements throws
144       * NullPointerException after possibly adding some elements
145       */
146      public void testAddAll3() {
147 +        LinkedTransferQueue q = new LinkedTransferQueue();
148 +        Integer[] ints = new Integer[SIZE];
149 +        for (int i = 0; i < SIZE - 1; ++i)
150 +            ints[i] = i;
151          try {
220            LinkedTransferQueue q = new LinkedTransferQueue();
221            Integer[] ints = new Integer[SIZE];
222            for (int i = 0; i < SIZE - 1; ++i) {
223                ints[i] = i;
224            }
152              q.addAll(Arrays.asList(ints));
153              shouldThrow();
154          } catch (NullPointerException success) {}
# Line 245 | Line 172 | public class LinkedTransferQueueTest ext
172      }
173  
174      /**
248     * put(null) throws NullPointerException
249     */
250    public void testPutNull() throws InterruptedException {
251        try {
252            LinkedTransferQueue q = new LinkedTransferQueue();
253            q.put(null);
254            shouldThrow();
255        } catch (NullPointerException success) {}
256    }
257
258    /**
175       * all elements successfully put are contained
176       */
177      public void testPut() {
178          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
179          for (int i = 0; i < SIZE; ++i) {
180 <            assertEquals(q.size(), i);
180 >            assertEquals(i, q.size());
181              q.put(i);
182              assertTrue(q.contains(i));
183          }
# Line 281 | Line 197 | public class LinkedTransferQueueTest ext
197       * take removes existing elements until empty, then blocks interruptibly
198       */
199      public void testBlockingTake() throws InterruptedException {
200 <        final BlockingQueue<Integer> q = populatedQueue(SIZE);
201 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
200 >        final BlockingQueue q = populatedQueue(SIZE);
201 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
202          Thread t = newStartedThread(new CheckedRunnable() {
203              public void realRun() throws InterruptedException {
204                  for (int i = 0; i < SIZE; ++i) {
205 <                    assertEquals(i, (int) q.take());
205 >                    assertEquals(i, q.take());
206                  }
207 <                aboutToWait.countDown();
207 >
208 >                Thread.currentThread().interrupt();
209 >                try {
210 >                    q.take();
211 >                    shouldThrow();
212 >                } catch (InterruptedException success) {}
213 >                assertFalse(Thread.interrupted());
214 >
215 >                pleaseInterrupt.countDown();
216                  try {
217                      q.take();
218                      shouldThrow();
219                  } catch (InterruptedException success) {}
220 +                assertFalse(Thread.interrupted());
221              }});
222  
223 <        aboutToWait.await();
224 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
223 >        await(pleaseInterrupt);
224 >        assertThreadStaysAlive(t);
225          t.interrupt();
226 <        awaitTermination(t, MEDIUM_DELAY_MS);
302 <        checkEmpty(q);
226 >        awaitTermination(t);
227      }
228  
229      /**
# Line 332 | Line 256 | public class LinkedTransferQueueTest ext
256      public void testTimedPoll() throws InterruptedException {
257          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
258          for (int i = 0; i < SIZE; ++i) {
259 <            long t0 = System.nanoTime();
260 <            assertEquals(i, (int) q.poll(SMALL_DELAY_MS, MILLISECONDS));
261 <            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
262 <        }
263 <        long t0 = System.nanoTime();
264 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
265 <        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
259 >            long startTime = System.nanoTime();
260 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
261 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
262 >        }
263 >        long startTime = System.nanoTime();
264 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
265 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
266          checkEmpty(q);
267      }
268  
# Line 444 | Line 368 | public class LinkedTransferQueueTest ext
368      }
369  
370      /**
447     * remove(x) removes x and returns true if present
448     */
449    public void testRemoveElement() throws InterruptedException {
450        LinkedTransferQueue q = populatedQueue(SIZE);
451        for (int i = 1; i < SIZE; i += 2) {
452            assertTrue(q.remove(i));
453        }
454        for (int i = 0; i < SIZE; i += 2) {
455            assertTrue(q.remove(i));
456            assertFalse(q.remove(i + 1));
457        }
458        checkEmpty(q);
459    }
460
461    /**
371       * An add following remove(x) succeeds
372       */
373      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 566 | Line 475 | public class LinkedTransferQueueTest ext
475      public void testToArray2() {
476          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
477          Integer[] ints = new Integer[SIZE];
478 <        assertSame(ints, q.toArray(ints));
478 >        Integer[] array = q.toArray(ints);
479 >        assertSame(ints, array);
480          for (int i = 0; i < ints.length; i++) {
481              assertSame(ints[i], q.poll());
482          }
483      }
484  
485      /**
576     * toArray(null) throws NullPointerException
577     */
578    public void testToArray_NullArg() {
579        LinkedTransferQueue q = populatedQueue(SIZE);
580        try {
581            q.toArray(null);
582            shouldThrow();
583        } catch (NullPointerException success) {}
584    }
585
586    /**
486       * toArray(incompatible array type) throws ArrayStoreException
487       */
488      public void testToArray1_BadArg() {
# Line 600 | Line 499 | public class LinkedTransferQueueTest ext
499      public void testIterator() throws InterruptedException {
500          LinkedTransferQueue q = populatedQueue(SIZE);
501          Iterator it = q.iterator();
502 <        int i = 0;
503 <        while (it.hasNext()) {
504 <            assertEquals(it.next(), i++);
505 <        }
502 >        int i;
503 >        for (i = 0; it.hasNext(); i++)
504 >            assertTrue(q.contains(it.next()));
505 >        assertEquals(i, SIZE);
506 >        assertIteratorExhausted(it);
507 >
508 >        it = q.iterator();
509 >        for (i = 0; it.hasNext(); i++)
510 >            assertEquals(it.next(), q.take());
511          assertEquals(i, SIZE);
512 +        assertIteratorExhausted(it);
513 +    }
514 +
515 +    /**
516 +     * iterator of empty collection has no elements
517 +     */
518 +    public void testEmptyIterator() {
519 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
520      }
521  
522      /**
# Line 666 | Line 578 | public class LinkedTransferQueueTest ext
578          LinkedTransferQueue q = populatedQueue(SIZE);
579          String s = q.toString();
580          for (int i = 0; i < SIZE; ++i) {
581 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
581 >            assertTrue(s.contains(String.valueOf(i)));
582          }
583      }
584  
# Line 675 | Line 587 | public class LinkedTransferQueueTest ext
587       */
588      public void testOfferInExecutor() {
589          final LinkedTransferQueue q = new LinkedTransferQueue();
590 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
590 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
591          ExecutorService executor = Executors.newFixedThreadPool(2);
592  
593          executor.execute(new CheckedRunnable() {
594              public void realRun() throws InterruptedException {
683                threadsStarted.countDown();
595                  threadsStarted.await();
596 <                assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
596 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
597              }});
598  
599          executor.execute(new CheckedRunnable() {
600              public void realRun() throws InterruptedException {
690                threadsStarted.countDown();
601                  threadsStarted.await();
602                  assertSame(one, q.take());
603                  checkEmpty(q);
# Line 701 | Line 611 | public class LinkedTransferQueueTest ext
611       */
612      public void testPollInExecutor() {
613          final LinkedTransferQueue q = new LinkedTransferQueue();
614 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
614 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
615          ExecutorService executor = Executors.newFixedThreadPool(2);
616  
617          executor.execute(new CheckedRunnable() {
618              public void realRun() throws InterruptedException {
619                  assertNull(q.poll());
710                threadsStarted.countDown();
620                  threadsStarted.await();
621 <                assertSame(one, q.poll(SMALL_DELAY_MS, MILLISECONDS));
621 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
622                  checkEmpty(q);
623              }});
624  
625          executor.execute(new CheckedRunnable() {
626              public void realRun() throws InterruptedException {
718                threadsStarted.countDown();
627                  threadsStarted.await();
628                  q.put(one);
629              }});
# Line 727 | Line 635 | public class LinkedTransferQueueTest ext
635       * A deserialized serialized queue has same elements in same order
636       */
637      public void testSerialization() throws Exception {
638 <        LinkedTransferQueue q = populatedQueue(SIZE);
639 <
732 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
733 <        ObjectOutputStream out
734 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
735 <        out.writeObject(q);
736 <        out.close();
737 <
738 <        ByteArrayInputStream bin
739 <            = new ByteArrayInputStream(bout.toByteArray());
740 <        ObjectInputStream in
741 <            = new ObjectInputStream(new BufferedInputStream(bin));
742 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
638 >        Queue x = populatedQueue(SIZE);
639 >        Queue y = serialClone(x);
640  
641 <        assertEquals(q.size(), r.size());
642 <        assertEquals(q.toString(), r.toString());
643 <        assertTrue(Arrays.equals(q.toArray(), r.toArray()));
644 <        while (!q.isEmpty()) {
645 <            assertEquals(q.remove(), r.remove());
641 >        assertNotSame(y, x);
642 >        assertEquals(x.size(), y.size());
643 >        assertEquals(x.toString(), y.toString());
644 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
645 >        while (!x.isEmpty()) {
646 >            assertFalse(y.isEmpty());
647 >            assertEquals(x.remove(), y.remove());
648          }
649 <    }
751 <
752 <    /**
753 <     * drainTo(null) throws NullPointerException
754 <     */
755 <    public void testDrainToNull() {
756 <        LinkedTransferQueue q = populatedQueue(SIZE);
757 <        try {
758 <            q.drainTo(null);
759 <            shouldThrow();
760 <        } catch (NullPointerException success) {}
761 <    }
762 <
763 <    /**
764 <     * drainTo(this) throws IllegalArgumentException
765 <     */
766 <    public void testDrainToSelf() {
767 <        LinkedTransferQueue q = populatedQueue(SIZE);
768 <        try {
769 <            q.drainTo(q);
770 <            shouldThrow();
771 <        } catch (IllegalArgumentException success) {}
649 >        assertTrue(y.isEmpty());
650      }
651  
652      /**
# Line 778 | Line 656 | public class LinkedTransferQueueTest ext
656          LinkedTransferQueue q = populatedQueue(SIZE);
657          ArrayList l = new ArrayList();
658          q.drainTo(l);
659 <        assertEquals(q.size(), 0);
660 <        assertEquals(l.size(), SIZE);
659 >        assertEquals(0, q.size());
660 >        assertEquals(SIZE, l.size());
661          for (int i = 0; i < SIZE; ++i) {
662 <            assertEquals(l.get(i), i);
662 >            assertEquals(i, l.get(i));
663          }
664          q.add(zero);
665          q.add(one);
# Line 790 | Line 668 | public class LinkedTransferQueueTest ext
668          assertTrue(q.contains(one));
669          l.clear();
670          q.drainTo(l);
671 <        assertEquals(q.size(), 0);
672 <        assertEquals(l.size(), 2);
671 >        assertEquals(0, q.size());
672 >        assertEquals(2, l.size());
673          for (int i = 0; i < 2; ++i) {
674 <            assertEquals(l.get(i), i);
674 >            assertEquals(i, l.get(i));
675          }
676      }
677  
# Line 809 | Line 687 | public class LinkedTransferQueueTest ext
687          ArrayList l = new ArrayList();
688          q.drainTo(l);
689          assertTrue(l.size() >= SIZE);
690 <        for (int i = 0; i < SIZE; ++i) {
691 <            assertEquals(l.get(i), i);
814 <        }
690 >        for (int i = 0; i < SIZE; ++i)
691 >            assertEquals(i, l.get(i));
692          awaitTermination(t, MEDIUM_DELAY_MS);
693          assertTrue(q.size() + l.size() >= SIZE);
694      }
695  
696      /**
820     * drainTo(null, n) throws NullPointerException
821     */
822    public void testDrainToNullN() {
823        LinkedTransferQueue q = populatedQueue(SIZE);
824        try {
825            q.drainTo(null, SIZE);
826            shouldThrow();
827        } catch (NullPointerException success) {}
828    }
829
830    /**
831     * drainTo(this, n) throws IllegalArgumentException
832     */
833    public void testDrainToSelfN() {
834        LinkedTransferQueue q = populatedQueue(SIZE);
835        try {
836            q.drainTo(q, SIZE);
837            shouldThrow();
838        } catch (IllegalArgumentException success) {}
839    }
840
841    /**
697       * drainTo(c, n) empties first min(n, size) elements of queue into c
698       */
699      public void testDrainToN() {
# Line 850 | Line 705 | public class LinkedTransferQueueTest ext
705              ArrayList l = new ArrayList();
706              q.drainTo(l, i);
707              int k = (i < SIZE) ? i : SIZE;
708 <            assertEquals(l.size(), k);
709 <            assertEquals(q.size(), SIZE - k);
710 <            for (int j = 0; j < k; ++j) {
711 <                assertEquals(l.get(j), j);
712 <            }
858 <            while (q.poll() != null)
859 <                ;
708 >            assertEquals(k, l.size());
709 >            assertEquals(SIZE - k, q.size());
710 >            for (int j = 0; j < k; ++j)
711 >                assertEquals(j, l.get(j));
712 >            do {} while (q.poll() != null);
713          }
714      }
715  
# Line 866 | Line 719 | public class LinkedTransferQueueTest ext
719       */
720      public void testWaitingConsumer() throws InterruptedException {
721          final LinkedTransferQueue q = new LinkedTransferQueue();
722 <        assertEquals(q.getWaitingConsumerCount(), 0);
722 >        assertEquals(0, q.getWaitingConsumerCount());
723          assertFalse(q.hasWaitingConsumer());
724          final CountDownLatch threadStarted = new CountDownLatch(1);
725  
# Line 874 | Line 727 | public class LinkedTransferQueueTest ext
727              public void realRun() throws InterruptedException {
728                  threadStarted.countDown();
729                  assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
730 <                assertEquals(q.getWaitingConsumerCount(), 0);
730 >                assertEquals(0, q.getWaitingConsumerCount());
731                  assertFalse(q.hasWaitingConsumer());
732              }});
733  
734          threadStarted.await();
735          waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
736 <        assertEquals(q.getWaitingConsumerCount(), 1);
736 >        assertEquals(1, q.getWaitingConsumerCount());
737          assertTrue(q.hasWaitingConsumer());
738  
739          assertTrue(q.offer(one));
740 <        assertEquals(q.getWaitingConsumerCount(), 0);
740 >        assertEquals(0, q.getWaitingConsumerCount());
741          assertFalse(q.hasWaitingConsumer());
742  
743          awaitTermination(t, MEDIUM_DELAY_MS);
# Line 1008 | Line 861 | public class LinkedTransferQueueTest ext
861       * tryTransfer(null) throws NullPointerException
862       */
863      public void testTryTransfer1() {
864 +        final LinkedTransferQueue q = new LinkedTransferQueue();
865          try {
1012            final LinkedTransferQueue q = new LinkedTransferQueue();
866              q.tryTransfer(null);
867              shouldThrow();
868          } catch (NullPointerException success) {}
# Line 1071 | Line 924 | public class LinkedTransferQueueTest ext
924      }
925  
926      /**
927 <     * tryTransfer waits the amount given if interrupted, and
1075 <     * throws interrupted exception
927 >     * tryTransfer blocks interruptibly if no takers
928       */
929      public void testTryTransfer5() throws InterruptedException {
930          final LinkedTransferQueue q = new LinkedTransferQueue();
931 <        final CountDownLatch threadStarted = new CountDownLatch(1);
931 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
932 >        assertTrue(q.isEmpty());
933  
934          Thread t = newStartedThread(new CheckedRunnable() {
935              public void realRun() throws InterruptedException {
936 <                long t0 = System.nanoTime();
937 <                threadStarted.countDown();
936 >                Thread.currentThread().interrupt();
937 >                try {
938 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
939 >                    shouldThrow();
940 >                } catch (InterruptedException success) {}
941 >                assertFalse(Thread.interrupted());
942 >
943 >                pleaseInterrupt.countDown();
944                  try {
945                      q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
946                      shouldThrow();
947                  } catch (InterruptedException success) {}
948 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
948 >                assertFalse(Thread.interrupted());
949              }});
950  
951 <        threadStarted.await();
952 <        Thread.sleep(SHORT_DELAY_MS);
951 >        await(pleaseInterrupt);
952 >        assertThreadStaysAlive(t);
953          t.interrupt();
954 <        awaitTermination(t, MEDIUM_DELAY_MS);
954 >        awaitTermination(t);
955          checkEmpty(q);
956      }
957  
# Line 1106 | Line 965 | public class LinkedTransferQueueTest ext
965              public void realRun() throws InterruptedException {
966                  long t0 = System.nanoTime();
967                  assertFalse(q.tryTransfer(new Object(),
968 <                                          SHORT_DELAY_MS, MILLISECONDS));
969 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
968 >                                          timeoutMillis(), MILLISECONDS));
969 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
970                  checkEmpty(q);
971              }});
972  
973 <        awaitTermination(t, MEDIUM_DELAY_MS);
973 >        awaitTermination(t);
974          checkEmpty(q);
975      }
976  
# Line 1139 | Line 998 | public class LinkedTransferQueueTest ext
998      }
999  
1000      /**
1001 <     * tryTransfer attempts to enqueue into the q and fails returning
1002 <     * false not enqueueing and the successive poll is null
1001 >     * tryTransfer attempts to enqueue into the queue and fails
1002 >     * returning false not enqueueing and the successive poll is null
1003       */
1004      public void testTryTransfer8() throws InterruptedException {
1005          final LinkedTransferQueue q = new LinkedTransferQueue();
1006          assertTrue(q.offer(four));
1007          assertEquals(1, q.size());
1008          long t0 = System.nanoTime();
1009 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1010 <        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
1009 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1010 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1011          assertEquals(1, q.size());
1012          assertSame(four, q.poll());
1013          assertNull(q.poll());
# Line 1166 | Line 1025 | public class LinkedTransferQueueTest ext
1025          assertFalse(q.isEmpty());
1026          return q;
1027      }
1028 +
1029 +    /**
1030 +     * remove(null), contains(null) always return false
1031 +     */
1032 +    public void testNeverContainsNull() {
1033 +        Collection<?>[] qs = {
1034 +            new LinkedTransferQueue<Object>(),
1035 +            populatedQueue(2),
1036 +        };
1037 +
1038 +        for (Collection<?> q : qs) {
1039 +            assertFalse(q.contains(null));
1040 +            assertFalse(q.remove(null));
1041 +        }
1042 +    }
1043   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines