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.33 by jsr166, Fri Oct 29 06:22:12 2010 UTC vs.
Revision 1.51 by jsr166, Sat Nov 26 05:42:14 2011 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;
14 < import java.util.ArrayList;
8 > import junit.framework.*;
9   import java.util.Arrays;
10 + import java.util.ArrayList;
11 + import java.util.Collection;
12   import java.util.Iterator;
13   import java.util.List;
14   import java.util.NoSuchElementException;
15 < import java.util.concurrent.*;
15 > import java.util.Queue;
16 > import java.util.concurrent.BlockingQueue;
17 > import java.util.concurrent.CountDownLatch;
18 > import java.util.concurrent.Executors;
19 > import java.util.concurrent.ExecutorService;
20 > import java.util.concurrent.LinkedTransferQueue;
21   import static java.util.concurrent.TimeUnit.MILLISECONDS;
22   import static java.util.concurrent.TimeUnit.NANOSECONDS;
22 import junit.framework.Test;
23 import junit.framework.TestSuite;
23  
24   @SuppressWarnings({"unchecked", "rawtypes"})
25   public class LinkedTransferQueueTest extends JSR166TestCase {
# Line 40 | Line 39 | public class LinkedTransferQueueTest ext
39                              new Generic().testSuite());
40      }
41  
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
42      /**
43       * Constructor builds new queue with size being zero and empty
44       * being true
# Line 92 | Line 64 | public class LinkedTransferQueueTest ext
64       * NullPointerException
65       */
66      public void testConstructor3() {
67 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
68          try {
69 <            Integer[] ints = new Integer[SIZE];
97 <            new LinkedTransferQueue(Arrays.asList(ints));
69 >            new LinkedTransferQueue(elements);
70              shouldThrow();
71          } catch (NullPointerException success) {}
72      }
# Line 104 | Line 76 | public class LinkedTransferQueueTest ext
76       * throws NullPointerException
77       */
78      public void testConstructor4() {
79 +        Integer[] ints = new Integer[SIZE];
80 +        for (int i = 0; i < SIZE-1; ++i)
81 +            ints[i] = i;
82 +        Collection<Integer> elements = Arrays.asList(ints);
83          try {
84 <            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));
84 >            new LinkedTransferQueue(elements);
85              shouldThrow();
86          } catch (NullPointerException success) {}
87      }
# Line 156 | Line 128 | public class LinkedTransferQueueTest ext
128      }
129  
130      /**
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    /**
131       * addAll(this) throws IllegalArgumentException
132       */
133      public void testAddAllSelf() {
# Line 200 | Line 139 | public class LinkedTransferQueueTest ext
139      }
140  
141      /**
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    /**
142       * addAll of a collection with any null elements throws
143       * NullPointerException after possibly adding some elements
144       */
# Line 245 | Line 172 | public class LinkedTransferQueueTest ext
172      }
173  
174      /**
248     * put(null) throws NullPointerException
249     */
250    public void testPutNull() throws InterruptedException {
251        try {
252            LinkedTransferQueue q = new LinkedTransferQueue();
253            q.put(null);
254            shouldThrow();
255        } catch (NullPointerException success) {}
256    }
257
258    /**
175       * all elements successfully put are contained
176       */
177      public void testPut() {
178          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
179          for (int i = 0; i < SIZE; ++i) {
180 <            assertEquals(q.size(), i);
180 >            assertEquals(i, q.size());
181              q.put(i);
182              assertTrue(q.contains(i));
183          }
# Line 281 | Line 197 | public class LinkedTransferQueueTest ext
197       * take removes existing elements until empty, then blocks interruptibly
198       */
199      public void testBlockingTake() throws InterruptedException {
200 <        final BlockingQueue<Integer> q = populatedQueue(SIZE);
201 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
200 >        final BlockingQueue q = populatedQueue(SIZE);
201 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
202          Thread t = newStartedThread(new CheckedRunnable() {
203              public void realRun() throws InterruptedException {
204                  for (int i = 0; i < SIZE; ++i) {
205 <                    assertEquals(i, (int) q.take());
205 >                    assertEquals(i, q.take());
206                  }
207 <                aboutToWait.countDown();
207 >
208 >                Thread.currentThread().interrupt();
209 >                try {
210 >                    q.take();
211 >                    shouldThrow();
212 >                } catch (InterruptedException success) {}
213 >                assertFalse(Thread.interrupted());
214 >
215 >                pleaseInterrupt.countDown();
216                  try {
217                      q.take();
218                      shouldThrow();
219                  } catch (InterruptedException success) {}
220 +                assertFalse(Thread.interrupted());
221              }});
222  
223 <        aboutToWait.await();
224 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
223 >        await(pleaseInterrupt);
224 >        assertThreadStaysAlive(t);
225          t.interrupt();
226 <        awaitTermination(t, MEDIUM_DELAY_MS);
302 <        checkEmpty(q);
226 >        awaitTermination(t);
227      }
228  
229      /**
# Line 332 | Line 256 | public class LinkedTransferQueueTest ext
256      public void testTimedPoll() throws InterruptedException {
257          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
258          for (int i = 0; i < SIZE; ++i) {
259 <            long t0 = System.nanoTime();
260 <            assertEquals(i, (int) q.poll(SMALL_DELAY_MS, MILLISECONDS));
261 <            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
262 <        }
263 <        long t0 = System.nanoTime();
264 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
265 <        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
259 >            long startTime = System.nanoTime();
260 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
261 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
262 >        }
263 >        long startTime = System.nanoTime();
264 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
265 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
266          checkEmpty(q);
267      }
268  
# Line 354 | Line 278 | public class LinkedTransferQueueTest ext
278                  for (int i = 0; i < SIZE; ++i) {
279                      long t0 = System.nanoTime();
280                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
281 <                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
281 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
282                  }
283 +                long t0 = System.nanoTime();
284                  aboutToWait.countDown();
285                  try {
286                      q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
287                      shouldThrow();
288 <                } catch (InterruptedException success) {}
288 >                } catch (InterruptedException success) {
289 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
290 >                }
291              }});
292  
293          aboutToWait.await();
# Line 382 | Line 309 | public class LinkedTransferQueueTest ext
309                  for (int i = 0; i < SIZE; ++i) {
310                      long t0 = System.nanoTime();
311                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
312 <                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
312 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
313                  }
314                  try {
315                      q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
# Line 441 | Line 368 | public class LinkedTransferQueueTest ext
368      }
369  
370      /**
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    /**
371       * An add following remove(x) succeeds
372       */
373      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 547 | Line 459 | public class LinkedTransferQueueTest ext
459      }
460  
461      /**
462 <     * toArray() contains all elements
462 >     * toArray() contains all elements in FIFO order
463       */
464 <    public void testToArray() throws InterruptedException {
464 >    public void testToArray() {
465          LinkedTransferQueue q = populatedQueue(SIZE);
466          Object[] o = q.toArray();
467          for (int i = 0; i < o.length; i++) {
468 <            assertEquals(o[i], q.take());
468 >            assertSame(o[i], q.poll());
469          }
470      }
471  
472      /**
473 <     * toArray(a) contains all elements
473 >     * toArray(a) contains all elements in FIFO order
474       */
475 <    public void testToArray2() throws InterruptedException {
475 >    public void testToArray2() {
476          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
477          Integer[] ints = new Integer[SIZE];
478 <        ints = q.toArray(ints);
478 >        Integer[] array = q.toArray(ints);
479 >        assertSame(ints, array);
480          for (int i = 0; i < ints.length; i++) {
481 <            assertEquals(ints[i], q.take());
481 >            assertSame(ints[i], q.poll());
482          }
483      }
484  
485      /**
486 <     * 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
486 >     * toArray(incompatible array type) throws ArrayStoreException
487       */
488      public void testToArray1_BadArg() {
489          LinkedTransferQueue q = populatedQueue(SIZE);
490          try {
491 <            Object o[] = q.toArray(new String[10]);
491 >            q.toArray(new String[10]);
492              shouldThrow();
493          } catch (ArrayStoreException success) {}
494      }
# Line 663 | Line 565 | public class LinkedTransferQueueTest ext
565          LinkedTransferQueue q = populatedQueue(SIZE);
566          String s = q.toString();
567          for (int i = 0; i < SIZE; ++i) {
568 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
568 >            assertTrue(s.contains(String.valueOf(i)));
569          }
570      }
571  
# Line 672 | Line 574 | public class LinkedTransferQueueTest ext
574       */
575      public void testOfferInExecutor() {
576          final LinkedTransferQueue q = new LinkedTransferQueue();
577 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
577 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
578          ExecutorService executor = Executors.newFixedThreadPool(2);
579  
580          executor.execute(new CheckedRunnable() {
581              public void realRun() throws InterruptedException {
680                threadsStarted.countDown();
582                  threadsStarted.await();
583 <                assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
583 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
584              }});
585  
586          executor.execute(new CheckedRunnable() {
587              public void realRun() throws InterruptedException {
687                threadsStarted.countDown();
588                  threadsStarted.await();
589                  assertSame(one, q.take());
590                  checkEmpty(q);
# Line 698 | Line 598 | public class LinkedTransferQueueTest ext
598       */
599      public void testPollInExecutor() {
600          final LinkedTransferQueue q = new LinkedTransferQueue();
601 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
601 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
602          ExecutorService executor = Executors.newFixedThreadPool(2);
603  
604          executor.execute(new CheckedRunnable() {
605              public void realRun() throws InterruptedException {
606                  assertNull(q.poll());
707                threadsStarted.countDown();
607                  threadsStarted.await();
608 <                assertSame(one, q.poll(SMALL_DELAY_MS, MILLISECONDS));
608 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
609                  checkEmpty(q);
610              }});
611  
612          executor.execute(new CheckedRunnable() {
613              public void realRun() throws InterruptedException {
715                threadsStarted.countDown();
614                  threadsStarted.await();
615                  q.put(one);
616              }});
# Line 724 | Line 622 | public class LinkedTransferQueueTest ext
622       * A deserialized serialized queue has same elements in same order
623       */
624      public void testSerialization() throws Exception {
625 <        LinkedTransferQueue q = populatedQueue(SIZE);
626 <
729 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
730 <        ObjectOutputStream out
731 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
732 <        out.writeObject(q);
733 <        out.close();
625 >        Queue x = populatedQueue(SIZE);
626 >        Queue y = serialClone(x);
627  
628 <        ByteArrayInputStream bin
629 <            = new ByteArrayInputStream(bout.toByteArray());
630 <        ObjectInputStream in
631 <            = new ObjectInputStream(new BufferedInputStream(bin));
632 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
633 <
634 <        assertEquals(q.size(), r.size());
742 <        assertEquals(q.toString(), r.toString());
743 <        assertTrue(Arrays.equals(q.toArray(), r.toArray()));
744 <        while (!q.isEmpty()) {
745 <            assertEquals(q.remove(), r.remove());
628 >        assertTrue(x != y);
629 >        assertEquals(x.size(), y.size());
630 >        assertEquals(x.toString(), y.toString());
631 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
632 >        while (!x.isEmpty()) {
633 >            assertFalse(y.isEmpty());
634 >            assertEquals(x.remove(), y.remove());
635          }
636 <    }
748 <
749 <    /**
750 <     * drainTo(null) throws NullPointerException
751 <     */
752 <    public void testDrainToNull() {
753 <        LinkedTransferQueue q = populatedQueue(SIZE);
754 <        try {
755 <            q.drainTo(null);
756 <            shouldThrow();
757 <        } catch (NullPointerException success) {}
758 <    }
759 <
760 <    /**
761 <     * drainTo(this) throws IllegalArgumentException
762 <     */
763 <    public void testDrainToSelf() {
764 <        LinkedTransferQueue q = populatedQueue(SIZE);
765 <        try {
766 <            q.drainTo(q);
767 <            shouldThrow();
768 <        } catch (IllegalArgumentException success) {}
636 >        assertTrue(y.isEmpty());
637      }
638  
639      /**
# Line 775 | Line 643 | public class LinkedTransferQueueTest ext
643          LinkedTransferQueue q = populatedQueue(SIZE);
644          ArrayList l = new ArrayList();
645          q.drainTo(l);
646 <        assertEquals(q.size(), 0);
647 <        assertEquals(l.size(), SIZE);
646 >        assertEquals(0, q.size());
647 >        assertEquals(SIZE, l.size());
648          for (int i = 0; i < SIZE; ++i) {
649 <            assertEquals(l.get(i), i);
649 >            assertEquals(i, l.get(i));
650          }
651          q.add(zero);
652          q.add(one);
# Line 787 | Line 655 | public class LinkedTransferQueueTest ext
655          assertTrue(q.contains(one));
656          l.clear();
657          q.drainTo(l);
658 <        assertEquals(q.size(), 0);
659 <        assertEquals(l.size(), 2);
658 >        assertEquals(0, q.size());
659 >        assertEquals(2, l.size());
660          for (int i = 0; i < 2; ++i) {
661 <            assertEquals(l.get(i), i);
661 >            assertEquals(i, l.get(i));
662          }
663      }
664  
# Line 806 | Line 674 | public class LinkedTransferQueueTest ext
674          ArrayList l = new ArrayList();
675          q.drainTo(l);
676          assertTrue(l.size() >= SIZE);
677 <        for (int i = 0; i < SIZE; ++i) {
678 <            assertEquals(l.get(i), i);
811 <        }
677 >        for (int i = 0; i < SIZE; ++i)
678 >            assertEquals(i, l.get(i));
679          awaitTermination(t, MEDIUM_DELAY_MS);
680          assertTrue(q.size() + l.size() >= SIZE);
681      }
682  
683      /**
817     * drainTo(null, n) throws NullPointerException
818     */
819    public void testDrainToNullN() {
820        LinkedTransferQueue q = populatedQueue(SIZE);
821        try {
822            q.drainTo(null, SIZE);
823            shouldThrow();
824        } catch (NullPointerException success) {}
825    }
826
827    /**
828     * drainTo(this, n) throws IllegalArgumentException
829     */
830    public void testDrainToSelfN() {
831        LinkedTransferQueue q = populatedQueue(SIZE);
832        try {
833            q.drainTo(q, SIZE);
834            shouldThrow();
835        } catch (IllegalArgumentException success) {}
836    }
837
838    /**
684       * drainTo(c, n) empties first min(n, size) elements of queue into c
685       */
686      public void testDrainToN() {
# Line 847 | Line 692 | public class LinkedTransferQueueTest ext
692              ArrayList l = new ArrayList();
693              q.drainTo(l, i);
694              int k = (i < SIZE) ? i : SIZE;
695 <            assertEquals(l.size(), k);
696 <            assertEquals(q.size(), SIZE - k);
697 <            for (int j = 0; j < k; ++j) {
698 <                assertEquals(l.get(j), j);
854 <            }
695 >            assertEquals(k, l.size());
696 >            assertEquals(SIZE - k, q.size());
697 >            for (int j = 0; j < k; ++j)
698 >                assertEquals(j, l.get(j));
699              while (q.poll() != null)
700                  ;
701          }
# Line 863 | Line 707 | public class LinkedTransferQueueTest ext
707       */
708      public void testWaitingConsumer() throws InterruptedException {
709          final LinkedTransferQueue q = new LinkedTransferQueue();
710 <        assertEquals(q.getWaitingConsumerCount(), 0);
710 >        assertEquals(0, q.getWaitingConsumerCount());
711          assertFalse(q.hasWaitingConsumer());
712          final CountDownLatch threadStarted = new CountDownLatch(1);
713  
# Line 871 | Line 715 | public class LinkedTransferQueueTest ext
715              public void realRun() throws InterruptedException {
716                  threadStarted.countDown();
717                  assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
718 <                assertEquals(q.getWaitingConsumerCount(), 0);
718 >                assertEquals(0, q.getWaitingConsumerCount());
719                  assertFalse(q.hasWaitingConsumer());
720              }});
721  
722          threadStarted.await();
723          waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
724 <        assertEquals(q.getWaitingConsumerCount(), 1);
724 >        assertEquals(1, q.getWaitingConsumerCount());
725          assertTrue(q.hasWaitingConsumer());
726  
727          assertTrue(q.offer(one));
728 <        assertEquals(q.getWaitingConsumerCount(), 0);
728 >        assertEquals(0, q.getWaitingConsumerCount());
729          assertFalse(q.hasWaitingConsumer());
730  
731          awaitTermination(t, MEDIUM_DELAY_MS);
# Line 910 | Line 754 | public class LinkedTransferQueueTest ext
754          Thread t = newStartedThread(new CheckedRunnable() {
755              public void realRun() throws InterruptedException {
756                  threadStarted.countDown();
757 <                q.transfer(SIZE);
757 >                q.transfer(five);
758                  checkEmpty(q);
759              }});
760  
761          threadStarted.await();
762          waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
919        assertTrue(t.isAlive());
763          assertEquals(1, q.size());
764 <        assertEquals(SIZE, (int) q.poll());
764 >        assertSame(five, q.poll());
765          checkEmpty(q);
766          awaitTermination(t, MEDIUM_DELAY_MS);
767      }
# Line 1069 | Line 912 | public class LinkedTransferQueueTest ext
912      }
913  
914      /**
915 <     * tryTransfer waits the amount given if interrupted, and
1073 <     * throws interrupted exception
915 >     * tryTransfer blocks interruptibly if no takers
916       */
917      public void testTryTransfer5() throws InterruptedException {
918          final LinkedTransferQueue q = new LinkedTransferQueue();
919 <        final CountDownLatch threadStarted = new CountDownLatch(1);
919 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
920 >        assertTrue(q.isEmpty());
921  
922          Thread t = newStartedThread(new CheckedRunnable() {
923              public void realRun() throws InterruptedException {
924 <                long t0 = System.nanoTime();
1082 <                threadStarted.countDown();
924 >                Thread.currentThread().interrupt();
925                  try {
926                      q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
927                      shouldThrow();
928                  } catch (InterruptedException success) {}
929 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
929 >                assertFalse(Thread.interrupted());
930 >
931 >                pleaseInterrupt.countDown();
932 >                try {
933 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
934 >                    shouldThrow();
935 >                } catch (InterruptedException success) {}
936 >                assertFalse(Thread.interrupted());
937              }});
938  
939 <        threadStarted.await();
940 <        Thread.sleep(SHORT_DELAY_MS);
939 >        await(pleaseInterrupt);
940 >        assertThreadStaysAlive(t);
941          t.interrupt();
942 <        awaitTermination(t, MEDIUM_DELAY_MS);
942 >        awaitTermination(t);
943          checkEmpty(q);
944      }
945  
# Line 1104 | Line 953 | public class LinkedTransferQueueTest ext
953              public void realRun() throws InterruptedException {
954                  long t0 = System.nanoTime();
955                  assertFalse(q.tryTransfer(new Object(),
956 <                                          SHORT_DELAY_MS, MILLISECONDS));
957 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
956 >                                          timeoutMillis(), MILLISECONDS));
957 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
958                  checkEmpty(q);
959              }});
960  
961 <        awaitTermination(t, MEDIUM_DELAY_MS);
961 >        awaitTermination(t);
962          checkEmpty(q);
963      }
964  
# Line 1137 | Line 986 | public class LinkedTransferQueueTest ext
986      }
987  
988      /**
989 <     * tryTransfer attempts to enqueue into the q and fails returning
990 <     * false not enqueueing and the successive poll is null
989 >     * tryTransfer attempts to enqueue into the queue and fails
990 >     * returning false not enqueueing and the successive poll is null
991       */
992      public void testTryTransfer8() throws InterruptedException {
993          final LinkedTransferQueue q = new LinkedTransferQueue();
994          assertTrue(q.offer(four));
995          assertEquals(1, q.size());
996          long t0 = System.nanoTime();
997 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
998 <        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
997 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
998 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
999          assertEquals(1, q.size());
1000          assertSame(four, q.poll());
1001          assertNull(q.poll());

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines