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.48 by jsr166, Tue May 31 16:16:24 2011 UTC vs.
Revision 1.80 by jsr166, Tue Aug 15 20:30:30 2017 UTC

# Line 5 | Line 5
5   * Other contributors include John Vint
6   */
7  
8 < import junit.framework.*;
9 < import java.util.Arrays;
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;
24 < import static java.util.concurrent.TimeUnit.NANOSECONDS;
23 >
24 > import junit.framework.Test;
25  
26   @SuppressWarnings({"unchecked", "rawtypes"})
27   public class LinkedTransferQueueTest extends JSR166TestCase {
26
28      public static class Generic extends BlockingQueueTest {
29          protected BlockingQueue emptyCollection() {
30              return new LinkedTransferQueue();
# Line 31 | 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 77 | 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 114 | 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 131 | Line 140 | public class LinkedTransferQueueTest ext
140       * addAll(this) throws IllegalArgumentException
141       */
142      public void testAddAllSelf() {
143 +        LinkedTransferQueue q = populatedQueue(SIZE);
144          try {
135            LinkedTransferQueue q = populatedQueue(SIZE);
145              q.addAll(q);
146              shouldThrow();
147          } catch (IllegalArgumentException success) {}
# Line 143 | 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 {
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            }
160              q.addAll(Arrays.asList(ints));
161              shouldThrow();
162          } catch (NullPointerException success) {}
# Line 175 | 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 201 | 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) {
205 <                    assertEquals(i, q.take());
206 <                }
212 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
213  
214                  Thread.currentThread().interrupt();
215                  try {
# Line 221 | 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 255 | Line 261 | public class LinkedTransferQueueTest ext
261       */
262      public void testTimedPoll() throws InterruptedException {
263          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
258        for (int i = 0; i < SIZE; ++i) {
259            long startTime = System.nanoTime();
260            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
261            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
262        }
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 272 | 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 >                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(MEDIUM_DELAY_MS, MILLISECONDS);
297 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
298                      shouldThrow();
299 <                } catch (InterruptedException success) {
300 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
301 <                }
299 >                } catch (InterruptedException success) {}
300 >                assertFalse(Thread.interrupted());
301 >
302 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
303              }});
304  
305 <        aboutToWait.await();
306 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
305 >        await(pleaseInterrupt);
306 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
307          t.interrupt();
308 <        awaitTermination(t, MEDIUM_DELAY_MS);
308 >        awaitTermination(t);
309          checkEmpty(q);
310      }
311  
# Line 305 | Line 317 | public class LinkedTransferQueueTest ext
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) {
310 <                    long t0 = System.nanoTime();
322 >                for (int i = 0; i < SIZE; ++i)
323                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
312                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
313                }
324                  try {
325 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
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, MEDIUM_DELAY_MS);
332 >        awaitTermination(t);
333          checkEmpty(q);
334      }
335  
# Line 368 | Line 380 | public class LinkedTransferQueueTest ext
380      }
381  
382      /**
371     * remove(x) removes x and returns true if present
372     */
373    public void testRemoveElement() throws InterruptedException {
374        LinkedTransferQueue q = populatedQueue(SIZE);
375        for (int i = 1; i < SIZE; i+=2) {
376            assertTrue(q.contains(i));
377            assertTrue(q.remove(i));
378            assertFalse(q.contains(i));
379            assertTrue(q.contains(i-1));
380        }
381        for (int i = 0; i < SIZE; i+=2) {
382            assertTrue(q.contains(i));
383            assertTrue(q.remove(i));
384            assertFalse(q.contains(i));
385            assertFalse(q.remove(i+1));
386            assertFalse(q.contains(i+1));
387        }
388        checkEmpty(q);
389    }
390
391    /**
383       * An add following remove(x) succeeds
384       */
385      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 434 | 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 520 | Line 511 | public class LinkedTransferQueueTest ext
511      public void testIterator() throws InterruptedException {
512          LinkedTransferQueue q = populatedQueue(SIZE);
513          Iterator it = q.iterator();
514 <        int i = 0;
515 <        while (it.hasNext()) {
516 <            assertEquals(it.next(), i++);
526 <        }
514 >        int i;
515 >        for (i = 0; it.hasNext(); i++)
516 >            assertTrue(q.contains(it.next()));
517          assertEquals(i, SIZE);
518 +        assertIteratorExhausted(it);
519 +
520 +        it = q.iterator();
521 +        for (i = 0; it.hasNext(); i++)
522 +            assertEquals(it.next(), q.take());
523 +        assertEquals(i, SIZE);
524 +        assertIteratorExhausted(it);
525 +    }
526 +
527 +    /**
528 +     * iterator of empty collection has no elements
529 +     */
530 +    public void testEmptyIterator() {
531 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
532      }
533  
534      /**
# Line 550 | Line 554 | public class LinkedTransferQueueTest ext
554       * iterator ordering is FIFO
555       */
556      public void testIteratorOrdering() {
557 <        final LinkedTransferQueue<Integer> q
554 <            = new LinkedTransferQueue<Integer>();
557 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
558          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
559          q.add(one);
560          q.add(two);
# Line 596 | Line 599 | public class LinkedTransferQueueTest ext
599      public void testOfferInExecutor() {
600          final LinkedTransferQueue q = new LinkedTransferQueue();
601          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
602 <        ExecutorService executor = Executors.newFixedThreadPool(2);
603 <
601 <        executor.execute(new CheckedRunnable() {
602 <            public void realRun() throws InterruptedException {
603 <                threadsStarted.await();
604 <                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
605 <            }});
602 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
603 >        try (PoolCleaner cleaner = cleaner(executor)) {
604  
605 <        executor.execute(new CheckedRunnable() {
606 <            public void realRun() throws InterruptedException {
607 <                threadsStarted.await();
608 <                assertSame(one, q.take());
609 <                checkEmpty(q);
610 <            }});
605 >            executor.execute(new CheckedRunnable() {
606 >                public void realRun() throws InterruptedException {
607 >                    threadsStarted.await();
608 >                    long startTime = System.nanoTime();
609 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
610 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
611 >                }});
612  
613 <        joinPool(executor);
613 >            executor.execute(new CheckedRunnable() {
614 >                public void realRun() throws InterruptedException {
615 >                    threadsStarted.await();
616 >                    assertSame(one, q.take());
617 >                    checkEmpty(q);
618 >                }});
619 >        }
620      }
621  
622      /**
# Line 620 | Line 625 | public class LinkedTransferQueueTest ext
625      public void testPollInExecutor() {
626          final LinkedTransferQueue q = new LinkedTransferQueue();
627          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
628 <        ExecutorService executor = Executors.newFixedThreadPool(2);
629 <
625 <        executor.execute(new CheckedRunnable() {
626 <            public void realRun() throws InterruptedException {
627 <                assertNull(q.poll());
628 <                threadsStarted.await();
629 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
630 <                checkEmpty(q);
631 <            }});
628 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
629 >        try (PoolCleaner cleaner = cleaner(executor)) {
630  
631 <        executor.execute(new CheckedRunnable() {
632 <            public void realRun() throws InterruptedException {
633 <                threadsStarted.await();
634 <                q.put(one);
635 <            }});
631 >            executor.execute(new CheckedRunnable() {
632 >                public void realRun() throws InterruptedException {
633 >                    assertNull(q.poll());
634 >                    threadsStarted.await();
635 >                    long startTime = System.nanoTime();
636 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
637 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
638 >                    checkEmpty(q);
639 >                }});
640  
641 <        joinPool(executor);
641 >            executor.execute(new CheckedRunnable() {
642 >                public void realRun() throws InterruptedException {
643 >                    threadsStarted.await();
644 >                    q.put(one);
645 >                }});
646 >        }
647      }
648  
649      /**
650 <     * A deserialized serialized queue has same elements in same order
650 >     * A deserialized/reserialized queue has same elements in same order
651       */
652      public void testSerialization() throws Exception {
653          Queue x = populatedQueue(SIZE);
654          Queue y = serialClone(x);
655  
656 <        assertTrue(x != y);
656 >        assertNotSame(y, x);
657          assertEquals(x.size(), y.size());
658          assertEquals(x.toString(), y.toString());
659          assertTrue(Arrays.equals(x.toArray(), y.toArray()));
# Line 664 | Line 671 | public class LinkedTransferQueueTest ext
671          LinkedTransferQueue q = populatedQueue(SIZE);
672          ArrayList l = new ArrayList();
673          q.drainTo(l);
674 <        assertEquals(q.size(), 0);
675 <        assertEquals(l.size(), SIZE);
674 >        assertEquals(0, q.size());
675 >        assertEquals(SIZE, l.size());
676          for (int i = 0; i < SIZE; ++i) {
677 <            assertEquals(l.get(i), i);
677 >            assertEquals(i, l.get(i));
678          }
679          q.add(zero);
680          q.add(one);
# Line 676 | Line 683 | public class LinkedTransferQueueTest ext
683          assertTrue(q.contains(one));
684          l.clear();
685          q.drainTo(l);
686 <        assertEquals(q.size(), 0);
687 <        assertEquals(l.size(), 2);
686 >        assertEquals(0, q.size());
687 >        assertEquals(2, l.size());
688          for (int i = 0; i < 2; ++i) {
689 <            assertEquals(l.get(i), i);
689 >            assertEquals(i, l.get(i));
690          }
691      }
692  
# Line 695 | Line 702 | public class LinkedTransferQueueTest ext
702          ArrayList l = new ArrayList();
703          q.drainTo(l);
704          assertTrue(l.size() >= SIZE);
705 <        for (int i = 0; i < SIZE; ++i) {
706 <            assertEquals(l.get(i), i);
707 <        }
701 <        awaitTermination(t, MEDIUM_DELAY_MS);
705 >        for (int i = 0; i < SIZE; ++i)
706 >            assertEquals(i, l.get(i));
707 >        awaitTermination(t);
708          assertTrue(q.size() + l.size() >= SIZE);
709      }
710  
# Line 714 | Line 720 | public class LinkedTransferQueueTest ext
720              ArrayList l = new ArrayList();
721              q.drainTo(l, i);
722              int k = (i < SIZE) ? i : SIZE;
723 <            assertEquals(l.size(), k);
724 <            assertEquals(q.size(), SIZE - k);
725 <            for (int j = 0; j < k; ++j) {
726 <                assertEquals(l.get(j), j);
727 <            }
722 <            while (q.poll() != null)
723 <                ;
723 >            assertEquals(k, l.size());
724 >            assertEquals(SIZE - k, q.size());
725 >            for (int j = 0; j < k; ++j)
726 >                assertEquals(j, l.get(j));
727 >            do {} while (q.poll() != null);
728          }
729      }
730  
# Line 730 | Line 734 | public class LinkedTransferQueueTest ext
734       */
735      public void testWaitingConsumer() throws InterruptedException {
736          final LinkedTransferQueue q = new LinkedTransferQueue();
737 <        assertEquals(q.getWaitingConsumerCount(), 0);
737 >        assertEquals(0, q.getWaitingConsumerCount());
738          assertFalse(q.hasWaitingConsumer());
739          final CountDownLatch threadStarted = new CountDownLatch(1);
740  
741          Thread t = newStartedThread(new CheckedRunnable() {
742              public void realRun() throws InterruptedException {
743                  threadStarted.countDown();
744 +                long startTime = System.nanoTime();
745                  assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
746 <                assertEquals(q.getWaitingConsumerCount(), 0);
746 >                assertEquals(0, q.getWaitingConsumerCount());
747                  assertFalse(q.hasWaitingConsumer());
748 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
749              }});
750  
751          threadStarted.await();
752 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
753 <        assertEquals(q.getWaitingConsumerCount(), 1);
754 <        assertTrue(q.hasWaitingConsumer());
752 >        Callable<Boolean> oneConsumer
753 >            = new Callable<Boolean>() { public Boolean call() {
754 >                return q.hasWaitingConsumer()
755 >                && q.getWaitingConsumerCount() == 1; }};
756 >        waitForThreadToEnterWaitState(t, oneConsumer);
757  
758          assertTrue(q.offer(one));
759 <        assertEquals(q.getWaitingConsumerCount(), 0);
759 >        assertEquals(0, q.getWaitingConsumerCount());
760          assertFalse(q.hasWaitingConsumer());
761  
762 <        awaitTermination(t, MEDIUM_DELAY_MS);
762 >        awaitTermination(t);
763      }
764  
765      /**
# Line 766 | Line 774 | public class LinkedTransferQueueTest ext
774      }
775  
776      /**
777 <     * transfer waits until a poll occurs. The transfered element
778 <     * is returned by this associated poll.
777 >     * transfer waits until a poll occurs. The transferred element
778 >     * is returned by the associated poll.
779       */
780      public void testTransfer2() throws InterruptedException {
781 <        final LinkedTransferQueue<Integer> q
774 <            = new LinkedTransferQueue<Integer>();
781 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
782          final CountDownLatch threadStarted = new CountDownLatch(1);
783  
784          Thread t = newStartedThread(new CheckedRunnable() {
# Line 782 | Line 789 | public class LinkedTransferQueueTest ext
789              }});
790  
791          threadStarted.await();
792 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
793 <        assertEquals(1, q.size());
792 >        Callable<Boolean> oneElement
793 >            = new Callable<Boolean>() { public Boolean call() {
794 >                return !q.isEmpty() && q.size() == 1; }};
795 >        waitForThreadToEnterWaitState(t, oneElement);
796 >
797          assertSame(five, q.poll());
798          checkEmpty(q);
799 <        awaitTermination(t, MEDIUM_DELAY_MS);
799 >        awaitTermination(t);
800      }
801  
802      /**
803       * transfer waits until a poll occurs, and then transfers in fifo order
804       */
805      public void testTransfer3() throws InterruptedException {
806 <        final LinkedTransferQueue<Integer> q
797 <            = new LinkedTransferQueue<Integer>();
806 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
807  
808          Thread first = newStartedThread(new CheckedRunnable() {
809              public void realRun() throws InterruptedException {
810                  q.transfer(four);
811 <                assertTrue(!q.contains(four));
811 >                assertFalse(q.contains(four));
812                  assertEquals(1, q.size());
813              }});
814  
# Line 842 | Line 851 | public class LinkedTransferQueueTest ext
851          assertEquals(1, q.size());
852          assertTrue(q.offer(three));
853          assertSame(four, q.poll());
854 <        awaitTermination(t, MEDIUM_DELAY_MS);
854 >        awaitTermination(t);
855      }
856  
857      /**
858 <     * transfer waits until a take occurs. The transfered element
859 <     * is returned by this associated take.
858 >     * transfer waits until a take occurs. The transferred element
859 >     * is returned by the associated take.
860       */
861      public void testTransfer5() throws InterruptedException {
862 <        final LinkedTransferQueue<Integer> q
854 <            = new LinkedTransferQueue<Integer>();
862 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
863  
864          Thread t = newStartedThread(new CheckedRunnable() {
865              public void realRun() throws InterruptedException {
# Line 865 | Line 873 | public class LinkedTransferQueueTest ext
873          assertEquals(1, q.size());
874          assertSame(four, q.take());
875          checkEmpty(q);
876 <        awaitTermination(t, MEDIUM_DELAY_MS);
876 >        awaitTermination(t);
877      }
878  
879      /**
880       * tryTransfer(null) throws NullPointerException
881       */
882      public void testTryTransfer1() {
883 +        final LinkedTransferQueue q = new LinkedTransferQueue();
884          try {
876            final LinkedTransferQueue q = new LinkedTransferQueue();
885              q.tryTransfer(null);
886              shouldThrow();
887          } catch (NullPointerException success) {}
# Line 907 | Line 915 | public class LinkedTransferQueueTest ext
915                  assertTrue(q.tryTransfer(hotPotato));
916              }});
917  
918 <        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
918 >        long startTime = System.nanoTime();
919 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
920 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
921          checkEmpty(q);
922 <        awaitTermination(t, MEDIUM_DELAY_MS);
922 >        awaitTermination(t);
923      }
924  
925      /**
# Line 931 | Line 941 | public class LinkedTransferQueueTest ext
941  
942          assertSame(q.take(), hotPotato);
943          checkEmpty(q);
944 <        awaitTermination(t, MEDIUM_DELAY_MS);
944 >        awaitTermination(t);
945      }
946  
947      /**
# Line 944 | Line 954 | public class LinkedTransferQueueTest ext
954  
955          Thread t = newStartedThread(new CheckedRunnable() {
956              public void realRun() throws InterruptedException {
957 +                long startTime = System.nanoTime();
958                  Thread.currentThread().interrupt();
959                  try {
960                      q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
# Line 957 | Line 968 | public class LinkedTransferQueueTest ext
968                      shouldThrow();
969                  } catch (InterruptedException success) {}
970                  assertFalse(Thread.interrupted());
971 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
972              }});
973  
974          await(pleaseInterrupt);
975 <        assertThreadStaysAlive(t);
975 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
976          t.interrupt();
977          awaitTermination(t);
978          checkEmpty(q);
# Line 974 | Line 986 | public class LinkedTransferQueueTest ext
986  
987          Thread t = newStartedThread(new CheckedRunnable() {
988              public void realRun() throws InterruptedException {
989 <                long t0 = System.nanoTime();
989 >                long startTime = System.nanoTime();
990                  assertFalse(q.tryTransfer(new Object(),
991                                            timeoutMillis(), MILLISECONDS));
992 <                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
992 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
993                  checkEmpty(q);
994              }});
995  
# Line 995 | Line 1007 | public class LinkedTransferQueueTest ext
1007  
1008          Thread t = newStartedThread(new CheckedRunnable() {
1009              public void realRun() throws InterruptedException {
1010 <                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1010 >                long startTime = System.nanoTime();
1011 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1012 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1013                  checkEmpty(q);
1014              }});
1015  
# Line 1005 | Line 1019 | public class LinkedTransferQueueTest ext
1019          assertSame(four, q.poll());
1020          assertSame(five, q.poll());
1021          checkEmpty(q);
1022 <        awaitTermination(t, MEDIUM_DELAY_MS);
1022 >        awaitTermination(t);
1023      }
1024  
1025      /**
# Line 1016 | Line 1030 | public class LinkedTransferQueueTest ext
1030          final LinkedTransferQueue q = new LinkedTransferQueue();
1031          assertTrue(q.offer(four));
1032          assertEquals(1, q.size());
1033 <        long t0 = System.nanoTime();
1033 >        long startTime = System.nanoTime();
1034          assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1035 <        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1035 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1036          assertEquals(1, q.size());
1037          assertSame(four, q.poll());
1038          assertNull(q.poll());
# Line 1026 | Line 1040 | public class LinkedTransferQueueTest ext
1040      }
1041  
1042      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1043 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1043 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1044          checkEmpty(q);
1045          for (int i = 0; i < n; i++) {
1046              assertEquals(i, q.size());
# Line 1036 | Line 1050 | public class LinkedTransferQueueTest ext
1050          assertFalse(q.isEmpty());
1051          return q;
1052      }
1053 +
1054 +    /**
1055 +     * remove(null), contains(null) always return false
1056 +     */
1057 +    public void testNeverContainsNull() {
1058 +        Collection<?>[] qs = {
1059 +            new LinkedTransferQueue<Object>(),
1060 +            populatedQueue(2),
1061 +        };
1062 +
1063 +        for (Collection<?> q : qs) {
1064 +            assertFalse(q.contains(null));
1065 +            assertFalse(q.remove(null));
1066 +        }
1067 +    }
1068   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines