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.12 by jsr166, Sat Aug 15 00:35:01 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 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 748 | Line 794 | public class LinkedTransferQueueTest ext
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 815 | Line 860 | public class LinkedTransferQueueTest ext
860      public void testWaitingConsumer() throws InterruptedException {
861          final LinkedTransferQueue q = new LinkedTransferQueue();
862          final ConsumerObserver waiting = new ConsumerObserver();
863 <        new Thread(new CheckedRunnable() {
864 <            void realRun() {
863 >
864 >        Thread t = newStartedThread(new CheckedRunnable() {
865 >            void realRun() throws InterruptedException {
866 >                Thread.sleep(SMALL_DELAY_MS);
867                  threadAssertTrue(q.hasWaitingConsumer());
868                  waiting.setWaitingConsumer(q.getWaitingConsumerCount());
869                  threadAssertTrue(q.offer(new Object()));
870 <            }}).start();
870 >            }});
871 >
872          assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
873          assertTrue(q.getWaitingConsumerCount()
874                     < waiting.getWaitingConsumers());
875 +        t.join();
876      }
877  
878      /**
# Line 846 | Line 895 | public class LinkedTransferQueueTest ext
895          final LinkedTransferQueue<Integer> q
896              = new LinkedTransferQueue<Integer>();
897  
898 <        new Thread(new CheckedRunnable() {
898 >        Thread t = newStartedThread(new CheckedRunnable() {
899              void realRun() throws InterruptedException {
900                  q.transfer(SIZE);
901                  threadAssertTrue(q.isEmpty());
902 <            }}).start();
902 >            }});
903  
904          Thread.sleep(SHORT_DELAY_MS);
905          assertEquals(1, q.size());
906          assertEquals(SIZE, (int) q.poll());
907          assertTrue(q.isEmpty());
908 +        t.join();
909      }
910  
911      /**
# Line 865 | Line 915 | public class LinkedTransferQueueTest ext
915          final LinkedTransferQueue<Integer> q
916              = new LinkedTransferQueue<Integer>();
917  
918 <        Thread first = new Thread(new CheckedRunnable() {
918 >        Thread first = newStartedThread(new CheckedRunnable() {
919              void realRun() throws InterruptedException {
920                  Integer i = SIZE + 1;
921                  q.transfer(i);
922                  threadAssertTrue(!q.contains(i));
923                  threadAssertEquals(1, q.size());
924              }});
875        first.start();
925  
926 <        Thread interruptedThread = new Thread(new CheckedInterruptedRunnable() {
927 <            void realRun() throws InterruptedException {
928 <                while (q.size() == 0)
929 <                    Thread.yield();
930 <                q.transfer(SIZE);
931 <            }});
932 <        interruptedThread.start();
926 >        Thread interruptedThread = newStartedThread(
927 >            new CheckedInterruptedRunnable() {
928 >                void realRun() throws InterruptedException {
929 >                    while (q.size() == 0)
930 >                        Thread.yield();
931 >                    q.transfer(SIZE);
932 >                }});
933  
934          while (q.size() < 2)
935              Thread.yield();
# Line 900 | Line 949 | public class LinkedTransferQueueTest ext
949       */
950      public void testTransfer4() throws InterruptedException {
951          final LinkedTransferQueue q = new LinkedTransferQueue();
952 <        new Thread(new CheckedRunnable() {
952 >
953 >        Thread t = newStartedThread(new CheckedRunnable() {
954              void realRun() throws InterruptedException {
955                  q.transfer(four);
956                  threadAssertFalse(q.contains(four));
957                  threadAssertEquals(three, q.poll());
958 <            }}).start();
959 <        Thread.sleep(MEDIUM_DELAY_MS);
958 >            }});
959 >
960 >        Thread.sleep(SHORT_DELAY_MS);
961          assertTrue(q.offer(three));
962          assertEquals(four, q.poll());
963 +        t.join();
964      }
965  
966      /**
# Line 919 | Line 971 | public class LinkedTransferQueueTest ext
971          final LinkedTransferQueue<Integer> q
972              = new LinkedTransferQueue<Integer>();
973  
974 <        new Thread(new CheckedRunnable() {
974 >        Thread t = newStartedThread(new CheckedRunnable() {
975              void realRun() throws InterruptedException {
976                  q.transfer(SIZE);
977 <                threadAssertTrue(q.isEmpty());
978 <            }}).start();
977 >                checkEmpty(q);
978 >            }});
979  
980          Thread.sleep(SHORT_DELAY_MS);
981          assertEquals(SIZE, (int) q.take());
982 <        assertTrue(q.isEmpty());
982 >        checkEmpty(q);
983 >        t.join();
984      }
985  
986      /**
# Line 937 | Line 990 | public class LinkedTransferQueueTest ext
990          try {
991              final LinkedTransferQueue q = new LinkedTransferQueue();
992              q.tryTransfer(null);
993 <            this.shouldThrow();
993 >            shouldThrow();
994          } catch (NullPointerException ex) {
995          }
996      }
# Line 946 | Line 999 | public class LinkedTransferQueueTest ext
999       * tryTransfer returns false and does not enqueue if there are no
1000       * consumers waiting to poll or take.
1001       */
1002 <    public void testTryTransfer2() {
1002 >    public void testTryTransfer2() throws InterruptedException {
1003          final LinkedTransferQueue q = new LinkedTransferQueue();
1004          assertFalse(q.tryTransfer(new Object()));
1005          assertFalse(q.hasWaitingConsumer());
1006 <        assertTrue(q.isEmpty());
954 <        assertEquals(0, q.size());
1006 >        checkEmpty(q);
1007      }
1008  
1009      /**
# Line 961 | Line 1013 | public class LinkedTransferQueueTest ext
1013      public void testTryTransfer3() throws InterruptedException {
1014          final Object hotPotato = new Object();
1015          final LinkedTransferQueue q = new LinkedTransferQueue();
1016 <        new Thread(new CheckedRunnable() {
1016 >
1017 >        Thread t = newStartedThread(new CheckedRunnable() {
1018              void realRun() {
1019                  while (! q.hasWaitingConsumer())
1020                      Thread.yield();
# Line 969 | Line 1022 | public class LinkedTransferQueueTest ext
1022                  threadAssertTrue(q.isEmpty());
1023                  threadAssertTrue(q.size() == 0);
1024                  threadAssertTrue(q.tryTransfer(hotPotato));
1025 <            }}).start();
1026 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) == hotPotato);
1027 <        assertTrue(q.isEmpty());
1025 >            }});
1026 >
1027 >        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
1028 >        checkEmpty(q);
1029 >        t.join();
1030      }
1031  
1032      /**
# Line 981 | Line 1036 | public class LinkedTransferQueueTest ext
1036      public void testTryTransfer4() throws InterruptedException {
1037          final Object hotPotato = new Object();
1038          final LinkedTransferQueue q = new LinkedTransferQueue();
1039 <        new Thread(new CheckedRunnable() {
1039 >
1040 >        Thread t = newStartedThread(new CheckedRunnable() {
1041              void realRun() {
1042                  while (! q.hasWaitingConsumer())
1043                      Thread.yield();
# Line 989 | Line 1045 | public class LinkedTransferQueueTest ext
1045                  threadAssertTrue(q.isEmpty());
1046                  threadAssertTrue(q.size() == 0);
1047                  threadAssertTrue(q.tryTransfer(hotPotato));
1048 <            }}).start();
1048 >            }});
1049 >
1050          assertTrue(q.take() == hotPotato);
1051 <        assertTrue(q.isEmpty());
1051 >        checkEmpty(q);
1052 >        t.join();
1053      }
1054  
1055      /**
# Line 1000 | Line 1058 | public class LinkedTransferQueueTest ext
1058       */
1059      public void testTryTransfer5() throws InterruptedException {
1060          final LinkedTransferQueue q = new LinkedTransferQueue();
1061 <        Thread toInterrupt = new Thread(new CheckedInterruptedRunnable() {
1061 >
1062 >        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
1063              void realRun() throws InterruptedException {
1064                  q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
1065              }});
1066 <        toInterrupt.start();
1066 >
1067          Thread.sleep(SMALL_DELAY_MS);
1068          toInterrupt.interrupt();
1069 +        toInterrupt.join();
1070      }
1071  
1072      /**
# Line 1014 | Line 1074 | public class LinkedTransferQueueTest ext
1074       */
1075      public void testTryTransfer6() throws InterruptedException {
1076          final LinkedTransferQueue q = new LinkedTransferQueue();
1077 <        new Thread(new CheckedRunnable() {
1077 >
1078 >        Thread t = newStartedThread(new CheckedRunnable() {
1079              void realRun() throws InterruptedException {
1080                  threadAssertFalse
1081                      (q.tryTransfer(new Object(),
1082                                     SHORT_DELAY_MS, MILLISECONDS));
1083 <            }}).start();
1084 <        Thread.sleep(LONG_DELAY_MS);
1085 <        assertTrue(q.isEmpty());
1083 >            }});
1084 >
1085 >        Thread.sleep(SMALL_DELAY_MS);
1086 >        checkEmpty(q);
1087 >        t.join();
1088      }
1089  
1090      /**
# Line 1031 | Line 1094 | public class LinkedTransferQueueTest ext
1094      public void testTryTransfer7() throws InterruptedException {
1095          final LinkedTransferQueue q = new LinkedTransferQueue();
1096          assertTrue(q.offer(four));
1097 <        new Thread(new CheckedRunnable() {
1097 >
1098 >        Thread t = newStartedThread(new CheckedRunnable() {
1099              void realRun() throws InterruptedException {
1100                  threadAssertTrue(q.tryTransfer(five,
1101 <                                               LONG_DELAY_MS, MILLISECONDS));
1101 >                                               MEDIUM_DELAY_MS, MILLISECONDS));
1102                  threadAssertTrue(q.isEmpty());
1103 <            }}).start();
1103 >            }});
1104 >
1105          Thread.sleep(SHORT_DELAY_MS);
1106          assertEquals(2, q.size());
1107          assertEquals(four, q.poll());
1108          assertEquals(five, q.poll());
1109 <        assertTrue(q.isEmpty());
1109 >        checkEmpty(q);
1110 >        t.join();
1111      }
1112  
1113      /**
# Line 1055 | Line 1121 | public class LinkedTransferQueueTest ext
1121          assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1122          assertEquals(1, q.size());
1123          assertEquals(four, q.poll());
1124 <        threadAssertTrue(q.isEmpty());
1124 >        checkEmpty(q);
1125          assertNull(q.poll());
1126      }
1127  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines