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.59 by jsr166, Sat Apr 25 04:55:31 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() {
# Line 200 | Line 140 | public class LinkedTransferQueueTest ext
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       */
# Line 245 | Line 173 | public class LinkedTransferQueueTest ext
173      }
174  
175      /**
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    /**
176       * all elements successfully put are contained
177       */
178      public void testPut() {
179          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
180          for (int i = 0; i < SIZE; ++i) {
181 <            assertEquals(q.size(), i);
181 >            assertEquals(i, q.size());
182              q.put(i);
183              assertTrue(q.contains(i));
184          }
# Line 281 | Line 198 | public class LinkedTransferQueueTest ext
198       * take removes existing elements until empty, then blocks interruptibly
199       */
200      public void testBlockingTake() throws InterruptedException {
201 <        final BlockingQueue<Integer> q = populatedQueue(SIZE);
202 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
201 >        final BlockingQueue q = populatedQueue(SIZE);
202 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
203          Thread t = newStartedThread(new CheckedRunnable() {
204              public void realRun() throws InterruptedException {
205                  for (int i = 0; i < SIZE; ++i) {
206 <                    assertEquals(i, (int) q.take());
206 >                    assertEquals(i, q.take());
207                  }
208 <                aboutToWait.countDown();
208 >
209 >                Thread.currentThread().interrupt();
210 >                try {
211 >                    q.take();
212 >                    shouldThrow();
213 >                } catch (InterruptedException success) {}
214 >                assertFalse(Thread.interrupted());
215 >
216 >                pleaseInterrupt.countDown();
217                  try {
218                      q.take();
219                      shouldThrow();
220                  } catch (InterruptedException success) {}
221 +                assertFalse(Thread.interrupted());
222              }});
223  
224 <        aboutToWait.await();
225 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
224 >        await(pleaseInterrupt);
225 >        assertThreadStaysAlive(t);
226          t.interrupt();
227 <        awaitTermination(t, MEDIUM_DELAY_MS);
302 <        checkEmpty(q);
227 >        awaitTermination(t);
228      }
229  
230      /**
# Line 332 | Line 257 | public class LinkedTransferQueueTest ext
257      public void testTimedPoll() throws InterruptedException {
258          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
259          for (int i = 0; i < SIZE; ++i) {
260 <            long t0 = System.nanoTime();
261 <            assertEquals(i, (int) q.poll(SMALL_DELAY_MS, MILLISECONDS));
262 <            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
263 <        }
264 <        long t0 = System.nanoTime();
265 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
266 <        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
260 >            long startTime = System.nanoTime();
261 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
262 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
263 >        }
264 >        long startTime = System.nanoTime();
265 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
266 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
267          checkEmpty(q);
268      }
269  
# Line 444 | Line 369 | public class LinkedTransferQueueTest ext
369      }
370  
371      /**
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    /**
372       * An add following remove(x) succeeds
373       */
374      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 566 | Line 476 | public class LinkedTransferQueueTest ext
476      public void testToArray2() {
477          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
478          Integer[] ints = new Integer[SIZE];
479 <        assertSame(ints, q.toArray(ints));
479 >        Integer[] array = q.toArray(ints);
480 >        assertSame(ints, array);
481          for (int i = 0; i < ints.length; i++) {
482              assertSame(ints[i], q.poll());
483          }
484      }
485  
486      /**
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    /**
487       * toArray(incompatible array type) throws ArrayStoreException
488       */
489      public void testToArray1_BadArg() {
# Line 600 | Line 500 | public class LinkedTransferQueueTest ext
500      public void testIterator() throws InterruptedException {
501          LinkedTransferQueue q = populatedQueue(SIZE);
502          Iterator it = q.iterator();
503 <        int i = 0;
504 <        while (it.hasNext()) {
505 <            assertEquals(it.next(), i++);
506 <        }
503 >        int i;
504 >        for (i = 0; it.hasNext(); i++)
505 >            assertTrue(q.contains(it.next()));
506 >        assertEquals(i, SIZE);
507 >        assertIteratorExhausted(it);
508 >
509 >        it = q.iterator();
510 >        for (i = 0; it.hasNext(); i++)
511 >            assertEquals(it.next(), q.take());
512          assertEquals(i, SIZE);
513 +        assertIteratorExhausted(it);
514 +    }
515 +
516 +    /**
517 +     * iterator of empty collection has no elements
518 +     */
519 +    public void testEmptyIterator() {
520 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
521      }
522  
523      /**
# Line 666 | Line 579 | public class LinkedTransferQueueTest ext
579          LinkedTransferQueue q = populatedQueue(SIZE);
580          String s = q.toString();
581          for (int i = 0; i < SIZE; ++i) {
582 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
582 >            assertTrue(s.contains(String.valueOf(i)));
583          }
584      }
585  
# Line 675 | Line 588 | public class LinkedTransferQueueTest ext
588       */
589      public void testOfferInExecutor() {
590          final LinkedTransferQueue q = new LinkedTransferQueue();
591 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
591 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
592          ExecutorService executor = Executors.newFixedThreadPool(2);
593  
594          executor.execute(new CheckedRunnable() {
595              public void realRun() throws InterruptedException {
683                threadsStarted.countDown();
596                  threadsStarted.await();
597 <                assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
597 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
598              }});
599  
600          executor.execute(new CheckedRunnable() {
601              public void realRun() throws InterruptedException {
690                threadsStarted.countDown();
602                  threadsStarted.await();
603                  assertSame(one, q.take());
604                  checkEmpty(q);
# Line 701 | Line 612 | public class LinkedTransferQueueTest ext
612       */
613      public void testPollInExecutor() {
614          final LinkedTransferQueue q = new LinkedTransferQueue();
615 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
615 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
616          ExecutorService executor = Executors.newFixedThreadPool(2);
617  
618          executor.execute(new CheckedRunnable() {
619              public void realRun() throws InterruptedException {
620                  assertNull(q.poll());
710                threadsStarted.countDown();
621                  threadsStarted.await();
622 <                assertSame(one, q.poll(SMALL_DELAY_MS, MILLISECONDS));
622 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
623                  checkEmpty(q);
624              }});
625  
626          executor.execute(new CheckedRunnable() {
627              public void realRun() throws InterruptedException {
718                threadsStarted.countDown();
628                  threadsStarted.await();
629                  q.put(one);
630              }});
# Line 727 | Line 636 | public class LinkedTransferQueueTest ext
636       * A deserialized serialized queue has same elements in same order
637       */
638      public void testSerialization() throws Exception {
639 <        LinkedTransferQueue q = populatedQueue(SIZE);
640 <
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();
639 >        Queue x = populatedQueue(SIZE);
640 >        Queue y = serialClone(x);
641  
642 <        assertEquals(q.size(), r.size());
643 <        assertEquals(q.toString(), r.toString());
644 <        assertTrue(Arrays.equals(q.toArray(), r.toArray()));
645 <        while (!q.isEmpty()) {
646 <            assertEquals(q.remove(), r.remove());
642 >        assertNotSame(y, x);
643 >        assertEquals(x.size(), y.size());
644 >        assertEquals(x.toString(), y.toString());
645 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
646 >        while (!x.isEmpty()) {
647 >            assertFalse(y.isEmpty());
648 >            assertEquals(x.remove(), y.remove());
649          }
650 <    }
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) {}
650 >        assertTrue(y.isEmpty());
651      }
652  
653      /**
# Line 778 | Line 657 | public class LinkedTransferQueueTest ext
657          LinkedTransferQueue q = populatedQueue(SIZE);
658          ArrayList l = new ArrayList();
659          q.drainTo(l);
660 <        assertEquals(q.size(), 0);
661 <        assertEquals(l.size(), SIZE);
660 >        assertEquals(0, q.size());
661 >        assertEquals(SIZE, l.size());
662          for (int i = 0; i < SIZE; ++i) {
663 <            assertEquals(l.get(i), i);
663 >            assertEquals(i, l.get(i));
664          }
665          q.add(zero);
666          q.add(one);
# Line 790 | Line 669 | public class LinkedTransferQueueTest ext
669          assertTrue(q.contains(one));
670          l.clear();
671          q.drainTo(l);
672 <        assertEquals(q.size(), 0);
673 <        assertEquals(l.size(), 2);
672 >        assertEquals(0, q.size());
673 >        assertEquals(2, l.size());
674          for (int i = 0; i < 2; ++i) {
675 <            assertEquals(l.get(i), i);
675 >            assertEquals(i, l.get(i));
676          }
677      }
678  
# Line 809 | Line 688 | public class LinkedTransferQueueTest ext
688          ArrayList l = new ArrayList();
689          q.drainTo(l);
690          assertTrue(l.size() >= SIZE);
691 <        for (int i = 0; i < SIZE; ++i) {
692 <            assertEquals(l.get(i), i);
814 <        }
691 >        for (int i = 0; i < SIZE; ++i)
692 >            assertEquals(i, l.get(i));
693          awaitTermination(t, MEDIUM_DELAY_MS);
694          assertTrue(q.size() + l.size() >= SIZE);
695      }
696  
697      /**
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    /**
698       * drainTo(c, n) empties first min(n, size) elements of queue into c
699       */
700      public void testDrainToN() {
# Line 850 | Line 706 | public class LinkedTransferQueueTest ext
706              ArrayList l = new ArrayList();
707              q.drainTo(l, i);
708              int k = (i < SIZE) ? i : SIZE;
709 <            assertEquals(l.size(), k);
710 <            assertEquals(q.size(), SIZE - k);
711 <            for (int j = 0; j < k; ++j) {
712 <                assertEquals(l.get(j), j);
713 <            }
858 <            while (q.poll() != null)
859 <                ;
709 >            assertEquals(k, l.size());
710 >            assertEquals(SIZE - k, q.size());
711 >            for (int j = 0; j < k; ++j)
712 >                assertEquals(j, l.get(j));
713 >            do {} while (q.poll() != null);
714          }
715      }
716  
# Line 866 | Line 720 | public class LinkedTransferQueueTest ext
720       */
721      public void testWaitingConsumer() throws InterruptedException {
722          final LinkedTransferQueue q = new LinkedTransferQueue();
723 <        assertEquals(q.getWaitingConsumerCount(), 0);
723 >        assertEquals(0, q.getWaitingConsumerCount());
724          assertFalse(q.hasWaitingConsumer());
725          final CountDownLatch threadStarted = new CountDownLatch(1);
726  
# Line 874 | Line 728 | public class LinkedTransferQueueTest ext
728              public void realRun() throws InterruptedException {
729                  threadStarted.countDown();
730                  assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
731 <                assertEquals(q.getWaitingConsumerCount(), 0);
731 >                assertEquals(0, q.getWaitingConsumerCount());
732                  assertFalse(q.hasWaitingConsumer());
733              }});
734  
735          threadStarted.await();
736          waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
737 <        assertEquals(q.getWaitingConsumerCount(), 1);
737 >        assertEquals(1, q.getWaitingConsumerCount());
738          assertTrue(q.hasWaitingConsumer());
739  
740          assertTrue(q.offer(one));
741 <        assertEquals(q.getWaitingConsumerCount(), 0);
741 >        assertEquals(0, q.getWaitingConsumerCount());
742          assertFalse(q.hasWaitingConsumer());
743  
744          awaitTermination(t, MEDIUM_DELAY_MS);
# Line 1071 | Line 925 | public class LinkedTransferQueueTest ext
925      }
926  
927      /**
928 <     * tryTransfer waits the amount given if interrupted, and
1075 <     * throws interrupted exception
928 >     * tryTransfer blocks interruptibly if no takers
929       */
930      public void testTryTransfer5() throws InterruptedException {
931          final LinkedTransferQueue q = new LinkedTransferQueue();
932 <        final CountDownLatch threadStarted = new CountDownLatch(1);
932 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
933 >        assertTrue(q.isEmpty());
934  
935          Thread t = newStartedThread(new CheckedRunnable() {
936              public void realRun() throws InterruptedException {
937 <                long t0 = System.nanoTime();
1084 <                threadStarted.countDown();
937 >                Thread.currentThread().interrupt();
938                  try {
939                      q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
940                      shouldThrow();
941                  } catch (InterruptedException success) {}
942 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
942 >                assertFalse(Thread.interrupted());
943 >
944 >                pleaseInterrupt.countDown();
945 >                try {
946 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
947 >                    shouldThrow();
948 >                } catch (InterruptedException success) {}
949 >                assertFalse(Thread.interrupted());
950              }});
951  
952 <        threadStarted.await();
953 <        Thread.sleep(SHORT_DELAY_MS);
952 >        await(pleaseInterrupt);
953 >        assertThreadStaysAlive(t);
954          t.interrupt();
955 <        awaitTermination(t, MEDIUM_DELAY_MS);
955 >        awaitTermination(t);
956          checkEmpty(q);
957      }
958  
# Line 1106 | Line 966 | public class LinkedTransferQueueTest ext
966              public void realRun() throws InterruptedException {
967                  long t0 = System.nanoTime();
968                  assertFalse(q.tryTransfer(new Object(),
969 <                                          SHORT_DELAY_MS, MILLISECONDS));
970 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
969 >                                          timeoutMillis(), MILLISECONDS));
970 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
971                  checkEmpty(q);
972              }});
973  
974 <        awaitTermination(t, MEDIUM_DELAY_MS);
974 >        awaitTermination(t);
975          checkEmpty(q);
976      }
977  
# Line 1139 | Line 999 | public class LinkedTransferQueueTest ext
999      }
1000  
1001      /**
1002 <     * tryTransfer attempts to enqueue into the q and fails returning
1003 <     * false not enqueueing and the successive poll is null
1002 >     * tryTransfer attempts to enqueue into the queue and fails
1003 >     * returning false not enqueueing and the successive poll is null
1004       */
1005      public void testTryTransfer8() throws InterruptedException {
1006          final LinkedTransferQueue q = new LinkedTransferQueue();
1007          assertTrue(q.offer(four));
1008          assertEquals(1, q.size());
1009          long t0 = System.nanoTime();
1010 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1011 <        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
1010 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1011 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1012          assertEquals(1, q.size());
1013          assertSame(four, q.poll());
1014          assertNull(q.poll());
# Line 1166 | Line 1026 | public class LinkedTransferQueueTest ext
1026          assertFalse(q.isEmpty());
1027          return q;
1028      }
1029 +
1030 +    /**
1031 +     * remove(null), contains(null) always return false
1032 +     */
1033 +    public void testNeverContainsNull() {
1034 +        Collection<?>[] qs = {
1035 +            new LinkedTransferQueue<Object>(),
1036 +            populatedQueue(2),
1037 +        };
1038 +
1039 +        for (Collection<?> q : qs) {
1040 +            assertFalse(q.contains(null));
1041 +            assertFalse(q.remove(null));
1042 +        }
1043 +    }
1044   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines