--- jsr166/src/test/tck/CopyOnWriteArraySetTest.java 2003/09/07 20:39:11 1.2 +++ jsr166/src/test/tck/CopyOnWriteArraySetTest.java 2003/09/14 20:42:40 1.3 @@ -10,7 +10,7 @@ import java.util.*; import java.util.concurrent.*; import java.io.*; -public class CopyOnWriteArraySetTest extends TestCase{ +public class CopyOnWriteArraySetTest extends JSR166TestCase { public static void main(String[] args) { junit.textui.TestRunner.run (suite()); @@ -20,7 +20,7 @@ public class CopyOnWriteArraySetTest ext return new TestSuite(CopyOnWriteArraySetTest.class); } - static CopyOnWriteArraySet fullSet(int n){ + static CopyOnWriteArraySet populatedSet(int n){ CopyOnWriteArraySet a = new CopyOnWriteArraySet(); assertTrue(a.isEmpty()); for (int i = 0; i < n; ++i) @@ -30,79 +30,94 @@ public class CopyOnWriteArraySetTest ext return a; } + public void testConstructor() { + CopyOnWriteArraySet a = new CopyOnWriteArraySet(); + assertTrue(a.isEmpty()); + } + + public void testConstructor3() { + 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)); + for (int i = 0; i < SIZE; ++i) + assertTrue(a.contains(ints[i])); + } + + /** - * Test to verify addAll correctly adds each element from the given collection + * addAll correctly adds each element from the given collection */ public void testAddAll(){ - CopyOnWriteArraySet full = fullSet(3); + CopyOnWriteArraySet full = populatedSet(3); Vector v = new Vector(); - v.add(new Integer(3)); - v.add(new Integer(4)); - v.add(new Integer(5)); + v.add(three); + v.add(four); + v.add(five); full.addAll(v); assertEquals(6, full.size()); } /** - * Test to verify addAllAbsent adds each element from the given collection that did not + * addAllAbsent adds each element from the given collection that did not * already exist in the List */ public void testAddAll2(){ - CopyOnWriteArraySet full = fullSet(3); + CopyOnWriteArraySet full = populatedSet(3); Vector v = new Vector(); - v.add(new Integer(3)); - v.add(new Integer(4)); - v.add(new Integer(1)); // will not add this element + v.add(three); + v.add(four); + v.add(one); // will not add this element full.addAll(v); assertEquals(5, full.size()); } /** - * Test to verify addIfAbsent will not add the element if it already exists in the list + * addIfAbsent will not add the element if it already exists in the list */ public void testAdd2(){ - CopyOnWriteArraySet full = fullSet(3); - full.add(new Integer(1)); + CopyOnWriteArraySet full = populatedSet(3); + full.add(one); assertEquals(3, full.size()); } /** - * test to verify addIfAbsent correctly adds the element when it does not exist in the list + * addIfAbsent correctly adds the element when it does not exist in the list */ public void testAdd3(){ - CopyOnWriteArraySet full = fullSet(3); - full.add(new Integer(3)); - assertTrue(full.contains(new Integer(3))); + CopyOnWriteArraySet full = populatedSet(3); + full.add(three); + assertTrue(full.contains(three)); } /** - * Test to verify clear correctly removes all elements from the list + * clear correctly removes all elements from the list */ public void testClear(){ - CopyOnWriteArraySet full = fullSet(3); + CopyOnWriteArraySet full = populatedSet(3); full.clear(); assertEquals(0, full.size()); } /** - * Test to verify contains returns the correct values + * contains returns the correct values */ public void testContains(){ - CopyOnWriteArraySet full = fullSet(3); - assertTrue(full.contains(new Integer(1))); - assertFalse(full.contains(new Integer(5))); + CopyOnWriteArraySet full = populatedSet(3); + assertTrue(full.contains(one)); + assertFalse(full.contains(five)); } public void testEquals() { - CopyOnWriteArraySet a = fullSet(3); - CopyOnWriteArraySet b = fullSet(3); + CopyOnWriteArraySet a = populatedSet(3); + CopyOnWriteArraySet b = populatedSet(3); assertTrue(a.equals(b)); assertTrue(b.equals(a)); assertEquals(a.hashCode(), b.hashCode()); - a.add(new Integer(-1)); + a.add(m1); assertFalse(a.equals(b)); assertFalse(b.equals(a)); - b.add(new Integer(-1)); + b.add(m1); assertTrue(a.equals(b)); assertTrue(b.equals(a)); assertEquals(a.hashCode(), b.hashCode()); @@ -110,33 +125,33 @@ public class CopyOnWriteArraySetTest ext /** - * Test to verify containsAll returns the correct values + * containsAll returns the correct values */ public void testContainsAll(){ - CopyOnWriteArraySet full = fullSet(3); + CopyOnWriteArraySet full = populatedSet(3); Vector v = new Vector(); - v.add(new Integer(1)); - v.add(new Integer(2)); + v.add(one); + v.add(two); assertTrue(full.containsAll(v)); - v.add(new Integer(6)); + v.add(six); assertFalse(full.containsAll(v)); } /** - * Test to verify isEmpty returns the correct values + * isEmpty returns the correct values */ public void testIsEmpty(){ CopyOnWriteArraySet empty = new CopyOnWriteArraySet(); - CopyOnWriteArraySet full = fullSet(3); + CopyOnWriteArraySet full = populatedSet(3); assertTrue(empty.isEmpty()); assertFalse(full.isEmpty()); } /** - * Test to verify iterator() returns an iterator containing the elements of the list + * iterator() returns an iterator containing the elements of the list */ public void testIterator(){ - CopyOnWriteArraySet full = fullSet(3); + CopyOnWriteArraySet full = populatedSet(3); Iterator i = full.iterator(); int j; for(j = 0; i.hasNext(); j++) @@ -145,7 +160,7 @@ public class CopyOnWriteArraySetTest ext } public void testIteratorRemove () { - CopyOnWriteArraySet full = fullSet(3); + CopyOnWriteArraySet full = populatedSet(3); Iterator it = full.iterator(); it.next(); try { @@ -156,7 +171,7 @@ public class CopyOnWriteArraySetTest ext } public void testToString(){ - CopyOnWriteArraySet full = fullSet(3); + CopyOnWriteArraySet full = populatedSet(3); String s = full.toString(); for (int i = 0; i < 3; ++i) { assertTrue(s.indexOf(String.valueOf(i)) >= 0); @@ -165,40 +180,40 @@ public class CopyOnWriteArraySetTest ext /** - * Test to verify removeAll correctly removes all elements from the given collection + * removeAll correctly removes all elements from the given collection */ public void testRemoveAll(){ - CopyOnWriteArraySet full = fullSet(3); + CopyOnWriteArraySet full = populatedSet(3); Vector v = new Vector(); - v.add(new Integer(1)); - v.add(new Integer(2)); + v.add(one); + v.add(two); full.removeAll(v); assertEquals(1, full.size()); } public void testRemove(){ - CopyOnWriteArraySet full = fullSet(3); - full.remove(new Integer(1)); - assertFalse(full.contains(new Integer(1))); + CopyOnWriteArraySet full = populatedSet(3); + full.remove(one); + assertFalse(full.contains(one)); assertEquals(2, full.size()); } /** - * Test to verify size returns the correct values + * size returns the correct values */ public void testSize(){ CopyOnWriteArraySet empty = new CopyOnWriteArraySet(); - CopyOnWriteArraySet full = fullSet(3); + CopyOnWriteArraySet full = populatedSet(3); assertEquals(3, full.size()); assertEquals(0, empty.size()); } /** - * Test to verify toArray returns an Object array containing all elements from the list + * toArray returns an Object array containing all elements from the list */ public void testToArray(){ - CopyOnWriteArraySet full = fullSet(3); + CopyOnWriteArraySet full = populatedSet(3); Object[] o = full.toArray(); assertEquals(3, o.length); assertEquals(0, ((Integer)o[0]).intValue()); @@ -207,10 +222,10 @@ public class CopyOnWriteArraySetTest ext } /** - * test to verify toArray returns an Integer array containing all elements from the list + * toArray returns an Integer array containing all elements from the list */ public void testToArray2(){ - CopyOnWriteArraySet full = fullSet(3); + CopyOnWriteArraySet full = populatedSet(3); Integer[] i = new Integer[3]; i = (Integer[])full.toArray(i); assertEquals(3, i.length); @@ -224,7 +239,7 @@ public class CopyOnWriteArraySetTest ext // Exception tests /** - * Test to verify toArray throws an ArrayStoreException when the given array + * toArray throws an ArrayStoreException when the given array * can not store the objects inside the list */ public void testToArray_ArrayStoreException(){ @@ -238,7 +253,7 @@ public class CopyOnWriteArraySetTest ext } public void testSerialization() { - CopyOnWriteArraySet q = fullSet(10); + CopyOnWriteArraySet q = populatedSet(SIZE); try { ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);