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.43 by dl, Fri May 6 11:22:07 2011 UTC vs.
Revision 1.59 by jsr166, Sat Feb 28 19:59:23 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 36 | Line 47 | public class PriorityBlockingQueueTest e
47                              new InitialCapacity().testSuite());
48      }
49  
39    private static final int NOCAP = Integer.MAX_VALUE;
40
50      /** Sample Comparator */
51      static class MyReverseComparator implements Comparator {
52          public int compare(Object x, Object y) {
# Line 46 | Line 55 | public class PriorityBlockingQueueTest e
55      }
56  
57      /**
58 <     * Create a queue of given size containing consecutive
58 >     * Returns a new queue of given size containing consecutive
59       * Integers 0 ... n.
60       */
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)
65 >        for (int i = n-1; i >= 0; i -= 2)
66              assertTrue(q.offer(new Integer(i)));
67 <        for (int i = (n & 1); i < n; i+=2)
67 >        for (int i = (n & 1); i < n; i += 2)
68              assertTrue(q.offer(new Integer(i)));
69          assertFalse(q.isEmpty());
70 <        assertEquals(NOCAP, q.remainingCapacity());
70 >        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
71          assertEquals(n, q.size());
72          return q;
73      }
# Line 67 | Line 76 | public class PriorityBlockingQueueTest e
76       * A new queue has unbounded capacity
77       */
78      public void testConstructor1() {
79 <        assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
79 >        assertEquals(Integer.MAX_VALUE,
80 >                     new PriorityBlockingQueue(SIZE).remainingCapacity());
81      }
82  
83      /**
# Line 75 | Line 85 | public class PriorityBlockingQueueTest e
85       */
86      public void testConstructor2() {
87          try {
88 <            PriorityBlockingQueue q = new PriorityBlockingQueue(0);
88 >            new PriorityBlockingQueue(0);
89              shouldThrow();
90          } catch (IllegalArgumentException success) {}
91      }
# Line 85 | Line 95 | public class PriorityBlockingQueueTest e
95       */
96      public void testConstructor3() {
97          try {
98 <            PriorityBlockingQueue q = new PriorityBlockingQueue(null);
98 >            new PriorityBlockingQueue(null);
99              shouldThrow();
100          } catch (NullPointerException success) {}
101      }
# Line 94 | Line 104 | public class PriorityBlockingQueueTest e
104       * Initializing from Collection of null elements throws NPE
105       */
106      public void testConstructor4() {
107 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
108          try {
109 <            Integer[] ints = new Integer[SIZE];
99 <            PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
109 >            new PriorityBlockingQueue(elements);
110              shouldThrow();
111          } catch (NullPointerException success) {}
112      }
# Line 105 | Line 115 | public class PriorityBlockingQueueTest e
115       * Initializing from Collection with some null elements throws NPE
116       */
117      public void testConstructor5() {
118 +        Integer[] ints = new Integer[SIZE];
119 +        for (int i = 0; i < SIZE-1; ++i)
120 +            ints[i] = i;
121 +        Collection<Integer> elements = Arrays.asList(ints);
122          try {
123 <            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));
123 >            new PriorityBlockingQueue(elements);
124              shouldThrow();
125          } catch (NullPointerException success) {}
126      }
# Line 120 | Line 131 | public class PriorityBlockingQueueTest e
131      public void testConstructor6() {
132          Integer[] ints = new Integer[SIZE];
133          for (int i = 0; i < SIZE; ++i)
134 <            ints[i] = new Integer(i);
134 >            ints[i] = i;
135          PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
136          for (int i = 0; i < SIZE; ++i)
137              assertEquals(ints[i], q.poll());
# Line 147 | Line 158 | public class PriorityBlockingQueueTest e
158      public void testEmpty() {
159          PriorityBlockingQueue q = new PriorityBlockingQueue(2);
160          assertTrue(q.isEmpty());
161 <        assertEquals(NOCAP, q.remainingCapacity());
161 >        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
162          q.add(one);
163          assertFalse(q.isEmpty());
164          q.add(two);
# Line 157 | Line 168 | public class PriorityBlockingQueueTest e
168      }
169  
170      /**
171 <     * remainingCapacity does not change when elements added or removed,
161 <     * but size does
171 >     * remainingCapacity() always returns Integer.MAX_VALUE
172       */
173      public void testRemainingCapacity() {
174 <        PriorityBlockingQueue q = populatedQueue(SIZE);
174 >        BlockingQueue q = populatedQueue(SIZE);
175          for (int i = 0; i < SIZE; ++i) {
176 <            assertEquals(NOCAP, q.remainingCapacity());
177 <            assertEquals(SIZE-i, q.size());
178 <            q.remove();
176 >            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
177 >            assertEquals(SIZE - i, q.size());
178 >            assertEquals(i, q.remove());
179          }
180          for (int i = 0; i < SIZE; ++i) {
181 <            assertEquals(NOCAP, q.remainingCapacity());
181 >            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
182              assertEquals(i, q.size());
183 <            q.add(new Integer(i));
183 >            assertTrue(q.add(i));
184          }
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() {
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));
267 >            Integer x = new Integer(i);
268 >            q.put(x);
269 >            assertTrue(q.contains(x));
270          }
271          assertEquals(SIZE, q.size());
272      }
# 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 <        delay(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 <        delay(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 <        delay(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 586 | Line 528 | public class PriorityBlockingQueueTest e
528              assertTrue(q.removeAll(p));
529              assertEquals(SIZE-i, q.size());
530              for (int j = 0; j < i; ++j) {
531 <                Integer I = (Integer)(p.remove());
532 <                assertFalse(q.contains(I));
531 >                Integer x = (Integer)(p.remove());
532 >                assertFalse(q.contains(x));
533              }
534          }
535      }
# 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 643 | Line 574 | public class PriorityBlockingQueueTest e
574       */
575      public void testIterator() {
576          PriorityBlockingQueue q = populatedQueue(SIZE);
646        int i = 0;
577          Iterator it = q.iterator();
578 <        while (it.hasNext()) {
578 >        int i;
579 >        for (i = 0; it.hasNext(); i++)
580              assertTrue(q.contains(it.next()));
650            ++i;
651        }
581          assertEquals(i, SIZE);
582 +        assertIteratorExhausted(it);
583 +    }
584 +
585 +    /**
586 +     * iterator of empty collection has no elements
587 +     */
588 +    public void testEmptyIterator() {
589 +        assertIteratorExhausted(new PriorityBlockingQueue().iterator());
590      }
591  
592      /**
# Line 671 | Line 608 | public class PriorityBlockingQueueTest e
608          assertFalse(it.hasNext());
609      }
610  
674
611      /**
612       * toString contains toStrings of elements
613       */
# Line 679 | Line 615 | public class PriorityBlockingQueueTest e
615          PriorityBlockingQueue q = populatedQueue(SIZE);
616          String s = q.toString();
617          for (int i = 0; i < SIZE; ++i) {
618 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
618 >            assertTrue(s.contains(String.valueOf(i)));
619          }
620      }
621  
622      /**
623 <     * offer transfers elements across Executor tasks
623 >     * timed poll transfers elements across Executor tasks
624       */
625      public void testPollInExecutor() {
626          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
627 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
628          ExecutorService executor = Executors.newFixedThreadPool(2);
629          executor.execute(new CheckedRunnable() {
630              public void realRun() throws InterruptedException {
631                  assertNull(q.poll());
632 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
633 <                assertTrue(q.isEmpty());
632 >                threadsStarted.await();
633 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
634 >                checkEmpty(q);
635              }});
636  
637          executor.execute(new CheckedRunnable() {
638              public void realRun() throws InterruptedException {
639 <                delay(SMALL_DELAY_MS);
639 >                threadsStarted.await();
640                  q.put(one);
641              }});
642  
# Line 709 | Line 647 | public class PriorityBlockingQueueTest e
647       * A deserialized serialized queue has same elements
648       */
649      public void testSerialization() throws Exception {
650 <        PriorityBlockingQueue q = populatedQueue(SIZE);
651 <        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 <    }
650 >        Queue x = populatedQueue(SIZE);
651 >        Queue y = serialClone(x);
652  
653 <    /**
654 <     * drainTo(null) throws NPE
655 <     */
656 <    public void testDrainToNull() {
657 <        PriorityBlockingQueue q = populatedQueue(SIZE);
658 <        try {
659 <            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) {}
653 >        assertNotSame(x, y);
654 >        assertEquals(x.size(), y.size());
655 >        while (!x.isEmpty()) {
656 >            assertFalse(y.isEmpty());
657 >            assertEquals(x.remove(), y.remove());
658 >        }
659 >        assertTrue(y.isEmpty());
660      }
661  
662      /**
# Line 752 | Line 666 | public class PriorityBlockingQueueTest e
666          PriorityBlockingQueue q = populatedQueue(SIZE);
667          ArrayList l = new ArrayList();
668          q.drainTo(l);
669 <        assertEquals(q.size(), 0);
670 <        assertEquals(l.size(), SIZE);
669 >        assertEquals(0, q.size());
670 >        assertEquals(SIZE, l.size());
671          for (int i = 0; i < SIZE; ++i)
672              assertEquals(l.get(i), new Integer(i));
673          q.add(zero);
# Line 763 | Line 677 | public class PriorityBlockingQueueTest e
677          assertTrue(q.contains(one));
678          l.clear();
679          q.drainTo(l);
680 <        assertEquals(q.size(), 0);
681 <        assertEquals(l.size(), 2);
680 >        assertEquals(0, q.size());
681 >        assertEquals(2, l.size());
682          for (int i = 0; i < 2; ++i)
683              assertEquals(l.get(i), new Integer(i));
684      }
# Line 790 | Line 704 | public class PriorityBlockingQueueTest e
704      }
705  
706      /**
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    /**
707       * drainTo(c, n) empties first min(n, size) elements of queue into c
708       */
709      public void testDrainToN() {
# Line 822 | Line 714 | public class PriorityBlockingQueueTest e
714              ArrayList l = new ArrayList();
715              q.drainTo(l, i);
716              int k = (i < SIZE) ? i : SIZE;
717 <            assertEquals(l.size(), k);
718 <            assertEquals(q.size(), SIZE-k);
717 >            assertEquals(k, l.size());
718 >            assertEquals(SIZE-k, q.size());
719              for (int j = 0; j < k; ++j)
720                  assertEquals(l.get(j), new Integer(j));
721 <            while (q.poll() != null) ;
721 >            do {} while (q.poll() != null);
722 >        }
723 >    }
724 >
725 >    /**
726 >     * remove(null), contains(null) always return false
727 >     */
728 >    public void testNeverContainsNull() {
729 >        Collection<?>[] qs = {
730 >            new PriorityBlockingQueue<Object>(),
731 >            populatedQueue(2),
732 >        };
733 >
734 >        for (Collection<?> q : qs) {
735 >            assertFalse(q.contains(null));
736 >            assertFalse(q.remove(null));
737          }
738      }
739  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines