--- jsr166/src/test/tck/ArrayDequeTest.java 2004/12/28 16:15:59 1.1 +++ jsr166/src/test/tck/ArrayDequeTest.java 2009/11/21 10:29:49 1.10 @@ -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); + assertEquals(four,q.peekFirst()); + } /** * pop removes next element, or throws NSEE if empty @@ -126,24 +122,22 @@ public class ArrayDequeTest extends JSR1 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()); } /** @@ -209,7 +199,7 @@ public class ArrayDequeTest extends JSR1 for (int i = 0; i < SIZE; ++i) { assertEquals(i, ((Integer)q.pollFirst()).intValue()); } - assertNull(q.pollFirst()); + assertNull(q.pollFirst()); } /** @@ -220,7 +210,7 @@ public class ArrayDequeTest extends JSR1 for (int i = SIZE-1; i >= 0; --i) { assertEquals(i, ((Integer)q.pollLast()).intValue()); } - assertNull(q.pollLast()); + assertNull(q.pollLast()); } /** @@ -231,7 +221,7 @@ public class ArrayDequeTest extends JSR1 for (int i = 0; i < SIZE; ++i) { assertEquals(i, ((Integer)q.poll()).intValue()); } - assertNull(q.poll()); + assertNull(q.poll()); } /** @@ -245,8 +235,7 @@ public class ArrayDequeTest extends JSR1 try { q.remove(); shouldThrow(); - } catch (NoSuchElementException success){ - } + } catch (NoSuchElementException success) {} } /** @@ -260,7 +249,7 @@ public class ArrayDequeTest extends JSR1 assertTrue(q.peekFirst() == null || i != ((Integer)q.peekFirst()).intValue()); } - assertNull(q.peekFirst()); + assertNull(q.peekFirst()); } /** @@ -274,7 +263,7 @@ public class ArrayDequeTest extends JSR1 assertTrue(q.peek() == null || i != ((Integer)q.peek()).intValue()); } - assertNull(q.peek()); + assertNull(q.peek()); } /** @@ -288,7 +277,7 @@ public class ArrayDequeTest extends JSR1 assertTrue(q.peekLast() == null || i != ((Integer)q.peekLast()).intValue()); } - assertNull(q.peekLast()); + assertNull(q.peekLast()); } /** @@ -303,8 +292,7 @@ public class ArrayDequeTest extends JSR1 try { q.getFirst(); shouldThrow(); - } - catch (NoSuchElementException success) {} + } catch (NoSuchElementException success) {} } /** @@ -319,9 +307,8 @@ public class ArrayDequeTest extends JSR1 try { q.getLast(); shouldThrow(); - } - catch (NoSuchElementException success) {} - assertNull(q.peekLast()); + } catch (NoSuchElementException success) {} + assertNull(q.peekLast()); } @@ -336,8 +323,7 @@ public class ArrayDequeTest extends JSR1 try { q.removeFirst(); shouldThrow(); - } catch (NoSuchElementException success){ - } + } catch (NoSuchElementException success) {} } /** @@ -450,10 +436,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 +447,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 +458,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){} + 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 */ 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){} + try { + ArrayDeque l = new ArrayDeque(); + l.add(new Integer(5)); + 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; } @@ -528,16 +514,95 @@ public class ArrayDequeTest extends JSR1 */ public void testIteratorRemove () { final ArrayDeque q = new ArrayDeque(); - q.add(new Integer(1)); - q.add(new Integer(2)); - q.add(new Integer(3)); - Iterator it = q.iterator(); - it.next(); - it.remove(); - it = q.iterator(); - assertEquals(it.next(), new Integer(2)); - assertEquals(it.next(), new Integer(3)); + final Random rng = new Random(); + for (int iters = 0; iters < 100; ++iters) { + int max = rng.nextInt(5) + 2; + int split = rng.nextInt(max-1) + 1; + for (int j = 1; j <= max; ++j) + q.add(new Integer(j)); + Iterator it = q.iterator(); + 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) + q.remove(new Integer(j)); + it = q.iterator(); + for (int j = split+1; j <= max; ++j) { + assertEquals(it.next(), new Integer(j)); + it.remove(); + } + assertFalse(it.hasNext()); + assertTrue(q.isEmpty()); + } + } + + /** + * Descending iterator iterates through all elements + */ + public void testDescendingIterator() { + ArrayDeque q = populatedDeque(SIZE); + int i = 0; + Iterator it = q.descendingIterator(); + while (it.hasNext()) { + assertTrue(q.contains(it.next())); + ++i; + } + assertEquals(i, SIZE); assertFalse(it.hasNext()); + try { + it.next(); + } catch (NoSuchElementException success) {} + } + + /** + * Descending iterator ordering is reverse FIFO + */ + public void testDescendingIteratorOrdering() { + final ArrayDeque q = new ArrayDeque(); + for (int iters = 0; iters < 100; ++iters) { + q.add(new Integer(3)); + q.add(new Integer(2)); + 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(3, k); + q.remove(); + q.remove(); + q.remove(); + } + } + + /** + * descendingIterator.remove removes current element + */ + public void testDescendingIteratorRemove () { + final ArrayDeque q = new ArrayDeque(); + final Random rng = new Random(); + for (int iters = 0; iters < 100; ++iters) { + int max = rng.nextInt(5) + 2; + int split = rng.nextInt(max-1) + 1; + for (int j = max; j >= 1; --j) + q.add(new Integer(j)); + Iterator it = q.descendingIterator(); + 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) + q.remove(new Integer(j)); + it = q.descendingIterator(); + for (int j = split+1; j <= max; ++j) { + assertEquals(it.next(), new Integer(j)); + it.remove(); + } + assertFalse(it.hasNext()); + assertTrue(q.isEmpty()); + } } @@ -550,24 +615,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); + assertEquals(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); + assertEquals(four,q.peekLast()); + } }