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.31 by jsr166, Thu Oct 28 22:42:05 2010 UTC vs.
Revision 1.55 by jsr166, Wed Dec 31 19:05:43 2014 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 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 156 | Line 129 | public class LinkedTransferQueueTest ext
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 354 | Line 279 | public class LinkedTransferQueueTest ext
279                  for (int i = 0; i < SIZE; ++i) {
280                      long t0 = System.nanoTime();
281                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
282 <                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
282 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
283                  }
284 +                long t0 = System.nanoTime();
285                  aboutToWait.countDown();
286                  try {
287                      q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
288                      shouldThrow();
289 <                } catch (InterruptedException success) {}
289 >                } catch (InterruptedException success) {
290 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
291 >                }
292              }});
293  
294          aboutToWait.await();
# Line 382 | Line 310 | public class LinkedTransferQueueTest ext
310                  for (int i = 0; i < SIZE; ++i) {
311                      long t0 = System.nanoTime();
312                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
313 <                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
313 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
314                  }
315                  try {
316                      q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
# Line 441 | Line 369 | public class LinkedTransferQueueTest ext
369      }
370  
371      /**
444     * remove(x) removes x and returns true if present
445     */
446    public void testRemoveElement() throws InterruptedException {
447        LinkedTransferQueue q = populatedQueue(SIZE);
448        for (int i = 1; i < SIZE; i += 2) {
449            assertTrue(q.remove(i));
450        }
451        for (int i = 0; i < SIZE; i += 2) {
452            assertTrue(q.remove(i));
453            assertFalse(q.remove(i + 1));
454        }
455        checkEmpty(q);
456    }
457
458    /**
372       * An add following remove(x) succeeds
373       */
374      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 547 | Line 460 | public class LinkedTransferQueueTest ext
460      }
461  
462      /**
463 <     * toArray() contains all elements
463 >     * toArray() contains all elements in FIFO order
464       */
465 <    public void testToArray() throws InterruptedException {
465 >    public void testToArray() {
466          LinkedTransferQueue q = populatedQueue(SIZE);
467          Object[] o = q.toArray();
468          for (int i = 0; i < o.length; i++) {
469 <            assertEquals(o[i], q.take());
469 >            assertSame(o[i], q.poll());
470          }
471      }
472  
473      /**
474 <     * toArray(a) contains all elements
474 >     * toArray(a) contains all elements in FIFO order
475       */
476 <    public void testToArray2() throws InterruptedException {
476 >    public void testToArray2() {
477          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
478          Integer[] ints = new Integer[SIZE];
479 <        ints = q.toArray(ints);
479 >        Integer[] array = q.toArray(ints);
480 >        assertSame(ints, array);
481          for (int i = 0; i < ints.length; i++) {
482 <            assertEquals(ints[i], q.take());
482 >            assertSame(ints[i], q.poll());
483          }
484      }
485  
486      /**
487 <     * toArray(null) throws NullPointerException
574 <     */
575 <    public void testToArray_BadArg() {
576 <        LinkedTransferQueue q = populatedQueue(SIZE);
577 <        try {
578 <            Object o[] = q.toArray(null);
579 <            shouldThrow();
580 <        } catch (NullPointerException success) {}
581 <    }
582 <
583 <    /**
584 <     * toArray(incompatible array type) throws CCE
487 >     * toArray(incompatible array type) throws ArrayStoreException
488       */
489      public void testToArray1_BadArg() {
490          LinkedTransferQueue q = populatedQueue(SIZE);
491          try {
492 <            Object o[] = q.toArray(new String[10]);
492 >            q.toArray(new String[10]);
493              shouldThrow();
494          } catch (ArrayStoreException success) {}
495      }
# Line 663 | Line 566 | public class LinkedTransferQueueTest ext
566          LinkedTransferQueue q = populatedQueue(SIZE);
567          String s = q.toString();
568          for (int i = 0; i < SIZE; ++i) {
569 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
569 >            assertTrue(s.contains(String.valueOf(i)));
570          }
571      }
572  
# Line 672 | Line 575 | public class LinkedTransferQueueTest ext
575       */
576      public void testOfferInExecutor() {
577          final LinkedTransferQueue q = new LinkedTransferQueue();
578 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
578 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
579          ExecutorService executor = Executors.newFixedThreadPool(2);
580  
581          executor.execute(new CheckedRunnable() {
582              public void realRun() throws InterruptedException {
680                threadsStarted.countDown();
583                  threadsStarted.await();
584 <                assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
584 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
585              }});
586  
587          executor.execute(new CheckedRunnable() {
588              public void realRun() throws InterruptedException {
687                threadsStarted.countDown();
589                  threadsStarted.await();
590                  assertSame(one, q.take());
591                  checkEmpty(q);
# Line 698 | Line 599 | public class LinkedTransferQueueTest ext
599       */
600      public void testPollInExecutor() {
601          final LinkedTransferQueue q = new LinkedTransferQueue();
602 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
602 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
603          ExecutorService executor = Executors.newFixedThreadPool(2);
604  
605          executor.execute(new CheckedRunnable() {
606              public void realRun() throws InterruptedException {
607                  assertNull(q.poll());
707                threadsStarted.countDown();
608                  threadsStarted.await();
609 <                assertSame(one, q.poll(SMALL_DELAY_MS, MILLISECONDS));
609 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
610                  checkEmpty(q);
611              }});
612  
613          executor.execute(new CheckedRunnable() {
614              public void realRun() throws InterruptedException {
715                threadsStarted.countDown();
615                  threadsStarted.await();
616                  q.put(one);
617              }});
# Line 724 | Line 623 | public class LinkedTransferQueueTest ext
623       * A deserialized serialized queue has same elements in same order
624       */
625      public void testSerialization() throws Exception {
626 <        LinkedTransferQueue q = populatedQueue(SIZE);
627 <
729 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
730 <        ObjectOutputStream out
731 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
732 <        out.writeObject(q);
733 <        out.close();
734 <
735 <        ByteArrayInputStream bin
736 <            = new ByteArrayInputStream(bout.toByteArray());
737 <        ObjectInputStream in
738 <            = new ObjectInputStream(new BufferedInputStream(bin));
739 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
626 >        Queue x = populatedQueue(SIZE);
627 >        Queue y = serialClone(x);
628  
629 <        assertEquals(q.size(), r.size());
630 <        while (!q.isEmpty()) {
631 <            assertEquals(q.remove(), r.remove());
629 >        assertNotSame(y, x);
630 >        assertEquals(x.size(), y.size());
631 >        assertEquals(x.toString(), y.toString());
632 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
633 >        while (!x.isEmpty()) {
634 >            assertFalse(y.isEmpty());
635 >            assertEquals(x.remove(), y.remove());
636          }
637 <    }
746 <
747 <    /**
748 <     * drainTo(null) throws NullPointerException
749 <     */
750 <    public void testDrainToNull() {
751 <        LinkedTransferQueue q = populatedQueue(SIZE);
752 <        try {
753 <            q.drainTo(null);
754 <            shouldThrow();
755 <        } catch (NullPointerException success) {}
756 <    }
757 <
758 <    /**
759 <     * drainTo(this) throws IllegalArgumentException
760 <     */
761 <    public void testDrainToSelf() {
762 <        LinkedTransferQueue q = populatedQueue(SIZE);
763 <        try {
764 <            q.drainTo(q);
765 <            shouldThrow();
766 <        } catch (IllegalArgumentException success) {}
637 >        assertTrue(y.isEmpty());
638      }
639  
640      /**
# Line 773 | Line 644 | public class LinkedTransferQueueTest ext
644          LinkedTransferQueue q = populatedQueue(SIZE);
645          ArrayList l = new ArrayList();
646          q.drainTo(l);
647 <        assertEquals(q.size(), 0);
648 <        assertEquals(l.size(), SIZE);
647 >        assertEquals(0, q.size());
648 >        assertEquals(SIZE, l.size());
649          for (int i = 0; i < SIZE; ++i) {
650 <            assertEquals(l.get(i), i);
650 >            assertEquals(i, l.get(i));
651          }
652          q.add(zero);
653          q.add(one);
# Line 785 | Line 656 | public class LinkedTransferQueueTest ext
656          assertTrue(q.contains(one));
657          l.clear();
658          q.drainTo(l);
659 <        assertEquals(q.size(), 0);
660 <        assertEquals(l.size(), 2);
659 >        assertEquals(0, q.size());
660 >        assertEquals(2, l.size());
661          for (int i = 0; i < 2; ++i) {
662 <            assertEquals(l.get(i), i);
662 >            assertEquals(i, l.get(i));
663          }
664      }
665  
# Line 804 | Line 675 | public class LinkedTransferQueueTest ext
675          ArrayList l = new ArrayList();
676          q.drainTo(l);
677          assertTrue(l.size() >= SIZE);
678 <        for (int i = 0; i < SIZE; ++i) {
679 <            assertEquals(l.get(i), i);
809 <        }
678 >        for (int i = 0; i < SIZE; ++i)
679 >            assertEquals(i, l.get(i));
680          awaitTermination(t, MEDIUM_DELAY_MS);
681          assertTrue(q.size() + l.size() >= SIZE);
682      }
683  
684      /**
815     * drainTo(null, n) throws NullPointerException
816     */
817    public void testDrainToNullN() {
818        LinkedTransferQueue q = populatedQueue(SIZE);
819        try {
820            q.drainTo(null, SIZE);
821            shouldThrow();
822        } catch (NullPointerException success) {}
823    }
824
825    /**
826     * drainTo(this, n) throws IllegalArgumentException
827     */
828    public void testDrainToSelfN() {
829        LinkedTransferQueue q = populatedQueue(SIZE);
830        try {
831            q.drainTo(q, SIZE);
832            shouldThrow();
833        } catch (IllegalArgumentException success) {}
834    }
835
836    /**
685       * drainTo(c, n) empties first min(n, size) elements of queue into c
686       */
687      public void testDrainToN() {
# Line 845 | Line 693 | public class LinkedTransferQueueTest ext
693              ArrayList l = new ArrayList();
694              q.drainTo(l, i);
695              int k = (i < SIZE) ? i : SIZE;
696 <            assertEquals(l.size(), k);
697 <            assertEquals(q.size(), SIZE - k);
698 <            for (int j = 0; j < k; ++j) {
699 <                assertEquals(l.get(j), j);
852 <            }
696 >            assertEquals(k, l.size());
697 >            assertEquals(SIZE - k, q.size());
698 >            for (int j = 0; j < k; ++j)
699 >                assertEquals(j, l.get(j));
700              while (q.poll() != null)
701                  ;
702          }
# Line 861 | Line 708 | public class LinkedTransferQueueTest ext
708       */
709      public void testWaitingConsumer() throws InterruptedException {
710          final LinkedTransferQueue q = new LinkedTransferQueue();
711 <        assertEquals(q.getWaitingConsumerCount(), 0);
711 >        assertEquals(0, q.getWaitingConsumerCount());
712          assertFalse(q.hasWaitingConsumer());
713          final CountDownLatch threadStarted = new CountDownLatch(1);
714  
# Line 869 | Line 716 | public class LinkedTransferQueueTest ext
716              public void realRun() throws InterruptedException {
717                  threadStarted.countDown();
718                  assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
719 <                assertEquals(q.getWaitingConsumerCount(), 0);
719 >                assertEquals(0, q.getWaitingConsumerCount());
720                  assertFalse(q.hasWaitingConsumer());
721              }});
722  
723          threadStarted.await();
724          waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
725 <        assertEquals(q.getWaitingConsumerCount(), 1);
725 >        assertEquals(1, q.getWaitingConsumerCount());
726          assertTrue(q.hasWaitingConsumer());
727  
728          assertTrue(q.offer(one));
729 <        assertEquals(q.getWaitingConsumerCount(), 0);
729 >        assertEquals(0, q.getWaitingConsumerCount());
730          assertFalse(q.hasWaitingConsumer());
731  
732          awaitTermination(t, MEDIUM_DELAY_MS);
# Line 908 | Line 755 | public class LinkedTransferQueueTest ext
755          Thread t = newStartedThread(new CheckedRunnable() {
756              public void realRun() throws InterruptedException {
757                  threadStarted.countDown();
758 <                q.transfer(SIZE);
758 >                q.transfer(five);
759                  checkEmpty(q);
760              }});
761  
762          threadStarted.await();
763          waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
917        assertTrue(t.isAlive());
764          assertEquals(1, q.size());
765 <        assertEquals(SIZE, (int) q.poll());
765 >        assertSame(five, q.poll());
766          checkEmpty(q);
767          awaitTermination(t, MEDIUM_DELAY_MS);
768      }
# Line 930 | Line 776 | public class LinkedTransferQueueTest ext
776  
777          Thread first = newStartedThread(new CheckedRunnable() {
778              public void realRun() throws InterruptedException {
779 <                Integer i = SIZE + 1;
780 <                q.transfer(i);
935 <                assertTrue(!q.contains(i));
779 >                q.transfer(four);
780 >                assertTrue(!q.contains(four));
781                  assertEquals(1, q.size());
782              }});
783  
784          Thread interruptedThread = newStartedThread(
785              new CheckedInterruptedRunnable() {
786                  public void realRun() throws InterruptedException {
787 <                    while (q.size() == 0)
787 >                    while (q.isEmpty())
788                          Thread.yield();
789 <                    q.transfer(SIZE);
789 >                    q.transfer(five);
790                  }});
791  
792          while (q.size() < 2)
793              Thread.yield();
794          assertEquals(2, q.size());
795 <        assertEquals(SIZE + 1, (int) q.poll());
795 >        assertSame(four, q.poll());
796          first.join();
797          assertEquals(1, q.size());
798          interruptedThread.interrupt();
# Line 1068 | Line 913 | public class LinkedTransferQueueTest ext
913      }
914  
915      /**
916 <     * tryTransfer waits the amount given if interrupted, and
1072 <     * throws interrupted exception
916 >     * tryTransfer blocks interruptibly if no takers
917       */
918      public void testTryTransfer5() throws InterruptedException {
919          final LinkedTransferQueue q = new LinkedTransferQueue();
920 <        final CountDownLatch threadStarted = new CountDownLatch(1);
920 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
921 >        assertTrue(q.isEmpty());
922  
923          Thread t = newStartedThread(new CheckedRunnable() {
924              public void realRun() throws InterruptedException {
925 <                long t0 = System.nanoTime();
926 <                threadStarted.countDown();
925 >                Thread.currentThread().interrupt();
926 >                try {
927 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
928 >                    shouldThrow();
929 >                } catch (InterruptedException success) {}
930 >                assertFalse(Thread.interrupted());
931 >
932 >                pleaseInterrupt.countDown();
933                  try {
934                      q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
935                      shouldThrow();
936                  } catch (InterruptedException success) {}
937 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
937 >                assertFalse(Thread.interrupted());
938              }});
939  
940 <        threadStarted.await();
941 <        Thread.sleep(SHORT_DELAY_MS);
940 >        await(pleaseInterrupt);
941 >        assertThreadStaysAlive(t);
942          t.interrupt();
943 <        awaitTermination(t, MEDIUM_DELAY_MS);
943 >        awaitTermination(t);
944          checkEmpty(q);
945      }
946  
947      /**
948 <     * tryTransfer gives up after the timeout and return false
948 >     * tryTransfer gives up after the timeout and returns false
949       */
950      public void testTryTransfer6() throws InterruptedException {
951          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 1103 | Line 954 | public class LinkedTransferQueueTest ext
954              public void realRun() throws InterruptedException {
955                  long t0 = System.nanoTime();
956                  assertFalse(q.tryTransfer(new Object(),
957 <                                          SHORT_DELAY_MS, MILLISECONDS));
958 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
957 >                                          timeoutMillis(), MILLISECONDS));
958 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
959 >                checkEmpty(q);
960              }});
961  
962 <        checkEmpty(q);
1111 <        awaitTermination(t, MEDIUM_DELAY_MS);
962 >        awaitTermination(t);
963          checkEmpty(q);
964      }
965  
# Line 1126 | Line 977 | public class LinkedTransferQueueTest ext
977                  checkEmpty(q);
978              }});
979  
980 <        Thread.sleep(SHORT_DELAY_MS);
980 >        while (q.size() != 2)
981 >            Thread.yield();
982          assertEquals(2, q.size());
983          assertSame(four, q.poll());
984          assertSame(five, q.poll());
# Line 1135 | Line 987 | public class LinkedTransferQueueTest ext
987      }
988  
989      /**
990 <     * tryTransfer attempts to enqueue into the q and fails returning
991 <     * false not enqueueing and the successive poll is null
990 >     * tryTransfer attempts to enqueue into the queue and fails
991 >     * returning false not enqueueing and the successive poll is null
992       */
993      public void testTryTransfer8() throws InterruptedException {
994          final LinkedTransferQueue q = new LinkedTransferQueue();
995          assertTrue(q.offer(four));
996          assertEquals(1, q.size());
997 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
997 >        long t0 = System.nanoTime();
998 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
999 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1000          assertEquals(1, q.size());
1001          assertSame(four, q.poll());
1002          assertNull(q.poll());
# Line 1160 | Line 1014 | public class LinkedTransferQueueTest ext
1014          assertFalse(q.isEmpty());
1015          return q;
1016      }
1017 +
1018 +    /**
1019 +     * remove(null), contains(null) always return false
1020 +     */
1021 +    public void testNeverContainsNull() {
1022 +        Collection<?>[] qs = {
1023 +            new LinkedTransferQueue<Object>(),
1024 +            populatedQueue(2),
1025 +        };
1026 +
1027 +        for (Collection<?> q : qs) {
1028 +            assertFalse(q.contains(null));
1029 +            assertFalse(q.remove(null));
1030 +        }
1031 +    }
1032   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines