--- jsr166/src/test/tck/ConcurrentSkipListSetTest.java 2010/11/18 20:21:53 1.19 +++ jsr166/src/test/tck/ConcurrentSkipListSetTest.java 2015/01/17 22:55:06 1.35 @@ -1,13 +1,23 @@ /* * 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/ */ -import junit.framework.*; -import java.util.*; -import java.util.concurrent.*; -import java.io.*; +import java.util.Arrays; +import java.util.BitSet; +import java.util.Collection; +import java.util.Comparator; +import java.util.Iterator; +import java.util.NavigableSet; +import java.util.NoSuchElementException; +import java.util.Random; +import java.util.Set; +import java.util.SortedSet; +import java.util.concurrent.ConcurrentSkipListSet; + +import junit.framework.Test; +import junit.framework.TestSuite; public class ConcurrentSkipListSetTest extends JSR166TestCase { public static void main(String[] args) { @@ -24,16 +34,16 @@ public class ConcurrentSkipListSetTest e } /** - * Create a set of given size containing consecutive + * Returns a new set of given size containing consecutive * Integers 0 ... n. */ private ConcurrentSkipListSet populatedSet(int n) { ConcurrentSkipListSet q = new ConcurrentSkipListSet(); assertTrue(q.isEmpty()); - for (int i = n-1; i >= 0; i-=2) + for (int i = n-1; i >= 0; i -= 2) assertTrue(q.add(new Integer(i))); - for (int i = (n & 1); i < n; i+=2) + for (int i = (n & 1); i < n; i += 2) assertTrue(q.add(new Integer(i))); assertFalse(q.isEmpty()); assertEquals(n, q.size()); @@ -41,7 +51,7 @@ public class ConcurrentSkipListSetTest e } /** - * Create set of first 5 ints + * Returns a new set of first 5 ints. */ private ConcurrentSkipListSet set5() { ConcurrentSkipListSet q = new ConcurrentSkipListSet(); @@ -269,19 +279,18 @@ public class ConcurrentSkipListSetTest e assertNull(q.pollFirst()); } - /** * remove(x) removes x and returns true if present */ public void testRemoveElement() { ConcurrentSkipListSet q = populatedSet(SIZE); - for (int i = 1; i < SIZE; i+=2) { + for (int i = 1; i < SIZE; i += 2) { assertTrue(q.contains(i)); assertTrue(q.remove(i)); assertFalse(q.contains(i)); assertTrue(q.contains(i-1)); } - for (int i = 0; i < SIZE; i+=2) { + for (int i = 0; i < SIZE; i += 2) { assertTrue(q.contains(i)); assertTrue(q.remove(i)); assertFalse(q.contains(i)); @@ -360,14 +369,12 @@ public class ConcurrentSkipListSetTest e assertTrue(q.removeAll(p)); assertEquals(SIZE-i, q.size()); for (int j = 0; j < i; ++j) { - Integer I = (Integer)(p.pollFirst()); - assertFalse(q.contains(I)); + Integer x = (Integer)(p.pollFirst()); + assertFalse(q.contains(x)); } } } - - /** * lower returns preceding element */ @@ -456,8 +463,7 @@ public class ConcurrentSkipListSetTest e public void testToArray2() { ConcurrentSkipListSet q = populatedSet(SIZE); Integer[] ints = new Integer[SIZE]; - Integer[] array = q.toArray(ints); - assertSame(ints, array); + assertSame(ints, q.toArray(ints)); for (int i = 0; i < ints.length; i++) assertSame(ints[i], q.pollFirst()); } @@ -467,27 +473,21 @@ public class ConcurrentSkipListSetTest e */ public void testIterator() { ConcurrentSkipListSet q = populatedSet(SIZE); - int i = 0; Iterator it = q.iterator(); - while (it.hasNext()) { + int i; + for (i = 0; it.hasNext(); i++) assertTrue(q.contains(it.next())); - ++i; - } assertEquals(i, SIZE); + assertIteratorExhausted(it); } /** * iterator of empty set has no elements */ public void testEmptyIterator() { - ConcurrentSkipListSet q = new ConcurrentSkipListSet(); - int i = 0; - Iterator it = q.iterator(); - while (it.hasNext()) { - assertTrue(q.contains(it.next())); - ++i; - } - assertEquals(i, 0); + NavigableSet s = new ConcurrentSkipListSet(); + assertIteratorExhausted(s.iterator()); + assertIteratorExhausted(s.descendingSet().iterator()); } /** @@ -509,7 +509,6 @@ public class ConcurrentSkipListSetTest e assertFalse(it.hasNext()); } - /** * toString contains toStrings of elements */ @@ -517,7 +516,7 @@ public class ConcurrentSkipListSetTest e ConcurrentSkipListSet q = populatedSet(SIZE); String s = q.toString(); for (int i = 0; i < SIZE; ++i) { - assertTrue(s.indexOf(String.valueOf(i)) >= 0); + assertTrue(s.contains(String.valueOf(i))); } } @@ -525,18 +524,18 @@ public class ConcurrentSkipListSetTest e * A deserialized serialized set has same elements */ public void testSerialization() throws Exception { - ConcurrentSkipListSet q = populatedSet(SIZE); - 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)); - ConcurrentSkipListSet r = (ConcurrentSkipListSet)in.readObject(); - assertEquals(q.size(), r.size()); - while (!q.isEmpty()) - assertEquals(q.pollFirst(), r.pollFirst()); + NavigableSet x = populatedSet(SIZE); + NavigableSet y = serialClone(x); + + assertNotSame(x, y); + assertEquals(x.size(), y.size()); + assertEquals(x, y); + assertEquals(y, x); + while (!x.isEmpty()) { + assertFalse(y.isEmpty()); + assertEquals(x.pollFirst(), y.pollFirst()); + } + assertTrue(y.isEmpty()); } /** @@ -659,7 +658,6 @@ public class ConcurrentSkipListSetTest e } Random rnd = new Random(666); - BitSet bs; /** * Subsets of subsets subdivide correctly @@ -669,41 +667,52 @@ public class ConcurrentSkipListSetTest e Class cl = ConcurrentSkipListSet.class; NavigableSet set = newSet(cl); - bs = new BitSet(setSize); + BitSet bs = new BitSet(setSize); - populate(set, setSize); - check(set, 0, setSize - 1, true); - check(set.descendingSet(), 0, setSize - 1, false); - - mutateSet(set, 0, setSize - 1); - check(set, 0, setSize - 1, true); - check(set.descendingSet(), 0, setSize - 1, false); + populate(set, setSize, bs); + check(set, 0, setSize - 1, true, bs); + check(set.descendingSet(), 0, setSize - 1, false, bs); + + mutateSet(set, 0, setSize - 1, bs); + check(set, 0, setSize - 1, true, bs); + check(set.descendingSet(), 0, setSize - 1, false, bs); bashSubSet(set.subSet(0, true, setSize, false), - 0, setSize - 1, true); + 0, setSize - 1, true, bs); + } + + /** + * addAll is idempotent + */ + public void testAddAll_idempotent() throws Exception { + Set x = populatedSet(SIZE); + Set y = new ConcurrentSkipListSet(x); + y.addAll(x); + assertEquals(x, y); + assertEquals(y, x); } static NavigableSet newSet(Class cl) throws Exception { NavigableSet result = (NavigableSet) cl.newInstance(); - assertEquals(result.size(), 0); + assertEquals(0, result.size()); assertFalse(result.iterator().hasNext()); return result; } - void populate(NavigableSet set, int limit) { + void populate(NavigableSet set, int limit, BitSet bs) { for (int i = 0, n = 2 * limit / 3; i < n; i++) { int element = rnd.nextInt(limit); - put(set, element); + put(set, element, bs); } } - void mutateSet(NavigableSet set, int min, int max) { + void mutateSet(NavigableSet set, int min, int max, BitSet bs) { int size = set.size(); int rangeSize = max - min + 1; // Remove a bunch of entries directly for (int i = 0, n = rangeSize / 2; i < n; i++) { - remove(set, min - 5 + rnd.nextInt(rangeSize + 10)); + remove(set, min - 5 + rnd.nextInt(rangeSize + 10), bs); } // Remove a bunch of entries with iterator @@ -717,18 +726,19 @@ public class ConcurrentSkipListSetTest e // Add entries till we're back to original size while (set.size() < size) { int element = min + rnd.nextInt(rangeSize); - assertTrue(element >= min && element<= max); - put(set, element); + assertTrue(element >= min && element <= max); + put(set, element, bs); } } - void mutateSubSet(NavigableSet set, int min, int max) { + void mutateSubSet(NavigableSet set, int min, int max, + BitSet bs) { int size = set.size(); int rangeSize = max - min + 1; // Remove a bunch of entries directly for (int i = 0, n = rangeSize / 2; i < n; i++) { - remove(set, min - 5 + rnd.nextInt(rangeSize + 10)); + remove(set, min - 5 + rnd.nextInt(rangeSize + 10), bs); } // Remove a bunch of entries with iterator @@ -742,8 +752,8 @@ public class ConcurrentSkipListSetTest e // Add entries till we're back to original size while (set.size() < size) { int element = min - 5 + rnd.nextInt(rangeSize + 10); - if (element >= min && element<= max) { - put(set, element); + if (element >= min && element <= max) { + put(set, element, bs); } else { try { set.add(element); @@ -753,24 +763,25 @@ public class ConcurrentSkipListSetTest e } } - void put(NavigableSet set, int element) { + void put(NavigableSet set, int element, BitSet bs) { if (set.add(element)) bs.set(element); } - void remove(NavigableSet set, int element) { + void remove(NavigableSet set, int element, BitSet bs) { if (set.remove(element)) bs.clear(element); } void bashSubSet(NavigableSet set, - int min, int max, boolean ascending) { - check(set, min, max, ascending); - check(set.descendingSet(), min, max, !ascending); - - mutateSubSet(set, min, max); - check(set, min, max, ascending); - check(set.descendingSet(), min, max, !ascending); + int min, int max, boolean ascending, + BitSet bs) { + check(set, min, max, ascending, bs); + check(set.descendingSet(), min, max, !ascending, bs); + + mutateSubSet(set, min, max, bs); + check(set, min, max, ascending, bs); + check(set.descendingSet(), min, max, !ascending, bs); // Recurse if (max - min < 2) @@ -782,16 +793,16 @@ public class ConcurrentSkipListSetTest e NavigableSet hm = set.headSet(midPoint, incl); if (ascending) { if (rnd.nextBoolean()) - bashSubSet(hm, min, midPoint - (incl ? 0 : 1), true); + bashSubSet(hm, min, midPoint - (incl ? 0 : 1), true, bs); else bashSubSet(hm.descendingSet(), min, midPoint - (incl ? 0 : 1), - false); + false, bs); } else { if (rnd.nextBoolean()) - bashSubSet(hm, midPoint + (incl ? 0 : 1), max, false); + bashSubSet(hm, midPoint + (incl ? 0 : 1), max, false, bs); else bashSubSet(hm.descendingSet(), midPoint + (incl ? 0 : 1), max, - true); + true, bs); } // tailSet - pick direction and endpoint inclusion randomly @@ -799,16 +810,16 @@ public class ConcurrentSkipListSetTest e NavigableSet tm = set.tailSet(midPoint,incl); if (ascending) { if (rnd.nextBoolean()) - bashSubSet(tm, midPoint + (incl ? 0 : 1), max, true); + bashSubSet(tm, midPoint + (incl ? 0 : 1), max, true, bs); else bashSubSet(tm.descendingSet(), midPoint + (incl ? 0 : 1), max, - false); + false, bs); } else { if (rnd.nextBoolean()) { - bashSubSet(tm, min, midPoint - (incl ? 0 : 1), false); + bashSubSet(tm, min, midPoint - (incl ? 0 : 1), false, bs); } else { bashSubSet(tm.descendingSet(), min, midPoint - (incl ? 0 : 1), - true); + true, bs); } } @@ -825,19 +836,19 @@ public class ConcurrentSkipListSetTest e endpoints[0], lowIncl, endpoints[1], highIncl); if (rnd.nextBoolean()) bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1), - endpoints[1] - (highIncl ? 0 : 1), true); + endpoints[1] - (highIncl ? 0 : 1), true, bs); else bashSubSet(sm.descendingSet(), endpoints[0] + (lowIncl ? 0 : 1), - endpoints[1] - (highIncl ? 0 : 1), false); + endpoints[1] - (highIncl ? 0 : 1), false, bs); } else { NavigableSet sm = set.subSet( endpoints[1], highIncl, endpoints[0], lowIncl); if (rnd.nextBoolean()) bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1), - endpoints[1] - (highIncl ? 0 : 1), false); + endpoints[1] - (highIncl ? 0 : 1), false, bs); else bashSubSet(sm.descendingSet(), endpoints[0] + (lowIncl ? 0 : 1), - endpoints[1] - (highIncl ? 0 : 1), true); + endpoints[1] - (highIncl ? 0 : 1), true, bs); } } @@ -845,8 +856,9 @@ public class ConcurrentSkipListSetTest e * min and max are both inclusive. If max < min, interval is empty. */ void check(NavigableSet set, - final int min, final int max, final boolean ascending) { - class ReferenceSet { + final int min, final int max, final boolean ascending, + final BitSet bs) { + class ReferenceSet { int lower(int element) { return ascending ? lowerAscending(element) : higherAscending(element); @@ -916,7 +928,7 @@ public class ConcurrentSkipListSetTest e if (bsContainsI) size++; } - assertEquals(set.size(), size); + assertEquals(size, set.size()); // Test contents using contains elementSet iterator int size2 = 0;