ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/PriorityBlockingQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/PriorityBlockingQueueTest.java (file contents):
Revision 1.35 by jsr166, Wed Nov 3 07:54:52 2010 UTC vs.
Revision 1.45 by jsr166, Mon May 30 22:43:20 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 Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9   import junit.framework.*;
10 < import java.util.*;
11 < import java.util.concurrent.*;
10 > import java.util.Arrays;
11 > import java.util.ArrayList;
12 > import java.util.Collection;
13 > import java.util.Comparator;
14 > import java.util.Iterator;
15 > import java.util.NoSuchElementException;
16 > import java.util.concurrent.PriorityBlockingQueue;
17 > import java.util.concurrent.BlockingQueue;
18 > import java.util.concurrent.CountDownLatch;
19 > import java.util.concurrent.Executors;
20 > import java.util.concurrent.ExecutorService;
21   import static java.util.concurrent.TimeUnit.MILLISECONDS;
22   import java.io.*;
23  
# Line 49 | Line 58 | public class PriorityBlockingQueueTest e
58       * Create a queue of given size containing consecutive
59       * Integers 0 ... n.
60       */
61 <    private PriorityBlockingQueue populatedQueue(int n) {
62 <        PriorityBlockingQueue q = new PriorityBlockingQueue(n);
61 >    private PriorityBlockingQueue<Integer> populatedQueue(int n) {
62 >        PriorityBlockingQueue<Integer> q =
63 >            new PriorityBlockingQueue<Integer>(n);
64          assertTrue(q.isEmpty());
65          for (int i = n-1; i >= 0; i-=2)
66              assertTrue(q.offer(new Integer(i)));
# Line 74 | Line 84 | public class PriorityBlockingQueueTest e
84       */
85      public void testConstructor2() {
86          try {
87 <            PriorityBlockingQueue q = new PriorityBlockingQueue(0);
87 >            new PriorityBlockingQueue(0);
88              shouldThrow();
89          } catch (IllegalArgumentException success) {}
90      }
# Line 84 | Line 94 | public class PriorityBlockingQueueTest e
94       */
95      public void testConstructor3() {
96          try {
97 <            PriorityBlockingQueue q = new PriorityBlockingQueue(null);
97 >            new PriorityBlockingQueue(null);
98              shouldThrow();
99          } catch (NullPointerException success) {}
100      }
# Line 93 | Line 103 | public class PriorityBlockingQueueTest e
103       * Initializing from Collection of null elements throws NPE
104       */
105      public void testConstructor4() {
106 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
107          try {
108 <            Integer[] ints = new Integer[SIZE];
98 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
108 >            new PriorityBlockingQueue(elements);
109              shouldThrow();
110          } catch (NullPointerException success) {}
111      }
# Line 104 | Line 114 | public class PriorityBlockingQueueTest e
114       * Initializing from Collection with some null elements throws NPE
115       */
116      public void testConstructor5() {
117 +        Integer[] ints = new Integer[SIZE];
118 +        for (int i = 0; i < SIZE-1; ++i)
119 +            ints[i] = i;
120 +        Collection<Integer> elements = Arrays.asList(ints);
121          try {
122 <            Integer[] ints = new Integer[SIZE];
109 <            for (int i = 0; i < SIZE-1; ++i)
110 <                ints[i] = new Integer(i);
111 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
122 >            new PriorityBlockingQueue(elements);
123              shouldThrow();
124          } catch (NullPointerException success) {}
125      }
# Line 119 | Line 130 | public class PriorityBlockingQueueTest e
130      public void testConstructor6() {
131          Integer[] ints = new Integer[SIZE];
132          for (int i = 0; i < SIZE; ++i)
133 <            ints[i] = new Integer(i);
133 >            ints[i] = i;
134          PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
135          for (int i = 0; i < SIZE; ++i)
136              assertEquals(ints[i], q.poll());
# Line 174 | Line 185 | public class PriorityBlockingQueueTest e
185      }
186  
187      /**
177     * offer(null) throws NPE
178     */
179    public void testOfferNull() {
180        try {
181            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
182            q.offer(null);
183            shouldThrow();
184        } catch (NullPointerException success) {}
185    }
186
187    /**
188     * add(null) throws NPE
189     */
190    public void testAddNull() {
191        try {
192            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
193            q.add(null);
194            shouldThrow();
195        } catch (NullPointerException success) {}
196    }
197
198    /**
188       * Offer of comparable element succeeds
189       */
190      public void testOffer() {
# Line 229 | Line 218 | public class PriorityBlockingQueueTest e
218      }
219  
220      /**
232     * addAll(null) throws NPE
233     */
234    public void testAddAll1() {
235        try {
236            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
237            q.addAll(null);
238            shouldThrow();
239        } catch (NullPointerException success) {}
240    }
241
242    /**
221       * addAll(this) throws IAE
222       */
223      public void testAddAllSelf() {
# Line 251 | Line 229 | public class PriorityBlockingQueueTest e
229      }
230  
231      /**
254     * addAll of a collection with null elements throws NPE
255     */
256    public void testAddAll2() {
257        try {
258            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
259            Integer[] ints = new Integer[SIZE];
260            q.addAll(Arrays.asList(ints));
261            shouldThrow();
262        } catch (NullPointerException success) {}
263    }
264
265    /**
232       * addAll of a collection with any null elements throws NPE after
233       * possibly adding some elements
234       */
# Line 293 | Line 259 | public class PriorityBlockingQueueTest e
259      }
260  
261      /**
296     * put(null) throws NPE
297     */
298     public void testPutNull() {
299        try {
300            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
301            q.put(null);
302            shouldThrow();
303        } catch (NullPointerException success) {}
304     }
305
306    /**
262       * all elements successfully put are contained
263       */
264 <     public void testPut() {
265 <         PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
266 <         for (int i = 0; i < SIZE; ++i) {
267 <             Integer I = new Integer(i);
268 <             q.put(I);
269 <             assertTrue(q.contains(I));
270 <         }
271 <         assertEquals(SIZE, q.size());
264 >    public void testPut() {
265 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
266 >        for (int i = 0; i < SIZE; ++i) {
267 >            Integer I = new Integer(i);
268 >            q.put(I);
269 >            assertTrue(q.contains(I));
270 >        }
271 >        assertEquals(SIZE, q.size());
272      }
273  
274      /**
# Line 322 | Line 277 | public class PriorityBlockingQueueTest e
277      public void testPutWithTake() throws InterruptedException {
278          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
279          final int size = 4;
280 <        Thread t = new Thread(new CheckedRunnable() {
280 >        Thread t = newStartedThread(new CheckedRunnable() {
281              public void realRun() {
282                  for (int i = 0; i < size; i++)
283                      q.put(new Integer(0));
284              }});
285  
286 <        t.start();
287 <        Thread.sleep(SHORT_DELAY_MS);
333 <        assertEquals(q.size(), size);
286 >        awaitTermination(t);
287 >        assertEquals(size, q.size());
288          q.take();
335        t.interrupt();
336        t.join();
289      }
290  
291      /**
# Line 341 | Line 293 | public class PriorityBlockingQueueTest e
293       */
294      public void testTimedOffer() throws InterruptedException {
295          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
296 <        Thread t = new Thread(new CheckedRunnable() {
296 >        Thread t = newStartedThread(new CheckedRunnable() {
297              public void realRun() {
298                  q.put(new Integer(0));
299                  q.put(new Integer(0));
# Line 349 | Line 301 | public class PriorityBlockingQueueTest e
301                  assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
302              }});
303  
304 <        t.start();
353 <        Thread.sleep(SMALL_DELAY_MS);
354 <        t.interrupt();
355 <        t.join();
304 >        awaitTermination(t);
305      }
306  
307      /**
# Line 370 | Line 319 | public class PriorityBlockingQueueTest e
319       */
320      public void testBlockingTake() throws InterruptedException {
321          final PriorityBlockingQueue q = populatedQueue(SIZE);
322 <        Thread t = new Thread(new CheckedRunnable() {
322 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
323 >        Thread t = newStartedThread(new CheckedRunnable() {
324              public void realRun() throws InterruptedException {
325                  for (int i = 0; i < SIZE; ++i) {
326                      assertEquals(i, q.take());
327                  }
328 +
329 +                Thread.currentThread().interrupt();
330 +                try {
331 +                    q.take();
332 +                    shouldThrow();
333 +                } catch (InterruptedException success) {}
334 +                assertFalse(Thread.interrupted());
335 +
336 +                pleaseInterrupt.countDown();
337                  try {
338                      q.take();
339                      shouldThrow();
340                  } catch (InterruptedException success) {}
341 +                assertFalse(Thread.interrupted());
342              }});
343  
344 <        t.start();
345 <        Thread.sleep(SHORT_DELAY_MS);
344 >        await(pleaseInterrupt);
345 >        assertThreadStaysAlive(t);
346          t.interrupt();
347 <        t.join();
347 >        awaitTermination(t);
348      }
349  
390
350      /**
351       * poll succeeds unless empty
352       */
# Line 414 | Line 373 | public class PriorityBlockingQueueTest e
373       * timed poll with nonzero timeout succeeds when non-empty, else times out
374       */
375      public void testTimedPoll() throws InterruptedException {
376 <        PriorityBlockingQueue q = populatedQueue(SIZE);
376 >        PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
377          for (int i = 0; i < SIZE; ++i) {
378 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
379 <        }
380 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
378 >            long startTime = System.nanoTime();
379 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
380 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
381 >        }
382 >        long startTime = System.nanoTime();
383 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
384 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
385 >        checkEmpty(q);
386      }
387  
388      /**
# Line 426 | Line 390 | public class PriorityBlockingQueueTest e
390       * returning timeout status
391       */
392      public void testInterruptedTimedPoll() throws InterruptedException {
393 <        Thread t = new Thread(new CheckedRunnable() {
393 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
394 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
395 >        Thread t = newStartedThread(new CheckedRunnable() {
396              public void realRun() throws InterruptedException {
431                PriorityBlockingQueue q = populatedQueue(SIZE);
397                  for (int i = 0; i < SIZE; ++i) {
398 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
398 >                    long t0 = System.nanoTime();
399 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
400 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
401                  }
402 +                long t0 = System.nanoTime();
403 +                aboutToWait.countDown();
404                  try {
405 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
405 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
406                      shouldThrow();
407 <                } catch (InterruptedException success) {}
407 >                } catch (InterruptedException success) {
408 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
409 >                }
410              }});
411  
412 <        t.start();
413 <        Thread.sleep(SHORT_DELAY_MS);
412 >        aboutToWait.await();
413 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
414          t.interrupt();
415 <        t.join();
415 >        awaitTermination(t, MEDIUM_DELAY_MS);
416      }
417  
418      /**
# Line 493 | Line 464 | public class PriorityBlockingQueueTest e
464      public void testRemoveElement() {
465          PriorityBlockingQueue q = populatedQueue(SIZE);
466          for (int i = 1; i < SIZE; i+=2) {
467 <            assertTrue(q.remove(new Integer(i)));
467 >            assertTrue(q.contains(i));
468 >            assertTrue(q.remove(i));
469 >            assertFalse(q.contains(i));
470 >            assertTrue(q.contains(i-1));
471          }
472          for (int i = 0; i < SIZE; i+=2) {
473 <            assertTrue(q.remove(new Integer(i)));
474 <            assertFalse(q.remove(new Integer(i+1)));
473 >            assertTrue(q.contains(i));
474 >            assertTrue(q.remove(i));
475 >            assertFalse(q.contains(i));
476 >            assertFalse(q.remove(i+1));
477 >            assertFalse(q.contains(i+1));
478          }
479          assertTrue(q.isEmpty());
480      }
# Line 586 | Line 563 | public class PriorityBlockingQueueTest e
563          Object[] o = q.toArray();
564          Arrays.sort(o);
565          for (int i = 0; i < o.length; i++)
566 <            assertEquals(o[i], q.take());
566 >            assertSame(o[i], q.take());
567      }
568  
569      /**
570       * toArray(a) contains all elements
571       */
572      public void testToArray2() throws InterruptedException {
573 <        PriorityBlockingQueue q = populatedQueue(SIZE);
573 >        PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
574          Integer[] ints = new Integer[SIZE];
575 <        ints = (Integer[])q.toArray(ints);
575 >        Integer[] array = q.toArray(ints);
576 >        assertSame(ints, array);
577          Arrays.sort(ints);
578          for (int i = 0; i < ints.length; i++)
579 <            assertEquals(ints[i], q.take());
602 <    }
603 <
604 <    /**
605 <     * toArray(null) throws NPE
606 <     */
607 <    public void testToArray_BadArg() {
608 <        PriorityBlockingQueue q = populatedQueue(SIZE);
609 <        try {
610 <            Object o[] = q.toArray(null);
611 <            shouldThrow();
612 <        } catch (NullPointerException success) {}
579 >            assertSame(ints[i], q.take());
580      }
581  
582      /**
# Line 656 | Line 623 | public class PriorityBlockingQueueTest e
623          assertFalse(it.hasNext());
624      }
625  
659
626      /**
627       * toString contains toStrings of elements
628       */
# Line 664 | Line 630 | public class PriorityBlockingQueueTest e
630          PriorityBlockingQueue q = populatedQueue(SIZE);
631          String s = q.toString();
632          for (int i = 0; i < SIZE; ++i) {
633 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
633 >            assertTrue(s.contains(String.valueOf(i)));
634          }
635      }
636  
637      /**
638 <     * offer transfers elements across Executor tasks
638 >     * timed poll transfers elements across Executor tasks
639       */
640      public void testPollInExecutor() {
641          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
642 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
643          ExecutorService executor = Executors.newFixedThreadPool(2);
644          executor.execute(new CheckedRunnable() {
645              public void realRun() throws InterruptedException {
646                  assertNull(q.poll());
647 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
648 <                assertTrue(q.isEmpty());
647 >                threadsStarted.await();
648 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
649 >                checkEmpty(q);
650              }});
651  
652          executor.execute(new CheckedRunnable() {
653              public void realRun() throws InterruptedException {
654 <                Thread.sleep(SMALL_DELAY_MS);
654 >                threadsStarted.await();
655                  q.put(one);
656              }});
657  
# Line 709 | Line 677 | public class PriorityBlockingQueueTest e
677      }
678  
679      /**
712     * drainTo(null) throws NPE
713     */
714    public void testDrainToNull() {
715        PriorityBlockingQueue q = populatedQueue(SIZE);
716        try {
717            q.drainTo(null);
718            shouldThrow();
719        } catch (NullPointerException success) {}
720    }
721
722    /**
723     * drainTo(this) throws IAE
724     */
725    public void testDrainToSelf() {
726        PriorityBlockingQueue q = populatedQueue(SIZE);
727        try {
728            q.drainTo(q);
729            shouldThrow();
730        } catch (IllegalArgumentException success) {}
731    }
732
733    /**
680       * drainTo(c) empties queue into another collection c
681       */
682      public void testDrainTo() {
# Line 775 | Line 721 | public class PriorityBlockingQueueTest e
721      }
722  
723      /**
778     * drainTo(null, n) throws NPE
779     */
780    public void testDrainToNullN() {
781        PriorityBlockingQueue q = populatedQueue(SIZE);
782        try {
783            q.drainTo(null, 0);
784            shouldThrow();
785        } catch (NullPointerException success) {}
786    }
787
788    /**
789     * drainTo(this, n) throws IAE
790     */
791    public void testDrainToSelfN() {
792        PriorityBlockingQueue q = populatedQueue(SIZE);
793        try {
794            q.drainTo(q, 0);
795            shouldThrow();
796        } catch (IllegalArgumentException success) {}
797    }
798
799    /**
724       * drainTo(c, n) empties first min(n, size) elements of queue into c
725       */
726      public void testDrainToN() {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines