--- jsr166/src/test/tck/ArrayDequeTest.java 2005/09/14 23:50:31 1.2 +++ jsr166/src/test/tck/ArrayDequeTest.java 2009/11/16 04:57:10 1.6 @@ -10,7 +10,7 @@ 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() { @@ -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) + for (int i = 0; i < n; ++i) assertTrue(q.offerLast(new Integer(i))); assertFalse(q.isEmpty()); assertEquals(n, q.size()); return q; } - + /** * new queue is empty */ @@ -102,7 +102,7 @@ public class ArrayDequeTest extends JSR1 ArrayDeque q = new ArrayDeque(1); q.push(null); shouldThrow(); - } catch (NullPointerException success) { } + } catch (NullPointerException success) { } } /** @@ -113,7 +113,7 @@ public class ArrayDequeTest extends JSR1 q.pollLast(); q.push(four); assertEquals(four,q.peekFirst()); - } + } /** * pop removes next element, or throws NSEE if empty @@ -127,7 +127,7 @@ public class ArrayDequeTest extends JSR1 q.pop(); shouldThrow(); } catch (NoSuchElementException success){ - } + } } /** @@ -138,12 +138,12 @@ public class ArrayDequeTest extends JSR1 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 +152,7 @@ public class ArrayDequeTest extends JSR1 } /** - * OfferLast succeeds + * OfferLast succeeds */ public void testOfferLast() { ArrayDeque q = new ArrayDeque(); @@ -246,7 +246,7 @@ public class ArrayDequeTest extends JSR1 q.remove(); shouldThrow(); } catch (NoSuchElementException success){ - } + } } /** @@ -337,7 +337,7 @@ public class ArrayDequeTest extends JSR1 q.removeFirst(); shouldThrow(); } catch (NoSuchElementException success){ - } + } } /** @@ -452,7 +452,7 @@ public class ArrayDequeTest extends JSR1 ArrayDeque q = populatedDeque(SIZE); Object[] o = q.toArray(); Arrays.sort(o); - for(int i = 0; i < o.length; i++) + for (int i = 0; i < o.length; i++) assertEquals(o[i], q.pollFirst()); } @@ -464,7 +464,7 @@ public class ArrayDequeTest extends JSR1 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()); } @@ -477,7 +477,7 @@ public class ArrayDequeTest extends JSR1 l.add(new Object()); Object o[] = l.toArray(null); shouldThrow(); - } catch(NullPointerException success){} + } catch (NullPointerException success){} } /** @@ -489,9 +489,9 @@ public class ArrayDequeTest extends JSR1 l.add(new Integer(5)); Object o[] = l.toArray(new String[10] ); shouldThrow(); - } catch(ArrayStoreException success){} + } catch (ArrayStoreException success){} } - + /** * iterator iterates through all elements */ @@ -499,7 +499,7 @@ public class ArrayDequeTest extends JSR1 ArrayDeque q = populatedDeque(SIZE); int i = 0; Iterator it = q.iterator(); - while(it.hasNext()) { + while (it.hasNext()) { assertTrue(q.contains(it.next())); ++i; } @@ -528,16 +528,27 @@ 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)); - assertFalse(it.hasNext()); + 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()); + } } /** @@ -547,7 +558,7 @@ public class ArrayDequeTest extends JSR1 ArrayDeque q = populatedDeque(SIZE); int i = 0; Iterator it = q.descendingIterator(); - while(it.hasNext()) { + while (it.hasNext()) { assertTrue(q.contains(it.next())); ++i; } @@ -555,7 +566,7 @@ public class ArrayDequeTest extends JSR1 assertFalse(it.hasNext()); try { it.next(); - } catch(NoSuchElementException success) { + } catch (NoSuchElementException success) { } } @@ -564,16 +575,21 @@ public class ArrayDequeTest extends JSR1 */ public void testDescendingIteratorOrdering() { final ArrayDeque q = new ArrayDeque(); - 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); - } + 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); + assertEquals(3, k); + q.remove(); + q.remove(); + q.remove(); + } } /** @@ -581,16 +597,27 @@ public class ArrayDequeTest extends JSR1 */ public void testDescendingIteratorRemove () { final ArrayDeque q = new ArrayDeque(); - q.add(new Integer(3)); - q.add(new Integer(2)); - q.add(new Integer(1)); - Iterator it = q.descendingIterator(); - it.next(); - it.remove(); - it = q.descendingIterator(); - assertEquals(it.next(), new Integer(2)); - assertEquals(it.next(), new Integer(3)); - assertFalse(it.hasNext()); + 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()); + } } @@ -603,7 +630,7 @@ 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 @@ -612,7 +639,7 @@ public class ArrayDequeTest extends JSR1 ArrayDeque q = populatedDeque(3); q.addFirst(four); assertEquals(four,q.peekFirst()); - } + } /** * peekLast returns element inserted with addLast @@ -621,6 +648,6 @@ public class ArrayDequeTest extends JSR1 ArrayDeque q = populatedDeque(3); q.addLast(four); assertEquals(four,q.peekLast()); - } + } }