--- jsr166/src/test/tck/CopyOnWriteArrayListTest.java 2010/10/09 19:30:35 1.18 +++ jsr166/src/test/tck/CopyOnWriteArrayListTest.java 2011/11/29 05:23:56 1.26 @@ -1,15 +1,21 @@ /* * Written by Doug Lea with assistance from members of JCP JSR-166 * Expert Group and released to the public domain, as explained at - * http://creativecommons.org/licenses/publicdomain + * http://creativecommons.org/publicdomain/zero/1.0/ * Other contributors include Andrew Wright, Jeffrey Hayes, * Pat Fisher, Mike Judd. */ import junit.framework.*; -import java.util.*; -import java.util.concurrent.*; -import java.io.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.ListIterator; +import java.util.Vector; +import java.util.concurrent.CopyOnWriteArrayList; public class CopyOnWriteArrayListTest extends JSR166TestCase { @@ -21,16 +27,25 @@ public class CopyOnWriteArrayListTest ex return new TestSuite(CopyOnWriteArrayListTest.class); } - static CopyOnWriteArrayList populatedArray(int n) { - CopyOnWriteArrayList a = new CopyOnWriteArrayList(); + static CopyOnWriteArrayList populatedArray(int n) { + CopyOnWriteArrayList a = new CopyOnWriteArrayList(); assertTrue(a.isEmpty()); - for (int i = 0; i < n; ++i) - a.add(new Integer(i)); + for (int i = 0; i < n; i++) + a.add(i); assertFalse(a.isEmpty()); assertEquals(n, a.size()); return a; } + static CopyOnWriteArrayList populatedArray(Integer[] elements) { + CopyOnWriteArrayList a = new CopyOnWriteArrayList(); + assertTrue(a.isEmpty()); + for (int i = 0; i < elements.length; i++) + a.add(elements[i]); + assertFalse(a.isEmpty()); + assertEquals(elements.length, a.size()); + return a; + } /** * a new list is empty @@ -64,7 +79,6 @@ public class CopyOnWriteArrayListTest ex assertEquals(ints[i], a.get(i)); } - /** * addAll adds each element from the given collection */ @@ -119,7 +133,6 @@ public class CopyOnWriteArrayListTest ex assertEquals(0, full.size()); } - /** * Cloned list is equal */ @@ -174,7 +187,6 @@ public class CopyOnWriteArrayListTest ex assertEquals(a.hashCode(), b.hashCode()); } - /** * containsAll returns true for collection with subset of elements */ @@ -257,7 +269,7 @@ public class CopyOnWriteArrayListTest ex CopyOnWriteArrayList full = populatedArray(3); String s = full.toString(); for (int i = 0; i < 3; ++i) { - assertTrue(s.indexOf(String.valueOf(i)) >= 0); + assertTrue(s.contains(String.valueOf(i))); } } @@ -275,7 +287,7 @@ public class CopyOnWriteArrayListTest ex /** * lastIndexOf returns the index from the given starting point */ - public void testlastIndexOf2() { + public void testLastIndexOf2() { CopyOnWriteArrayList full = populatedArray(3); full.add(one); full.add(three); @@ -348,31 +360,67 @@ public class CopyOnWriteArrayListTest ex } /** - * toArray returns an Object array containing all elements from the list + * toArray() returns an Object array containing all elements from + * the list in insertion order */ public void testToArray() { - CopyOnWriteArrayList full = populatedArray(3); - Object[] o = full.toArray(); - assertEquals(3, o.length); - assertEquals(0, o[0]); - assertEquals(1, o[1]); - assertEquals(2, o[2]); + Object[] a = new CopyOnWriteArrayList().toArray(); + assertTrue(Arrays.equals(new Object[0], a)); + assertSame(Object[].class, a.getClass()); + + Integer[] elements = new Integer[SIZE]; + for (int i = 0; i < SIZE; i++) + elements[i] = i; + Collections.shuffle(Arrays.asList(elements)); + Collection full = populatedArray(elements); + + assertTrue(Arrays.equals(elements, full.toArray())); + assertSame(Object[].class, full.toArray().getClass()); } /** - * toArray returns an Integer array containing all elements from - * the list + * toArray(Integer array) returns an Integer array containing all + * elements from the list in insertion order */ public void testToArray2() { - CopyOnWriteArrayList full = populatedArray(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()); - } + Collection empty = new CopyOnWriteArrayList(); + Integer[] a; + + a = new Integer[0]; + assertSame(a, empty.toArray(a)); + a = new Integer[SIZE/2]; + Arrays.fill(a, 42); + assertSame(a, empty.toArray(a)); + assertNull(a[0]); + for (int i = 1; i < a.length; i++) + assertEquals(42, (int) a[i]); + + Integer[] elements = new Integer[SIZE]; + for (int i = 0; i < SIZE; i++) + elements[i] = i; + Collections.shuffle(Arrays.asList(elements)); + Collection full = populatedArray(elements); + + Arrays.fill(a, 42); + assertTrue(Arrays.equals(elements, full.toArray(a))); + for (int i = 0; i < a.length; i++) + assertEquals(42, (int) a[i]); + assertSame(Integer[].class, full.toArray(a).getClass()); + + a = new Integer[SIZE]; + Arrays.fill(a, 42); + assertSame(a, full.toArray(a)); + assertTrue(Arrays.equals(elements, a)); + + a = new Integer[2*SIZE]; + Arrays.fill(a, 42); + assertSame(a, full.toArray(a)); + assertTrue(Arrays.equals(elements, Arrays.copyOf(a, SIZE))); + assertNull(a[SIZE]); + for (int i = SIZE + 1; i < a.length; i++) + assertEquals(42, (int) a[i]); + } /** * sublists contains elements at indexes offset from their base @@ -390,11 +438,11 @@ public class CopyOnWriteArrayListTest ex } List s = a.subList(2, 5); - assertEquals(s.size(), 3); + assertEquals(3, s.size()); s.set(2, m1); assertEquals(a.get(4), m1); s.clear(); - assertEquals(a.size(), 7); + assertEquals(7, a.size()); } // Exception tests @@ -596,19 +644,20 @@ public class CopyOnWriteArrayListTest ex * a deserialized serialized list is equal */ public void testSerialization() throws Exception { - CopyOnWriteArrayList q = populatedArray(SIZE); + List x = populatedArray(SIZE); + List y = serialClone(x); - ByteArrayOutputStream bout = new ByteArrayOutputStream(10000); - ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout)); - out.writeObject(q); - out.close(); - - ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); - ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin)); - CopyOnWriteArrayList r = (CopyOnWriteArrayList)in.readObject(); - assertEquals(q.size(), r.size()); - assertTrue(q.equals(r)); - assertTrue(r.equals(q)); + assertTrue(x != y); + assertEquals(x.size(), y.size()); + assertEquals(x.toString(), y.toString()); + assertTrue(Arrays.equals(x.toArray(), y.toArray())); + assertEquals(x, y); + assertEquals(y, x); + while (!x.isEmpty()) { + assertFalse(y.isEmpty()); + assertEquals(x.remove(0), y.remove(0)); + } + assertTrue(y.isEmpty()); } }