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

Comparing jsr166/src/test/tck/PriorityQueueTest.java (file contents):
Revision 1.6 by dl, Thu Sep 25 11:02:41 2003 UTC vs.
Revision 1.40 by jsr166, Wed Jan 4 06:09:58 2017 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
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/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.*;
12 < import java.io.*;
9 > import java.util.Arrays;
10 > import java.util.Collection;
11 > import java.util.Comparator;
12 > import java.util.Iterator;
13 > import java.util.NoSuchElementException;
14 > import java.util.PriorityQueue;
15 > import java.util.Queue;
16 >
17 > import junit.framework.Test;
18 > import junit.framework.TestSuite;
19  
20   public class PriorityQueueTest extends JSR166TestCase {
21      public static void main(String[] args) {
22 <        junit.textui.TestRunner.run (suite());  
22 >        main(suite(), args);
23      }
24      public static Test suite() {
25 <        return new TestSuite(PriorityQueueTest.class);
25 >        class Implementation implements CollectionImplementation {
26 >            public Class<?> klazz() { return PriorityQueue.class; }
27 >            public Collection emptyCollection() { return new PriorityQueue(); }
28 >            public Object makeElement(int i) { return i; }
29 >            public boolean isConcurrent() { return false; }
30 >            public boolean permitsNulls() { return false; }
31 >        }
32 >        return newTestSuite(PriorityQueueTest.class,
33 >                            CollectionTest.testSuite(new Implementation()));
34      }
35  
36 <    static class MyReverseComparator implements Comparator {
36 >    static class MyReverseComparator implements Comparator {
37          public int compare(Object x, Object y) {
38 <            int i = ((Integer)x).intValue();
24 <            int j = ((Integer)y).intValue();
25 <            if (i < j) return 1;
26 <            if (i > j) return -1;
27 <            return 0;
38 >            return ((Comparable)y).compareTo(x);
39          }
40      }
41  
42      /**
43 <     * Create a queue of given size containing consecutive
44 <     * Integers 0 ... n.
43 >     * Returns a new queue of given size containing consecutive
44 >     * Integers 0 ... n - 1.
45       */
46 <    private PriorityQueue populatedQueue(int n) {
47 <        PriorityQueue q = new PriorityQueue(n);
46 >    private PriorityQueue<Integer> populatedQueue(int n) {
47 >        PriorityQueue<Integer> q = new PriorityQueue<>(n);
48          assertTrue(q.isEmpty());
49 <        for(int i = n-1; i >= 0; i-=2)
50 <            assertTrue(q.offer(new Integer(i)));
51 <        for(int i = (n & 1); i < n; i+=2)
52 <            assertTrue(q.offer(new Integer(i)));
49 >        for (int i = n - 1; i >= 0; i -= 2)
50 >            assertTrue(q.offer(new Integer(i)));
51 >        for (int i = (n & 1); i < n; i += 2)
52 >            assertTrue(q.offer(new Integer(i)));
53          assertFalse(q.isEmpty());
54 <        assertEquals(n, q.size());
54 >        assertEquals(n, q.size());
55 >        assertEquals((Integer) 0, q.peek());
56          return q;
57      }
58 <
58 >
59      /**
60       * A new queue has unbounded capacity
61       */
# Line 52 | Line 64 | public class PriorityQueueTest extends J
64      }
65  
66      /**
67 <     * Constructor throws IAE if  capacity argument nonpositive
67 >     * Constructor throws IAE if capacity argument nonpositive
68       */
69      public void testConstructor2() {
70          try {
71 <            PriorityQueue q = new PriorityQueue(0);
71 >            new PriorityQueue(0);
72              shouldThrow();
73 <        }
62 <        catch (IllegalArgumentException success) {}
73 >        } catch (IllegalArgumentException success) {}
74      }
75  
76      /**
# Line 67 | Line 78 | public class PriorityQueueTest extends J
78       */
79      public void testConstructor3() {
80          try {
81 <            PriorityQueue q = new PriorityQueue((Collection)null);
81 >            new PriorityQueue((Collection)null);
82              shouldThrow();
83 <        }
73 <        catch (NullPointerException success) {}
83 >        } catch (NullPointerException success) {}
84      }
85  
86      /**
# Line 78 | Line 88 | public class PriorityQueueTest extends J
88       */
89      public void testConstructor4() {
90          try {
91 <            Integer[] ints = new Integer[SIZE];
82 <            PriorityQueue q = new PriorityQueue(Arrays.asList(ints));
91 >            new PriorityQueue(Arrays.asList(new Integer[SIZE]));
92              shouldThrow();
93 <        }
85 <        catch (NullPointerException success) {}
93 >        } catch (NullPointerException success) {}
94      }
95  
96      /**
97       * Initializing from Collection with some null elements throws NPE
98       */
99      public void testConstructor5() {
100 +        Integer[] ints = new Integer[SIZE];
101 +        for (int i = 0; i < SIZE - 1; ++i)
102 +            ints[i] = new Integer(i);
103          try {
104 <            Integer[] ints = new Integer[SIZE];
94 <            for (int i = 0; i < SIZE-1; ++i)
95 <                ints[i] = new Integer(i);
96 <            PriorityQueue q = new PriorityQueue(Arrays.asList(ints));
104 >            new PriorityQueue(Arrays.asList(ints));
105              shouldThrow();
106 <        }
99 <        catch (NullPointerException success) {}
106 >        } catch (NullPointerException success) {}
107      }
108  
109      /**
110       * Queue contains all elements of collection used to initialize
111       */
112      public void testConstructor6() {
113 <        try {
114 <            Integer[] ints = new Integer[SIZE];
115 <            for (int i = 0; i < SIZE; ++i)
116 <                ints[i] = new Integer(i);
117 <            PriorityQueue q = new PriorityQueue(Arrays.asList(ints));
118 <            for (int i = 0; i < SIZE; ++i)
112 <                assertEquals(ints[i], q.poll());
113 <        }
114 <        finally {}
113 >        Integer[] ints = new Integer[SIZE];
114 >        for (int i = 0; i < SIZE; ++i)
115 >            ints[i] = new Integer(i);
116 >        PriorityQueue q = new PriorityQueue(Arrays.asList(ints));
117 >        for (int i = 0; i < SIZE; ++i)
118 >            assertEquals(ints[i], q.poll());
119      }
120  
121      /**
122       * The comparator used in constructor is used
123       */
124      public void testConstructor7() {
125 <        try {
126 <            MyReverseComparator cmp = new MyReverseComparator();
127 <            PriorityQueue q = new PriorityQueue(SIZE, cmp);
128 <            assertEquals(cmp, q.comparator());
129 <            Integer[] ints = new Integer[SIZE];
130 <            for (int i = 0; i < SIZE; ++i)
131 <                ints[i] = new Integer(i);
132 <            q.addAll(Arrays.asList(ints));
133 <            for (int i = SIZE-1; i >= 0; --i)
130 <                assertEquals(ints[i], q.poll());
131 <        }
132 <        finally {}
125 >        MyReverseComparator cmp = new MyReverseComparator();
126 >        PriorityQueue q = new PriorityQueue(SIZE, cmp);
127 >        assertEquals(cmp, q.comparator());
128 >        Integer[] ints = new Integer[SIZE];
129 >        for (int i = 0; i < SIZE; ++i)
130 >            ints[i] = new Integer(i);
131 >        q.addAll(Arrays.asList(ints));
132 >        for (int i = SIZE - 1; i >= 0; --i)
133 >            assertEquals(ints[i], q.poll());
134      }
135  
136      /**
# Line 152 | Line 153 | public class PriorityQueueTest extends J
153      public void testSize() {
154          PriorityQueue q = populatedQueue(SIZE);
155          for (int i = 0; i < SIZE; ++i) {
156 <            assertEquals(SIZE-i, q.size());
156 >            assertEquals(SIZE - i, q.size());
157              q.remove();
158          }
159          for (int i = 0; i < SIZE; ++i) {
# Line 165 | Line 166 | public class PriorityQueueTest extends J
166       * offer(null) throws NPE
167       */
168      public void testOfferNull() {
169 <        try {
170 <            PriorityQueue q = new PriorityQueue(1);
169 >        PriorityQueue q = new PriorityQueue(1);
170 >        try {
171              q.offer(null);
172              shouldThrow();
173 <        } catch (NullPointerException success) { }  
173 >        } catch (NullPointerException success) {}
174 >    }
175 >
176 >    /**
177 >     * add(null) throws NPE
178 >     */
179 >    public void testAddNull() {
180 >        PriorityQueue q = new PriorityQueue(1);
181 >        try {
182 >            q.add(null);
183 >            shouldThrow();
184 >        } catch (NullPointerException success) {}
185      }
186  
187      /**
# Line 185 | Line 197 | public class PriorityQueueTest extends J
197       * Offer of non-Comparable throws CCE
198       */
199      public void testOfferNonComparable() {
200 +        PriorityQueue q = new PriorityQueue(1);
201          try {
189            PriorityQueue q = new PriorityQueue(1);
190            q.offer(new Object());
191            q.offer(new Object());
202              q.offer(new Object());
203              shouldThrow();
204 +        } catch (ClassCastException success) {
205 +            assertTrue(q.isEmpty());
206 +            assertEquals(0, q.size());
207 +            assertNull(q.poll());
208          }
195        catch(ClassCastException success) {}
209      }
210  
211      /**
# Line 210 | Line 223 | public class PriorityQueueTest extends J
223       * addAll(null) throws NPE
224       */
225      public void testAddAll1() {
226 +        PriorityQueue q = new PriorityQueue(1);
227          try {
214            PriorityQueue q = new PriorityQueue(1);
228              q.addAll(null);
229              shouldThrow();
230 <        }
218 <        catch (NullPointerException success) {}
230 >        } catch (NullPointerException success) {}
231      }
232 +
233      /**
234       * addAll of a collection with null elements throws NPE
235       */
236      public void testAddAll2() {
237 +        PriorityQueue q = new PriorityQueue(SIZE);
238          try {
239 <            PriorityQueue q = new PriorityQueue(SIZE);
226 <            Integer[] ints = new Integer[SIZE];
227 <            q.addAll(Arrays.asList(ints));
239 >            q.addAll(Arrays.asList(new Integer[SIZE]));
240              shouldThrow();
241 <        }
230 <        catch (NullPointerException success) {}
241 >        } catch (NullPointerException success) {}
242      }
243 +
244      /**
245       * addAll of a collection with any null elements throws NPE after
246       * possibly adding some elements
247       */
248      public void testAddAll3() {
249 +        PriorityQueue q = new PriorityQueue(SIZE);
250 +        Integer[] ints = new Integer[SIZE];
251 +        for (int i = 0; i < SIZE - 1; ++i)
252 +            ints[i] = new Integer(i);
253          try {
238            PriorityQueue q = new PriorityQueue(SIZE);
239            Integer[] ints = new Integer[SIZE];
240            for (int i = 0; i < SIZE-1; ++i)
241                ints[i] = new Integer(i);
254              q.addAll(Arrays.asList(ints));
255              shouldThrow();
256 <        }
245 <        catch (NullPointerException success) {}
256 >        } catch (NullPointerException success) {}
257      }
258  
259      /**
260       * Queue contains all elements of successful addAll
261       */
262      public void testAddAll5() {
263 <        try {
264 <            Integer[] empty = new Integer[0];
265 <            Integer[] ints = new Integer[SIZE];
266 <            for (int i = 0; i < SIZE; ++i)
267 <                ints[i] = new Integer(SIZE-1-i);
268 <            PriorityQueue q = new PriorityQueue(SIZE);
269 <            assertFalse(q.addAll(Arrays.asList(empty)));
270 <            assertTrue(q.addAll(Arrays.asList(ints)));
271 <            for (int i = 0; i < SIZE; ++i)
261 <                assertEquals(new Integer(i), q.poll());
262 <        }
263 <        finally {}
263 >        Integer[] empty = new Integer[0];
264 >        Integer[] ints = new Integer[SIZE];
265 >        for (int i = 0; i < SIZE; ++i)
266 >            ints[i] = new Integer(SIZE - 1 - i);
267 >        PriorityQueue q = new PriorityQueue(SIZE);
268 >        assertFalse(q.addAll(Arrays.asList(empty)));
269 >        assertTrue(q.addAll(Arrays.asList(ints)));
270 >        for (int i = 0; i < SIZE; ++i)
271 >            assertEquals(new Integer(i), q.poll());
272      }
273  
274      /**
# Line 269 | Line 277 | public class PriorityQueueTest extends J
277      public void testPoll() {
278          PriorityQueue q = populatedQueue(SIZE);
279          for (int i = 0; i < SIZE; ++i) {
280 <            assertEquals(i, ((Integer)q.poll()).intValue());
280 >            assertEquals(i, q.poll());
281          }
282 <        assertNull(q.poll());
282 >        assertNull(q.poll());
283      }
284  
285      /**
# Line 280 | Line 288 | public class PriorityQueueTest extends J
288      public void testPeek() {
289          PriorityQueue q = populatedQueue(SIZE);
290          for (int i = 0; i < SIZE; ++i) {
291 <            assertEquals(i, ((Integer)q.peek()).intValue());
292 <            q.poll();
291 >            assertEquals(i, q.peek());
292 >            assertEquals(i, q.poll());
293              assertTrue(q.peek() == null ||
294 <                       i != ((Integer)q.peek()).intValue());
294 >                       !q.peek().equals(i));
295          }
296 <        assertNull(q.peek());
296 >        assertNull(q.peek());
297      }
298  
299      /**
# Line 294 | Line 302 | public class PriorityQueueTest extends J
302      public void testElement() {
303          PriorityQueue q = populatedQueue(SIZE);
304          for (int i = 0; i < SIZE; ++i) {
305 <            assertEquals(i, ((Integer)q.element()).intValue());
306 <            q.poll();
305 >            assertEquals(i, q.element());
306 >            assertEquals(i, q.poll());
307          }
308          try {
309              q.element();
310              shouldThrow();
311 <        }
304 <        catch (NoSuchElementException success) {}
311 >        } catch (NoSuchElementException success) {}
312      }
313  
314      /**
# Line 310 | Line 317 | public class PriorityQueueTest extends J
317      public void testRemove() {
318          PriorityQueue q = populatedQueue(SIZE);
319          for (int i = 0; i < SIZE; ++i) {
320 <            assertEquals(i, ((Integer)q.remove()).intValue());
320 >            assertEquals(i, q.remove());
321          }
322          try {
323              q.remove();
324              shouldThrow();
325 <        } catch (NoSuchElementException success){
319 <        }  
325 >        } catch (NoSuchElementException success) {}
326      }
327  
328      /**
# Line 324 | Line 330 | public class PriorityQueueTest extends J
330       */
331      public void testRemoveElement() {
332          PriorityQueue q = populatedQueue(SIZE);
333 <        for (int i = 1; i < SIZE; i+=2) {
334 <            assertTrue(q.remove(new Integer(i)));
335 <        }
336 <        for (int i = 0; i < SIZE; i+=2) {
337 <            assertTrue(q.remove(new Integer(i)));
338 <            assertFalse(q.remove(new Integer(i+1)));
333 >        for (int i = 1; i < SIZE; i += 2) {
334 >            assertTrue(q.contains(i));
335 >            assertTrue(q.remove(i));
336 >            assertFalse(q.contains(i));
337 >            assertTrue(q.contains(i - 1));
338 >        }
339 >        for (int i = 0; i < SIZE; i += 2) {
340 >            assertTrue(q.contains(i));
341 >            assertTrue(q.remove(i));
342 >            assertFalse(q.contains(i));
343 >            assertFalse(q.remove(i + 1));
344 >            assertFalse(q.contains(i + 1));
345          }
346          assertTrue(q.isEmpty());
347      }
348 <        
348 >
349      /**
350       * contains(x) reports true when elements added but not yet removed
351       */
# Line 388 | Line 400 | public class PriorityQueueTest extends J
400                  assertTrue(changed);
401  
402              assertTrue(q.containsAll(p));
403 <            assertEquals(SIZE-i, q.size());
403 >            assertEquals(SIZE - i, q.size());
404              p.remove();
405          }
406      }
# Line 401 | Line 413 | public class PriorityQueueTest extends J
413              PriorityQueue q = populatedQueue(SIZE);
414              PriorityQueue p = populatedQueue(i);
415              assertTrue(q.removeAll(p));
416 <            assertEquals(SIZE-i, q.size());
416 >            assertEquals(SIZE - i, q.size());
417              for (int j = 0; j < i; ++j) {
418 <                Integer I = (Integer)(p.remove());
419 <                assertFalse(q.contains(I));
418 >                Integer x = (Integer)(p.remove());
419 >                assertFalse(q.contains(x));
420              }
421          }
422      }
# Line 414 | Line 426 | public class PriorityQueueTest extends J
426       */
427      public void testToArray() {
428          PriorityQueue q = populatedQueue(SIZE);
429 <        Object[] o = q.toArray();
429 >        Object[] o = q.toArray();
430          Arrays.sort(o);
431 <        for(int i = 0; i < o.length; i++)
432 <            assertEquals(o[i], q.poll());
431 >        for (int i = 0; i < o.length; i++)
432 >            assertSame(o[i], q.poll());
433      }
434  
435      /**
436       * toArray(a) contains all elements
437       */
438      public void testToArray2() {
439 <        PriorityQueue q = populatedQueue(SIZE);
440 <        Integer[] ints = new Integer[SIZE];
441 <        ints = (Integer[])q.toArray(ints);
439 >        PriorityQueue<Integer> q = populatedQueue(SIZE);
440 >        Integer[] ints = new Integer[SIZE];
441 >        Integer[] array = q.toArray(ints);
442 >        assertSame(ints, array);
443          Arrays.sort(ints);
444 <        for(int i = 0; i < ints.length; i++)
445 <            assertEquals(ints[i], q.poll());
444 >        for (int i = 0; i < ints.length; i++)
445 >            assertSame(ints[i], q.poll());
446      }
447 <    
447 >
448      /**
449       * iterator iterates through all elements
450       */
451      public void testIterator() {
452          PriorityQueue q = populatedQueue(SIZE);
453 <        int i = 0;
454 <        Iterator it = q.iterator();
455 <        while(it.hasNext()) {
453 >        Iterator it = q.iterator();
454 >        int i;
455 >        for (i = 0; it.hasNext(); i++)
456              assertTrue(q.contains(it.next()));
444            ++i;
445        }
457          assertEquals(i, SIZE);
458 +        assertIteratorExhausted(it);
459 +    }
460 +
461 +    /**
462 +     * iterator of empty collection has no elements
463 +     */
464 +    public void testEmptyIterator() {
465 +        assertIteratorExhausted(new PriorityQueue().iterator());
466      }
467  
468      /**
469       * iterator.remove removes current element
470       */
471 <    public void testIteratorRemove () {
471 >    public void testIteratorRemove() {
472          final PriorityQueue q = new PriorityQueue(3);
473          q.add(new Integer(2));
474          q.add(new Integer(1));
# Line 465 | Line 484 | public class PriorityQueueTest extends J
484          assertFalse(it.hasNext());
485      }
486  
468
487      /**
488       * toString contains toStrings of elements
489       */
# Line 473 | Line 491 | public class PriorityQueueTest extends J
491          PriorityQueue q = populatedQueue(SIZE);
492          String s = q.toString();
493          for (int i = 0; i < SIZE; ++i) {
494 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
494 >            assertTrue(s.contains(String.valueOf(i)));
495          }
496 <    }        
496 >    }
497  
498      /**
499 <     * A deserialized serialized queue has same elements
499 >     * A deserialized serialized queue has same elements
500       */
501 <    public void testSerialization() {
502 <        PriorityQueue q = populatedQueue(SIZE);
503 <        try {
486 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
487 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
488 <            out.writeObject(q);
489 <            out.close();
501 >    public void testSerialization() throws Exception {
502 >        Queue x = populatedQueue(SIZE);
503 >        Queue y = serialClone(x);
504  
505 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
506 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
507 <            PriorityQueue r = (PriorityQueue)in.readObject();
508 <            assertEquals(q.size(), r.size());
509 <            while (!q.isEmpty())
496 <                assertEquals(q.remove(), r.remove());
497 <        } catch(Exception e){
498 <            unexpectedException();
505 >        assertNotSame(x, y);
506 >        assertEquals(x.size(), y.size());
507 >        while (!x.isEmpty()) {
508 >            assertFalse(y.isEmpty());
509 >            assertEquals(x.remove(), y.remove());
510          }
511 +        assertTrue(y.isEmpty());
512      }
513   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines