--- jsr166/src/test/tck/CopyOnWriteArraySetTest.java 2009/11/16 05:30:07 1.10 +++ jsr166/src/test/tck/CopyOnWriteArraySetTest.java 2009/11/21 02:07:26 1.11 @@ -13,14 +13,14 @@ import java.io.*; public class CopyOnWriteArraySetTest 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(CopyOnWriteArraySetTest.class); + return new TestSuite(CopyOnWriteArraySetTest.class); } static CopyOnWriteArraySet populatedSet(int n) { - CopyOnWriteArraySet a = new CopyOnWriteArraySet(); + CopyOnWriteArraySet a = new CopyOnWriteArraySet(); assertTrue(a.isEmpty()); for (int i = 0; i < n; ++i) a.add(new Integer(i)); @@ -33,7 +33,7 @@ public class CopyOnWriteArraySetTest ext * Default-constructed set is empty */ public void testConstructor() { - CopyOnWriteArraySet a = new CopyOnWriteArraySet(); + CopyOnWriteArraySet a = new CopyOnWriteArraySet(); assertTrue(a.isEmpty()); } @@ -44,7 +44,7 @@ public class CopyOnWriteArraySetTest ext Integer[] ints = new Integer[SIZE]; for (int i = 0; i < SIZE-1; ++i) ints[i] = new Integer(i); - CopyOnWriteArraySet a = new CopyOnWriteArraySet(Arrays.asList(ints)); + CopyOnWriteArraySet a = new CopyOnWriteArraySet(Arrays.asList(ints)); for (int i = 0; i < SIZE; ++i) assertTrue(a.contains(ints[i])); } @@ -54,13 +54,13 @@ public class CopyOnWriteArraySetTest ext * addAll adds each element from the given collection */ public void testAddAll() { - CopyOnWriteArraySet full = populatedSet(3); - Vector v = new Vector(); - v.add(three); - v.add(four); - v.add(five); - full.addAll(v); - assertEquals(6, full.size()); + CopyOnWriteArraySet full = populatedSet(3); + Vector v = new Vector(); + v.add(three); + v.add(four); + v.add(five); + full.addAll(v); + assertEquals(6, full.size()); } /** @@ -68,22 +68,22 @@ public class CopyOnWriteArraySetTest ext * already exist in the set */ public void testAddAll2() { - CopyOnWriteArraySet full = populatedSet(3); - Vector v = new Vector(); - v.add(three); - v.add(four); - v.add(one); // will not add this element - full.addAll(v); - assertEquals(5, full.size()); + CopyOnWriteArraySet full = populatedSet(3); + Vector v = new Vector(); + v.add(three); + v.add(four); + v.add(one); // will not add this element + full.addAll(v); + assertEquals(5, full.size()); } /** * add will not add the element if it already exists in the set */ public void testAdd2() { - CopyOnWriteArraySet full = populatedSet(3); - full.add(one); - assertEquals(3, full.size()); + CopyOnWriteArraySet full = populatedSet(3); + full.add(one); + assertEquals(3, full.size()); } /** @@ -91,7 +91,7 @@ public class CopyOnWriteArraySetTest ext * in the set */ public void testAdd3() { - CopyOnWriteArraySet full = populatedSet(3); + CopyOnWriteArraySet full = populatedSet(3); full.add(three); assertTrue(full.contains(three)); } @@ -100,26 +100,26 @@ public class CopyOnWriteArraySetTest ext * clear removes all elements from the set */ public void testClear() { - CopyOnWriteArraySet full = populatedSet(3); - full.clear(); - assertEquals(0, full.size()); + CopyOnWriteArraySet full = populatedSet(3); + full.clear(); + assertEquals(0, full.size()); } /** * contains returns true for added elements */ public void testContains() { - CopyOnWriteArraySet full = populatedSet(3); - assertTrue(full.contains(one)); - assertFalse(full.contains(five)); + CopyOnWriteArraySet full = populatedSet(3); + assertTrue(full.contains(one)); + assertFalse(full.contains(five)); } /** * Sets with equal elements are equal */ public void testEquals() { - CopyOnWriteArraySet a = populatedSet(3); - CopyOnWriteArraySet b = populatedSet(3); + CopyOnWriteArraySet a = populatedSet(3); + CopyOnWriteArraySet b = populatedSet(3); assertTrue(a.equals(b)); assertTrue(b.equals(a)); assertEquals(a.hashCode(), b.hashCode()); @@ -137,42 +137,42 @@ public class CopyOnWriteArraySetTest ext * containsAll returns true for collections with subset of elements */ public void testContainsAll() { - CopyOnWriteArraySet full = populatedSet(3); - Vector v = new Vector(); - v.add(one); - v.add(two); - assertTrue(full.containsAll(v)); - v.add(six); - assertFalse(full.containsAll(v)); + CopyOnWriteArraySet full = populatedSet(3); + Vector v = new Vector(); + v.add(one); + v.add(two); + assertTrue(full.containsAll(v)); + v.add(six); + assertFalse(full.containsAll(v)); } /** * isEmpty is true when empty, else false */ public void testIsEmpty() { - CopyOnWriteArraySet empty = new CopyOnWriteArraySet(); - CopyOnWriteArraySet full = populatedSet(3); - assertTrue(empty.isEmpty()); - assertFalse(full.isEmpty()); + CopyOnWriteArraySet empty = new CopyOnWriteArraySet(); + CopyOnWriteArraySet full = populatedSet(3); + assertTrue(empty.isEmpty()); + assertFalse(full.isEmpty()); } /** * iterator() returns an iterator containing the elements of the set */ public void testIterator() { - CopyOnWriteArraySet full = populatedSet(3); - Iterator i = full.iterator(); - int j; - for (j = 0; i.hasNext(); j++) - assertEquals(j, ((Integer)i.next()).intValue()); - assertEquals(3, j); + CopyOnWriteArraySet full = populatedSet(3); + Iterator i = full.iterator(); + int j; + for (j = 0; i.hasNext(); j++) + assertEquals(j, ((Integer)i.next()).intValue()); + assertEquals(3, j); } /** * iterator remove is unsupported */ public void testIteratorRemove () { - CopyOnWriteArraySet full = populatedSet(3); + CopyOnWriteArraySet full = populatedSet(3); Iterator it = full.iterator(); it.next(); try { @@ -186,7 +186,7 @@ public class CopyOnWriteArraySetTest ext * toString holds toString of elements */ public void testToString() { - CopyOnWriteArraySet full = populatedSet(3); + CopyOnWriteArraySet full = populatedSet(3); String s = full.toString(); for (int i = 0; i < 3; ++i) { assertTrue(s.indexOf(String.valueOf(i)) >= 0); @@ -198,12 +198,12 @@ public class CopyOnWriteArraySetTest ext * removeAll removes all elements from the given collection */ public void testRemoveAll() { - CopyOnWriteArraySet full = populatedSet(3); - Vector v = new Vector(); - v.add(one); - v.add(two); - full.removeAll(v); - assertEquals(1, full.size()); + CopyOnWriteArraySet full = populatedSet(3); + Vector v = new Vector(); + v.add(one); + v.add(two); + full.removeAll(v); + assertEquals(1, full.size()); } @@ -211,32 +211,32 @@ public class CopyOnWriteArraySetTest ext * remove removes an element */ public void testRemove() { - CopyOnWriteArraySet full = populatedSet(3); - full.remove(one); + CopyOnWriteArraySet full = populatedSet(3); + full.remove(one); assertFalse(full.contains(one)); - assertEquals(2, full.size()); + assertEquals(2, full.size()); } /** * size returns the number of elements */ public void testSize() { - CopyOnWriteArraySet empty = new CopyOnWriteArraySet(); - CopyOnWriteArraySet full = populatedSet(3); - assertEquals(3, full.size()); - assertEquals(0, empty.size()); + CopyOnWriteArraySet empty = new CopyOnWriteArraySet(); + CopyOnWriteArraySet full = populatedSet(3); + assertEquals(3, full.size()); + assertEquals(0, empty.size()); } /** * toArray returns an Object array containing all elements from the set */ public void testToArray() { - CopyOnWriteArraySet full = populatedSet(3); - Object[] o = full.toArray(); - assertEquals(3, o.length); - assertEquals(0, ((Integer)o[0]).intValue()); - assertEquals(1, ((Integer)o[1]).intValue()); - assertEquals(2, ((Integer)o[2]).intValue()); + CopyOnWriteArraySet full = populatedSet(3); + Object[] o = full.toArray(); + assertEquals(3, o.length); + assertEquals(0, ((Integer)o[0]).intValue()); + assertEquals(1, ((Integer)o[1]).intValue()); + assertEquals(2, ((Integer)o[2]).intValue()); } /** @@ -244,13 +244,13 @@ public class CopyOnWriteArraySetTest ext * the set */ public void testToArray2() { - CopyOnWriteArraySet full = populatedSet(3); - Integer[] i = new Integer[3]; - i = (Integer[])full.toArray(i); - assertEquals(3, i.length); - assertEquals(0, i[0].intValue()); - assertEquals(1, i[1].intValue()); - assertEquals(2, i[2].intValue()); + CopyOnWriteArraySet full = populatedSet(3); + Integer[] i = new Integer[3]; + i = (Integer[])full.toArray(i); + assertEquals(3, i.length); + assertEquals(0, i[0].intValue()); + assertEquals(1, i[1].intValue()); + assertEquals(2, i[2].intValue()); } @@ -264,7 +264,7 @@ public class CopyOnWriteArraySetTest ext c.add("zfasdfsdf"); c.add("asdadasd"); c.toArray(new Long[5]); - shouldThrow(); + shouldThrow(); } catch (ArrayStoreException e) {} }