--- jsr166/src/test/tck/PriorityQueueTest.java 2018/05/28 21:19:50 1.47 +++ jsr166/src/test/tck/PriorityQueueTest.java 2021/01/26 13:33:06 1.48 @@ -24,16 +24,17 @@ public class PriorityQueueTest extends J class Implementation implements CollectionImplementation { public Class klazz() { return PriorityQueue.class; } public Collection emptyCollection() { return new PriorityQueue(); } - public Object makeElement(int i) { return i; } + public Object makeElement(int i) { return JSR166TestCase.itemFor(i); } public boolean isConcurrent() { return false; } public boolean permitsNulls() { return false; } } class ComparatorImplementation implements CollectionImplementation { public Class klazz() { return PriorityQueue.class; } + @SuppressWarnings("unchecked") public Collection emptyCollection() { return new PriorityQueue(new MyReverseComparator()); } - public Object makeElement(int i) { return i; } + public Object makeElement(int i) { return JSR166TestCase.itemFor(i); } public boolean isConcurrent() { return false; } public boolean permitsNulls() { return false; } } @@ -44,6 +45,7 @@ public class PriorityQueueTest extends J } static class MyReverseComparator implements Comparator, java.io.Serializable { + @SuppressWarnings("unchecked") public int compare(Object x, Object y) { return ((Comparable)y).compareTo(x); } @@ -51,18 +53,18 @@ public class PriorityQueueTest extends J /** * Returns a new queue of given size containing consecutive - * Integers 0 ... n - 1. + * Items 0 ... n - 1. */ - private static PriorityQueue populatedQueue(int n) { - PriorityQueue q = new PriorityQueue<>(n); + private static PriorityQueue populatedQueue(int n) { + PriorityQueue q = new PriorityQueue<>(n); assertTrue(q.isEmpty()); for (int i = n - 1; i >= 0; i -= 2) - assertTrue(q.offer(new Integer(i))); + mustOffer(q, i); for (int i = (n & 1); i < n; i += 2) - assertTrue(q.offer(new Integer(i))); + mustOffer(q, i); assertFalse(q.isEmpty()); - assertEquals(n, q.size()); - assertEquals((Integer) 0, q.peek()); + mustEqual(n, q.size()); + mustEqual(0, q.peek()); return q; } @@ -70,7 +72,7 @@ public class PriorityQueueTest extends J * A new queue has unbounded capacity */ public void testConstructor1() { - assertEquals(0, new PriorityQueue(SIZE).size()); + mustEqual(0, new PriorityQueue(SIZE).size()); } /** @@ -78,7 +80,7 @@ public class PriorityQueueTest extends J */ public void testConstructor2() { try { - new PriorityQueue(0); + new PriorityQueue(0); shouldThrow(); } catch (IllegalArgumentException success) {} } @@ -88,7 +90,7 @@ public class PriorityQueueTest extends J */ public void testConstructor3() { try { - new PriorityQueue((Collection)null); + new PriorityQueue((Collection)null); shouldThrow(); } catch (NullPointerException success) {} } @@ -98,7 +100,7 @@ public class PriorityQueueTest extends J */ public void testConstructor4() { try { - new PriorityQueue(Arrays.asList(new Integer[SIZE])); + new PriorityQueue(Arrays.asList(new Item[SIZE])); shouldThrow(); } catch (NullPointerException success) {} } @@ -107,11 +109,10 @@ public class PriorityQueueTest extends J * Initializing from Collection with some null elements throws NPE */ public void testConstructor5() { - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE - 1; ++i) - ints[i] = new Integer(i); + Item[] items = new Item[2]; + items[0] = zero; try { - new PriorityQueue(Arrays.asList(ints)); + new PriorityQueue(Arrays.asList(items)); shouldThrow(); } catch (NullPointerException success) {} } @@ -120,12 +121,10 @@ public class PriorityQueueTest extends J * Queue contains all elements of collection used to initialize */ public void testConstructor6() { - Integer[] ints = new Integer[SIZE]; + Item[] items = defaultItems; + PriorityQueue q = new PriorityQueue(Arrays.asList(items)); for (int i = 0; i < SIZE; ++i) - ints[i] = new Integer(i); - PriorityQueue q = new PriorityQueue(Arrays.asList(ints)); - for (int i = 0; i < SIZE; ++i) - assertEquals(ints[i], q.poll()); + mustEqual(items[i], q.poll()); } /** @@ -133,25 +132,24 @@ public class PriorityQueueTest extends J */ public void testConstructor7() { MyReverseComparator cmp = new MyReverseComparator(); - PriorityQueue q = new PriorityQueue(SIZE, cmp); + @SuppressWarnings("unchecked") + PriorityQueue q = new PriorityQueue(SIZE, cmp); assertEquals(cmp, q.comparator()); - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE; ++i) - ints[i] = new Integer(i); - q.addAll(Arrays.asList(ints)); + Item[] items = seqItems(SIZE); + q.addAll(Arrays.asList(items)); for (int i = SIZE - 1; i >= 0; --i) - assertEquals(ints[i], q.poll()); + mustEqual(items[i], q.poll()); } /** * isEmpty is true before add, false after */ public void testEmpty() { - PriorityQueue q = new PriorityQueue(2); + PriorityQueue q = new PriorityQueue(2); assertTrue(q.isEmpty()); - q.add(new Integer(1)); + q.add(one); assertFalse(q.isEmpty()); - q.add(new Integer(2)); + q.add(two); q.remove(); q.remove(); assertTrue(q.isEmpty()); @@ -161,14 +159,14 @@ public class PriorityQueueTest extends J * size changes when elements added and removed */ public void testSize() { - PriorityQueue q = populatedQueue(SIZE); + PriorityQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(SIZE - i, q.size()); + mustEqual(SIZE - i, q.size()); q.remove(); } for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.size()); - q.add(new Integer(i)); + mustEqual(i, q.size()); + mustAdd(q, i); } } @@ -176,7 +174,7 @@ public class PriorityQueueTest extends J * offer(null) throws NPE */ public void testOfferNull() { - PriorityQueue q = new PriorityQueue(1); + PriorityQueue q = new PriorityQueue(1); try { q.offer(null); shouldThrow(); @@ -187,7 +185,7 @@ public class PriorityQueueTest extends J * add(null) throws NPE */ public void testAddNull() { - PriorityQueue q = new PriorityQueue(1); + PriorityQueue q = new PriorityQueue(1); try { q.add(null); shouldThrow(); @@ -198,7 +196,7 @@ public class PriorityQueueTest extends J * Offer of comparable element succeeds */ public void testOffer() { - PriorityQueue q = new PriorityQueue(1); + PriorityQueue q = new PriorityQueue(1); assertTrue(q.offer(zero)); assertTrue(q.offer(one)); } @@ -207,13 +205,13 @@ public class PriorityQueueTest extends J * Offer of non-Comparable throws CCE */ public void testOfferNonComparable() { - PriorityQueue q = new PriorityQueue(1); + PriorityQueue q = new PriorityQueue(1); try { q.offer(new Object()); shouldThrow(); } catch (ClassCastException success) { assertTrue(q.isEmpty()); - assertEquals(0, q.size()); + mustEqual(0, q.size()); assertNull(q.poll()); } } @@ -222,10 +220,10 @@ public class PriorityQueueTest extends J * add of comparable succeeds */ public void testAdd() { - PriorityQueue q = new PriorityQueue(SIZE); + PriorityQueue q = new PriorityQueue(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.size()); - assertTrue(q.add(new Integer(i))); + mustEqual(i, q.size()); + mustAdd(q, i); } } @@ -233,7 +231,7 @@ public class PriorityQueueTest extends J * addAll(null) throws NPE */ public void testAddAll1() { - PriorityQueue q = new PriorityQueue(1); + PriorityQueue q = new PriorityQueue(1); try { q.addAll(null); shouldThrow(); @@ -244,9 +242,9 @@ public class PriorityQueueTest extends J * addAll of a collection with null elements throws NPE */ public void testAddAll2() { - PriorityQueue q = new PriorityQueue(SIZE); + PriorityQueue q = new PriorityQueue(SIZE); try { - q.addAll(Arrays.asList(new Integer[SIZE])); + q.addAll(Arrays.asList(new Item[SIZE])); shouldThrow(); } catch (NullPointerException success) {} } @@ -256,12 +254,11 @@ public class PriorityQueueTest extends J * possibly adding some elements */ public void testAddAll3() { - PriorityQueue q = new PriorityQueue(SIZE); - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE - 1; ++i) - ints[i] = new Integer(i); + PriorityQueue q = new PriorityQueue(SIZE); + Item[] items = new Item[2]; + items[0] = zero; try { - q.addAll(Arrays.asList(ints)); + q.addAll(Arrays.asList(items)); shouldThrow(); } catch (NullPointerException success) {} } @@ -270,24 +267,24 @@ public class PriorityQueueTest extends J * Queue contains all elements of successful addAll */ public void testAddAll5() { - Integer[] empty = new Integer[0]; - Integer[] ints = new Integer[SIZE]; + Item[] empty = new Item[0]; + Item[] items = new Item[SIZE]; for (int i = 0; i < SIZE; ++i) - ints[i] = new Integer(SIZE - 1 - i); - PriorityQueue q = new PriorityQueue(SIZE); + items[i] = itemFor(SIZE - 1 - i); + PriorityQueue q = new PriorityQueue(SIZE); assertFalse(q.addAll(Arrays.asList(empty))); - assertTrue(q.addAll(Arrays.asList(ints))); + assertTrue(q.addAll(Arrays.asList(items))); for (int i = 0; i < SIZE; ++i) - assertEquals(new Integer(i), q.poll()); + mustEqual(i, q.poll()); } /** * poll succeeds unless empty */ public void testPoll() { - PriorityQueue q = populatedQueue(SIZE); + PriorityQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.poll()); + mustEqual(i, q.poll()); } assertNull(q.poll()); } @@ -296,10 +293,10 @@ public class PriorityQueueTest extends J * peek returns next element, or null if empty */ public void testPeek() { - PriorityQueue q = populatedQueue(SIZE); + PriorityQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.peek()); - assertEquals(i, q.poll()); + mustEqual(i, q.peek()); + mustEqual(i, q.poll()); assertTrue(q.peek() == null || !q.peek().equals(i)); } @@ -310,10 +307,10 @@ public class PriorityQueueTest extends J * element returns next element, or throws NSEE if empty */ public void testElement() { - PriorityQueue q = populatedQueue(SIZE); + PriorityQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.element()); - assertEquals(i, q.poll()); + mustEqual(i, q.element()); + mustEqual(i, q.poll()); } try { q.element(); @@ -325,9 +322,9 @@ public class PriorityQueueTest extends J * remove removes next element, or throws NSEE if empty */ public void testRemove() { - PriorityQueue q = populatedQueue(SIZE); + PriorityQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, q.remove()); + mustEqual(i, q.remove()); } try { q.remove(); @@ -339,19 +336,19 @@ public class PriorityQueueTest extends J * remove(x) removes x and returns true if present */ public void testRemoveElement() { - PriorityQueue q = populatedQueue(SIZE); + PriorityQueue q = populatedQueue(SIZE); for (int i = 1; i < SIZE; i += 2) { - assertTrue(q.contains(i)); - assertTrue(q.remove(i)); - assertFalse(q.contains(i)); - assertTrue(q.contains(i - 1)); + mustContain(q, i); + mustRemove(q, i); + mustNotContain(q, i); + mustContain(q, i - 1); } for (int i = 0; i < SIZE; i += 2) { - assertTrue(q.contains(i)); - assertTrue(q.remove(i)); - assertFalse(q.contains(i)); - assertFalse(q.remove(i + 1)); - assertFalse(q.contains(i + 1)); + mustContain(q, i); + mustRemove(q, i); + mustNotContain(q, i); + mustNotRemove(q, i + 1); + mustNotContain(q, i + 1); } assertTrue(q.isEmpty()); } @@ -360,11 +357,11 @@ public class PriorityQueueTest extends J * contains(x) reports true when elements added but not yet removed */ public void testContains() { - PriorityQueue q = populatedQueue(SIZE); + PriorityQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { - assertTrue(q.contains(new Integer(i))); + mustContain(q, i); q.poll(); - assertFalse(q.contains(new Integer(i))); + mustNotContain(q, i); } } @@ -372,11 +369,11 @@ public class PriorityQueueTest extends J * clear removes all elements */ public void testClear() { - PriorityQueue q = populatedQueue(SIZE); + PriorityQueue q = populatedQueue(SIZE); q.clear(); assertTrue(q.isEmpty()); - assertEquals(0, q.size()); - q.add(new Integer(1)); + mustEqual(0, q.size()); + q.add(one); assertFalse(q.isEmpty()); q.clear(); assertTrue(q.isEmpty()); @@ -386,12 +383,12 @@ public class PriorityQueueTest extends J * containsAll(c) is true when c contains a subset of elements */ public void testContainsAll() { - PriorityQueue q = populatedQueue(SIZE); - PriorityQueue p = new PriorityQueue(SIZE); + PriorityQueue q = populatedQueue(SIZE); + PriorityQueue p = new PriorityQueue(SIZE); for (int i = 0; i < SIZE; ++i) { assertTrue(q.containsAll(p)); assertFalse(p.containsAll(q)); - p.add(new Integer(i)); + mustAdd(p, i); } assertTrue(p.containsAll(q)); } @@ -400,8 +397,8 @@ public class PriorityQueueTest extends J * retainAll(c) retains only those elements of c and reports true if changed */ public void testRetainAll() { - PriorityQueue q = populatedQueue(SIZE); - PriorityQueue p = populatedQueue(SIZE); + PriorityQueue q = populatedQueue(SIZE); + PriorityQueue p = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { boolean changed = q.retainAll(p); if (i == 0) @@ -410,7 +407,7 @@ public class PriorityQueueTest extends J assertTrue(changed); assertTrue(q.containsAll(p)); - assertEquals(SIZE - i, q.size()); + mustEqual(SIZE - i, q.size()); p.remove(); } } @@ -420,13 +417,12 @@ public class PriorityQueueTest extends J */ public void testRemoveAll() { for (int i = 1; i < SIZE; ++i) { - PriorityQueue q = populatedQueue(SIZE); - PriorityQueue p = populatedQueue(i); + PriorityQueue q = populatedQueue(SIZE); + PriorityQueue p = populatedQueue(i); assertTrue(q.removeAll(p)); - assertEquals(SIZE - i, q.size()); + mustEqual(SIZE - i, q.size()); for (int j = 0; j < i; ++j) { - Integer x = (Integer)(p.remove()); - assertFalse(q.contains(x)); + mustNotContain(q, p.remove()); } } } @@ -435,7 +431,7 @@ public class PriorityQueueTest extends J * toArray contains all elements */ public void testToArray() { - PriorityQueue q = populatedQueue(SIZE); + PriorityQueue q = populatedQueue(SIZE); Object[] a = q.toArray(); assertSame(Object[].class, a.getClass()); Arrays.sort(a); @@ -448,12 +444,12 @@ public class PriorityQueueTest extends J * toArray(a) contains all elements */ public void testToArray2() { - PriorityQueue q = populatedQueue(SIZE); - Integer[] ints = new Integer[SIZE]; - Integer[] array = q.toArray(ints); - assertSame(ints, array); - Arrays.sort(ints); - for (Integer o : ints) + PriorityQueue q = populatedQueue(SIZE); + Item[] items = new Item[SIZE]; + Item[] array = q.toArray(items); + assertSame(items, array); + Arrays.sort(items); + for (Item o : items) assertSame(o, q.poll()); assertTrue(q.isEmpty()); } @@ -462,12 +458,12 @@ public class PriorityQueueTest extends J * iterator iterates through all elements */ public void testIterator() { - PriorityQueue q = populatedQueue(SIZE); - Iterator it = q.iterator(); + PriorityQueue q = populatedQueue(SIZE); + Iterator it = q.iterator(); int i; for (i = 0; it.hasNext(); i++) - assertTrue(q.contains(it.next())); - assertEquals(i, SIZE); + mustContain(q, it.next()); + mustEqual(i, SIZE); assertIteratorExhausted(it); } @@ -475,25 +471,25 @@ public class PriorityQueueTest extends J * iterator of empty collection has no elements */ public void testEmptyIterator() { - assertIteratorExhausted(new PriorityQueue().iterator()); + assertIteratorExhausted(new PriorityQueue().iterator()); } /** * iterator.remove removes current element */ public void testIteratorRemove() { - final PriorityQueue q = new PriorityQueue(3); - q.add(new Integer(2)); - q.add(new Integer(1)); - q.add(new Integer(3)); + final PriorityQueue q = new PriorityQueue(3); + q.add(two); + q.add(one); + q.add(three); - Iterator it = q.iterator(); + Iterator it = q.iterator(); it.next(); it.remove(); it = q.iterator(); - assertEquals(it.next(), new Integer(2)); - assertEquals(it.next(), new Integer(3)); + mustEqual(it.next(), two); + mustEqual(it.next(), three); assertFalse(it.hasNext()); } @@ -501,7 +497,7 @@ public class PriorityQueueTest extends J * toString contains toStrings of elements */ public void testToString() { - PriorityQueue q = populatedQueue(SIZE); + PriorityQueue q = populatedQueue(SIZE); String s = q.toString(); for (int i = 0; i < SIZE; ++i) { assertTrue(s.contains(String.valueOf(i))); @@ -512,14 +508,14 @@ public class PriorityQueueTest extends J * A deserialized/reserialized queue has same elements */ public void testSerialization() throws Exception { - Queue x = populatedQueue(SIZE); - Queue y = serialClone(x); + Queue x = populatedQueue(SIZE); + Queue y = serialClone(x); assertNotSame(x, y); - assertEquals(x.size(), y.size()); + mustEqual(x.size(), y.size()); while (!x.isEmpty()) { assertFalse(y.isEmpty()); - assertEquals(x.remove(), y.remove()); + mustEqual(x.remove(), y.remove()); } assertTrue(y.isEmpty()); }