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.13 by jsr166, Sat Aug 15 00:48:10 2009 UTC vs.
Revision 1.31 by jsr166, Thu Oct 28 22:42:05 2010 UTC

# Line 13 | Line 13 | import java.io.ObjectInputStream;
13   import java.io.ObjectOutputStream;
14   import java.util.ArrayList;
15   import java.util.Arrays;
16 import java.util.ConcurrentModificationException;
16   import java.util.Iterator;
17   import java.util.List;
18   import java.util.NoSuchElementException;
19   import java.util.concurrent.*;
20   import static java.util.concurrent.TimeUnit.MILLISECONDS;
21 + import static java.util.concurrent.TimeUnit.NANOSECONDS;
22   import junit.framework.Test;
23   import junit.framework.TestSuite;
24  
25   @SuppressWarnings({"unchecked", "rawtypes"})
26   public class LinkedTransferQueueTest extends JSR166TestCase {
27  
28 +    public static class Generic extends BlockingQueueTest {
29 +        protected BlockingQueue emptyCollection() {
30 +            return new LinkedTransferQueue();
31 +        }
32 +    }
33 +
34      public static void main(String[] args) {
35          junit.textui.TestRunner.run(suite());
36      }
37  
38      public static Test suite() {
39 <        return new TestSuite(LinkedTransferQueueTest.class);
39 >        return newTestSuite(LinkedTransferQueueTest.class,
40 >                            new Generic().testSuite());
41      }
42  
43 <    void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
37 <        assertTrue(q.isEmpty());
38 <        assertEquals(0, q.size());
39 <        assertNull(q.peek());
40 <        assertNull(q.poll());
41 <        assertNull(q.poll(0, MILLISECONDS));
42 <        assertEquals(q.toString(), "[]");
43 <        assertTrue(Arrays.equals(q.toArray(), new Object[0]));
44 <        assertFalse(q.iterator().hasNext());
45 <        try {
46 <            q.element();
47 <            shouldThrow();
48 <        } catch (NoSuchElementException success) {
49 <        }
50 <        try {
51 <            q.iterator().next();
52 <            shouldThrow();
53 <        } catch (NoSuchElementException success) {
54 <        }
43 >    void checkEmpty(BlockingQueue q) {
44          try {
45 <            q.remove();
46 <            shouldThrow();
47 <        } catch (NoSuchElementException success) {
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  
# Line 76 | Line 84 | public class LinkedTransferQueueTest ext
84          try {
85              new LinkedTransferQueue(null);
86              shouldThrow();
87 <        } catch (NullPointerException success) {
80 <        }
87 >        } catch (NullPointerException success) {}
88      }
89  
90      /**
# Line 89 | Line 96 | public class LinkedTransferQueueTest ext
96              Integer[] ints = new Integer[SIZE];
97              new LinkedTransferQueue(Arrays.asList(ints));
98              shouldThrow();
99 <        } catch (NullPointerException success) {
93 <        }
99 >        } catch (NullPointerException success) {}
100      }
101  
102      /**
# Line 105 | Line 111 | public class LinkedTransferQueueTest ext
111              }
112              new LinkedTransferQueue(Arrays.asList(ints));
113              shouldThrow();
114 <        } catch (NullPointerException success) {
109 <        }
114 >        } catch (NullPointerException success) {}
115      }
116  
117      /**
# Line 158 | Line 163 | public class LinkedTransferQueueTest ext
163              LinkedTransferQueue q = new LinkedTransferQueue();
164              q.offer(null);
165              shouldThrow();
166 <        } catch (NullPointerException success) {
162 <        }
166 >        } catch (NullPointerException success) {}
167      }
168  
169      /**
# Line 170 | Line 174 | public class LinkedTransferQueueTest ext
174              LinkedTransferQueue q = new LinkedTransferQueue();
175              q.add(null);
176              shouldThrow();
177 <        } catch (NullPointerException success) {
174 <        }
177 >        } catch (NullPointerException success) {}
178      }
179  
180      /**
# Line 182 | Line 185 | public class LinkedTransferQueueTest ext
185              LinkedTransferQueue q = new LinkedTransferQueue();
186              q.addAll(null);
187              shouldThrow();
188 <        } catch (NullPointerException success) {
186 <        }
188 >        } catch (NullPointerException success) {}
189      }
190  
191      /**
# Line 194 | Line 196 | public class LinkedTransferQueueTest ext
196              LinkedTransferQueue q = populatedQueue(SIZE);
197              q.addAll(q);
198              shouldThrow();
199 <        } catch (IllegalArgumentException success) {
198 <        }
199 >        } catch (IllegalArgumentException success) {}
200      }
201  
202      /**
# Line 207 | Line 208 | public class LinkedTransferQueueTest ext
208              Integer[] ints = new Integer[SIZE];
209              q.addAll(Arrays.asList(ints));
210              shouldThrow();
211 <        } catch (NullPointerException success) {
211 <        }
211 >        } catch (NullPointerException success) {}
212      }
213  
214      /**
# Line 224 | Line 224 | public class LinkedTransferQueueTest ext
224              }
225              q.addAll(Arrays.asList(ints));
226              shouldThrow();
227 <        } catch (NullPointerException success) {
228 <        }
227 >        } catch (NullPointerException success) {}
228      }
229  
230      /**
# Line 279 | Line 278 | public class LinkedTransferQueueTest ext
278      }
279  
280      /**
281 <     * take blocks interruptibly when empty
283 <     */
284 <    public void testTakeFromEmpty() throws InterruptedException {
285 <        final LinkedTransferQueue q = new LinkedTransferQueue();
286 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
287 <            void realRun() throws InterruptedException {
288 <                q.take();
289 <            }});
290 <        Thread.sleep(SHORT_DELAY_MS);
291 <        t.interrupt();
292 <        t.join();
293 <    }
294 <
295 <    /**
296 <     * Take removes existing elements until empty, then blocks interruptibly
281 >     * take removes existing elements until empty, then blocks interruptibly
282       */
283      public void testBlockingTake() throws InterruptedException {
284 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
285 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
286 <            void realRun() throws InterruptedException {
284 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
285 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
286 >        Thread t = newStartedThread(new CheckedRunnable() {
287 >            public void realRun() throws InterruptedException {
288                  for (int i = 0; i < SIZE; ++i) {
289 <                    threadAssertEquals(i, (int) q.take());
289 >                    assertEquals(i, (int) q.take());
290                  }
291 <                q.take();
291 >                aboutToWait.countDown();
292 >                try {
293 >                    q.take();
294 >                    shouldThrow();
295 >                } catch (InterruptedException success) {}
296              }});
297 <        Thread.sleep(SMALL_DELAY_MS);
297 >
298 >        aboutToWait.await();
299 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
300          t.interrupt();
301 <        t.join();
301 >        awaitTermination(t, MEDIUM_DELAY_MS);
302          checkEmpty(q);
303      }
304  
# Line 323 | Line 315 | public class LinkedTransferQueueTest ext
315      }
316  
317      /**
318 <     * timed pool with zero timeout succeeds when non-empty, else times out
318 >     * timed poll with zero timeout succeeds when non-empty, else times out
319       */
320      public void testTimedPoll0() throws InterruptedException {
321          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 335 | Line 327 | public class LinkedTransferQueueTest ext
327      }
328  
329      /**
330 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
330 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
331       */
332      public void testTimedPoll() throws InterruptedException {
333          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
334          for (int i = 0; i < SIZE; ++i) {
335              long t0 = System.nanoTime();
336 <            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
337 <            long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
346 <            assertTrue(millisElapsed < SMALL_DELAY_MS);
336 >            assertEquals(i, (int) q.poll(SMALL_DELAY_MS, MILLISECONDS));
337 >            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
338          }
339 +        long t0 = System.nanoTime();
340          assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
341 +        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
342          checkEmpty(q);
343      }
344  
# Line 354 | Line 347 | public class LinkedTransferQueueTest ext
347       * returning timeout status
348       */
349      public void testInterruptedTimedPoll() throws InterruptedException {
350 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
351 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
352 <            void realRun() throws InterruptedException {
350 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
351 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
352 >        Thread t = newStartedThread(new CheckedRunnable() {
353 >            public void realRun() throws InterruptedException {
354                  for (int i = 0; i < SIZE; ++i) {
355                      long t0 = System.nanoTime();
356 <                    threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
357 <                                                       MILLISECONDS));
364 <                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
365 <                    assertTrue(millisElapsed < SMALL_DELAY_MS);
356 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
357 >                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
358                  }
359 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
359 >                aboutToWait.countDown();
360 >                try {
361 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
362 >                    shouldThrow();
363 >                } catch (InterruptedException success) {}
364              }});
365 <        Thread.sleep(SMALL_DELAY_MS);
365 >
366 >        aboutToWait.await();
367 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
368          t.interrupt();
369 <        t.join();
369 >        awaitTermination(t, MEDIUM_DELAY_MS);
370          checkEmpty(q);
371      }
372  
373      /**
374 <     * timed poll before a delayed offer fails; after offer succeeds;
375 <     * on interruption throws
374 >     * timed poll after thread interrupted throws InterruptedException
375 >     * instead of returning timeout status
376       */
377 <    public void testTimedPollWithOffer() throws InterruptedException {
378 <        final LinkedTransferQueue q = new LinkedTransferQueue();
379 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
380 <            void realRun() throws InterruptedException {
381 <                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
382 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
383 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
377 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
378 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
379 >        Thread t = newStartedThread(new CheckedRunnable() {
380 >            public void realRun() throws InterruptedException {
381 >                Thread.currentThread().interrupt();
382 >                for (int i = 0; i < SIZE; ++i) {
383 >                    long t0 = System.nanoTime();
384 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
385 >                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
386 >                }
387 >                try {
388 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
389 >                    shouldThrow();
390 >                } catch (InterruptedException success) {}
391              }});
392 <        Thread.sleep(SMALL_DELAY_MS);
393 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
394 <        t.interrupt();
390 <        t.join();
392 >
393 >        awaitTermination(t, MEDIUM_DELAY_MS);
394 >        checkEmpty(q);
395      }
396  
397      /**
# Line 417 | Line 421 | public class LinkedTransferQueueTest ext
421          try {
422              q.element();
423              shouldThrow();
424 <        } catch (NoSuchElementException success) {
421 <        }
424 >        } catch (NoSuchElementException success) {}
425          checkEmpty(q);
426      }
427  
# Line 433 | Line 436 | public class LinkedTransferQueueTest ext
436          try {
437              q.remove();
438              shouldThrow();
439 <        } catch (NoSuchElementException success) {
437 <        }
439 >        } catch (NoSuchElementException success) {}
440          checkEmpty(q);
441      }
442  
# Line 463 | Line 465 | public class LinkedTransferQueueTest ext
465          assertTrue(q.remove(one));
466          assertTrue(q.remove(two));
467          assertTrue(q.add(three));
468 <        assertTrue(q.take() == three);
468 >        assertSame(q.take(), three);
469      }
470  
471      /**
# Line 571 | Line 573 | public class LinkedTransferQueueTest ext
573       * toArray(null) throws NullPointerException
574       */
575      public void testToArray_BadArg() {
576 +        LinkedTransferQueue q = populatedQueue(SIZE);
577          try {
575            LinkedTransferQueue q = populatedQueue(SIZE);
578              Object o[] = q.toArray(null);
579              shouldThrow();
580 <        } catch (NullPointerException success) {
579 <        }
580 >        } catch (NullPointerException success) {}
581      }
582  
583      /**
584       * toArray(incompatible array type) throws CCE
585       */
586      public void testToArray1_BadArg() {
587 +        LinkedTransferQueue q = populatedQueue(SIZE);
588          try {
587            LinkedTransferQueue q = populatedQueue(SIZE);
589              Object o[] = q.toArray(new String[10]);
590              shouldThrow();
591 <        } catch (ArrayStoreException success) {
591 <        }
591 >        } catch (ArrayStoreException success) {}
592      }
593  
594      /**
# Line 618 | Line 618 | public class LinkedTransferQueueTest ext
618          it.remove();
619  
620          it = q.iterator();
621 <        assertEquals(it.next(), one);
622 <        assertEquals(it.next(), three);
621 >        assertSame(it.next(), one);
622 >        assertSame(it.next(), three);
623          assertFalse(it.hasNext());
624      }
625  
# Line 672 | Line 672 | public class LinkedTransferQueueTest ext
672       */
673      public void testOfferInExecutor() {
674          final LinkedTransferQueue q = new LinkedTransferQueue();
675 <        q.add(one);
676 <        q.add(two);
675 >        final CountDownLatch threadsStarted = new CountDownLatch(2);
676          ExecutorService executor = Executors.newFixedThreadPool(2);
677  
678          executor.execute(new CheckedRunnable() {
679 <            void realRun() {
680 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
681 <                                         MILLISECONDS));
679 >            public void realRun() throws InterruptedException {
680 >                threadsStarted.countDown();
681 >                threadsStarted.await();
682 >                assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
683              }});
684  
685          executor.execute(new CheckedRunnable() {
686 <            void realRun() throws InterruptedException {
687 <                Thread.sleep(SMALL_DELAY_MS);
688 <                threadAssertEquals(one, q.take());
686 >            public void realRun() throws InterruptedException {
687 >                threadsStarted.countDown();
688 >                threadsStarted.await();
689 >                assertSame(one, q.take());
690 >                checkEmpty(q);
691              }});
692  
693          joinPool(executor);
# Line 696 | Line 698 | public class LinkedTransferQueueTest ext
698       */
699      public void testPollInExecutor() {
700          final LinkedTransferQueue q = new LinkedTransferQueue();
701 +        final CountDownLatch threadsStarted = new CountDownLatch(2);
702          ExecutorService executor = Executors.newFixedThreadPool(2);
703  
704          executor.execute(new CheckedRunnable() {
705 <            void realRun() throws InterruptedException {
706 <                threadAssertNull(q.poll());
707 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
708 <                                                MILLISECONDS));
709 <                threadAssertTrue(q.isEmpty());
705 >            public void realRun() throws InterruptedException {
706 >                assertNull(q.poll());
707 >                threadsStarted.countDown();
708 >                threadsStarted.await();
709 >                assertSame(one, q.poll(SMALL_DELAY_MS, MILLISECONDS));
710 >                checkEmpty(q);
711              }});
712  
713          executor.execute(new CheckedRunnable() {
714 <            void realRun() throws InterruptedException {
715 <                Thread.sleep(SMALL_DELAY_MS);
714 >            public void realRun() throws InterruptedException {
715 >                threadsStarted.countDown();
716 >                threadsStarted.await();
717                  q.put(one);
718              }});
719  
# Line 747 | Line 752 | public class LinkedTransferQueueTest ext
752          try {
753              q.drainTo(null);
754              shouldThrow();
755 <        } catch (NullPointerException success) {
751 <        }
755 >        } catch (NullPointerException success) {}
756      }
757  
758      /**
# Line 759 | Line 763 | public class LinkedTransferQueueTest ext
763          try {
764              q.drainTo(q);
765              shouldThrow();
766 <        } catch (IllegalArgumentException success) {
763 <        }
766 >        } catch (IllegalArgumentException success) {}
767      }
768  
769      /**
# Line 795 | Line 798 | public class LinkedTransferQueueTest ext
798      public void testDrainToWithActivePut() throws InterruptedException {
799          final LinkedTransferQueue q = populatedQueue(SIZE);
800          Thread t = newStartedThread(new CheckedRunnable() {
801 <            void realRun() {
801 >            public void realRun() {
802                  q.put(SIZE + 1);
803              }});
804          ArrayList l = new ArrayList();
# Line 804 | Line 807 | public class LinkedTransferQueueTest ext
807          for (int i = 0; i < SIZE; ++i) {
808              assertEquals(l.get(i), i);
809          }
810 <        t.join();
810 >        awaitTermination(t, MEDIUM_DELAY_MS);
811          assertTrue(q.size() + l.size() >= SIZE);
812      }
813  
# Line 816 | Line 819 | public class LinkedTransferQueueTest ext
819          try {
820              q.drainTo(null, SIZE);
821              shouldThrow();
822 <        } catch (NullPointerException success) {
820 <        }
822 >        } catch (NullPointerException success) {}
823      }
824  
825      /**
# Line 828 | Line 830 | public class LinkedTransferQueueTest ext
830          try {
831              q.drainTo(q, SIZE);
832              shouldThrow();
833 <        } catch (IllegalArgumentException success) {
832 <        }
833 >        } catch (IllegalArgumentException success) {}
834      }
835  
836      /**
837 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
837 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
838       */
839      public void testDrainToN() {
840          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 862 | Line 863 | public class LinkedTransferQueueTest ext
863          final LinkedTransferQueue q = new LinkedTransferQueue();
864          assertEquals(q.getWaitingConsumerCount(), 0);
865          assertFalse(q.hasWaitingConsumer());
866 +        final CountDownLatch threadStarted = new CountDownLatch(1);
867  
868          Thread t = newStartedThread(new CheckedRunnable() {
869 <            void realRun() throws InterruptedException {
870 <                Thread.sleep(SMALL_DELAY_MS);
871 <                threadAssertTrue(q.hasWaitingConsumer());
872 <                threadAssertEquals(q.getWaitingConsumerCount(), 1);
873 <                threadAssertTrue(q.offer(new Object()));
872 <                threadAssertFalse(q.hasWaitingConsumer());
873 <                threadAssertEquals(q.getWaitingConsumerCount(), 0);
869 >            public void realRun() throws InterruptedException {
870 >                threadStarted.countDown();
871 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
872 >                assertEquals(q.getWaitingConsumerCount(), 0);
873 >                assertFalse(q.hasWaitingConsumer());
874              }});
875  
876 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
876 >        threadStarted.await();
877 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
878 >        assertEquals(q.getWaitingConsumerCount(), 1);
879 >        assertTrue(q.hasWaitingConsumer());
880 >
881 >        assertTrue(q.offer(one));
882          assertEquals(q.getWaitingConsumerCount(), 0);
883          assertFalse(q.hasWaitingConsumer());
884 <        t.join();
884 >
885 >        awaitTermination(t, MEDIUM_DELAY_MS);
886      }
887  
888      /**
# Line 887 | Line 893 | public class LinkedTransferQueueTest ext
893              LinkedTransferQueue q = new LinkedTransferQueue();
894              q.transfer(null);
895              shouldThrow();
896 <        } catch (NullPointerException ex) {
891 <        }
896 >        } catch (NullPointerException success) {}
897      }
898  
899      /**
# Line 898 | Line 903 | public class LinkedTransferQueueTest ext
903      public void testTransfer2() throws InterruptedException {
904          final LinkedTransferQueue<Integer> q
905              = new LinkedTransferQueue<Integer>();
906 +        final CountDownLatch threadStarted = new CountDownLatch(1);
907  
908          Thread t = newStartedThread(new CheckedRunnable() {
909 <            void realRun() throws InterruptedException {
909 >            public void realRun() throws InterruptedException {
910 >                threadStarted.countDown();
911                  q.transfer(SIZE);
912 <                threadAssertTrue(q.isEmpty());
912 >                checkEmpty(q);
913              }});
914  
915 <        Thread.sleep(SHORT_DELAY_MS);
915 >        threadStarted.await();
916 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
917 >        assertTrue(t.isAlive());
918          assertEquals(1, q.size());
919          assertEquals(SIZE, (int) q.poll());
920 <        assertTrue(q.isEmpty());
921 <        t.join();
920 >        checkEmpty(q);
921 >        awaitTermination(t, MEDIUM_DELAY_MS);
922      }
923  
924      /**
# Line 920 | Line 929 | public class LinkedTransferQueueTest ext
929              = new LinkedTransferQueue<Integer>();
930  
931          Thread first = newStartedThread(new CheckedRunnable() {
932 <            void realRun() throws InterruptedException {
932 >            public void realRun() throws InterruptedException {
933                  Integer i = SIZE + 1;
934                  q.transfer(i);
935 <                threadAssertTrue(!q.contains(i));
936 <                threadAssertEquals(1, q.size());
935 >                assertTrue(!q.contains(i));
936 >                assertEquals(1, q.size());
937              }});
938  
939          Thread interruptedThread = newStartedThread(
940              new CheckedInterruptedRunnable() {
941 <                void realRun() throws InterruptedException {
941 >                public void realRun() throws InterruptedException {
942                      while (q.size() == 0)
943                          Thread.yield();
944                      q.transfer(SIZE);
# Line 943 | Line 952 | public class LinkedTransferQueueTest ext
952          assertEquals(1, q.size());
953          interruptedThread.interrupt();
954          interruptedThread.join();
955 <        assertEquals(0, q.size());
947 <        assertTrue(q.isEmpty());
955 >        checkEmpty(q);
956      }
957  
958      /**
# Line 955 | Line 963 | public class LinkedTransferQueueTest ext
963          final LinkedTransferQueue q = new LinkedTransferQueue();
964  
965          Thread t = newStartedThread(new CheckedRunnable() {
966 <            void realRun() throws InterruptedException {
966 >            public void realRun() throws InterruptedException {
967                  q.transfer(four);
968 <                threadAssertFalse(q.contains(four));
969 <                threadAssertEquals(three, q.poll());
968 >                assertFalse(q.contains(four));
969 >                assertSame(three, q.poll());
970              }});
971  
972 <        Thread.sleep(SHORT_DELAY_MS);
972 >        while (q.isEmpty())
973 >            Thread.yield();
974 >        assertFalse(q.isEmpty());
975 >        assertEquals(1, q.size());
976          assertTrue(q.offer(three));
977 <        assertEquals(four, q.poll());
978 <        t.join();
977 >        assertSame(four, q.poll());
978 >        awaitTermination(t, MEDIUM_DELAY_MS);
979      }
980  
981      /**
# Line 976 | Line 987 | public class LinkedTransferQueueTest ext
987              = new LinkedTransferQueue<Integer>();
988  
989          Thread t = newStartedThread(new CheckedRunnable() {
990 <            void realRun() throws InterruptedException {
991 <                q.transfer(SIZE);
990 >            public void realRun() throws InterruptedException {
991 >                q.transfer(four);
992                  checkEmpty(q);
993              }});
994  
995 <        Thread.sleep(SHORT_DELAY_MS);
996 <        assertEquals(SIZE, (int) q.take());
995 >        while (q.isEmpty())
996 >            Thread.yield();
997 >        assertFalse(q.isEmpty());
998 >        assertEquals(1, q.size());
999 >        assertSame(four, q.take());
1000          checkEmpty(q);
1001 <        t.join();
1001 >        awaitTermination(t, MEDIUM_DELAY_MS);
1002      }
1003  
1004      /**
# Line 995 | Line 1009 | public class LinkedTransferQueueTest ext
1009              final LinkedTransferQueue q = new LinkedTransferQueue();
1010              q.tryTransfer(null);
1011              shouldThrow();
1012 <        } catch (NullPointerException ex) {
999 <        }
1012 >        } catch (NullPointerException success) {}
1013      }
1014  
1015      /**
# Line 1019 | Line 1032 | public class LinkedTransferQueueTest ext
1032          final LinkedTransferQueue q = new LinkedTransferQueue();
1033  
1034          Thread t = newStartedThread(new CheckedRunnable() {
1035 <            void realRun() {
1035 >            public void realRun() {
1036                  while (! q.hasWaitingConsumer())
1037                      Thread.yield();
1038 <                threadAssertTrue(q.hasWaitingConsumer());
1039 <                threadAssertTrue(q.isEmpty());
1040 <                threadAssertTrue(q.size() == 0);
1028 <                threadAssertTrue(q.tryTransfer(hotPotato));
1038 >                assertTrue(q.hasWaitingConsumer());
1039 >                checkEmpty(q);
1040 >                assertTrue(q.tryTransfer(hotPotato));
1041              }});
1042  
1043 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
1043 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1044          checkEmpty(q);
1045 <        t.join();
1045 >        awaitTermination(t, MEDIUM_DELAY_MS);
1046      }
1047  
1048      /**
# Line 1042 | Line 1054 | public class LinkedTransferQueueTest ext
1054          final LinkedTransferQueue q = new LinkedTransferQueue();
1055  
1056          Thread t = newStartedThread(new CheckedRunnable() {
1057 <            void realRun() {
1057 >            public void realRun() {
1058                  while (! q.hasWaitingConsumer())
1059                      Thread.yield();
1060 <                threadAssertTrue(q.hasWaitingConsumer());
1061 <                threadAssertTrue(q.isEmpty());
1062 <                threadAssertTrue(q.size() == 0);
1051 <                threadAssertTrue(q.tryTransfer(hotPotato));
1060 >                assertTrue(q.hasWaitingConsumer());
1061 >                checkEmpty(q);
1062 >                assertTrue(q.tryTransfer(hotPotato));
1063              }});
1064  
1065 <        assertTrue(q.take() == hotPotato);
1065 >        assertSame(q.take(), hotPotato);
1066          checkEmpty(q);
1067 <        t.join();
1067 >        awaitTermination(t, MEDIUM_DELAY_MS);
1068      }
1069  
1070      /**
# Line 1062 | Line 1073 | public class LinkedTransferQueueTest ext
1073       */
1074      public void testTryTransfer5() throws InterruptedException {
1075          final LinkedTransferQueue q = new LinkedTransferQueue();
1076 +        final CountDownLatch threadStarted = new CountDownLatch(1);
1077  
1078 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
1079 <            void realRun() throws InterruptedException {
1080 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
1078 >        Thread t = newStartedThread(new CheckedRunnable() {
1079 >            public void realRun() throws InterruptedException {
1080 >                long t0 = System.nanoTime();
1081 >                threadStarted.countDown();
1082 >                try {
1083 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
1084 >                    shouldThrow();
1085 >                } catch (InterruptedException success) {}
1086 >                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
1087              }});
1088  
1089 <        Thread.sleep(SMALL_DELAY_MS);
1090 <        toInterrupt.interrupt();
1091 <        toInterrupt.join();
1089 >        threadStarted.await();
1090 >        Thread.sleep(SHORT_DELAY_MS);
1091 >        t.interrupt();
1092 >        awaitTermination(t, MEDIUM_DELAY_MS);
1093 >        checkEmpty(q);
1094      }
1095  
1096      /**
# Line 1080 | Line 1100 | public class LinkedTransferQueueTest ext
1100          final LinkedTransferQueue q = new LinkedTransferQueue();
1101  
1102          Thread t = newStartedThread(new CheckedRunnable() {
1103 <            void realRun() throws InterruptedException {
1104 <                threadAssertFalse
1105 <                    (q.tryTransfer(new Object(),
1106 <                                   SHORT_DELAY_MS, MILLISECONDS));
1103 >            public void realRun() throws InterruptedException {
1104 >                long t0 = System.nanoTime();
1105 >                assertFalse(q.tryTransfer(new Object(),
1106 >                                          SHORT_DELAY_MS, MILLISECONDS));
1107 >                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
1108              }});
1109  
1089        Thread.sleep(SMALL_DELAY_MS);
1110          checkEmpty(q);
1111 <        t.join();
1111 >        awaitTermination(t, MEDIUM_DELAY_MS);
1112 >        checkEmpty(q);
1113      }
1114  
1115      /**
# Line 1100 | Line 1121 | public class LinkedTransferQueueTest ext
1121          assertTrue(q.offer(four));
1122  
1123          Thread t = newStartedThread(new CheckedRunnable() {
1124 <            void realRun() throws InterruptedException {
1125 <                threadAssertTrue(q.tryTransfer(five,
1126 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
1106 <                threadAssertTrue(q.isEmpty());
1124 >            public void realRun() throws InterruptedException {
1125 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1126 >                checkEmpty(q);
1127              }});
1128  
1129          Thread.sleep(SHORT_DELAY_MS);
1130          assertEquals(2, q.size());
1131 <        assertEquals(four, q.poll());
1132 <        assertEquals(five, q.poll());
1131 >        assertSame(four, q.poll());
1132 >        assertSame(five, q.poll());
1133          checkEmpty(q);
1134 <        t.join();
1134 >        awaitTermination(t, MEDIUM_DELAY_MS);
1135      }
1136  
1137      /**
# Line 1124 | Line 1144 | public class LinkedTransferQueueTest ext
1144          assertEquals(1, q.size());
1145          assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1146          assertEquals(1, q.size());
1147 <        assertEquals(four, q.poll());
1147 >        assertSame(four, q.poll());
1148          assertNull(q.poll());
1149          checkEmpty(q);
1150      }
1151  
1152      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1153          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1154 <        assertTrue(q.isEmpty());
1154 >        checkEmpty(q);
1155          for (int i = 0; i < n; i++) {
1156              assertEquals(i, q.size());
1157              assertTrue(q.offer(i));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines