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.9 by jsr166, Wed Aug 5 00:43:23 2009 UTC vs.
Revision 1.49 by jsr166, Fri Jul 15 18:49:31 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.ConcurrentModificationException;
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 junit.framework.Test;
22 < import junit.framework.TestSuite;
22 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
23  
24 + @SuppressWarnings({"unchecked", "rawtypes"})
25   public class LinkedTransferQueueTest extends JSR166TestCase {
26  
27 +    public static class Generic extends BlockingQueueTest {
28 +        protected BlockingQueue emptyCollection() {
29 +            return new LinkedTransferQueue();
30 +        }
31 +    }
32 +
33      public static void main(String[] args) {
34          junit.textui.TestRunner.run(suite());
35      }
36  
37      public static Test suite() {
38 <        return new TestSuite(LinkedTransferQueueTest.class);
38 >        return newTestSuite(LinkedTransferQueueTest.class,
39 >                            new Generic().testSuite());
40      }
41  
42      /**
# Line 48 | Line 56 | public class LinkedTransferQueueTest ext
56          try {
57              new LinkedTransferQueue(null);
58              shouldThrow();
59 <        } catch (NullPointerException success) {
52 <        }
59 >        } catch (NullPointerException success) {}
60      }
61  
62      /**
# Line 57 | 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];
62 <            new LinkedTransferQueue(Arrays.asList(ints));
69 >            new LinkedTransferQueue(elements);
70              shouldThrow();
71 <        } catch (NullPointerException success) {
65 <        }
71 >        } catch (NullPointerException success) {}
72      }
73  
74      /**
# Line 70 | 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];
75 <            for (int i = 0; i < SIZE - 1; ++i) {
76 <                ints[i] = i;
77 <            }
78 <            new LinkedTransferQueue(Arrays.asList(ints));
84 >            new LinkedTransferQueue(elements);
85              shouldThrow();
86 <        } catch (NullPointerException success) {
81 <        }
86 >        } catch (NullPointerException success) {}
87      }
88  
89      /**
90       * Queue contains all elements of the collection it is initialized by
91       */
92      public void testConstructor5() {
93 <        try {
94 <            Integer[] ints = new Integer[SIZE];
95 <            for (int i = 0; i < SIZE; ++i) {
96 <                ints[i] = i;
97 <            }
98 <            LinkedTransferQueue q
99 <                = new LinkedTransferQueue(Arrays.asList(ints));
100 <            for (int i = 0; i < SIZE; ++i) {
101 <                assertEquals(ints[i], q.poll());
102 <            }
103 <        } finally {
93 >        Integer[] ints = new Integer[SIZE];
94 >        for (int i = 0; i < SIZE; ++i) {
95 >            ints[i] = i;
96 >        }
97 >        List intList = Arrays.asList(ints);
98 >        LinkedTransferQueue q
99 >            = new LinkedTransferQueue(intList);
100 >        assertEquals(q.size(), intList.size());
101 >        assertEquals(q.toString(), intList.toString());
102 >        assertTrue(Arrays.equals(q.toArray(),
103 >                                     intList.toArray()));
104 >        assertTrue(Arrays.equals(q.toArray(new Object[0]),
105 >                                 intList.toArray(new Object[0])));
106 >        assertTrue(Arrays.equals(q.toArray(new Object[SIZE]),
107 >                                 intList.toArray(new Object[SIZE])));
108 >        for (int i = 0; i < SIZE; ++i) {
109 >            assertEquals(ints[i], q.poll());
110          }
111      }
112  
113      /**
114 <     * Remaining capacity never decrease nor increase on add or remove
114 >     * remainingCapacity() always returns Integer.MAX_VALUE
115       */
116      public void testRemainingCapacity() {
117          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 117 | Line 128 | public class LinkedTransferQueueTest ext
128      }
129  
130      /**
120     * offer(null) throws NullPointerException
121     */
122    public void testOfferNull() {
123        try {
124            LinkedTransferQueue q = new LinkedTransferQueue();
125            q.offer(null);
126            shouldThrow();
127        } catch (NullPointerException success) {
128        }
129    }
130
131    /**
132     * add(null) throws NullPointerException
133     */
134    public void testAddNull() {
135        try {
136            LinkedTransferQueue q = new LinkedTransferQueue();
137            q.add(null);
138            shouldThrow();
139        } catch (NullPointerException success) {
140        }
141    }
142
143    /**
144     * addAll(null) throws NullPointerException
145     */
146    public void testAddAll1() {
147        try {
148            LinkedTransferQueue q = new LinkedTransferQueue();
149            q.addAll(null);
150            shouldThrow();
151        } catch (NullPointerException success) {
152        }
153    }
154
155    /**
131       * addAll(this) throws IllegalArgumentException
132       */
133      public void testAddAllSelf() {
# Line 160 | Line 135 | public class LinkedTransferQueueTest ext
135              LinkedTransferQueue q = populatedQueue(SIZE);
136              q.addAll(q);
137              shouldThrow();
138 <        } catch (IllegalArgumentException success) {
164 <        }
165 <    }
166 <
167 <    /**
168 <     * addAll of a collection with null elements throws NullPointerException
169 <     */
170 <    public void testAddAll2() {
171 <        try {
172 <            LinkedTransferQueue q = new LinkedTransferQueue();
173 <            Integer[] ints = new Integer[SIZE];
174 <            q.addAll(Arrays.asList(ints));
175 <            shouldThrow();
176 <        } catch (NullPointerException success) {
177 <        }
138 >        } catch (IllegalArgumentException success) {}
139      }
140  
141      /**
# Line 190 | Line 151 | public class LinkedTransferQueueTest ext
151              }
152              q.addAll(Arrays.asList(ints));
153              shouldThrow();
154 <        } catch (NullPointerException success) {
194 <        }
154 >        } catch (NullPointerException success) {}
155      }
156  
157      /**
# Line 212 | Line 172 | public class LinkedTransferQueueTest ext
172      }
173  
174      /**
215     * put(null) throws NullPointerException
216     */
217    public void testPutNull() throws InterruptedException {
218        try {
219            LinkedTransferQueue q = new LinkedTransferQueue();
220            q.put(null);
221            shouldThrow();
222        } catch (NullPointerException success) {}
223    }
224
225    /**
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);
181              q.put(i);
182              assertTrue(q.contains(i));
183          }
234        assertEquals(q.size(), SIZE);
184      }
185  
186      /**
# Line 245 | Line 194 | public class LinkedTransferQueueTest ext
194      }
195  
196      /**
197 <     * take blocks interruptibly when empty
249 <     */
250 <    public void testTakeFromEmpty() throws InterruptedException {
251 <        final LinkedTransferQueue q = new LinkedTransferQueue();
252 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
253 <            void realRun() throws InterruptedException {
254 <                q.take();
255 <            }});
256 <        Thread.sleep(SHORT_DELAY_MS);
257 <        t.interrupt();
258 <        t.join();
259 <    }
260 <
261 <    /**
262 <     * Take removes existing elements until empty, then blocks interruptibly
197 >     * take removes existing elements until empty, then blocks interruptibly
198       */
199      public void testBlockingTake() throws InterruptedException {
200 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
201 <            void realRun() throws InterruptedException {
202 <                LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
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 <                    threadAssertEquals(i, (int) q.take());
205 >                    assertEquals(i, q.take());
206                  }
207 <                q.take();
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 <        Thread.sleep(SHORT_DELAY_MS);
222 >
223 >        await(pleaseInterrupt);
224 >        assertThreadStaysAlive(t);
225          t.interrupt();
226 <        t.join();
226 >        awaitTermination(t);
227      }
228  
229      /**
230       * poll succeeds unless empty
231       */
232 <    public void testPoll() {
232 >    public void testPoll() throws InterruptedException {
233          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
234          for (int i = 0; i < SIZE; ++i) {
235              assertEquals(i, (int) q.poll());
236          }
237          assertNull(q.poll());
238 +        checkEmpty(q);
239      }
240  
241      /**
242 <     * timed pool with zero timeout succeeds when non-empty, else times out
242 >     * timed poll with zero timeout succeeds when non-empty, else times out
243       */
244      public void testTimedPoll0() throws InterruptedException {
245          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 295 | Line 247 | public class LinkedTransferQueueTest ext
247              assertEquals(i, (int) q.poll(0, MILLISECONDS));
248          }
249          assertNull(q.poll(0, MILLISECONDS));
250 +        checkEmpty(q);
251      }
252  
253      /**
254 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
254 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
255       */
256      public void testTimedPoll() throws InterruptedException {
257          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
258          for (int i = 0; i < SIZE; ++i) {
259 <            assertEquals(i, (int) q.poll(SHORT_DELAY_MS, MILLISECONDS));
260 <        }
261 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
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  
269      /**
# Line 313 | Line 271 | public class LinkedTransferQueueTest ext
271       * returning timeout status
272       */
273      public void testInterruptedTimedPoll() throws InterruptedException {
274 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
275 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
276 <            void realRun() throws InterruptedException {
274 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
275 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
276 >        Thread t = newStartedThread(new CheckedRunnable() {
277 >            public void realRun() throws InterruptedException {
278                  for (int i = 0; i < SIZE; ++i) {
279 <                    threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
280 <                                                       MILLISECONDS));
279 >                    long t0 = System.nanoTime();
280 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
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) {
289 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
290                  }
323                q.poll(LONG_DELAY_MS, MILLISECONDS);
291              }});
292 <        Thread.sleep(SMALL_DELAY_MS);
292 >
293 >        aboutToWait.await();
294 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
295          t.interrupt();
296 <        t.join();
297 <        assertEquals(q.size(), 0);
329 <        assertNull(q.poll());
296 >        awaitTermination(t, MEDIUM_DELAY_MS);
297 >        checkEmpty(q);
298      }
299  
300      /**
301 <     * timed poll before a delayed offer fails; after offer succeeds;
302 <     * on interruption throws
301 >     * timed poll after thread interrupted throws InterruptedException
302 >     * instead of returning timeout status
303       */
304 <    public void testTimedPollWithOffer() throws InterruptedException {
305 <        final LinkedTransferQueue q = new LinkedTransferQueue();
306 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
307 <            void realRun() throws InterruptedException {
308 <                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
309 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
310 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
304 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
305 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
306 >        Thread t = newStartedThread(new CheckedRunnable() {
307 >            public void realRun() throws InterruptedException {
308 >                Thread.currentThread().interrupt();
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) < SMALL_DELAY_MS);
313 >                }
314 >                try {
315 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
316 >                    shouldThrow();
317 >                } catch (InterruptedException success) {}
318              }});
319 <        Thread.sleep(SMALL_DELAY_MS);
320 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
321 <        t.interrupt();
347 <        t.join();
319 >
320 >        awaitTermination(t, MEDIUM_DELAY_MS);
321 >        checkEmpty(q);
322      }
323  
324      /**
325       * peek returns next element, or null if empty
326       */
327 <    public void testPeek() {
327 >    public void testPeek() throws InterruptedException {
328          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
329          for (int i = 0; i < SIZE; ++i) {
330              assertEquals(i, (int) q.peek());
# Line 359 | Line 333 | public class LinkedTransferQueueTest ext
333                         i != (int) q.peek());
334          }
335          assertNull(q.peek());
336 +        checkEmpty(q);
337      }
338  
339      /**
340       * element returns next element, or throws NoSuchElementException if empty
341       */
342 <    public void testElement() {
342 >    public void testElement() throws InterruptedException {
343          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
344          for (int i = 0; i < SIZE; ++i) {
345              assertEquals(i, (int) q.element());
# Line 373 | Line 348 | public class LinkedTransferQueueTest ext
348          try {
349              q.element();
350              shouldThrow();
351 <        } catch (NoSuchElementException success) {
352 <        }
351 >        } catch (NoSuchElementException success) {}
352 >        checkEmpty(q);
353      }
354  
355      /**
356       * remove removes next element, or throws NoSuchElementException if empty
357       */
358 <    public void testRemove() {
358 >    public void testRemove() throws InterruptedException {
359          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
360          for (int i = 0; i < SIZE; ++i) {
361              assertEquals(i, (int) q.remove());
# Line 388 | Line 363 | public class LinkedTransferQueueTest ext
363          try {
364              q.remove();
365              shouldThrow();
366 <        } catch (NoSuchElementException success) {
367 <        }
393 <    }
394 <
395 <    /**
396 <     * remove(x) removes x and returns true if present
397 <     */
398 <    public void testRemoveElement() {
399 <        LinkedTransferQueue q = populatedQueue(SIZE);
400 <        for (int i = 1; i < SIZE; i += 2) {
401 <            assertTrue(q.remove(i));
402 <        }
403 <        for (int i = 0; i < SIZE; i += 2) {
404 <            assertTrue(q.remove(i));
405 <            assertFalse(q.remove(i + 1));
406 <        }
407 <        assertTrue(q.isEmpty());
366 >        } catch (NoSuchElementException success) {}
367 >        checkEmpty(q);
368      }
369  
370      /**
# Line 417 | Line 377 | public class LinkedTransferQueueTest ext
377          assertTrue(q.remove(one));
378          assertTrue(q.remove(two));
379          assertTrue(q.add(three));
380 <        assertTrue(q.take() != null);
380 >        assertSame(q.take(), three);
381      }
382  
383      /**
# Line 435 | Line 395 | public class LinkedTransferQueueTest ext
395      /**
396       * clear removes all elements
397       */
398 <    public void testClear() {
398 >    public void testClear() throws InterruptedException {
399          LinkedTransferQueue q = populatedQueue(SIZE);
400          q.clear();
401 <        assertTrue(q.isEmpty());
442 <        assertEquals(0, q.size());
401 >        checkEmpty(q);
402          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
403          q.add(one);
404          assertFalse(q.isEmpty());
405 +        assertEquals(1, q.size());
406          assertTrue(q.contains(one));
407          q.clear();
408 <        assertTrue(q.isEmpty());
408 >        checkEmpty(q);
409      }
410  
411      /**
# Line 499 | 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
526 <     */
527 <    public void testToArray_BadArg() {
528 <        try {
529 <            LinkedTransferQueue q = populatedQueue(SIZE);
530 <            Object o[] = q.toArray(null);
531 <            shouldThrow();
532 <        } catch (NullPointerException success) {
533 <        }
534 <    }
535 <
536 <    /**
537 <     * toArray with 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 <            LinkedTransferQueue q = populatedQueue(SIZE);
542 <            Object o[] = q.toArray(new String[10]);
491 >            q.toArray(new String[10]);
492              shouldThrow();
493 <        } catch (ArrayStoreException success) {
545 <        }
493 >        } catch (ArrayStoreException success) {}
494      }
495  
496      /**
# Line 551 | Line 499 | public class LinkedTransferQueueTest ext
499      public void testIterator() throws InterruptedException {
500          LinkedTransferQueue q = populatedQueue(SIZE);
501          Iterator it = q.iterator();
502 +        int i = 0;
503          while (it.hasNext()) {
504 <            assertEquals(it.next(), q.take());
504 >            assertEquals(it.next(), i++);
505          }
506 +        assertEquals(i, SIZE);
507      }
508  
509      /**
510 <     * iterator.remove removes current element
510 >     * iterator.remove() removes current element
511       */
512      public void testIteratorRemove() {
513          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 570 | Line 520 | public class LinkedTransferQueueTest ext
520          it.remove();
521  
522          it = q.iterator();
523 <        assertEquals(it.next(), one);
524 <        assertEquals(it.next(), three);
523 >        assertSame(it.next(), one);
524 >        assertSame(it.next(), three);
525          assertFalse(it.hasNext());
526      }
527  
# Line 615 | 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 624 | Line 574 | public class LinkedTransferQueueTest ext
574       */
575      public void testOfferInExecutor() {
576          final LinkedTransferQueue q = new LinkedTransferQueue();
577 <        q.add(one);
628 <        q.add(two);
577 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
578          ExecutorService executor = Executors.newFixedThreadPool(2);
579  
580          executor.execute(new CheckedRunnable() {
581 <            void realRun() {
582 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
583 <                                         MILLISECONDS));
581 >            public void realRun() throws InterruptedException {
582 >                threadsStarted.await();
583 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
584              }});
585  
586          executor.execute(new CheckedRunnable() {
587 <            void realRun() throws InterruptedException {
588 <                Thread.sleep(SMALL_DELAY_MS);
589 <                threadAssertEquals(one, q.take());
587 >            public void realRun() throws InterruptedException {
588 >                threadsStarted.await();
589 >                assertSame(one, q.take());
590 >                checkEmpty(q);
591              }});
592  
593          joinPool(executor);
594      }
595  
596      /**
597 <     * poll retrieves elements across Executor threads
597 >     * timed poll retrieves elements across Executor threads
598       */
599      public void testPollInExecutor() {
600          final LinkedTransferQueue q = new LinkedTransferQueue();
601 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
602          ExecutorService executor = Executors.newFixedThreadPool(2);
603  
604          executor.execute(new CheckedRunnable() {
605 <            void realRun() throws InterruptedException {
606 <                threadAssertNull(q.poll());
607 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
608 <                                                MILLISECONDS));
609 <                threadAssertTrue(q.isEmpty());
605 >            public void realRun() throws InterruptedException {
606 >                assertNull(q.poll());
607 >                threadsStarted.await();
608 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
609 >                checkEmpty(q);
610              }});
611  
612          executor.execute(new CheckedRunnable() {
613 <            void realRun() throws InterruptedException {
614 <                Thread.sleep(SMALL_DELAY_MS);
613 >            public void realRun() throws InterruptedException {
614 >                threadsStarted.await();
615                  q.put(one);
616              }});
617  
# Line 671 | 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);
625 >        Queue x = populatedQueue(SIZE);
626 >        Queue y = serialClone(x);
627  
628 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
629 <        ObjectOutputStream out
630 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
631 <        out.writeObject(q);
632 <        out.close();
633 <
634 <        ByteArrayInputStream bin
683 <            = new ByteArrayInputStream(bout.toByteArray());
684 <        ObjectInputStream in
685 <            = new ObjectInputStream(new BufferedInputStream(bin));
686 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
687 <
688 <        assertEquals(q.size(), r.size());
689 <        while (!q.isEmpty()) {
690 <            assertEquals(q.remove(), r.remove());
691 <        }
692 <    }
693 <
694 <    /**
695 <     * drainTo(null) throws NullPointerException
696 <     */
697 <    public void testDrainToNull() {
698 <        LinkedTransferQueue q = populatedQueue(SIZE);
699 <        try {
700 <            q.drainTo(null);
701 <            shouldThrow();
702 <        } catch (NullPointerException success) {
703 <        }
704 <    }
705 <
706 <    /**
707 <     * drainTo(this) throws IllegalArgumentException
708 <     */
709 <    public void testDrainToSelf() {
710 <        LinkedTransferQueue q = populatedQueue(SIZE);
711 <        try {
712 <            q.drainTo(q);
713 <            shouldThrow();
714 <        } catch (IllegalArgumentException success) {
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 +        assertTrue(y.isEmpty());
637      }
638  
639      /**
# Line 742 | Line 663 | public class LinkedTransferQueueTest ext
663      }
664  
665      /**
666 <     * drainTo empties full queue, unblocking a waiting put.
666 >     * drainTo(c) empties full queue, unblocking a waiting put.
667       */
668      public void testDrainToWithActivePut() throws InterruptedException {
669          final LinkedTransferQueue q = populatedQueue(SIZE);
670          Thread t = newStartedThread(new CheckedRunnable() {
671 <            void realRun() {
671 >            public void realRun() {
672                  q.put(SIZE + 1);
673              }});
674          ArrayList l = new ArrayList();
# Line 756 | Line 677 | public class LinkedTransferQueueTest ext
677          for (int i = 0; i < SIZE; ++i) {
678              assertEquals(l.get(i), i);
679          }
680 <        t.join();
680 >        awaitTermination(t, MEDIUM_DELAY_MS);
681          assertTrue(q.size() + l.size() >= SIZE);
682      }
683  
684      /**
685 <     * drainTo(null, n) throws NullPointerException
765 <     */
766 <    public void testDrainToNullN() {
767 <        LinkedTransferQueue q = populatedQueue(SIZE);
768 <        try {
769 <            q.drainTo(null, 0);
770 <            shouldThrow();
771 <        } catch (NullPointerException success) {
772 <        }
773 <    }
774 <
775 <    /**
776 <     * drainTo(this, n) throws IllegalArgumentException
777 <     */
778 <    public void testDrainToSelfN() {
779 <        LinkedTransferQueue q = populatedQueue(SIZE);
780 <        try {
781 <            q.drainTo(q, 0);
782 <            shouldThrow();
783 <        } catch (IllegalArgumentException success) {
784 <        }
785 <    }
786 <
787 <    /**
788 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
685 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
686       */
687      public void testDrainToN() {
688          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 807 | Line 704 | public class LinkedTransferQueueTest ext
704      }
705  
706      /**
707 <     * poll and take decrement the waiting consumer count
707 >     * timed poll() or take() increments the waiting consumer count;
708 >     * offer(e) decrements the waiting consumer count
709       */
710      public void testWaitingConsumer() throws InterruptedException {
711          final LinkedTransferQueue q = new LinkedTransferQueue();
712 <        final ConsumerObserver waiting = new ConsumerObserver();
712 >        assertEquals(q.getWaitingConsumerCount(), 0);
713 >        assertFalse(q.hasWaitingConsumer());
714 >        final CountDownLatch threadStarted = new CountDownLatch(1);
715  
716          Thread t = newStartedThread(new CheckedRunnable() {
717 <            void realRun() throws InterruptedException {
718 <                Thread.sleep(SMALL_DELAY_MS);
719 <                threadAssertTrue(q.hasWaitingConsumer());
720 <                waiting.setWaitingConsumer(q.getWaitingConsumerCount());
721 <                threadAssertTrue(q.offer(new Object()));
717 >            public void realRun() throws InterruptedException {
718 >                threadStarted.countDown();
719 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
720 >                assertEquals(q.getWaitingConsumerCount(), 0);
721 >                assertFalse(q.hasWaitingConsumer());
722              }});
723  
724 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
725 <        assertTrue(q.getWaitingConsumerCount()
726 <                   < waiting.getWaitingConsumers());
727 <        t.join();
724 >        threadStarted.await();
725 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
726 >        assertEquals(q.getWaitingConsumerCount(), 1);
727 >        assertTrue(q.hasWaitingConsumer());
728 >
729 >        assertTrue(q.offer(one));
730 >        assertEquals(q.getWaitingConsumerCount(), 0);
731 >        assertFalse(q.hasWaitingConsumer());
732 >
733 >        awaitTermination(t, MEDIUM_DELAY_MS);
734      }
735  
736      /**
# Line 835 | Line 741 | public class LinkedTransferQueueTest ext
741              LinkedTransferQueue q = new LinkedTransferQueue();
742              q.transfer(null);
743              shouldThrow();
744 <        } catch (NullPointerException ex) {
839 <        }
744 >        } catch (NullPointerException success) {}
745      }
746  
747      /**
# Line 846 | Line 751 | public class LinkedTransferQueueTest ext
751      public void testTransfer2() throws InterruptedException {
752          final LinkedTransferQueue<Integer> q
753              = new LinkedTransferQueue<Integer>();
754 +        final CountDownLatch threadStarted = new CountDownLatch(1);
755  
756          Thread t = newStartedThread(new CheckedRunnable() {
757 <            void realRun() throws InterruptedException {
758 <                q.transfer(SIZE);
759 <                threadAssertTrue(q.isEmpty());
757 >            public void realRun() throws InterruptedException {
758 >                threadStarted.countDown();
759 >                q.transfer(five);
760 >                checkEmpty(q);
761              }});
762  
763 <        Thread.sleep(SHORT_DELAY_MS);
763 >        threadStarted.await();
764 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
765          assertEquals(1, q.size());
766 <        assertEquals(SIZE, (int) q.poll());
767 <        assertTrue(q.isEmpty());
768 <        t.join();
766 >        assertSame(five, q.poll());
767 >        checkEmpty(q);
768 >        awaitTermination(t, MEDIUM_DELAY_MS);
769      }
770  
771      /**
# Line 868 | Line 776 | public class LinkedTransferQueueTest ext
776              = new LinkedTransferQueue<Integer>();
777  
778          Thread first = newStartedThread(new CheckedRunnable() {
779 <            void realRun() throws InterruptedException {
780 <                Integer i = SIZE + 1;
781 <                q.transfer(i);
782 <                threadAssertTrue(!q.contains(i));
875 <                threadAssertEquals(1, q.size());
779 >            public void realRun() throws InterruptedException {
780 >                q.transfer(four);
781 >                assertTrue(!q.contains(four));
782 >                assertEquals(1, q.size());
783              }});
784  
785          Thread interruptedThread = newStartedThread(
786              new CheckedInterruptedRunnable() {
787 <                void realRun() throws InterruptedException {
788 <                    while (q.size() == 0)
787 >                public void realRun() throws InterruptedException {
788 >                    while (q.isEmpty())
789                          Thread.yield();
790 <                    q.transfer(SIZE);
790 >                    q.transfer(five);
791                  }});
792  
793          while (q.size() < 2)
794              Thread.yield();
795          assertEquals(2, q.size());
796 <        assertEquals(SIZE + 1, (int) q.poll());
796 >        assertSame(four, q.poll());
797          first.join();
798          assertEquals(1, q.size());
799          interruptedThread.interrupt();
800          interruptedThread.join();
801 <        assertEquals(0, q.size());
895 <        assertTrue(q.isEmpty());
801 >        checkEmpty(q);
802      }
803  
804      /**
# Line 903 | Line 809 | public class LinkedTransferQueueTest ext
809          final LinkedTransferQueue q = new LinkedTransferQueue();
810  
811          Thread t = newStartedThread(new CheckedRunnable() {
812 <            void realRun() throws InterruptedException {
812 >            public void realRun() throws InterruptedException {
813                  q.transfer(four);
814 <                threadAssertFalse(q.contains(four));
815 <                threadAssertEquals(three, q.poll());
814 >                assertFalse(q.contains(four));
815 >                assertSame(three, q.poll());
816              }});
817  
818 <        Thread.sleep(SHORT_DELAY_MS);
818 >        while (q.isEmpty())
819 >            Thread.yield();
820 >        assertFalse(q.isEmpty());
821 >        assertEquals(1, q.size());
822          assertTrue(q.offer(three));
823 <        assertEquals(four, q.poll());
824 <        t.join();
823 >        assertSame(four, q.poll());
824 >        awaitTermination(t, MEDIUM_DELAY_MS);
825      }
826  
827      /**
# Line 924 | Line 833 | public class LinkedTransferQueueTest ext
833              = new LinkedTransferQueue<Integer>();
834  
835          Thread t = newStartedThread(new CheckedRunnable() {
836 <            void realRun() throws InterruptedException {
837 <                q.transfer(SIZE);
838 <                threadAssertTrue(q.isEmpty());
836 >            public void realRun() throws InterruptedException {
837 >                q.transfer(four);
838 >                checkEmpty(q);
839              }});
840  
841 <        Thread.sleep(SHORT_DELAY_MS);
842 <        assertEquals(SIZE, (int) q.take());
843 <        assertTrue(q.isEmpty());
844 <        t.join();
841 >        while (q.isEmpty())
842 >            Thread.yield();
843 >        assertFalse(q.isEmpty());
844 >        assertEquals(1, q.size());
845 >        assertSame(four, q.take());
846 >        checkEmpty(q);
847 >        awaitTermination(t, MEDIUM_DELAY_MS);
848      }
849  
850      /**
# Line 943 | Line 855 | public class LinkedTransferQueueTest ext
855              final LinkedTransferQueue q = new LinkedTransferQueue();
856              q.tryTransfer(null);
857              shouldThrow();
858 <        } catch (NullPointerException ex) {
947 <        }
858 >        } catch (NullPointerException success) {}
859      }
860  
861      /**
862       * tryTransfer returns false and does not enqueue if there are no
863       * consumers waiting to poll or take.
864       */
865 <    public void testTryTransfer2() {
865 >    public void testTryTransfer2() throws InterruptedException {
866          final LinkedTransferQueue q = new LinkedTransferQueue();
867          assertFalse(q.tryTransfer(new Object()));
868          assertFalse(q.hasWaitingConsumer());
869 <        assertTrue(q.isEmpty());
959 <        assertEquals(0, q.size());
869 >        checkEmpty(q);
870      }
871  
872      /**
# Line 968 | Line 878 | public class LinkedTransferQueueTest ext
878          final LinkedTransferQueue q = new LinkedTransferQueue();
879  
880          Thread t = newStartedThread(new CheckedRunnable() {
881 <            void realRun() {
881 >            public void realRun() {
882                  while (! q.hasWaitingConsumer())
883                      Thread.yield();
884 <                threadAssertTrue(q.hasWaitingConsumer());
885 <                threadAssertTrue(q.isEmpty());
886 <                threadAssertTrue(q.size() == 0);
977 <                threadAssertTrue(q.tryTransfer(hotPotato));
884 >                assertTrue(q.hasWaitingConsumer());
885 >                checkEmpty(q);
886 >                assertTrue(q.tryTransfer(hotPotato));
887              }});
888  
889 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
890 <        assertTrue(q.isEmpty());
891 <        t.join();
889 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
890 >        checkEmpty(q);
891 >        awaitTermination(t, MEDIUM_DELAY_MS);
892      }
893  
894      /**
# Line 991 | Line 900 | public class LinkedTransferQueueTest ext
900          final LinkedTransferQueue q = new LinkedTransferQueue();
901  
902          Thread t = newStartedThread(new CheckedRunnable() {
903 <            void realRun() {
903 >            public void realRun() {
904                  while (! q.hasWaitingConsumer())
905                      Thread.yield();
906 <                threadAssertTrue(q.hasWaitingConsumer());
907 <                threadAssertTrue(q.isEmpty());
908 <                threadAssertTrue(q.size() == 0);
1000 <                threadAssertTrue(q.tryTransfer(hotPotato));
906 >                assertTrue(q.hasWaitingConsumer());
907 >                checkEmpty(q);
908 >                assertTrue(q.tryTransfer(hotPotato));
909              }});
910  
911 <        assertTrue(q.take() == hotPotato);
912 <        assertTrue(q.isEmpty());
913 <        t.join();
911 >        assertSame(q.take(), hotPotato);
912 >        checkEmpty(q);
913 >        awaitTermination(t, MEDIUM_DELAY_MS);
914      }
915  
916      /**
917 <     * tryTransfer waits the amount given if interrupted, and
1010 <     * throws interrupted exception
917 >     * tryTransfer blocks interruptibly if no takers
918       */
919      public void testTryTransfer5() throws InterruptedException {
920          final LinkedTransferQueue q = new LinkedTransferQueue();
921 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
922 +        assertTrue(q.isEmpty());
923  
924 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
925 <            void realRun() throws InterruptedException {
926 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
924 >        Thread t = newStartedThread(new CheckedRunnable() {
925 >            public void realRun() throws InterruptedException {
926 >                Thread.currentThread().interrupt();
927 >                try {
928 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
929 >                    shouldThrow();
930 >                } catch (InterruptedException success) {}
931 >                assertFalse(Thread.interrupted());
932 >
933 >                pleaseInterrupt.countDown();
934 >                try {
935 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
936 >                    shouldThrow();
937 >                } catch (InterruptedException success) {}
938 >                assertFalse(Thread.interrupted());
939              }});
940  
941 <        Thread.sleep(SMALL_DELAY_MS);
942 <        toInterrupt.interrupt();
943 <        toInterrupt.join();
941 >        await(pleaseInterrupt);
942 >        assertThreadStaysAlive(t);
943 >        t.interrupt();
944 >        awaitTermination(t);
945 >        checkEmpty(q);
946      }
947  
948      /**
949 <     * tryTransfer gives up after the timeout and return false
949 >     * tryTransfer gives up after the timeout and returns false
950       */
951      public void testTryTransfer6() throws InterruptedException {
952          final LinkedTransferQueue q = new LinkedTransferQueue();
953  
954          Thread t = newStartedThread(new CheckedRunnable() {
955 <            void realRun() throws InterruptedException {
956 <                threadAssertFalse
957 <                    (q.tryTransfer(new Object(),
958 <                                   SHORT_DELAY_MS, MILLISECONDS));
955 >            public void realRun() throws InterruptedException {
956 >                long t0 = System.nanoTime();
957 >                assertFalse(q.tryTransfer(new Object(),
958 >                                          timeoutMillis(), MILLISECONDS));
959 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
960 >                checkEmpty(q);
961              }});
962  
963 <        Thread.sleep(SMALL_DELAY_MS);
964 <        assertTrue(q.isEmpty());
1040 <        t.join();
963 >        awaitTermination(t);
964 >        checkEmpty(q);
965      }
966  
967      /**
# Line 1049 | Line 973 | public class LinkedTransferQueueTest ext
973          assertTrue(q.offer(four));
974  
975          Thread t = newStartedThread(new CheckedRunnable() {
976 <            void realRun() throws InterruptedException {
977 <                threadAssertTrue(q.tryTransfer(five,
978 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
1055 <                threadAssertTrue(q.isEmpty());
976 >            public void realRun() throws InterruptedException {
977 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
978 >                checkEmpty(q);
979              }});
980  
981 <        Thread.sleep(SHORT_DELAY_MS);
981 >        while (q.size() != 2)
982 >            Thread.yield();
983          assertEquals(2, q.size());
984 <        assertEquals(four, q.poll());
985 <        assertEquals(five, q.poll());
986 <        assertTrue(q.isEmpty());
987 <        t.join();
984 >        assertSame(four, q.poll());
985 >        assertSame(five, q.poll());
986 >        checkEmpty(q);
987 >        awaitTermination(t, MEDIUM_DELAY_MS);
988      }
989  
990      /**
991 <     * tryTransfer attempts to enqueue into the q and fails returning
992 <     * false not enqueueing and the successive poll is null
991 >     * tryTransfer attempts to enqueue into the queue and fails
992 >     * returning false not enqueueing and the successive poll is null
993       */
994      public void testTryTransfer8() throws InterruptedException {
995          final LinkedTransferQueue q = new LinkedTransferQueue();
996          assertTrue(q.offer(four));
997          assertEquals(1, q.size());
998 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
998 >        long t0 = System.nanoTime();
999 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1000 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1001          assertEquals(1, q.size());
1002 <        assertEquals(four, q.poll());
1077 <        threadAssertTrue(q.isEmpty());
1002 >        assertSame(four, q.poll());
1003          assertNull(q.poll());
1004 +        checkEmpty(q);
1005      }
1006  
1007      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1008          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1009 <        assertTrue(q.isEmpty());
1009 >        checkEmpty(q);
1010          for (int i = 0; i < n; i++) {
1011              assertEquals(i, q.size());
1012              assertTrue(q.offer(i));
# Line 1089 | Line 1015 | public class LinkedTransferQueueTest ext
1015          assertFalse(q.isEmpty());
1016          return q;
1017      }
1092
1093    private static class ConsumerObserver {
1094
1095        private int waitingConsumers;
1096
1097        private ConsumerObserver() {
1098        }
1099
1100        private void setWaitingConsumer(int i) {
1101            this.waitingConsumers = i;
1102        }
1103
1104        private int getWaitingConsumers() {
1105            return waitingConsumers;
1106        }
1107    }
1018   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines