--- jsr166/src/test/tck/LinkedListTest.java 2003/09/07 20:39:11 1.2 +++ jsr166/src/test/tck/LinkedListTest.java 2003/09/20 18:20:08 1.4 @@ -9,13 +9,7 @@ import junit.framework.*; import java.util.*; import java.util.concurrent.*; -public class LinkedListTest extends TestCase { - - private static final int N = 10; - private static final long SHORT_DELAY_MS = 100; - private static final long MEDIUM_DELAY_MS = 1000; - private static final long LONG_DELAY_MS = 10000; - +public class LinkedListTest extends JSR166TestCase { public static void main(String[] args) { junit.textui.TestRunner.run (suite()); } @@ -28,7 +22,7 @@ public class LinkedListTest extends Test * Create a queue of given size containing consecutive * Integers 0 ... n. */ - private LinkedList fullQueue(int n) { + private LinkedList populatedQueue(int n) { LinkedList q = new LinkedList(); assertTrue(q.isEmpty()); for(int i = 0; i < n; ++i) @@ -38,30 +32,42 @@ public class LinkedListTest extends Test return q; } - public void testConstructor1(){ + /** + * + */ + public void testConstructor1() { assertEquals(0, new LinkedList().size()); } + /** + * + */ public void testConstructor3() { try { LinkedList q = new LinkedList((Collection)null); - fail("Cannot make from null collection"); + shouldThrow(); } catch (NullPointerException success) {} } - public void testConstructor6(){ + /** + * + */ + public void testConstructor6() { try { - Integer[] ints = new Integer[N]; - for (int i = 0; i < N; ++i) + Integer[] ints = new Integer[SIZE]; + for (int i = 0; i < SIZE; ++i) ints[i] = new Integer(i); LinkedList q = new LinkedList(Arrays.asList(ints)); - for (int i = 0; i < N; ++i) + for (int i = 0; i < SIZE; ++i) assertEquals(ints[i], q.poll()); } finally {} } + /** + * + */ public void testEmpty() { LinkedList q = new LinkedList(); assertTrue(q.isEmpty()); @@ -73,76 +79,100 @@ public class LinkedListTest extends Test assertTrue(q.isEmpty()); } + /** + * + */ public void testSize() { - LinkedList q = fullQueue(N); - for (int i = 0; i < N; ++i) { - assertEquals(N-i, q.size()); + LinkedList q = populatedQueue(SIZE); + for (int i = 0; i < SIZE; ++i) { + assertEquals(SIZE-i, q.size()); q.remove(); } - for (int i = 0; i < N; ++i) { + for (int i = 0; i < SIZE; ++i) { assertEquals(i, q.size()); q.add(new Integer(i)); } } - public void testOfferNull(){ + /** + * + */ + public void testOfferNull() { try { LinkedList q = new LinkedList(); q.offer(null); } catch (NullPointerException ie) { - fail("should not throw NPE"); + unexpectedException(); } } + /** + * + */ public void testOffer() { LinkedList q = new LinkedList(); assertTrue(q.offer(new Integer(0))); assertTrue(q.offer(new Integer(1))); } - public void testAdd(){ + /** + * + */ + public void testAdd() { LinkedList q = new LinkedList(); - for (int i = 0; i < N; ++i) { + for (int i = 0; i < SIZE; ++i) { assertEquals(i, q.size()); assertTrue(q.add(new Integer(i))); } } - public void testAddAll1(){ + /** + * + */ + public void testAddAll1() { try { LinkedList q = new LinkedList(); q.addAll(null); - fail("Cannot add null collection"); + shouldThrow(); } catch (NullPointerException success) {} } - public void testAddAll5(){ + /** + * + */ + public void testAddAll5() { try { Integer[] empty = new Integer[0]; - Integer[] ints = new Integer[N]; - for (int i = 0; i < N; ++i) + Integer[] ints = new Integer[SIZE]; + for (int i = 0; i < SIZE; ++i) ints[i] = new Integer(i); LinkedList q = new LinkedList(); assertFalse(q.addAll(Arrays.asList(empty))); assertTrue(q.addAll(Arrays.asList(ints))); - for (int i = 0; i < N; ++i) + for (int i = 0; i < SIZE; ++i) assertEquals(ints[i], q.poll()); } finally {} } - public void testPoll(){ - LinkedList q = fullQueue(N); - for (int i = 0; i < N; ++i) { + /** + * + */ + public void testPoll() { + LinkedList q = populatedQueue(SIZE); + for (int i = 0; i < SIZE; ++i) { assertEquals(i, ((Integer)q.poll()).intValue()); } assertNull(q.poll()); } - public void testPeek(){ - LinkedList q = fullQueue(N); - for (int i = 0; i < N; ++i) { + /** + * + */ + public void testPeek() { + LinkedList q = populatedQueue(SIZE); + for (int i = 0; i < SIZE; ++i) { assertEquals(i, ((Integer)q.peek()).intValue()); q.poll(); assertTrue(q.peek() == null || @@ -151,54 +181,69 @@ public class LinkedListTest extends Test assertNull(q.peek()); } - public void testElement(){ - LinkedList q = fullQueue(N); - for (int i = 0; i < N; ++i) { + /** + * + */ + public void testElement() { + LinkedList q = populatedQueue(SIZE); + for (int i = 0; i < SIZE; ++i) { assertEquals(i, ((Integer)q.element()).intValue()); q.poll(); } try { q.element(); - fail("no such element"); + shouldThrow(); } catch (NoSuchElementException success) {} } - public void testRemove(){ - LinkedList q = fullQueue(N); - for (int i = 0; i < N; ++i) { + /** + * + */ + public void testRemove() { + LinkedList q = populatedQueue(SIZE); + for (int i = 0; i < SIZE; ++i) { assertEquals(i, ((Integer)q.remove()).intValue()); } try { q.remove(); - fail("remove should throw"); + shouldThrow(); } catch (NoSuchElementException success){ } } - public void testRemoveElement(){ - LinkedList q = fullQueue(N); - for (int i = 1; i < N; i+=2) { + /** + * + */ + public void testRemoveElement() { + LinkedList q = populatedQueue(SIZE); + for (int i = 1; i < SIZE; i+=2) { assertTrue(q.remove(new Integer(i))); } - for (int i = 0; i < N; i+=2) { + for (int i = 0; i < SIZE; i+=2) { assertTrue(q.remove(new Integer(i))); assertFalse(q.remove(new Integer(i+1))); } assertTrue(q.isEmpty()); } - public void testContains(){ - LinkedList q = fullQueue(N); - for (int i = 0; i < N; ++i) { + /** + * + */ + public void testContains() { + LinkedList q = populatedQueue(SIZE); + for (int i = 0; i < SIZE; ++i) { assertTrue(q.contains(new Integer(i))); q.poll(); assertFalse(q.contains(new Integer(i))); } } - public void testClear(){ - LinkedList q = fullQueue(N); + /** + * + */ + public void testClear() { + LinkedList q = populatedQueue(SIZE); q.clear(); assertTrue(q.isEmpty()); assertEquals(0, q.size()); @@ -208,10 +253,13 @@ public class LinkedListTest extends Test assertTrue(q.isEmpty()); } - public void testContainsAll(){ - LinkedList q = fullQueue(N); + /** + * + */ + public void testContainsAll() { + LinkedList q = populatedQueue(SIZE); LinkedList p = new LinkedList(); - for (int i = 0; i < N; ++i) { + for (int i = 0; i < SIZE; ++i) { assertTrue(q.containsAll(p)); assertFalse(p.containsAll(q)); p.add(new Integer(i)); @@ -219,10 +267,13 @@ public class LinkedListTest extends Test assertTrue(p.containsAll(q)); } - public void testRetainAll(){ - LinkedList q = fullQueue(N); - LinkedList p = fullQueue(N); - for (int i = 0; i < N; ++i) { + /** + * + */ + public void testRetainAll() { + LinkedList q = populatedQueue(SIZE); + LinkedList p = populatedQueue(SIZE); + for (int i = 0; i < SIZE; ++i) { boolean changed = q.retainAll(p); if (i == 0) assertFalse(changed); @@ -230,17 +281,20 @@ public class LinkedListTest extends Test assertTrue(changed); assertTrue(q.containsAll(p)); - assertEquals(N-i, q.size()); + assertEquals(SIZE-i, q.size()); p.remove(); } } - public void testRemoveAll(){ - for (int i = 1; i < N; ++i) { - LinkedList q = fullQueue(N); - LinkedList p = fullQueue(i); + /** + * + */ + public void testRemoveAll() { + for (int i = 1; i < SIZE; ++i) { + LinkedList q = populatedQueue(SIZE); + LinkedList p = populatedQueue(i); assertTrue(q.removeAll(p)); - assertEquals(N-i, q.size()); + assertEquals(SIZE-i, q.size()); for (int j = 0; j < i; ++j) { Integer I = (Integer)(p.remove()); assertFalse(q.contains(I)); @@ -248,34 +302,46 @@ public class LinkedListTest extends Test } } - public void testToArray(){ - LinkedList q = fullQueue(N); + /** + * + */ + public void testToArray() { + LinkedList q = populatedQueue(SIZE); Object[] o = q.toArray(); Arrays.sort(o); for(int i = 0; i < o.length; i++) assertEquals(o[i], q.poll()); } - public void testToArray2(){ - LinkedList q = fullQueue(N); - Integer[] ints = new Integer[N]; + /** + * + */ + public void testToArray2() { + LinkedList q = populatedQueue(SIZE); + Integer[] ints = new Integer[SIZE]; ints = (Integer[])q.toArray(ints); Arrays.sort(ints); for(int i = 0; i < ints.length; i++) assertEquals(ints[i], q.poll()); } - public void testIterator(){ - LinkedList q = fullQueue(N); + /** + * + */ + public void testIterator() { + LinkedList q = populatedQueue(SIZE); int i = 0; Iterator it = q.iterator(); while(it.hasNext()) { assertTrue(q.contains(it.next())); ++i; } - assertEquals(i, N); + assertEquals(i, SIZE); } + /** + * + */ public void testIteratorOrdering() { final LinkedList q = new LinkedList(); @@ -287,12 +353,15 @@ public class LinkedListTest extends Test int k = 0; for (Iterator it = q.iterator(); it.hasNext();) { int i = ((Integer)(it.next())).intValue(); - assertEquals("items should come out in order", ++k, i); + assertEquals(++k, i); } - assertEquals("should go through 3 elements", 3, k); + assertEquals(3, k); } + /** + * + */ public void testIteratorRemove () { final LinkedList q = new LinkedList(); @@ -311,116 +380,161 @@ public class LinkedListTest extends Test } - public void testToString(){ - LinkedList q = fullQueue(N); + /** + * + */ + public void testToString() { + LinkedList q = populatedQueue(SIZE); String s = q.toString(); - for (int i = 0; i < N; ++i) { + for (int i = 0; i < SIZE; ++i) { assertTrue(s.indexOf(String.valueOf(i)) >= 0); } } - public void testAddFirst(){ - LinkedList q = fullQueue(3); + /** + * + */ + public void testAddFirst() { + LinkedList q = populatedQueue(3); q.addFirst(new Integer(4)); assertEquals(new Integer(4),q.get(0)); } - public void testAddLast(){ - LinkedList q = fullQueue(3); + /** + * + */ + public void testAddLast() { + LinkedList q = populatedQueue(3); q.addLast(new Integer(3)); assertEquals(new Integer(3),q.get(3)); } + /** + * + */ public void testGetFirst() { - LinkedList q = fullQueue(3); + LinkedList q = populatedQueue(3); assertEquals(new Integer(0),q.getFirst()); } + /** + * + */ public void testGetLast() { - LinkedList q = fullQueue(3); + LinkedList q = populatedQueue(3); assertEquals(new Integer(2),q.getLast()); } - public void testIndexOf(){ - LinkedList q = fullQueue(3); + /** + * + */ + public void testIndexOf() { + LinkedList q = populatedQueue(3); assertEquals(0,q.indexOf(new Integer(0))); assertEquals(1,q.indexOf(new Integer(1))); assertEquals(2,q.indexOf(new Integer(2))); assertEquals(-1, q.indexOf("not there")); } - public void testLastIndexOf(){ - LinkedList q = fullQueue(3); + /** + * + */ + public void testLastIndexOf() { + LinkedList q = populatedQueue(3); q.add(new Integer(2)); assertEquals(3,q.lastIndexOf(new Integer(2))); assertEquals(-1, q.lastIndexOf("not there")); } - public void testSet(){ - LinkedList q = fullQueue(3); + /** + * + */ + public void testSet() { + LinkedList q = populatedQueue(3); q.set(0,(new Integer(1))); assertFalse(q.contains(new Integer(0))); assertEquals(new Integer(1), q.get(0)); } - public void testGetFirst_NoSuchElementException(){ + /** + * + */ + public void testGetFirst_NoSuchElementException() { try { LinkedList l = new LinkedList(); l.getFirst(); - fail("First Element"); + shouldThrow(); } catch(NoSuchElementException success) {} } + /** + * + */ public void testRemoveFirst() { try { LinkedList l = new LinkedList(); l.removeFirst(); - fail("R: First Element"); + shouldThrow(); } catch(NoSuchElementException success) {} } + /** + * + */ public void testRemoveLast() { try { LinkedList l = new LinkedList(); l.removeLast(); - fail("R: Last Element"); + shouldThrow(); } catch(NoSuchElementException success) {} } - public void testGetLast_NoSuchElementException(){ + /** + * + */ + public void testGetLast_NoSuchElementException() { try { LinkedList l = new LinkedList(); l.getLast(); - fail("Last Element"); + shouldThrow(); } catch(NoSuchElementException success) {} } - public void testAddAll_NullPointerException(){ + /** + * + */ + public void testAddAll_NullPointerException() { try { LinkedList l = new LinkedList(); l.addAll((Collection)null); - fail("Add All Failed"); + shouldThrow(); } catch(NullPointerException success){} } + /** + * + */ public void testAddAll1_OutOfBounds() { try { LinkedList l = new LinkedList(); l.addAll(4,new LinkedList()); - fail("boolean addAll(int, Collection) should throw IndexOutOfBoundsException"); + shouldThrow(); } catch(IndexOutOfBoundsException success) {} } + /** + * + */ public void testAddAll2_IndexOutOfBoundsException() { try { LinkedList l = new LinkedList(); @@ -428,10 +542,13 @@ public class LinkedListTest extends Test LinkedList m = new LinkedList(); m.add(new Object()); l.addAll(4,m); - fail("Add All Failed " + l.size()); - }catch(IndexOutOfBoundsException success) {} + shouldThrow(); + } catch(IndexOutOfBoundsException success) {} } + /** + * + */ public void testAddAll4_BadIndex() { try { LinkedList l = new LinkedList(); @@ -439,109 +556,142 @@ public class LinkedListTest extends Test LinkedList m = new LinkedList(); m.add(new Object()); l.addAll(-1,m); - fail("Add All Failed " + l.size()); - }catch(IndexOutOfBoundsException success){} + shouldThrow(); + } catch(IndexOutOfBoundsException success){} } + /** + * + */ public void testget1() { try { LinkedList l = new LinkedList(); l.add(new Object()); l.get(-1); - fail("get Failed - l.get(-1)"); - }catch(IndexOutOfBoundsException success) {} + shouldThrow(); + } catch(IndexOutOfBoundsException success) {} } + /** + * + */ public void testget2() { try { LinkedList l = new LinkedList(); l.add(new Object()); l.get(5); - fail("get Failed - l.get(5) l.size(): " + l.size()); - }catch(IndexOutOfBoundsException success){} + shouldThrow(); + } catch(IndexOutOfBoundsException success){} } + /** + * + */ public void testset1() { try { LinkedList l = new LinkedList(); l.add(new Object()); l.set(-1,new Object()); - fail("set failed - l.set(-1,...)" + l.size()); - }catch(IndexOutOfBoundsException success){} + shouldThrow(); + } catch(IndexOutOfBoundsException success){} } + /** + * + */ public void testset2() { try { LinkedList l = new LinkedList(); l.add(new Object()); l.set(5,new Object()); - fail("set failed = l.set(5,..) l.size():" + l.size()); - }catch(IndexOutOfBoundsException success){} + shouldThrow(); + } catch(IndexOutOfBoundsException success){} } + /** + * + */ public void testadd1() { try { LinkedList l = new LinkedList(); l.add(new Object()); l.add(-1,new Object()); - fail("Add Failed - l.add(-1) l.size(): " + l.size()); - }catch(IndexOutOfBoundsException success){} + shouldThrow(); + } catch(IndexOutOfBoundsException success){} } - public void add2(){ + public void add2() { try { LinkedList l = new LinkedList(); l.add(new Object()); l.add(5,new Object()); - fail("Add Failed l.add(f,...)"); - }catch(IndexOutOfBoundsException success) {} + shouldThrow(); + } catch(IndexOutOfBoundsException success) {} } - public void testremove(){ + /** + * + */ + public void testremove() { try { LinkedList l = new LinkedList(); l.add(new Object()); l.remove(-1); - fail("Remove Failed l.remove(-1); l.size():" + l.size()); - }catch(IndexOutOfBoundsException success){} + shouldThrow(); + } catch(IndexOutOfBoundsException success){} } - public void testremove1(){ + /** + * + */ + public void testremove1() { try { LinkedList l = new LinkedList(); l.add(new Object()); l.remove(5); - fail("Remove Failed l.remove(5); l.size():" + l.size()); - }catch(IndexOutOfBoundsException success){} + shouldThrow(); + } catch(IndexOutOfBoundsException success){} } - public void testremove2(){ - try{ + /** + * + */ + public void testremove2() { + try { LinkedList l = new LinkedList(); l.remove(); - fail("LinkedList - Object remove() should throw a NoSuchElementException"); - }catch(NoSuchElementException e){} + shouldThrow(); + } catch(NoSuchElementException e){} } + /** + * + */ public void testlistIt1() { try { LinkedList l = new LinkedList(); l.add(new Object()); l.listIterator(5); - fail("l.listIterator(5) l.size():" + l.size()); - }catch(IndexOutOfBoundsException success){} + shouldThrow(); + } catch(IndexOutOfBoundsException success){} } + /** + * + */ public void testlistIt2() { try { LinkedList l = new LinkedList(); l.add(new Object()); l.listIterator(-1); - fail("l.listIterator(-1) l.size():" + l.size()); - }catch(IndexOutOfBoundsException success){} + shouldThrow(); + } catch(IndexOutOfBoundsException success){} } + /** + * + */ public void testlistIt3() { try { LinkedList l = new LinkedList(); @@ -549,26 +699,32 @@ public class LinkedListTest extends Test ListIterator a = l.listIterator(0); l.removeFirst(); a.next(); - fail("l.listIterator(-1) l.size():" + l.size()); - }catch(ConcurrentModificationException success){} + shouldThrow(); + } catch(ConcurrentModificationException success){} } + /** + * + */ public void testToArray_BadArg() { try { LinkedList l = new LinkedList(); l.add(new Object()); Object o[] = l.toArray(null); - fail("l.toArray(null) did not throw an exception"); - }catch(NullPointerException success){} + shouldThrow(); + } catch(NullPointerException success){} } + /** + * + */ public void testToArray1_BadArg() { try { LinkedList l = new LinkedList(); l.add(new Integer(5)); Object o[] = l.toArray(new String[10] ); - fail("l.toArray(String[] f) did not throw an exception, an Integer was added"); - }catch(ArrayStoreException success){} + shouldThrow(); + } catch(ArrayStoreException success){} } }