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.47 by jsr166, Mon May 30 22:43:20 2011 UTC vs.
Revision 1.76 by jsr166, Sun May 14 00:48:20 2017 UTC

# Line 5 | Line 5
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.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 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
26 < import static java.util.concurrent.TimeUnit.NANOSECONDS;
23 >
24   import junit.framework.Test;
28 import junit.framework.TestSuite;
25  
26   @SuppressWarnings({"unchecked", "rawtypes"})
27   public class LinkedTransferQueueTest extends JSR166TestCase {
32
28      public static class Generic extends BlockingQueueTest {
29          protected BlockingQueue emptyCollection() {
30              return new LinkedTransferQueue();
# Line 37 | 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());
47 >                            new Generic().testSuite(),
48 >                            CollectionTest.testSuite(new Implementation()));
49      }
50  
51      /**
# Line 83 | Line 86 | public class LinkedTransferQueueTest ext
86       */
87      public void testConstructor4() {
88          Integer[] ints = new Integer[SIZE];
89 <        for (int i = 0; i < SIZE-1; ++i)
89 >        for (int i = 0; i < SIZE - 1; ++i)
90              ints[i] = i;
91          Collection<Integer> elements = Arrays.asList(ints);
92          try {
# Line 120 | 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  
# Line 137 | Line 140 | public class LinkedTransferQueueTest ext
140       * addAll(this) throws IllegalArgumentException
141       */
142      public void testAddAllSelf() {
143 +        LinkedTransferQueue q = populatedQueue(SIZE);
144          try {
141            LinkedTransferQueue q = populatedQueue(SIZE);
145              q.addAll(q);
146              shouldThrow();
147          } catch (IllegalArgumentException success) {}
# Line 149 | Line 152 | public class LinkedTransferQueueTest ext
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 {
153            LinkedTransferQueue q = new LinkedTransferQueue();
154            Integer[] ints = new Integer[SIZE];
155            for (int i = 0; i < SIZE - 1; ++i) {
156                ints[i] = i;
157            }
160              q.addAll(Arrays.asList(ints));
161              shouldThrow();
162          } catch (NullPointerException success) {}
# Line 181 | Line 183 | public class LinkedTransferQueueTest ext
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 207 | Line 209 | public class LinkedTransferQueueTest ext
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) {
211 <                    assertEquals(i, q.take());
212 <                }
212 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
213  
214                  Thread.currentThread().interrupt();
215                  try {
# Line 227 | Line 227 | public class LinkedTransferQueueTest ext
227              }});
228  
229          await(pleaseInterrupt);
230 <        assertThreadStaysAlive(t);
230 >        assertThreadBlocks(t, Thread.State.WAITING);
231          t.interrupt();
232          awaitTermination(t);
233      }
# Line 261 | Line 261 | public class LinkedTransferQueueTest ext
261       */
262      public void testTimedPoll() throws InterruptedException {
263          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
264        for (int i = 0; i < SIZE; ++i) {
265            long startTime = System.nanoTime();
266            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
267            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
268        }
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(startTime) < LONG_DELAY_MS);
268 +
269 +        startTime = System.nanoTime();
270          assertNull(q.poll(timeoutMillis(), MILLISECONDS));
271          assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
272          checkEmpty(q);
# Line 278 | Line 278 | public class LinkedTransferQueueTest ext
278       */
279      public void testInterruptedTimedPoll() throws InterruptedException {
280          final BlockingQueue<Integer> q = populatedQueue(SIZE);
281 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
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 <                }
289 <                long t0 = System.nanoTime();
290 <                aboutToWait.countDown();
287 >
288 >                pleaseInterrupt.countDown();
289                  try {
290 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
290 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
291                      shouldThrow();
292 <                } catch (InterruptedException success) {
293 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
294 <                }
292 >                } catch (InterruptedException success) {}
293 >                assertFalse(Thread.interrupted());
294 >
295 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
296              }});
297  
298 <        aboutToWait.await();
299 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
298 >        await(pleaseInterrupt);
299 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
300          t.interrupt();
301 <        awaitTermination(t, MEDIUM_DELAY_MS);
301 >        awaitTermination(t);
302          checkEmpty(q);
303      }
304  
# Line 311 | Line 310 | public class LinkedTransferQueueTest ext
310          final BlockingQueue<Integer> q = populatedQueue(SIZE);
311          Thread t = newStartedThread(new CheckedRunnable() {
312              public void realRun() throws InterruptedException {
313 +                long startTime = System.nanoTime();
314                  Thread.currentThread().interrupt();
315 <                for (int i = 0; i < SIZE; ++i) {
316 <                    long t0 = System.nanoTime();
315 >                for (int i = 0; i < SIZE; ++i)
316                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
318                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
319                }
317                  try {
318 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
318 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
319                      shouldThrow();
320                  } catch (InterruptedException success) {}
321 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
322              }});
323  
324 <        awaitTermination(t, MEDIUM_DELAY_MS);
324 >        awaitTermination(t);
325          checkEmpty(q);
326      }
327  
# Line 374 | Line 372 | public class LinkedTransferQueueTest ext
372      }
373  
374      /**
377     * remove(x) removes x and returns true if present
378     */
379    public void testRemoveElement() throws InterruptedException {
380        LinkedTransferQueue q = populatedQueue(SIZE);
381        for (int i = 1; i < SIZE; i+=2) {
382            assertTrue(q.contains(i));
383            assertTrue(q.remove(i));
384            assertFalse(q.contains(i));
385            assertTrue(q.contains(i-1));
386        }
387        for (int i = 0; i < SIZE; i+=2) {
388            assertTrue(q.contains(i));
389            assertTrue(q.remove(i));
390            assertFalse(q.contains(i));
391            assertFalse(q.remove(i+1));
392            assertFalse(q.contains(i+1));
393        }
394        checkEmpty(q);
395    }
396
397    /**
375       * An add following remove(x) succeeds
376       */
377      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 440 | Line 417 | public class LinkedTransferQueueTest ext
417       */
418      public void testContainsAll() {
419          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
420 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
420 >        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
421          for (int i = 0; i < SIZE; ++i) {
422              assertTrue(q.containsAll(p));
423              assertFalse(p.containsAll(q));
# Line 526 | Line 503 | public class LinkedTransferQueueTest ext
503      public void testIterator() throws InterruptedException {
504          LinkedTransferQueue q = populatedQueue(SIZE);
505          Iterator it = q.iterator();
506 <        int i = 0;
507 <        while (it.hasNext()) {
508 <            assertEquals(it.next(), i++);
509 <        }
506 >        int i;
507 >        for (i = 0; it.hasNext(); i++)
508 >            assertTrue(q.contains(it.next()));
509 >        assertEquals(i, SIZE);
510 >        assertIteratorExhausted(it);
511 >
512 >        it = q.iterator();
513 >        for (i = 0; it.hasNext(); i++)
514 >            assertEquals(it.next(), q.take());
515          assertEquals(i, SIZE);
516 +        assertIteratorExhausted(it);
517 +    }
518 +
519 +    /**
520 +     * iterator of empty collection has no elements
521 +     */
522 +    public void testEmptyIterator() {
523 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
524      }
525  
526      /**
# Line 556 | Line 546 | public class LinkedTransferQueueTest ext
546       * iterator ordering is FIFO
547       */
548      public void testIteratorOrdering() {
549 <        final LinkedTransferQueue<Integer> q
560 <            = new LinkedTransferQueue<Integer>();
549 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
550          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
551          q.add(one);
552          q.add(two);
# Line 602 | Line 591 | public class LinkedTransferQueueTest ext
591      public void testOfferInExecutor() {
592          final LinkedTransferQueue q = new LinkedTransferQueue();
593          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
594 <        ExecutorService executor = Executors.newFixedThreadPool(2);
594 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
595 >        try (PoolCleaner cleaner = cleaner(executor)) {
596  
597 <        executor.execute(new CheckedRunnable() {
598 <            public void realRun() throws InterruptedException {
599 <                threadsStarted.await();
600 <                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
601 <            }});
602 <
603 <        executor.execute(new CheckedRunnable() {
614 <            public void realRun() throws InterruptedException {
615 <                threadsStarted.await();
616 <                assertSame(one, q.take());
617 <                checkEmpty(q);
618 <            }});
597 >            executor.execute(new CheckedRunnable() {
598 >                public void realRun() throws InterruptedException {
599 >                    threadsStarted.await();
600 >                    long startTime = System.nanoTime();
601 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
602 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
603 >                }});
604  
605 <        joinPool(executor);
605 >            executor.execute(new CheckedRunnable() {
606 >                public void realRun() throws InterruptedException {
607 >                    threadsStarted.await();
608 >                    assertSame(one, q.take());
609 >                    checkEmpty(q);
610 >                }});
611 >        }
612      }
613  
614      /**
# Line 626 | Line 617 | public class LinkedTransferQueueTest ext
617      public void testPollInExecutor() {
618          final LinkedTransferQueue q = new LinkedTransferQueue();
619          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
620 <        ExecutorService executor = Executors.newFixedThreadPool(2);
620 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
621 >        try (PoolCleaner cleaner = cleaner(executor)) {
622  
623 <        executor.execute(new CheckedRunnable() {
624 <            public void realRun() throws InterruptedException {
625 <                assertNull(q.poll());
626 <                threadsStarted.await();
627 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
628 <                checkEmpty(q);
629 <            }});
630 <
631 <        executor.execute(new CheckedRunnable() {
640 <            public void realRun() throws InterruptedException {
641 <                threadsStarted.await();
642 <                q.put(one);
643 <            }});
623 >            executor.execute(new CheckedRunnable() {
624 >                public void realRun() throws InterruptedException {
625 >                    assertNull(q.poll());
626 >                    threadsStarted.await();
627 >                    long startTime = System.nanoTime();
628 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
629 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
630 >                    checkEmpty(q);
631 >                }});
632  
633 <        joinPool(executor);
633 >            executor.execute(new CheckedRunnable() {
634 >                public void realRun() throws InterruptedException {
635 >                    threadsStarted.await();
636 >                    q.put(one);
637 >                }});
638 >        }
639      }
640  
641      /**
642       * A deserialized serialized queue has same elements in same order
643       */
644      public void testSerialization() throws Exception {
645 <        LinkedTransferQueue q = populatedQueue(SIZE);
645 >        Queue x = populatedQueue(SIZE);
646 >        Queue y = serialClone(x);
647  
648 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
649 <        ObjectOutputStream out
650 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
651 <        out.writeObject(q);
652 <        out.close();
653 <
654 <        ByteArrayInputStream bin
661 <            = new ByteArrayInputStream(bout.toByteArray());
662 <        ObjectInputStream in
663 <            = new ObjectInputStream(new BufferedInputStream(bin));
664 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
665 <
666 <        assertEquals(q.size(), r.size());
667 <        assertEquals(q.toString(), r.toString());
668 <        assertTrue(Arrays.equals(q.toArray(), r.toArray()));
669 <        while (!q.isEmpty()) {
670 <            assertEquals(q.remove(), r.remove());
648 >        assertNotSame(y, x);
649 >        assertEquals(x.size(), y.size());
650 >        assertEquals(x.toString(), y.toString());
651 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
652 >        while (!x.isEmpty()) {
653 >            assertFalse(y.isEmpty());
654 >            assertEquals(x.remove(), y.remove());
655          }
656 +        assertTrue(y.isEmpty());
657      }
658  
659      /**
# Line 678 | Line 663 | public class LinkedTransferQueueTest ext
663          LinkedTransferQueue q = populatedQueue(SIZE);
664          ArrayList l = new ArrayList();
665          q.drainTo(l);
666 <        assertEquals(q.size(), 0);
667 <        assertEquals(l.size(), SIZE);
666 >        assertEquals(0, q.size());
667 >        assertEquals(SIZE, l.size());
668          for (int i = 0; i < SIZE; ++i) {
669 <            assertEquals(l.get(i), i);
669 >            assertEquals(i, l.get(i));
670          }
671          q.add(zero);
672          q.add(one);
# Line 690 | Line 675 | public class LinkedTransferQueueTest ext
675          assertTrue(q.contains(one));
676          l.clear();
677          q.drainTo(l);
678 <        assertEquals(q.size(), 0);
679 <        assertEquals(l.size(), 2);
678 >        assertEquals(0, q.size());
679 >        assertEquals(2, l.size());
680          for (int i = 0; i < 2; ++i) {
681 <            assertEquals(l.get(i), i);
681 >            assertEquals(i, l.get(i));
682          }
683      }
684  
# Line 709 | Line 694 | public class LinkedTransferQueueTest ext
694          ArrayList l = new ArrayList();
695          q.drainTo(l);
696          assertTrue(l.size() >= SIZE);
697 <        for (int i = 0; i < SIZE; ++i) {
698 <            assertEquals(l.get(i), i);
699 <        }
715 <        awaitTermination(t, MEDIUM_DELAY_MS);
697 >        for (int i = 0; i < SIZE; ++i)
698 >            assertEquals(i, l.get(i));
699 >        awaitTermination(t);
700          assertTrue(q.size() + l.size() >= SIZE);
701      }
702  
# Line 728 | Line 712 | public class LinkedTransferQueueTest ext
712              ArrayList l = new ArrayList();
713              q.drainTo(l, i);
714              int k = (i < SIZE) ? i : SIZE;
715 <            assertEquals(l.size(), k);
716 <            assertEquals(q.size(), SIZE - k);
717 <            for (int j = 0; j < k; ++j) {
718 <                assertEquals(l.get(j), j);
719 <            }
736 <            while (q.poll() != null)
737 <                ;
715 >            assertEquals(k, l.size());
716 >            assertEquals(SIZE - k, q.size());
717 >            for (int j = 0; j < k; ++j)
718 >                assertEquals(j, l.get(j));
719 >            do {} while (q.poll() != null);
720          }
721      }
722  
# Line 744 | Line 726 | public class LinkedTransferQueueTest ext
726       */
727      public void testWaitingConsumer() throws InterruptedException {
728          final LinkedTransferQueue q = new LinkedTransferQueue();
729 <        assertEquals(q.getWaitingConsumerCount(), 0);
729 >        assertEquals(0, q.getWaitingConsumerCount());
730          assertFalse(q.hasWaitingConsumer());
731          final CountDownLatch threadStarted = new CountDownLatch(1);
732  
733          Thread t = newStartedThread(new CheckedRunnable() {
734              public void realRun() throws InterruptedException {
735                  threadStarted.countDown();
736 +                long startTime = System.nanoTime();
737                  assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
738 <                assertEquals(q.getWaitingConsumerCount(), 0);
738 >                assertEquals(0, q.getWaitingConsumerCount());
739                  assertFalse(q.hasWaitingConsumer());
740 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
741              }});
742  
743          threadStarted.await();
744 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
745 <        assertEquals(q.getWaitingConsumerCount(), 1);
746 <        assertTrue(q.hasWaitingConsumer());
744 >        Callable<Boolean> oneConsumer
745 >            = new Callable<Boolean>() { public Boolean call() {
746 >                return q.hasWaitingConsumer()
747 >                && q.getWaitingConsumerCount() == 1; }};
748 >        waitForThreadToEnterWaitState(t, oneConsumer);
749  
750          assertTrue(q.offer(one));
751 <        assertEquals(q.getWaitingConsumerCount(), 0);
751 >        assertEquals(0, q.getWaitingConsumerCount());
752          assertFalse(q.hasWaitingConsumer());
753  
754 <        awaitTermination(t, MEDIUM_DELAY_MS);
754 >        awaitTermination(t);
755      }
756  
757      /**
# Line 781 | Line 767 | public class LinkedTransferQueueTest ext
767  
768      /**
769       * transfer waits until a poll occurs. The transfered element
770 <     * is returned by this associated poll.
770 >     * is returned by the associated poll.
771       */
772      public void testTransfer2() throws InterruptedException {
773 <        final LinkedTransferQueue<Integer> q
788 <            = new LinkedTransferQueue<Integer>();
773 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
774          final CountDownLatch threadStarted = new CountDownLatch(1);
775  
776          Thread t = newStartedThread(new CheckedRunnable() {
# Line 796 | Line 781 | public class LinkedTransferQueueTest ext
781              }});
782  
783          threadStarted.await();
784 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
785 <        assertEquals(1, q.size());
784 >        Callable<Boolean> oneElement
785 >            = new Callable<Boolean>() { public Boolean call() {
786 >                return !q.isEmpty() && q.size() == 1; }};
787 >        waitForThreadToEnterWaitState(t, oneElement);
788 >
789          assertSame(five, q.poll());
790          checkEmpty(q);
791 <        awaitTermination(t, MEDIUM_DELAY_MS);
791 >        awaitTermination(t);
792      }
793  
794      /**
795       * transfer waits until a poll occurs, and then transfers in fifo order
796       */
797      public void testTransfer3() throws InterruptedException {
798 <        final LinkedTransferQueue<Integer> q
811 <            = new LinkedTransferQueue<Integer>();
798 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
799  
800          Thread first = newStartedThread(new CheckedRunnable() {
801              public void realRun() throws InterruptedException {
802                  q.transfer(four);
803 <                assertTrue(!q.contains(four));
803 >                assertFalse(q.contains(four));
804                  assertEquals(1, q.size());
805              }});
806  
# Line 856 | Line 843 | public class LinkedTransferQueueTest ext
843          assertEquals(1, q.size());
844          assertTrue(q.offer(three));
845          assertSame(four, q.poll());
846 <        awaitTermination(t, MEDIUM_DELAY_MS);
846 >        awaitTermination(t);
847      }
848  
849      /**
850       * transfer waits until a take occurs. The transfered element
851 <     * is returned by this associated take.
851 >     * is returned by the associated take.
852       */
853      public void testTransfer5() throws InterruptedException {
854 <        final LinkedTransferQueue<Integer> q
868 <            = new LinkedTransferQueue<Integer>();
854 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
855  
856          Thread t = newStartedThread(new CheckedRunnable() {
857              public void realRun() throws InterruptedException {
# Line 879 | Line 865 | public class LinkedTransferQueueTest ext
865          assertEquals(1, q.size());
866          assertSame(four, q.take());
867          checkEmpty(q);
868 <        awaitTermination(t, MEDIUM_DELAY_MS);
868 >        awaitTermination(t);
869      }
870  
871      /**
872       * tryTransfer(null) throws NullPointerException
873       */
874      public void testTryTransfer1() {
875 +        final LinkedTransferQueue q = new LinkedTransferQueue();
876          try {
890            final LinkedTransferQueue q = new LinkedTransferQueue();
877              q.tryTransfer(null);
878              shouldThrow();
879          } catch (NullPointerException success) {}
# Line 921 | Line 907 | public class LinkedTransferQueueTest ext
907                  assertTrue(q.tryTransfer(hotPotato));
908              }});
909  
910 <        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
910 >        long startTime = System.nanoTime();
911 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
912 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
913          checkEmpty(q);
914 <        awaitTermination(t, MEDIUM_DELAY_MS);
914 >        awaitTermination(t);
915      }
916  
917      /**
# Line 945 | Line 933 | public class LinkedTransferQueueTest ext
933  
934          assertSame(q.take(), hotPotato);
935          checkEmpty(q);
936 <        awaitTermination(t, MEDIUM_DELAY_MS);
936 >        awaitTermination(t);
937      }
938  
939      /**
# Line 958 | Line 946 | public class LinkedTransferQueueTest ext
946  
947          Thread t = newStartedThread(new CheckedRunnable() {
948              public void realRun() throws InterruptedException {
949 +                long startTime = System.nanoTime();
950                  Thread.currentThread().interrupt();
951                  try {
952                      q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
# Line 971 | Line 960 | public class LinkedTransferQueueTest ext
960                      shouldThrow();
961                  } catch (InterruptedException success) {}
962                  assertFalse(Thread.interrupted());
963 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
964              }});
965  
966          await(pleaseInterrupt);
967 <        assertThreadStaysAlive(t);
967 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
968          t.interrupt();
969          awaitTermination(t);
970          checkEmpty(q);
# Line 988 | Line 978 | public class LinkedTransferQueueTest ext
978  
979          Thread t = newStartedThread(new CheckedRunnable() {
980              public void realRun() throws InterruptedException {
981 <                long t0 = System.nanoTime();
981 >                long startTime = System.nanoTime();
982                  assertFalse(q.tryTransfer(new Object(),
983                                            timeoutMillis(), MILLISECONDS));
984 <                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
984 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
985                  checkEmpty(q);
986              }});
987  
# Line 1009 | Line 999 | public class LinkedTransferQueueTest ext
999  
1000          Thread t = newStartedThread(new CheckedRunnable() {
1001              public void realRun() throws InterruptedException {
1002 <                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1002 >                long startTime = System.nanoTime();
1003 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1004 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1005                  checkEmpty(q);
1006              }});
1007  
# Line 1019 | Line 1011 | public class LinkedTransferQueueTest ext
1011          assertSame(four, q.poll());
1012          assertSame(five, q.poll());
1013          checkEmpty(q);
1014 <        awaitTermination(t, MEDIUM_DELAY_MS);
1014 >        awaitTermination(t);
1015      }
1016  
1017      /**
# Line 1030 | Line 1022 | public class LinkedTransferQueueTest ext
1022          final LinkedTransferQueue q = new LinkedTransferQueue();
1023          assertTrue(q.offer(four));
1024          assertEquals(1, q.size());
1025 <        long t0 = System.nanoTime();
1025 >        long startTime = System.nanoTime();
1026          assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1027 <        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1027 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1028          assertEquals(1, q.size());
1029          assertSame(four, q.poll());
1030          assertNull(q.poll());
# Line 1040 | Line 1032 | public class LinkedTransferQueueTest ext
1032      }
1033  
1034      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1035 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1035 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1036          checkEmpty(q);
1037          for (int i = 0; i < n; i++) {
1038              assertEquals(i, q.size());
# Line 1050 | Line 1042 | public class LinkedTransferQueueTest ext
1042          assertFalse(q.isEmpty());
1043          return q;
1044      }
1045 +
1046 +    /**
1047 +     * remove(null), contains(null) always return false
1048 +     */
1049 +    public void testNeverContainsNull() {
1050 +        Collection<?>[] qs = {
1051 +            new LinkedTransferQueue<Object>(),
1052 +            populatedQueue(2),
1053 +        };
1054 +
1055 +        for (Collection<?> q : qs) {
1056 +            assertFalse(q.contains(null));
1057 +            assertFalse(q.remove(null));
1058 +        }
1059 +    }
1060   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines