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.41 by jsr166, Tue Mar 15 19:47:07 2011 UTC vs.
Revision 1.58 by jsr166, Sat Jan 17 22:55:06 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import junit.framework.*;
10 import java.util.*;
11 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.io.*;
10 >
11 > import java.util.ArrayList;
12 > import java.util.Arrays;
13 > import java.util.Collection;
14 > import java.util.Comparator;
15 > import java.util.Iterator;
16 > import java.util.NoSuchElementException;
17 > import java.util.Queue;
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 java.util.concurrent.PriorityBlockingQueue;
23 >
24 > import junit.framework.Test;
25  
26   public class PriorityBlockingQueueTest extends JSR166TestCase {
27  
# Line 22 | Line 33 | public class PriorityBlockingQueueTest e
33  
34      public static class InitialCapacity extends BlockingQueueTest {
35          protected BlockingQueue emptyCollection() {
36 <            return new PriorityBlockingQueue(20);
36 >            return new PriorityBlockingQueue(SIZE);
37          }
38      }
39  
# Line 46 | Line 57 | public class PriorityBlockingQueueTest e
57      }
58  
59      /**
60 <     * Create a queue of given size containing consecutive
60 >     * Returns a new queue of given size containing consecutive
61       * Integers 0 ... n.
62       */
63      private PriorityBlockingQueue<Integer> populatedQueue(int n) {
64          PriorityBlockingQueue<Integer> q =
65              new PriorityBlockingQueue<Integer>(n);
66          assertTrue(q.isEmpty());
67 <        for (int i = n-1; i >= 0; i-=2)
67 >        for (int i = n-1; i >= 0; i -= 2)
68              assertTrue(q.offer(new Integer(i)));
69 <        for (int i = (n & 1); i < n; i+=2)
69 >        for (int i = (n & 1); i < n; i += 2)
70              assertTrue(q.offer(new Integer(i)));
71          assertFalse(q.isEmpty());
72          assertEquals(NOCAP, q.remainingCapacity());
# Line 75 | Line 86 | public class PriorityBlockingQueueTest e
86       */
87      public void testConstructor2() {
88          try {
89 <            PriorityBlockingQueue q = new PriorityBlockingQueue(0);
89 >            new PriorityBlockingQueue(0);
90              shouldThrow();
91          } catch (IllegalArgumentException success) {}
92      }
# Line 85 | Line 96 | public class PriorityBlockingQueueTest e
96       */
97      public void testConstructor3() {
98          try {
99 <            PriorityBlockingQueue q = new PriorityBlockingQueue(null);
99 >            new PriorityBlockingQueue(null);
100              shouldThrow();
101          } catch (NullPointerException success) {}
102      }
# Line 94 | Line 105 | public class PriorityBlockingQueueTest e
105       * Initializing from Collection of null elements throws NPE
106       */
107      public void testConstructor4() {
108 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
109          try {
110 <            Integer[] ints = new Integer[SIZE];
99 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
110 >            new PriorityBlockingQueue(elements);
111              shouldThrow();
112          } catch (NullPointerException success) {}
113      }
# Line 105 | Line 116 | public class PriorityBlockingQueueTest e
116       * Initializing from Collection with some null elements throws NPE
117       */
118      public void testConstructor5() {
119 +        Integer[] ints = new Integer[SIZE];
120 +        for (int i = 0; i < SIZE-1; ++i)
121 +            ints[i] = i;
122 +        Collection<Integer> elements = Arrays.asList(ints);
123          try {
124 <            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));
124 >            new PriorityBlockingQueue(elements);
125              shouldThrow();
126          } catch (NullPointerException success) {}
127      }
# Line 120 | Line 132 | public class PriorityBlockingQueueTest e
132      public void testConstructor6() {
133          Integer[] ints = new Integer[SIZE];
134          for (int i = 0; i < SIZE; ++i)
135 <            ints[i] = new Integer(i);
135 >            ints[i] = i;
136          PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
137          for (int i = 0; i < SIZE; ++i)
138              assertEquals(ints[i], q.poll());
# Line 175 | Line 187 | public class PriorityBlockingQueueTest e
187      }
188  
189      /**
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    /**
190       * Offer of comparable element succeeds
191       */
192      public void testOffer() {
# Line 230 | Line 220 | public class PriorityBlockingQueueTest e
220      }
221  
222      /**
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    /**
223       * addAll(this) throws IAE
224       */
225      public void testAddAllSelf() {
# Line 252 | Line 231 | public class PriorityBlockingQueueTest e
231      }
232  
233      /**
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    /**
234       * addAll of a collection with any null elements throws NPE after
235       * possibly adding some elements
236       */
# Line 294 | Line 261 | public class PriorityBlockingQueueTest e
261      }
262  
263      /**
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    /**
264       * all elements successfully put are contained
265       */
266 <     public void testPut() {
267 <         PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
268 <         for (int i = 0; i < SIZE; ++i) {
269 <             Integer I = new Integer(i);
270 <             q.put(I);
271 <             assertTrue(q.contains(I));
272 <         }
273 <         assertEquals(SIZE, q.size());
266 >    public void testPut() {
267 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
268 >        for (int i = 0; i < SIZE; ++i) {
269 >            Integer x = new Integer(i);
270 >            q.put(x);
271 >            assertTrue(q.contains(x));
272 >        }
273 >        assertEquals(SIZE, q.size());
274      }
275  
276      /**
# Line 323 | Line 279 | public class PriorityBlockingQueueTest e
279      public void testPutWithTake() throws InterruptedException {
280          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
281          final int size = 4;
282 <        Thread t = new Thread(new CheckedRunnable() {
282 >        Thread t = newStartedThread(new CheckedRunnable() {
283              public void realRun() {
284                  for (int i = 0; i < size; i++)
285                      q.put(new Integer(0));
286              }});
287  
288 <        t.start();
289 <        Thread.sleep(SHORT_DELAY_MS);
334 <        assertEquals(q.size(), size);
288 >        awaitTermination(t);
289 >        assertEquals(size, q.size());
290          q.take();
336        t.interrupt();
337        t.join();
291      }
292  
293      /**
# Line 342 | Line 295 | public class PriorityBlockingQueueTest e
295       */
296      public void testTimedOffer() throws InterruptedException {
297          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
298 <        Thread t = new Thread(new CheckedRunnable() {
298 >        Thread t = newStartedThread(new CheckedRunnable() {
299              public void realRun() {
300                  q.put(new Integer(0));
301                  q.put(new Integer(0));
# Line 350 | Line 303 | public class PriorityBlockingQueueTest e
303                  assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
304              }});
305  
306 <        t.start();
354 <        Thread.sleep(SMALL_DELAY_MS);
355 <        t.interrupt();
356 <        t.join();
306 >        awaitTermination(t);
307      }
308  
309      /**
# Line 371 | Line 321 | public class PriorityBlockingQueueTest e
321       */
322      public void testBlockingTake() throws InterruptedException {
323          final PriorityBlockingQueue q = populatedQueue(SIZE);
324 <        Thread t = new Thread(new CheckedRunnable() {
324 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
325 >        Thread t = newStartedThread(new CheckedRunnable() {
326              public void realRun() throws InterruptedException {
327                  for (int i = 0; i < SIZE; ++i) {
328                      assertEquals(i, q.take());
329                  }
330 +
331 +                Thread.currentThread().interrupt();
332 +                try {
333 +                    q.take();
334 +                    shouldThrow();
335 +                } catch (InterruptedException success) {}
336 +                assertFalse(Thread.interrupted());
337 +
338 +                pleaseInterrupt.countDown();
339                  try {
340                      q.take();
341                      shouldThrow();
342                  } catch (InterruptedException success) {}
343 +                assertFalse(Thread.interrupted());
344              }});
345  
346 <        t.start();
347 <        Thread.sleep(SHORT_DELAY_MS);
346 >        await(pleaseInterrupt);
347 >        assertThreadStaysAlive(t);
348          t.interrupt();
349 <        t.join();
349 >        awaitTermination(t);
350      }
351  
391
352      /**
353       * poll succeeds unless empty
354       */
# Line 415 | Line 375 | public class PriorityBlockingQueueTest e
375       * timed poll with nonzero timeout succeeds when non-empty, else times out
376       */
377      public void testTimedPoll() throws InterruptedException {
378 <        PriorityBlockingQueue q = populatedQueue(SIZE);
378 >        PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
379          for (int i = 0; i < SIZE; ++i) {
380 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
381 <        }
382 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
380 >            long startTime = System.nanoTime();
381 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
382 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
383 >        }
384 >        long startTime = System.nanoTime();
385 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
386 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
387 >        checkEmpty(q);
388      }
389  
390      /**
# Line 439 | Line 404 | public class PriorityBlockingQueueTest e
404                  long t0 = System.nanoTime();
405                  aboutToWait.countDown();
406                  try {
407 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
407 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
408                      shouldThrow();
409                  } catch (InterruptedException success) {
410                      assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
# Line 496 | Line 461 | public class PriorityBlockingQueueTest e
461      }
462  
463      /**
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    /**
464       * contains(x) reports true when elements added but not yet removed
465       */
466      public void testContains() {
# Line 586 | Line 530 | public class PriorityBlockingQueueTest e
530              assertTrue(q.removeAll(p));
531              assertEquals(SIZE-i, q.size());
532              for (int j = 0; j < i; ++j) {
533 <                Integer I = (Integer)(p.remove());
534 <                assertFalse(q.contains(I));
533 >                Integer x = (Integer)(p.remove());
534 >                assertFalse(q.contains(x));
535              }
536          }
537      }
# Line 617 | Line 561 | public class PriorityBlockingQueueTest e
561      }
562  
563      /**
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    /**
564       * toArray(incompatible array type) throws ArrayStoreException
565       */
566      public void testToArray1_BadArg() {
# Line 643 | Line 576 | public class PriorityBlockingQueueTest e
576       */
577      public void testIterator() {
578          PriorityBlockingQueue q = populatedQueue(SIZE);
646        int i = 0;
579          Iterator it = q.iterator();
580 <        while (it.hasNext()) {
580 >        int i;
581 >        for (i = 0; it.hasNext(); i++)
582              assertTrue(q.contains(it.next()));
650            ++i;
651        }
583          assertEquals(i, SIZE);
584 +        assertIteratorExhausted(it);
585 +    }
586 +
587 +    /**
588 +     * iterator of empty collection has no elements
589 +     */
590 +    public void testEmptyIterator() {
591 +        assertIteratorExhausted(new PriorityBlockingQueue().iterator());
592      }
593  
594      /**
# Line 671 | Line 610 | public class PriorityBlockingQueueTest e
610          assertFalse(it.hasNext());
611      }
612  
674
613      /**
614       * toString contains toStrings of elements
615       */
# Line 679 | Line 617 | public class PriorityBlockingQueueTest e
617          PriorityBlockingQueue q = populatedQueue(SIZE);
618          String s = q.toString();
619          for (int i = 0; i < SIZE; ++i) {
620 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
620 >            assertTrue(s.contains(String.valueOf(i)));
621          }
622      }
623  
624      /**
625 <     * offer transfers elements across Executor tasks
625 >     * timed poll transfers elements across Executor tasks
626       */
627      public void testPollInExecutor() {
628          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
629 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
630          ExecutorService executor = Executors.newFixedThreadPool(2);
631          executor.execute(new CheckedRunnable() {
632              public void realRun() throws InterruptedException {
633                  assertNull(q.poll());
634 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
635 <                assertTrue(q.isEmpty());
634 >                threadsStarted.await();
635 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
636 >                checkEmpty(q);
637              }});
638  
639          executor.execute(new CheckedRunnable() {
640              public void realRun() throws InterruptedException {
641 <                Thread.sleep(SMALL_DELAY_MS);
641 >                threadsStarted.await();
642                  q.put(one);
643              }});
644  
# Line 709 | Line 649 | public class PriorityBlockingQueueTest e
649       * A deserialized serialized queue has same elements
650       */
651      public void testSerialization() throws Exception {
652 <        PriorityBlockingQueue q = populatedQueue(SIZE);
653 <        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 <    }
652 >        Queue x = populatedQueue(SIZE);
653 >        Queue y = serialClone(x);
654  
655 <    /**
656 <     * drainTo(null) throws NPE
657 <     */
658 <    public void testDrainToNull() {
659 <        PriorityBlockingQueue q = populatedQueue(SIZE);
660 <        try {
661 <            q.drainTo(null);
733 <            shouldThrow();
734 <        } catch (NullPointerException success) {}
735 <    }
736 <
737 <    /**
738 <     * drainTo(this) throws IAE
739 <     */
740 <    public void testDrainToSelf() {
741 <        PriorityBlockingQueue q = populatedQueue(SIZE);
742 <        try {
743 <            q.drainTo(q);
744 <            shouldThrow();
745 <        } catch (IllegalArgumentException success) {}
655 >        assertNotSame(x, y);
656 >        assertEquals(x.size(), y.size());
657 >        while (!x.isEmpty()) {
658 >            assertFalse(y.isEmpty());
659 >            assertEquals(x.remove(), y.remove());
660 >        }
661 >        assertTrue(y.isEmpty());
662      }
663  
664      /**
# Line 752 | Line 668 | public class PriorityBlockingQueueTest e
668          PriorityBlockingQueue q = populatedQueue(SIZE);
669          ArrayList l = new ArrayList();
670          q.drainTo(l);
671 <        assertEquals(q.size(), 0);
672 <        assertEquals(l.size(), SIZE);
671 >        assertEquals(0, q.size());
672 >        assertEquals(SIZE, l.size());
673          for (int i = 0; i < SIZE; ++i)
674              assertEquals(l.get(i), new Integer(i));
675          q.add(zero);
# Line 763 | Line 679 | public class PriorityBlockingQueueTest e
679          assertTrue(q.contains(one));
680          l.clear();
681          q.drainTo(l);
682 <        assertEquals(q.size(), 0);
683 <        assertEquals(l.size(), 2);
682 >        assertEquals(0, q.size());
683 >        assertEquals(2, l.size());
684          for (int i = 0; i < 2; ++i)
685              assertEquals(l.get(i), new Integer(i));
686      }
# Line 790 | Line 706 | public class PriorityBlockingQueueTest e
706      }
707  
708      /**
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    /**
709       * drainTo(c, n) empties first min(n, size) elements of queue into c
710       */
711      public void testDrainToN() {
# Line 822 | Line 716 | public class PriorityBlockingQueueTest e
716              ArrayList l = new ArrayList();
717              q.drainTo(l, i);
718              int k = (i < SIZE) ? i : SIZE;
719 <            assertEquals(l.size(), k);
720 <            assertEquals(q.size(), SIZE-k);
719 >            assertEquals(k, l.size());
720 >            assertEquals(SIZE-k, q.size());
721              for (int j = 0; j < k; ++j)
722                  assertEquals(l.get(j), new Integer(j));
723 <            while (q.poll() != null) ;
723 >            do {} while (q.poll() != null);
724 >        }
725 >    }
726 >
727 >    /**
728 >     * remove(null), contains(null) always return false
729 >     */
730 >    public void testNeverContainsNull() {
731 >        Collection<?>[] qs = {
732 >            new PriorityBlockingQueue<Object>(),
733 >            populatedQueue(2),
734 >        };
735 >
736 >        for (Collection<?> q : qs) {
737 >            assertFalse(q.contains(null));
738 >            assertFalse(q.remove(null));
739          }
740      }
741  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines