--- jsr166/src/test/tck/ArrayDequeTest.java 2009/11/21 02:07:26 1.8 +++ jsr166/src/test/tck/ArrayDequeTest.java 2009/12/23 00:49:44 1.15 @@ -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()); } /** @@ -102,7 +98,7 @@ public class ArrayDequeTest extends JSR1 ArrayDeque q = new ArrayDeque(1); q.push(null); shouldThrow(); - } catch (NullPointerException success) { } + } catch (NullPointerException success) {} } /** @@ -112,7 +108,7 @@ public class ArrayDequeTest extends JSR1 ArrayDeque q = populatedDeque(3); q.pollLast(); q.push(four); - assertEquals(four,q.peekFirst()); + assertSame(four, q.peekFirst()); } /** @@ -121,13 +117,12 @@ 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) {} } /** @@ -138,8 +133,7 @@ public class ArrayDequeTest extends JSR1 ArrayDeque q = new ArrayDeque(); q.offerFirst(null); shouldThrow(); - } catch (NullPointerException success) { - } + } catch (NullPointerException success) {} } /** @@ -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,7 +197,7 @@ 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()); } @@ -218,7 +208,7 @@ 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()); } @@ -229,7 +219,7 @@ 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()); } @@ -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,10 +244,10 @@ 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()); } @@ -269,10 +258,10 @@ 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()); } @@ -283,10 +272,10 @@ 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()); } @@ -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,14 +301,13 @@ 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) {} + } 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())); } } } @@ -472,24 +453,24 @@ public class ArrayDequeTest extends JSR1 * toArray(null) throws NPE */ public void testToArray_BadArg() { + ArrayDeque l = new ArrayDeque(); + l.add(new Object()); try { - ArrayDeque l = new ArrayDeque(); - l.add(new Object()); Object o[] = l.toArray(null); shouldThrow(); } catch (NullPointerException success) {} } /** - * toArray with incompatable aray type throws CCE + * toArray with incompatible array type throws CCE */ public void testToArray1_BadArg() { + ArrayDeque l = new ArrayDeque(); + l.add(new Integer(5)); try { - ArrayDeque l = new ArrayDeque(); - l.add(new Integer(5)); - Object o[] = l.toArray(new String[10] ); + Object o[] = l.toArray(new String[10]); shouldThrow(); - } catch (ArrayStoreException success) {} + } catch (ArrayStoreException success) {} } /** @@ -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); @@ -566,8 +546,8 @@ public class ArrayDequeTest extends JSR1 assertFalse(it.hasNext()); try { it.next(); - } catch (NoSuchElementException success) { - } + shouldThrow(); + } catch (NoSuchElementException success) {} } /** @@ -581,8 +561,7 @@ 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); @@ -638,7 +617,7 @@ public class ArrayDequeTest extends JSR1 public void testAddFirst() { ArrayDeque q = populatedDeque(3); q.addFirst(four); - assertEquals(four,q.peekFirst()); + assertSame(four, q.peekFirst()); } /** @@ -647,7 +626,7 @@ public class ArrayDequeTest extends JSR1 public void testAddLast() { ArrayDeque q = populatedDeque(3); q.addLast(four); - assertEquals(four,q.peekLast()); + assertSame(four, q.peekLast()); } }