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.42 by jsr166, Thu Apr 14 22:55:08 2011 UTC vs.
Revision 1.49 by jsr166, Sat Nov 26 05:42:14 2011 UTC

# Line 7 | Line 7
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.Queue;
17 > import java.util.concurrent.PriorityBlockingQueue;
18 > import java.util.concurrent.BlockingQueue;
19 > import java.util.concurrent.CountDownLatch;
20 > import java.util.concurrent.Executors;
21 > import java.util.concurrent.ExecutorService;
22   import static java.util.concurrent.TimeUnit.MILLISECONDS;
13 import java.io.*;
23  
24   public class PriorityBlockingQueueTest extends JSR166TestCase {
25  
# Line 22 | Line 31 | public class PriorityBlockingQueueTest e
31  
32      public static class InitialCapacity extends BlockingQueueTest {
33          protected BlockingQueue emptyCollection() {
34 <            return new PriorityBlockingQueue(20);
34 >            return new PriorityBlockingQueue(SIZE);
35          }
36      }
37  
# Line 75 | 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 85 | 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 94 | 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];
99 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
108 >            new PriorityBlockingQueue(elements);
109              shouldThrow();
110          } catch (NullPointerException success) {}
111      }
# Line 105 | 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];
110 <            for (int i = 0; i < SIZE-1; ++i)
111 <                ints[i] = new Integer(i);
112 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
122 >            new PriorityBlockingQueue(elements);
123              shouldThrow();
124          } catch (NullPointerException success) {}
125      }
# Line 120 | 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 175 | Line 185 | public class PriorityBlockingQueueTest e
185      }
186  
187      /**
178     * offer(null) throws NPE
179     */
180    public void testOfferNull() {
181        try {
182            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
183            q.offer(null);
184            shouldThrow();
185        } catch (NullPointerException success) {}
186    }
187
188    /**
189     * add(null) throws NPE
190     */
191    public void testAddNull() {
192        try {
193            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
194            q.add(null);
195            shouldThrow();
196        } catch (NullPointerException success) {}
197    }
198
199    /**
188       * Offer of comparable element succeeds
189       */
190      public void testOffer() {
# Line 230 | Line 218 | public class PriorityBlockingQueueTest e
218      }
219  
220      /**
233     * addAll(null) throws NPE
234     */
235    public void testAddAll1() {
236        try {
237            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
238            q.addAll(null);
239            shouldThrow();
240        } catch (NullPointerException success) {}
241    }
242
243    /**
221       * addAll(this) throws IAE
222       */
223      public void testAddAllSelf() {
# Line 252 | Line 229 | public class PriorityBlockingQueueTest e
229      }
230  
231      /**
255     * addAll of a collection with null elements throws NPE
256     */
257    public void testAddAll2() {
258        try {
259            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
260            Integer[] ints = new Integer[SIZE];
261            q.addAll(Arrays.asList(ints));
262            shouldThrow();
263        } catch (NullPointerException success) {}
264    }
265
266    /**
232       * addAll of a collection with any null elements throws NPE after
233       * possibly adding some elements
234       */
# Line 294 | Line 259 | public class PriorityBlockingQueueTest e
259      }
260  
261      /**
297     * put(null) throws NPE
298     */
299    public void testPutNull() {
300        try {
301            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
302            q.put(null);
303            shouldThrow();
304        } catch (NullPointerException success) {}
305    }
306
307    /**
262       * all elements successfully put are contained
263       */
264      public void testPut() {
# Line 323 | 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);
334 <        assertEquals(q.size(), size);
286 >        awaitTermination(t);
287 >        assertEquals(size, q.size());
288          q.take();
336        t.interrupt();
337        t.join();
289      }
290  
291      /**
# Line 342 | 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 350 | Line 301 | public class PriorityBlockingQueueTest e
301                  assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
302              }});
303  
304 <        t.start();
354 <        Thread.sleep(SMALL_DELAY_MS);
355 <        t.interrupt();
356 <        t.join();
304 >        awaitTermination(t);
305      }
306  
307      /**
# Line 371 | 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  
391
350      /**
351       * poll succeeds unless empty
352       */
# Line 415 | 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 439 | Line 402 | public class PriorityBlockingQueueTest e
402                  long t0 = System.nanoTime();
403                  aboutToWait.countDown();
404                  try {
405 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
405 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
406                      shouldThrow();
407                  } catch (InterruptedException success) {
408                      assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
# Line 496 | Line 459 | public class PriorityBlockingQueueTest e
459      }
460  
461      /**
499     * remove(x) removes x and returns true if present
500     */
501    public void testRemoveElement() {
502        PriorityBlockingQueue q = populatedQueue(SIZE);
503        for (int i = 1; i < SIZE; i+=2) {
504            assertTrue(q.contains(i));
505            assertTrue(q.remove(i));
506            assertFalse(q.contains(i));
507            assertTrue(q.contains(i-1));
508        }
509        for (int i = 0; i < SIZE; i+=2) {
510            assertTrue(q.contains(i));
511            assertTrue(q.remove(i));
512            assertFalse(q.contains(i));
513            assertFalse(q.remove(i+1));
514            assertFalse(q.contains(i+1));
515        }
516        assertTrue(q.isEmpty());
517    }
518
519    /**
462       * contains(x) reports true when elements added but not yet removed
463       */
464      public void testContains() {
# Line 617 | Line 559 | public class PriorityBlockingQueueTest e
559      }
560  
561      /**
620     * toArray(null) throws NullPointerException
621     */
622    public void testToArray_NullArg() {
623        PriorityBlockingQueue q = populatedQueue(SIZE);
624        try {
625            q.toArray(null);
626            shouldThrow();
627        } catch (NullPointerException success) {}
628    }
629
630    /**
562       * toArray(incompatible array type) throws ArrayStoreException
563       */
564      public void testToArray1_BadArg() {
# Line 671 | Line 602 | public class PriorityBlockingQueueTest e
602          assertFalse(it.hasNext());
603      }
604  
674
605      /**
606       * toString contains toStrings of elements
607       */
# Line 679 | Line 609 | public class PriorityBlockingQueueTest e
609          PriorityBlockingQueue q = populatedQueue(SIZE);
610          String s = q.toString();
611          for (int i = 0; i < SIZE; ++i) {
612 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
612 >            assertTrue(s.contains(String.valueOf(i)));
613          }
614      }
615  
616      /**
617 <     * offer transfers elements across Executor tasks
617 >     * timed poll transfers elements across Executor tasks
618       */
619      public void testPollInExecutor() {
620          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
621 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
622          ExecutorService executor = Executors.newFixedThreadPool(2);
623          executor.execute(new CheckedRunnable() {
624              public void realRun() throws InterruptedException {
625                  assertNull(q.poll());
626 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
627 <                assertTrue(q.isEmpty());
626 >                threadsStarted.await();
627 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
628 >                checkEmpty(q);
629              }});
630  
631          executor.execute(new CheckedRunnable() {
632              public void realRun() throws InterruptedException {
633 <                Thread.sleep(SMALL_DELAY_MS);
633 >                threadsStarted.await();
634                  q.put(one);
635              }});
636  
# Line 709 | Line 641 | public class PriorityBlockingQueueTest e
641       * A deserialized serialized queue has same elements
642       */
643      public void testSerialization() throws Exception {
644 <        PriorityBlockingQueue q = populatedQueue(SIZE);
645 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
714 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
715 <        out.writeObject(q);
716 <        out.close();
717 <
718 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
719 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
720 <        PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
721 <        assertEquals(q.size(), r.size());
722 <        while (!q.isEmpty())
723 <            assertEquals(q.remove(), r.remove());
724 <    }
725 <
726 <    /**
727 <     * drainTo(null) throws NPE
728 <     */
729 <    public void testDrainToNull() {
730 <        PriorityBlockingQueue q = populatedQueue(SIZE);
731 <        try {
732 <            q.drainTo(null);
733 <            shouldThrow();
734 <        } catch (NullPointerException success) {}
735 <    }
644 >        Queue x = populatedQueue(SIZE);
645 >        Queue y = serialClone(x);
646  
647 <    /**
648 <     * drainTo(this) throws IAE
649 <     */
650 <    public void testDrainToSelf() {
651 <        PriorityBlockingQueue q = populatedQueue(SIZE);
652 <        try {
653 <            q.drainTo(q);
744 <            shouldThrow();
745 <        } catch (IllegalArgumentException success) {}
647 >        assertTrue(x != y);
648 >        assertEquals(x.size(), y.size());
649 >        while (!x.isEmpty()) {
650 >            assertFalse(y.isEmpty());
651 >            assertEquals(x.remove(), y.remove());
652 >        }
653 >        assertTrue(y.isEmpty());
654      }
655  
656      /**
# Line 752 | Line 660 | public class PriorityBlockingQueueTest e
660          PriorityBlockingQueue q = populatedQueue(SIZE);
661          ArrayList l = new ArrayList();
662          q.drainTo(l);
663 <        assertEquals(q.size(), 0);
664 <        assertEquals(l.size(), SIZE);
663 >        assertEquals(0, q.size());
664 >        assertEquals(SIZE, l.size());
665          for (int i = 0; i < SIZE; ++i)
666              assertEquals(l.get(i), new Integer(i));
667          q.add(zero);
# Line 763 | Line 671 | public class PriorityBlockingQueueTest e
671          assertTrue(q.contains(one));
672          l.clear();
673          q.drainTo(l);
674 <        assertEquals(q.size(), 0);
675 <        assertEquals(l.size(), 2);
674 >        assertEquals(0, q.size());
675 >        assertEquals(2, l.size());
676          for (int i = 0; i < 2; ++i)
677              assertEquals(l.get(i), new Integer(i));
678      }
# Line 790 | Line 698 | public class PriorityBlockingQueueTest e
698      }
699  
700      /**
793     * drainTo(null, n) throws NPE
794     */
795    public void testDrainToNullN() {
796        PriorityBlockingQueue q = populatedQueue(SIZE);
797        try {
798            q.drainTo(null, 0);
799            shouldThrow();
800        } catch (NullPointerException success) {}
801    }
802
803    /**
804     * drainTo(this, n) throws IAE
805     */
806    public void testDrainToSelfN() {
807        PriorityBlockingQueue q = populatedQueue(SIZE);
808        try {
809            q.drainTo(q, 0);
810            shouldThrow();
811        } catch (IllegalArgumentException success) {}
812    }
813
814    /**
701       * drainTo(c, n) empties first min(n, size) elements of queue into c
702       */
703      public void testDrainToN() {
# Line 822 | Line 708 | public class PriorityBlockingQueueTest e
708              ArrayList l = new ArrayList();
709              q.drainTo(l, i);
710              int k = (i < SIZE) ? i : SIZE;
711 <            assertEquals(l.size(), k);
712 <            assertEquals(q.size(), SIZE-k);
711 >            assertEquals(k, l.size());
712 >            assertEquals(SIZE-k, q.size());
713              for (int j = 0; j < k; ++j)
714                  assertEquals(l.get(j), new Integer(j));
715              while (q.poll() != null) ;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines