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.7 by jsr166, Mon Aug 3 19:07:51 2009 UTC vs.
Revision 1.13 by jsr166, Sat Aug 15 00:48:10 2009 UTC

# Line 15 | Line 15 | import java.util.ArrayList;
15   import java.util.Arrays;
16   import java.util.ConcurrentModificationException;
17   import java.util.Iterator;
18 + import java.util.List;
19   import java.util.NoSuchElementException;
20   import java.util.concurrent.*;
21   import static java.util.concurrent.TimeUnit.MILLISECONDS;
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 void main(String[] args) {
# Line 31 | Line 33 | public class LinkedTransferQueueTest ext
33          return new TestSuite(LinkedTransferQueueTest.class);
34      }
35  
36 +    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 +        }
55 +        try {
56 +            q.remove();
57 +            shouldThrow();
58 +        } catch (NoSuchElementException success) {
59 +        }
60 +    }
61 +
62      /**
63       * Constructor builds new queue with size being zero and empty
64       * being true
# Line 85 | Line 113 | public class LinkedTransferQueueTest ext
113       * Queue contains all elements of the collection it is initialized by
114       */
115      public void testConstructor5() {
116 <        try {
117 <            Integer[] ints = new Integer[SIZE];
118 <            for (int i = 0; i < SIZE; ++i) {
119 <                ints[i] = i;
120 <            }
121 <            LinkedTransferQueue q
122 <                = new LinkedTransferQueue(Arrays.asList(ints));
123 <            for (int i = 0; i < SIZE; ++i) {
124 <                assertEquals(ints[i], q.poll());
125 <            }
126 <        } finally {
116 >        Integer[] ints = new Integer[SIZE];
117 >        for (int i = 0; i < SIZE; ++i) {
118 >            ints[i] = i;
119 >        }
120 >        List intList = Arrays.asList(ints);
121 >        LinkedTransferQueue q
122 >            = new LinkedTransferQueue(intList);
123 >        assertEquals(q.size(), intList.size());
124 >        assertEquals(q.toString(), intList.toString());
125 >        assertTrue(Arrays.equals(q.toArray(),
126 >                                     intList.toArray()));
127 >        assertTrue(Arrays.equals(q.toArray(new Object[0]),
128 >                                 intList.toArray(new Object[0])));
129 >        assertTrue(Arrays.equals(q.toArray(new Object[SIZE]),
130 >                                 intList.toArray(new Object[SIZE])));
131 >        for (int i = 0; i < SIZE; ++i) {
132 >            assertEquals(ints[i], q.poll());
133          }
134      }
135  
136      /**
137 <     * Remaining capacity never decrease nor increase on add or remove
137 >     * remainingCapacity() always returns Integer.MAX_VALUE
138       */
139      public void testRemainingCapacity() {
140          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 228 | Line 262 | public class LinkedTransferQueueTest ext
262      public void testPut() {
263          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
264          for (int i = 0; i < SIZE; ++i) {
265 +            assertEquals(q.size(), i);
266              q.put(i);
267              assertTrue(q.contains(i));
268          }
234        assertEquals(q.size(), SIZE);
269      }
270  
271      /**
# Line 249 | Line 283 | public class LinkedTransferQueueTest ext
283       */
284      public void testTakeFromEmpty() throws InterruptedException {
285          final LinkedTransferQueue q = new LinkedTransferQueue();
286 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
286 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
287              void realRun() throws InterruptedException {
288                  q.take();
289              }});
256        t.start();
290          Thread.sleep(SHORT_DELAY_MS);
291          t.interrupt();
292          t.join();
# Line 263 | Line 296 | public class LinkedTransferQueueTest ext
296       * Take removes existing elements until empty, then blocks interruptibly
297       */
298      public void testBlockingTake() throws InterruptedException {
299 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
299 >        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
300 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
301              void realRun() throws InterruptedException {
268                LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
302                  for (int i = 0; i < SIZE; ++i) {
303                      threadAssertEquals(i, (int) q.take());
304                  }
305                  q.take();
306              }});
307 <        t.start();
275 <        Thread.sleep(SHORT_DELAY_MS);
307 >        Thread.sleep(SMALL_DELAY_MS);
308          t.interrupt();
309          t.join();
310 +        checkEmpty(q);
311      }
312  
313      /**
314       * poll succeeds unless empty
315       */
316 <    public void testPoll() {
316 >    public void testPoll() throws InterruptedException {
317          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
318          for (int i = 0; i < SIZE; ++i) {
319              assertEquals(i, (int) q.poll());
320          }
321          assertNull(q.poll());
322 +        checkEmpty(q);
323      }
324  
325      /**
# Line 297 | Line 331 | public class LinkedTransferQueueTest ext
331              assertEquals(i, (int) q.poll(0, MILLISECONDS));
332          }
333          assertNull(q.poll(0, MILLISECONDS));
334 +        checkEmpty(q);
335      }
336  
337      /**
# Line 305 | Line 340 | public class LinkedTransferQueueTest ext
340      public void testTimedPoll() throws InterruptedException {
341          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
342          for (int i = 0; i < SIZE; ++i) {
343 <            assertEquals(i, (int) q.poll(SHORT_DELAY_MS, MILLISECONDS));
343 >            long t0 = System.nanoTime();
344 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
345 >            long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
346 >            assertTrue(millisElapsed < SMALL_DELAY_MS);
347          }
348          assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
349 +        checkEmpty(q);
350      }
351  
352      /**
# Line 315 | Line 354 | public class LinkedTransferQueueTest ext
354       * returning timeout status
355       */
356      public void testInterruptedTimedPoll() throws InterruptedException {
357 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
357 >        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
358 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
359              void realRun() throws InterruptedException {
320                LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
360                  for (int i = 0; i < SIZE; ++i) {
361 <                    threadAssertEquals(i, (int) q.poll(SHORT_DELAY_MS,
361 >                    long t0 = System.nanoTime();
362 >                    threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
363                                                         MILLISECONDS));
364 +                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
365 +                    assertTrue(millisElapsed < SMALL_DELAY_MS);
366                  }
367 <                q.poll(SHORT_DELAY_MS, MILLISECONDS);
367 >                q.poll(LONG_DELAY_MS, MILLISECONDS);
368              }});
369 <        t.start();
328 <        Thread.sleep(SHORT_DELAY_MS);
369 >        Thread.sleep(SMALL_DELAY_MS);
370          t.interrupt();
371          t.join();
372 +        checkEmpty(q);
373      }
374  
375      /**
# Line 336 | Line 378 | public class LinkedTransferQueueTest ext
378       */
379      public void testTimedPollWithOffer() throws InterruptedException {
380          final LinkedTransferQueue q = new LinkedTransferQueue();
381 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
381 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
382              void realRun() throws InterruptedException {
383                  threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
384                  q.poll(LONG_DELAY_MS, MILLISECONDS);
385                  q.poll(LONG_DELAY_MS, MILLISECONDS);
386              }});
345        t.start();
387          Thread.sleep(SMALL_DELAY_MS);
388          assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
389          t.interrupt();
# Line 352 | Line 393 | public class LinkedTransferQueueTest ext
393      /**
394       * peek returns next element, or null if empty
395       */
396 <    public void testPeek() {
396 >    public void testPeek() throws InterruptedException {
397          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
398          for (int i = 0; i < SIZE; ++i) {
399              assertEquals(i, (int) q.peek());
# Line 361 | Line 402 | public class LinkedTransferQueueTest ext
402                         i != (int) q.peek());
403          }
404          assertNull(q.peek());
405 +        checkEmpty(q);
406      }
407  
408      /**
409       * element returns next element, or throws NoSuchElementException if empty
410       */
411 <    public void testElement() {
411 >    public void testElement() throws InterruptedException {
412          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
413          for (int i = 0; i < SIZE; ++i) {
414              assertEquals(i, (int) q.element());
# Line 377 | Line 419 | public class LinkedTransferQueueTest ext
419              shouldThrow();
420          } catch (NoSuchElementException success) {
421          }
422 +        checkEmpty(q);
423      }
424  
425      /**
426       * remove removes next element, or throws NoSuchElementException if empty
427       */
428 <    public void testRemove() {
428 >    public void testRemove() throws InterruptedException {
429          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
430          for (int i = 0; i < SIZE; ++i) {
431              assertEquals(i, (int) q.remove());
# Line 392 | Line 435 | public class LinkedTransferQueueTest ext
435              shouldThrow();
436          } catch (NoSuchElementException success) {
437          }
438 +        checkEmpty(q);
439      }
440  
441      /**
442       * remove(x) removes x and returns true if present
443       */
444 <    public void testRemoveElement() {
444 >    public void testRemoveElement() throws InterruptedException {
445          LinkedTransferQueue q = populatedQueue(SIZE);
446          for (int i = 1; i < SIZE; i += 2) {
447              assertTrue(q.remove(i));
# Line 406 | Line 450 | public class LinkedTransferQueueTest ext
450              assertTrue(q.remove(i));
451              assertFalse(q.remove(i + 1));
452          }
453 <        assertTrue(q.isEmpty());
453 >        checkEmpty(q);
454      }
455  
456      /**
# Line 419 | Line 463 | public class LinkedTransferQueueTest ext
463          assertTrue(q.remove(one));
464          assertTrue(q.remove(two));
465          assertTrue(q.add(three));
466 <        assertTrue(q.take() != null);
466 >        assertTrue(q.take() == three);
467      }
468  
469      /**
# Line 437 | Line 481 | public class LinkedTransferQueueTest ext
481      /**
482       * clear removes all elements
483       */
484 <    public void testClear() {
484 >    public void testClear() throws InterruptedException {
485          LinkedTransferQueue q = populatedQueue(SIZE);
486          q.clear();
487 <        assertTrue(q.isEmpty());
444 <        assertEquals(0, q.size());
487 >        checkEmpty(q);
488          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
489          q.add(one);
490          assertFalse(q.isEmpty());
491 +        assertEquals(1, q.size());
492          assertTrue(q.contains(one));
493          q.clear();
494 <        assertTrue(q.isEmpty());
494 >        checkEmpty(q);
495      }
496  
497      /**
# Line 501 | Line 545 | public class LinkedTransferQueueTest ext
545      }
546  
547      /**
548 <     * toArray contains all elements
548 >     * toArray() contains all elements
549       */
550      public void testToArray() throws InterruptedException {
551          LinkedTransferQueue q = populatedQueue(SIZE);
# Line 536 | Line 580 | public class LinkedTransferQueueTest ext
580      }
581  
582      /**
583 <     * toArray with incompatible array type throws CCE
583 >     * toArray(incompatible array type) throws CCE
584       */
585      public void testToArray1_BadArg() {
586          try {
# Line 553 | Line 597 | public class LinkedTransferQueueTest ext
597      public void testIterator() throws InterruptedException {
598          LinkedTransferQueue q = populatedQueue(SIZE);
599          Iterator it = q.iterator();
600 +        int i = 0;
601          while (it.hasNext()) {
602 <            assertEquals(it.next(), q.take());
602 >            assertEquals(it.next(), i++);
603          }
604 +        assertEquals(i, SIZE);
605      }
606  
607      /**
608 <     * iterator.remove removes current element
608 >     * iterator.remove() removes current element
609       */
610      public void testIteratorRemove() {
611          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 646 | Line 692 | public class LinkedTransferQueueTest ext
692      }
693  
694      /**
695 <     * poll retrieves elements across Executor threads
695 >     * timed poll retrieves elements across Executor threads
696       */
697      public void testPollInExecutor() {
698          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 744 | Line 790 | public class LinkedTransferQueueTest ext
790      }
791  
792      /**
793 <     * drainTo empties full queue, unblocking a waiting put.
793 >     * drainTo(c) empties full queue, unblocking a waiting put.
794       */
795      public void testDrainToWithActivePut() throws InterruptedException {
796          final LinkedTransferQueue q = populatedQueue(SIZE);
797 <        Thread t = new Thread(new CheckedRunnable() {
797 >        Thread t = newStartedThread(new CheckedRunnable() {
798              void realRun() {
799                  q.put(SIZE + 1);
800              }});
755        t.start();
801          ArrayList l = new ArrayList();
802          q.drainTo(l);
803          assertTrue(l.size() >= SIZE);
# Line 769 | Line 814 | public class LinkedTransferQueueTest ext
814      public void testDrainToNullN() {
815          LinkedTransferQueue q = populatedQueue(SIZE);
816          try {
817 <            q.drainTo(null, 0);
817 >            q.drainTo(null, SIZE);
818              shouldThrow();
819          } catch (NullPointerException success) {
820          }
# Line 781 | Line 826 | public class LinkedTransferQueueTest ext
826      public void testDrainToSelfN() {
827          LinkedTransferQueue q = populatedQueue(SIZE);
828          try {
829 <            q.drainTo(q, 0);
829 >            q.drainTo(q, SIZE);
830              shouldThrow();
831          } catch (IllegalArgumentException success) {
832          }
# Line 810 | Line 855 | public class LinkedTransferQueueTest ext
855      }
856  
857      /**
858 <     * poll and take decrement the waiting consumer count
858 >     * timed poll() or take() increments the waiting consumer count;
859 >     * offer(e) decrements the waiting consumer count
860       */
861      public void testWaitingConsumer() throws InterruptedException {
862          final LinkedTransferQueue q = new LinkedTransferQueue();
863 <        final ConsumerObserver waiting = new ConsumerObserver();
864 <        new Thread(new CheckedRunnable() {
865 <            void realRun() {
863 >        assertEquals(q.getWaitingConsumerCount(), 0);
864 >        assertFalse(q.hasWaitingConsumer());
865 >
866 >        Thread t = newStartedThread(new CheckedRunnable() {
867 >            void realRun() throws InterruptedException {
868 >                Thread.sleep(SMALL_DELAY_MS);
869                  threadAssertTrue(q.hasWaitingConsumer());
870 <                waiting.setWaitingConsumer(q.getWaitingConsumerCount());
870 >                threadAssertEquals(q.getWaitingConsumerCount(), 1);
871                  threadAssertTrue(q.offer(new Object()));
872 <            }}).start();
872 >                threadAssertFalse(q.hasWaitingConsumer());
873 >                threadAssertEquals(q.getWaitingConsumerCount(), 0);
874 >            }});
875 >
876          assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
877 <        assertTrue(q.getWaitingConsumerCount()
878 <                   < waiting.getWaitingConsumers());
877 >        assertEquals(q.getWaitingConsumerCount(), 0);
878 >        assertFalse(q.hasWaitingConsumer());
879 >        t.join();
880      }
881  
882      /**
# Line 846 | Line 899 | public class LinkedTransferQueueTest ext
899          final LinkedTransferQueue<Integer> q
900              = new LinkedTransferQueue<Integer>();
901  
902 <        new Thread(new CheckedRunnable() {
902 >        Thread t = newStartedThread(new CheckedRunnable() {
903              void realRun() throws InterruptedException {
904                  q.transfer(SIZE);
905                  threadAssertTrue(q.isEmpty());
906 <            }}).start();
906 >            }});
907  
908          Thread.sleep(SHORT_DELAY_MS);
909          assertEquals(1, q.size());
910          assertEquals(SIZE, (int) q.poll());
911          assertTrue(q.isEmpty());
912 +        t.join();
913      }
914  
915      /**
# Line 865 | Line 919 | public class LinkedTransferQueueTest ext
919          final LinkedTransferQueue<Integer> q
920              = new LinkedTransferQueue<Integer>();
921  
922 <        Thread first = new Thread(new CheckedRunnable() {
922 >        Thread first = newStartedThread(new CheckedRunnable() {
923              void realRun() throws InterruptedException {
924                  Integer i = SIZE + 1;
925                  q.transfer(i);
926                  threadAssertTrue(!q.contains(i));
927                  threadAssertEquals(1, q.size());
928              }});
875        first.start();
929  
930 <        Thread interruptedThread = new Thread(new CheckedInterruptedRunnable() {
931 <            void realRun() throws InterruptedException {
932 <                while (q.size() == 0)
933 <                    Thread.yield();
934 <                q.transfer(SIZE);
935 <            }});
936 <        interruptedThread.start();
930 >        Thread interruptedThread = newStartedThread(
931 >            new CheckedInterruptedRunnable() {
932 >                void realRun() throws InterruptedException {
933 >                    while (q.size() == 0)
934 >                        Thread.yield();
935 >                    q.transfer(SIZE);
936 >                }});
937  
938          while (q.size() < 2)
939              Thread.yield();
# Line 900 | Line 953 | public class LinkedTransferQueueTest ext
953       */
954      public void testTransfer4() throws InterruptedException {
955          final LinkedTransferQueue q = new LinkedTransferQueue();
956 <        new Thread(new CheckedRunnable() {
956 >
957 >        Thread t = newStartedThread(new CheckedRunnable() {
958              void realRun() throws InterruptedException {
959                  q.transfer(four);
960                  threadAssertFalse(q.contains(four));
961                  threadAssertEquals(three, q.poll());
962 <            }}).start();
963 <        Thread.sleep(MEDIUM_DELAY_MS);
962 >            }});
963 >
964 >        Thread.sleep(SHORT_DELAY_MS);
965          assertTrue(q.offer(three));
966          assertEquals(four, q.poll());
967 +        t.join();
968      }
969  
970      /**
# Line 919 | Line 975 | public class LinkedTransferQueueTest ext
975          final LinkedTransferQueue<Integer> q
976              = new LinkedTransferQueue<Integer>();
977  
978 <        new Thread(new CheckedRunnable() {
978 >        Thread t = newStartedThread(new CheckedRunnable() {
979              void realRun() throws InterruptedException {
980                  q.transfer(SIZE);
981 <                threadAssertTrue(q.isEmpty());
982 <            }}).start();
981 >                checkEmpty(q);
982 >            }});
983  
984          Thread.sleep(SHORT_DELAY_MS);
985          assertEquals(SIZE, (int) q.take());
986 <        assertTrue(q.isEmpty());
986 >        checkEmpty(q);
987 >        t.join();
988      }
989  
990      /**
# Line 937 | Line 994 | public class LinkedTransferQueueTest ext
994          try {
995              final LinkedTransferQueue q = new LinkedTransferQueue();
996              q.tryTransfer(null);
997 <            this.shouldThrow();
997 >            shouldThrow();
998          } catch (NullPointerException ex) {
999          }
1000      }
# Line 946 | Line 1003 | public class LinkedTransferQueueTest ext
1003       * tryTransfer returns false and does not enqueue if there are no
1004       * consumers waiting to poll or take.
1005       */
1006 <    public void testTryTransfer2() {
1006 >    public void testTryTransfer2() throws InterruptedException {
1007          final LinkedTransferQueue q = new LinkedTransferQueue();
1008          assertFalse(q.tryTransfer(new Object()));
1009          assertFalse(q.hasWaitingConsumer());
1010 <        assertTrue(q.isEmpty());
954 <        assertEquals(0, q.size());
1010 >        checkEmpty(q);
1011      }
1012  
1013      /**
# Line 961 | Line 1017 | public class LinkedTransferQueueTest ext
1017      public void testTryTransfer3() throws InterruptedException {
1018          final Object hotPotato = new Object();
1019          final LinkedTransferQueue q = new LinkedTransferQueue();
1020 <        new Thread(new CheckedRunnable() {
1020 >
1021 >        Thread t = newStartedThread(new CheckedRunnable() {
1022              void realRun() {
1023                  while (! q.hasWaitingConsumer())
1024                      Thread.yield();
# Line 969 | Line 1026 | public class LinkedTransferQueueTest ext
1026                  threadAssertTrue(q.isEmpty());
1027                  threadAssertTrue(q.size() == 0);
1028                  threadAssertTrue(q.tryTransfer(hotPotato));
1029 <            }}).start();
1030 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) == hotPotato);
1031 <        assertTrue(q.isEmpty());
1029 >            }});
1030 >
1031 >        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
1032 >        checkEmpty(q);
1033 >        t.join();
1034      }
1035  
1036      /**
# Line 981 | Line 1040 | public class LinkedTransferQueueTest ext
1040      public void testTryTransfer4() throws InterruptedException {
1041          final Object hotPotato = new Object();
1042          final LinkedTransferQueue q = new LinkedTransferQueue();
1043 <        new Thread(new CheckedRunnable() {
1043 >
1044 >        Thread t = newStartedThread(new CheckedRunnable() {
1045              void realRun() {
1046                  while (! q.hasWaitingConsumer())
1047                      Thread.yield();
# Line 989 | Line 1049 | public class LinkedTransferQueueTest ext
1049                  threadAssertTrue(q.isEmpty());
1050                  threadAssertTrue(q.size() == 0);
1051                  threadAssertTrue(q.tryTransfer(hotPotato));
1052 <            }}).start();
1052 >            }});
1053 >
1054          assertTrue(q.take() == hotPotato);
1055 <        assertTrue(q.isEmpty());
1055 >        checkEmpty(q);
1056 >        t.join();
1057      }
1058  
1059      /**
# Line 1000 | Line 1062 | public class LinkedTransferQueueTest ext
1062       */
1063      public void testTryTransfer5() throws InterruptedException {
1064          final LinkedTransferQueue q = new LinkedTransferQueue();
1065 <        Thread toInterrupt = new Thread(new CheckedInterruptedRunnable() {
1065 >
1066 >        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
1067              void realRun() throws InterruptedException {
1068                  q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
1069              }});
1070 <        toInterrupt.start();
1070 >
1071          Thread.sleep(SMALL_DELAY_MS);
1072          toInterrupt.interrupt();
1073 +        toInterrupt.join();
1074      }
1075  
1076      /**
# Line 1014 | Line 1078 | public class LinkedTransferQueueTest ext
1078       */
1079      public void testTryTransfer6() throws InterruptedException {
1080          final LinkedTransferQueue q = new LinkedTransferQueue();
1081 <        new Thread(new CheckedRunnable() {
1081 >
1082 >        Thread t = newStartedThread(new CheckedRunnable() {
1083              void realRun() throws InterruptedException {
1084                  threadAssertFalse
1085                      (q.tryTransfer(new Object(),
1086                                     SHORT_DELAY_MS, MILLISECONDS));
1087 <            }}).start();
1088 <        Thread.sleep(LONG_DELAY_MS);
1089 <        assertTrue(q.isEmpty());
1087 >            }});
1088 >
1089 >        Thread.sleep(SMALL_DELAY_MS);
1090 >        checkEmpty(q);
1091 >        t.join();
1092      }
1093  
1094      /**
# Line 1031 | Line 1098 | public class LinkedTransferQueueTest ext
1098      public void testTryTransfer7() throws InterruptedException {
1099          final LinkedTransferQueue q = new LinkedTransferQueue();
1100          assertTrue(q.offer(four));
1101 <        new Thread(new CheckedRunnable() {
1101 >
1102 >        Thread t = newStartedThread(new CheckedRunnable() {
1103              void realRun() throws InterruptedException {
1104                  threadAssertTrue(q.tryTransfer(five,
1105 <                                               LONG_DELAY_MS, MILLISECONDS));
1105 >                                               MEDIUM_DELAY_MS, MILLISECONDS));
1106                  threadAssertTrue(q.isEmpty());
1107 <            }}).start();
1107 >            }});
1108 >
1109          Thread.sleep(SHORT_DELAY_MS);
1110          assertEquals(2, q.size());
1111          assertEquals(four, q.poll());
1112          assertEquals(five, q.poll());
1113 <        assertTrue(q.isEmpty());
1113 >        checkEmpty(q);
1114 >        t.join();
1115      }
1116  
1117      /**
# Line 1055 | Line 1125 | public class LinkedTransferQueueTest ext
1125          assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1126          assertEquals(1, q.size());
1127          assertEquals(four, q.poll());
1058        threadAssertTrue(q.isEmpty());
1128          assertNull(q.poll());
1129 +        checkEmpty(q);
1130      }
1131  
1132      private LinkedTransferQueue<Integer> populatedQueue(int n) {
# Line 1070 | Line 1140 | public class LinkedTransferQueueTest ext
1140          assertFalse(q.isEmpty());
1141          return q;
1142      }
1073
1074    private static class ConsumerObserver {
1075
1076        private int waitingConsumers;
1077
1078        private ConsumerObserver() {
1079        }
1080
1081        private void setWaitingConsumer(int i) {
1082            this.waitingConsumers = i;
1083        }
1084
1085        private int getWaitingConsumers() {
1086            return waitingConsumers;
1087        }
1088    }
1143   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines