--- jsr166/src/test/tck/ArrayDequeTest.java 2005/09/17 12:50:49 1.4 +++ jsr166/src/test/tck/ArrayDequeTest.java 2009/12/01 09:56:28 1.13 @@ -10,11 +10,11 @@ import java.util.concurrent.*; public class ArrayDequeTest extends JSR166TestCase { public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); + junit.textui.TestRunner.run (suite()); } public static Test suite() { - return new TestSuite(ArrayDequeTest.class); + return new TestSuite(ArrayDequeTest.class); } /** @@ -24,13 +24,13 @@ public class ArrayDequeTest extends JSR1 private ArrayDeque populatedDeque(int n) { ArrayDeque q = new ArrayDeque(); assertTrue(q.isEmpty()); - for(int i = 0; i < n; ++i) - assertTrue(q.offerLast(new Integer(i))); + for (int i = 0; i < n; ++i) + assertTrue(q.offerLast(new Integer(i))); assertFalse(q.isEmpty()); - assertEquals(n, q.size()); + assertEquals(n, q.size()); return q; } - + /** * new queue is empty */ @@ -45,8 +45,7 @@ public class ArrayDequeTest extends JSR1 try { ArrayDeque q = new ArrayDeque((Collection)null); shouldThrow(); - } - catch (NullPointerException success) {} + } catch (NullPointerException success) {} } /** @@ -54,15 +53,12 @@ public class ArrayDequeTest extends JSR1 */ public void testConstructor6() { - try { - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE; ++i) - ints[i] = new Integer(i); - ArrayDeque q = new ArrayDeque(Arrays.asList(ints)); - for (int i = 0; i < SIZE; ++i) - assertEquals(ints[i], q.pollFirst()); - } - finally {} + Integer[] ints = new Integer[SIZE]; + for (int i = 0; i < SIZE; ++i) + ints[i] = new Integer(i); + ArrayDeque q = new ArrayDeque(Arrays.asList(ints)); + for (int i = 0; i < SIZE; ++i) + assertEquals(ints[i], q.pollFirst()); } /** @@ -98,11 +94,11 @@ public class ArrayDequeTest extends JSR1 * push(null) throws NPE */ public void testPushNull() { - try { + try { ArrayDeque q = new ArrayDeque(1); q.push(null); shouldThrow(); - } catch (NullPointerException success) { } + } catch (NullPointerException success) {} } /** @@ -111,9 +107,9 @@ public class ArrayDequeTest extends JSR1 public void testPush() { ArrayDeque q = populatedDeque(3); q.pollLast(); - q.push(four); - assertEquals(four,q.peekFirst()); - } + q.push(four); + assertSame(four, q.peekFirst()); + } /** * pop removes next element, or throws NSEE if empty @@ -121,29 +117,27 @@ public class ArrayDequeTest extends JSR1 public void testPop() { ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.pop()).intValue()); + assertEquals(i, q.pop()); } try { q.pop(); shouldThrow(); - } catch (NoSuchElementException success){ - } + } catch (NoSuchElementException success) {} } /** * offer(null) throws NPE */ public void testOfferFirstNull() { - try { + try { ArrayDeque q = new ArrayDeque(); q.offerFirst(null); shouldThrow(); - } catch (NullPointerException success) { - } + } catch (NullPointerException success) {} } /** - * OfferFirst succeeds + * OfferFirst succeeds */ public void testOfferFirst() { ArrayDeque q = new ArrayDeque(); @@ -152,7 +146,7 @@ public class ArrayDequeTest extends JSR1 } /** - * OfferLast succeeds + * OfferLast succeeds */ public void testOfferLast() { ArrayDeque q = new ArrayDeque(); @@ -179,26 +173,22 @@ public class ArrayDequeTest extends JSR1 ArrayDeque q = new ArrayDeque(); q.addAll(null); shouldThrow(); - } - catch (NullPointerException success) {} + } catch (NullPointerException success) {} } /** * Queue contains all elements, in traversal order, of successful addAll */ public void testAddAll5() { - try { - Integer[] empty = new Integer[0]; - Integer[] ints = new Integer[SIZE]; - for (int i = 0; i < SIZE; ++i) - ints[i] = new Integer(i); - ArrayDeque q = new ArrayDeque(); - assertFalse(q.addAll(Arrays.asList(empty))); - assertTrue(q.addAll(Arrays.asList(ints))); - for (int i = 0; i < SIZE; ++i) - assertEquals(ints[i], q.pollFirst()); - } - finally {} + Integer[] empty = new Integer[0]; + Integer[] ints = new Integer[SIZE]; + for (int i = 0; i < SIZE; ++i) + ints[i] = new Integer(i); + ArrayDeque q = new ArrayDeque(); + assertFalse(q.addAll(Arrays.asList(empty))); + assertTrue(q.addAll(Arrays.asList(ints))); + for (int i = 0; i < SIZE; ++i) + assertEquals(ints[i], q.pollFirst()); } /** @@ -207,9 +197,9 @@ public class ArrayDequeTest extends JSR1 public void testPollFirst() { ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.pollFirst()).intValue()); + assertEquals(i, q.pollFirst()); } - assertNull(q.pollFirst()); + assertNull(q.pollFirst()); } /** @@ -218,9 +208,9 @@ public class ArrayDequeTest extends JSR1 public void testPollLast() { ArrayDeque q = populatedDeque(SIZE); for (int i = SIZE-1; i >= 0; --i) { - assertEquals(i, ((Integer)q.pollLast()).intValue()); + assertEquals(i, q.pollLast()); } - assertNull(q.pollLast()); + assertNull(q.pollLast()); } /** @@ -229,9 +219,9 @@ public class ArrayDequeTest extends JSR1 public void testPoll() { ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.poll()).intValue()); + assertEquals(i, q.poll()); } - assertNull(q.poll()); + assertNull(q.poll()); } /** @@ -240,13 +230,12 @@ public class ArrayDequeTest extends JSR1 public void testRemove() { ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.remove()).intValue()); + assertEquals(i, q.remove()); } try { q.remove(); shouldThrow(); - } catch (NoSuchElementException success){ - } + } catch (NoSuchElementException success) {} } /** @@ -255,12 +244,12 @@ public class ArrayDequeTest extends JSR1 public void testPeekFirst() { ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.peekFirst()).intValue()); - q.pollFirst(); + assertEquals(i, q.peekFirst()); + assertEquals(i, q.pollFirst()); assertTrue(q.peekFirst() == null || - i != ((Integer)q.peekFirst()).intValue()); + !q.peekFirst().equals(i)); } - assertNull(q.peekFirst()); + assertNull(q.peekFirst()); } /** @@ -269,12 +258,12 @@ public class ArrayDequeTest extends JSR1 public void testPeek() { ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.peek()).intValue()); - q.poll(); + assertEquals(i, q.peek()); + assertEquals(i, q.poll()); assertTrue(q.peek() == null || - i != ((Integer)q.peek()).intValue()); + !q.peek().equals(i)); } - assertNull(q.peek()); + assertNull(q.peek()); } /** @@ -283,12 +272,12 @@ public class ArrayDequeTest extends JSR1 public void testPeekLast() { ArrayDeque q = populatedDeque(SIZE); for (int i = SIZE-1; i >= 0; --i) { - assertEquals(i, ((Integer)q.peekLast()).intValue()); - q.pollLast(); + assertEquals(i, q.peekLast()); + assertEquals(i, q.pollLast()); assertTrue(q.peekLast() == null || - i != ((Integer)q.peekLast()).intValue()); + !q.peekLast().equals(i)); } - assertNull(q.peekLast()); + assertNull(q.peekLast()); } /** @@ -297,14 +286,13 @@ public class ArrayDequeTest extends JSR1 public void testFirstElement() { ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.getFirst()).intValue()); - q.pollFirst(); + assertEquals(i, q.getFirst()); + assertEquals(i, q.pollFirst()); } try { q.getFirst(); shouldThrow(); - } - catch (NoSuchElementException success) {} + } catch (NoSuchElementException success) {} } /** @@ -313,15 +301,14 @@ public class ArrayDequeTest extends JSR1 public void testLastElement() { ArrayDeque q = populatedDeque(SIZE); for (int i = SIZE-1; i >= 0; --i) { - assertEquals(i, ((Integer)q.getLast()).intValue()); - q.pollLast(); + assertEquals(i, q.getLast()); + assertEquals(i, q.pollLast()); } try { q.getLast(); shouldThrow(); - } - catch (NoSuchElementException success) {} - assertNull(q.peekLast()); + } catch (NoSuchElementException success) {} + assertNull(q.peekLast()); } @@ -331,13 +318,12 @@ public class ArrayDequeTest extends JSR1 public void testRemoveFirst() { ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(i, ((Integer)q.removeFirst()).intValue()); + assertEquals(i, q.removeFirst()); } try { q.removeFirst(); shouldThrow(); - } catch (NoSuchElementException success){ - } + } catch (NoSuchElementException success) {} } /** @@ -377,7 +363,7 @@ public class ArrayDequeTest extends JSR1 ArrayDeque q = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { assertTrue(q.contains(new Integer(i))); - q.pollFirst(); + assertEquals(i, q.pollFirst()); assertFalse(q.contains(new Integer(i))); } } @@ -390,7 +376,7 @@ public class ArrayDequeTest extends JSR1 q.clear(); assertTrue(q.isEmpty()); assertEquals(0, q.size()); - q.add(new Integer(1)); + assertTrue(q.add(new Integer(1))); assertFalse(q.isEmpty()); q.clear(); assertTrue(q.isEmpty()); @@ -405,7 +391,7 @@ public class ArrayDequeTest extends JSR1 for (int i = 0; i < SIZE; ++i) { assertTrue(q.containsAll(p)); assertFalse(p.containsAll(q)); - p.add(new Integer(i)); + assertTrue(p.add(new Integer(i))); } assertTrue(p.containsAll(q)); } @@ -418,11 +404,7 @@ public class ArrayDequeTest extends JSR1 ArrayDeque p = populatedDeque(SIZE); for (int i = 0; i < SIZE; ++i) { boolean changed = q.retainAll(p); - if (i == 0) - assertFalse(changed); - else - assertTrue(changed); - + assertEquals(changed, (i > 0)); assertTrue(q.containsAll(p)); assertEquals(SIZE-i, q.size()); p.removeFirst(); @@ -439,8 +421,7 @@ public class ArrayDequeTest extends JSR1 assertTrue(q.removeAll(p)); assertEquals(SIZE-i, q.size()); for (int j = 0; j < i; ++j) { - Integer I = (Integer)(p.removeFirst()); - assertFalse(q.contains(I)); + assertFalse(q.contains(p.removeFirst())); } } } @@ -450,10 +431,10 @@ public class ArrayDequeTest extends JSR1 */ public void testToArray() { ArrayDeque q = populatedDeque(SIZE); - Object[] o = q.toArray(); + Object[] o = q.toArray(); Arrays.sort(o); - for(int i = 0; i < o.length; i++) - assertEquals(o[i], q.pollFirst()); + for (int i = 0; i < o.length; i++) + assertEquals(o[i], q.pollFirst()); } /** @@ -461,10 +442,10 @@ public class ArrayDequeTest extends JSR1 */ public void testToArray2() { ArrayDeque q = populatedDeque(SIZE); - Integer[] ints = new Integer[SIZE]; - ints = (Integer[])q.toArray(ints); + Integer[] ints = new Integer[SIZE]; + ints = (Integer[])q.toArray(ints); Arrays.sort(ints); - for(int i = 0; i < ints.length; i++) + for (int i = 0; i < ints.length; i++) assertEquals(ints[i], q.pollFirst()); } @@ -472,34 +453,34 @@ public class ArrayDequeTest extends JSR1 * toArray(null) throws NPE */ public void testToArray_BadArg() { - try { - ArrayDeque l = new ArrayDeque(); - l.add(new Object()); - Object o[] = l.toArray(null); - shouldThrow(); - } catch(NullPointerException success){} + ArrayDeque l = new ArrayDeque(); + l.add(new Object()); + try { + Object o[] = l.toArray(null); + shouldThrow(); + } catch (NullPointerException success) {} } /** * toArray with incompatable aray type throws CCE */ public void testToArray1_BadArg() { - try { - ArrayDeque l = new ArrayDeque(); - l.add(new Integer(5)); - Object o[] = l.toArray(new String[10] ); - shouldThrow(); - } catch(ArrayStoreException success){} + ArrayDeque l = new ArrayDeque(); + l.add(new Integer(5)); + try { + Object o[] = l.toArray(new String[10]); + shouldThrow(); + } catch (ArrayStoreException success) {} } - + /** * iterator iterates through all elements */ public void testIterator() { ArrayDeque q = populatedDeque(SIZE); int i = 0; - Iterator it = q.iterator(); - while(it.hasNext()) { + Iterator it = q.iterator(); + while (it.hasNext()) { assertTrue(q.contains(it.next())); ++i; } @@ -516,8 +497,7 @@ public class ArrayDequeTest extends JSR1 q.add(new Integer(3)); int k = 0; for (Iterator it = q.iterator(); it.hasNext();) { - int i = ((Integer)(it.next())).intValue(); - assertEquals(++k, i); + assertEquals(++k, it.next()); } assertEquals(3, k); @@ -535,11 +515,11 @@ public class ArrayDequeTest extends JSR1 for (int j = 1; j <= max; ++j) q.add(new Integer(j)); Iterator it = q.iterator(); - for (int j = 1; j <= split; ++j) + for (int j = 1; j <= split; ++j) assertEquals(it.next(), new Integer(j)); it.remove(); assertEquals(it.next(), new Integer(split+1)); - for (int j = 1; j <= split; ++j) + for (int j = 1; j <= split; ++j) q.remove(new Integer(j)); it = q.iterator(); for (int j = split+1; j <= max; ++j) { @@ -557,8 +537,8 @@ public class ArrayDequeTest extends JSR1 public void testDescendingIterator() { ArrayDeque q = populatedDeque(SIZE); int i = 0; - Iterator it = q.descendingIterator(); - while(it.hasNext()) { + Iterator it = q.descendingIterator(); + while (it.hasNext()) { assertTrue(q.contains(it.next())); ++i; } @@ -566,8 +546,8 @@ public class ArrayDequeTest extends JSR1 assertFalse(it.hasNext()); try { it.next(); - } catch(NoSuchElementException success) { - } + shouldThrow(); + } catch (NoSuchElementException success) {} } /** @@ -581,10 +561,9 @@ public class ArrayDequeTest extends JSR1 q.add(new Integer(1)); int k = 0; for (Iterator it = q.descendingIterator(); it.hasNext();) { - int i = ((Integer)(it.next())).intValue(); - assertEquals(++k, i); + assertEquals(++k, it.next()); } - + assertEquals(3, k); q.remove(); q.remove(); @@ -604,11 +583,11 @@ public class ArrayDequeTest extends JSR1 for (int j = max; j >= 1; --j) q.add(new Integer(j)); Iterator it = q.descendingIterator(); - for (int j = 1; j <= split; ++j) + for (int j = 1; j <= split; ++j) assertEquals(it.next(), new Integer(j)); it.remove(); assertEquals(it.next(), new Integer(split+1)); - for (int j = 1; j <= split; ++j) + for (int j = 1; j <= split; ++j) q.remove(new Integer(j)); it = q.descendingIterator(); for (int j = split+1; j <= max; ++j) { @@ -630,24 +609,24 @@ public class ArrayDequeTest extends JSR1 for (int i = 0; i < SIZE; ++i) { assertTrue(s.indexOf(String.valueOf(i)) >= 0); } - } + } /** * peekFirst returns element inserted with addFirst */ public void testAddFirst() { ArrayDeque q = populatedDeque(3); - q.addFirst(four); - assertEquals(four,q.peekFirst()); - } + q.addFirst(four); + assertSame(four, q.peekFirst()); + } /** * peekLast returns element inserted with addLast */ public void testAddLast() { ArrayDeque q = populatedDeque(3); - q.addLast(four); - assertEquals(four,q.peekLast()); - } + q.addLast(four); + assertSame(four, q.peekLast()); + } }