11 |
|
|
12 |
|
public class ConcurrentSkipListSubSetTest extends JSR166TestCase { |
13 |
|
public static void main(String[] args) { |
14 |
< |
junit.textui.TestRunner.run (suite()); |
14 |
> |
junit.textui.TestRunner.run(suite()); |
15 |
|
} |
16 |
|
public static Test suite() { |
17 |
|
return new TestSuite(ConcurrentSkipListSubSetTest.class); |
19 |
|
|
20 |
|
static class MyReverseComparator implements Comparator { |
21 |
|
public int compare(Object x, Object y) { |
22 |
< |
int i = ((Integer)x).intValue(); |
23 |
< |
int j = ((Integer)y).intValue(); |
24 |
< |
if (i < j) return 1; |
25 |
< |
if (i > j) return -1; |
26 |
< |
return 0; |
22 |
> |
return ((Comparable)y).compareTo(x); |
23 |
|
} |
24 |
|
} |
25 |
|
|
27 |
|
* Create a set of given size containing consecutive |
28 |
|
* Integers 0 ... n. |
29 |
|
*/ |
30 |
< |
private NavigableSet populatedSet(int n) { |
31 |
< |
ConcurrentSkipListSet q = new ConcurrentSkipListSet(); |
30 |
> |
private NavigableSet<Integer> populatedSet(int n) { |
31 |
> |
ConcurrentSkipListSet<Integer> q = |
32 |
> |
new ConcurrentSkipListSet<Integer>(); |
33 |
|
assertTrue(q.isEmpty()); |
34 |
|
|
35 |
|
for (int i = n-1; i >= 0; i-=2) |
179 |
|
shouldThrow(); |
180 |
|
} catch (NullPointerException success) {} |
181 |
|
} |
182 |
+ |
|
183 |
|
/** |
184 |
|
* addAll of a collection with null elements throws NPE |
185 |
|
*/ |
191 |
|
shouldThrow(); |
192 |
|
} catch (NullPointerException success) {} |
193 |
|
} |
194 |
+ |
|
195 |
|
/** |
196 |
|
* addAll of a collection with any null elements throws NPE after |
197 |
|
* possibly adding some elements |
211 |
|
* Set contains all elements of successful addAll |
212 |
|
*/ |
213 |
|
public void testAddAll5() { |
214 |
< |
try { |
215 |
< |
Integer[] empty = new Integer[0]; |
216 |
< |
Integer[] ints = new Integer[SIZE]; |
217 |
< |
for (int i = 0; i < SIZE; ++i) |
218 |
< |
ints[i] = new Integer(SIZE-1- i); |
219 |
< |
NavigableSet q = set0(); |
220 |
< |
assertFalse(q.addAll(Arrays.asList(empty))); |
221 |
< |
assertTrue(q.addAll(Arrays.asList(ints))); |
222 |
< |
for (int i = 0; i < SIZE; ++i) |
224 |
< |
assertEquals(new Integer(i), q.pollFirst()); |
225 |
< |
} |
226 |
< |
finally {} |
214 |
> |
Integer[] empty = new Integer[0]; |
215 |
> |
Integer[] ints = new Integer[SIZE]; |
216 |
> |
for (int i = 0; i < SIZE; ++i) |
217 |
> |
ints[i] = new Integer(SIZE-1- i); |
218 |
> |
NavigableSet q = set0(); |
219 |
> |
assertFalse(q.addAll(Arrays.asList(empty))); |
220 |
> |
assertTrue(q.addAll(Arrays.asList(ints))); |
221 |
> |
for (int i = 0; i < SIZE; ++i) |
222 |
> |
assertEquals(new Integer(i), q.pollFirst()); |
223 |
|
} |
224 |
|
|
225 |
|
/** |
228 |
|
public void testPoll() { |
229 |
|
NavigableSet q = populatedSet(SIZE); |
230 |
|
for (int i = 0; i < SIZE; ++i) { |
231 |
< |
assertEquals(i, ((Integer)q.pollFirst()).intValue()); |
231 |
> |
assertEquals(i, q.pollFirst()); |
232 |
|
} |
233 |
|
assertNull(q.pollFirst()); |
234 |
|
} |
239 |
|
public void testRemoveElement() { |
240 |
|
NavigableSet q = populatedSet(SIZE); |
241 |
|
for (int i = 1; i < SIZE; i+=2) { |
242 |
< |
assertTrue(q.remove(new Integer(i))); |
242 |
> |
assertTrue(q.contains(i)); |
243 |
> |
assertTrue(q.remove(i)); |
244 |
> |
assertFalse(q.contains(i)); |
245 |
> |
assertTrue(q.contains(i-1)); |
246 |
|
} |
247 |
|
for (int i = 0; i < SIZE; i+=2) { |
248 |
< |
assertTrue(q.remove(new Integer(i))); |
249 |
< |
assertFalse(q.remove(new Integer(i+1))); |
248 |
> |
assertTrue(q.contains(i)); |
249 |
> |
assertTrue(q.remove(i)); |
250 |
> |
assertFalse(q.contains(i)); |
251 |
> |
assertFalse(q.remove(i+1)); |
252 |
> |
assertFalse(q.contains(i+1)); |
253 |
|
} |
254 |
|
assertTrue(q.isEmpty()); |
255 |
|
} |
347 |
|
|
348 |
|
Object e4 = q.lower(zero); |
349 |
|
assertNull(e4); |
348 |
– |
|
350 |
|
} |
351 |
|
|
352 |
|
/** |
365 |
|
|
366 |
|
Object e4 = q.higher(six); |
367 |
|
assertNull(e4); |
367 |
– |
|
368 |
|
} |
369 |
|
|
370 |
|
/** |
383 |
|
|
384 |
|
Object e4 = q.floor(zero); |
385 |
|
assertNull(e4); |
386 |
– |
|
386 |
|
} |
387 |
|
|
388 |
|
/** |
401 |
|
|
402 |
|
Object e4 = q.ceiling(six); |
403 |
|
assertNull(e4); |
405 |
– |
|
404 |
|
} |
405 |
|
|
406 |
|
/** |
407 |
< |
* toArray contains all elements |
407 |
> |
* toArray contains all elements in sorted order |
408 |
|
*/ |
409 |
|
public void testToArray() { |
410 |
|
NavigableSet q = populatedSet(SIZE); |
411 |
|
Object[] o = q.toArray(); |
414 |
– |
Arrays.sort(o); |
412 |
|
for (int i = 0; i < o.length; i++) |
413 |
< |
assertEquals(o[i], q.pollFirst()); |
413 |
> |
assertSame(o[i], q.pollFirst()); |
414 |
|
} |
415 |
|
|
416 |
|
/** |
417 |
< |
* toArray(a) contains all elements |
417 |
> |
* toArray(a) contains all elements in sorted order |
418 |
|
*/ |
419 |
|
public void testToArray2() { |
420 |
< |
NavigableSet q = populatedSet(SIZE); |
420 |
> |
NavigableSet<Integer> q = populatedSet(SIZE); |
421 |
|
Integer[] ints = new Integer[SIZE]; |
422 |
< |
ints = (Integer[])q.toArray(ints); |
423 |
< |
Arrays.sort(ints); |
422 |
> |
Integer[] array = q.toArray(ints); |
423 |
> |
assertSame(ints, array); |
424 |
|
for (int i = 0; i < ints.length; i++) |
425 |
< |
assertEquals(ints[i], q.pollFirst()); |
425 |
> |
assertSame(ints[i], q.pollFirst()); |
426 |
|
} |
427 |
|
|
428 |
|
/** |
456 |
|
/** |
457 |
|
* iterator.remove removes current element |
458 |
|
*/ |
459 |
< |
public void testIteratorRemove () { |
459 |
> |
public void testIteratorRemove() { |
460 |
|
final NavigableSet q = set0(); |
461 |
|
q.add(new Integer(2)); |
462 |
|
q.add(new Integer(1)); |
688 |
|
shouldThrow(); |
689 |
|
} catch (NullPointerException success) {} |
690 |
|
} |
691 |
+ |
|
692 |
|
/** |
693 |
|
* addAll of a collection with null elements throws NPE |
694 |
|
*/ |
700 |
|
shouldThrow(); |
701 |
|
} catch (NullPointerException success) {} |
702 |
|
} |
703 |
+ |
|
704 |
|
/** |
705 |
|
* addAll of a collection with any null elements throws NPE after |
706 |
|
* possibly adding some elements |
720 |
|
* Set contains all elements of successful addAll |
721 |
|
*/ |
722 |
|
public void testDescendingAddAll5() { |
723 |
< |
try { |
724 |
< |
Integer[] empty = new Integer[0]; |
725 |
< |
Integer[] ints = new Integer[SIZE]; |
726 |
< |
for (int i = 0; i < SIZE; ++i) |
727 |
< |
ints[i] = new Integer(SIZE-1- i); |
728 |
< |
NavigableSet q = dset0(); |
729 |
< |
assertFalse(q.addAll(Arrays.asList(empty))); |
730 |
< |
assertTrue(q.addAll(Arrays.asList(ints))); |
731 |
< |
for (int i = 0; i < SIZE; ++i) |
733 |
< |
assertEquals(new Integer(i), q.pollFirst()); |
734 |
< |
} |
735 |
< |
finally {} |
723 |
> |
Integer[] empty = new Integer[0]; |
724 |
> |
Integer[] ints = new Integer[SIZE]; |
725 |
> |
for (int i = 0; i < SIZE; ++i) |
726 |
> |
ints[i] = new Integer(SIZE-1- i); |
727 |
> |
NavigableSet q = dset0(); |
728 |
> |
assertFalse(q.addAll(Arrays.asList(empty))); |
729 |
> |
assertTrue(q.addAll(Arrays.asList(ints))); |
730 |
> |
for (int i = 0; i < SIZE; ++i) |
731 |
> |
assertEquals(new Integer(i), q.pollFirst()); |
732 |
|
} |
733 |
|
|
734 |
|
/** |
737 |
|
public void testDescendingPoll() { |
738 |
|
NavigableSet q = populatedSet(SIZE); |
739 |
|
for (int i = 0; i < SIZE; ++i) { |
740 |
< |
assertEquals(i, ((Integer)q.pollFirst()).intValue()); |
740 |
> |
assertEquals(i, q.pollFirst()); |
741 |
|
} |
742 |
|
assertNull(q.pollFirst()); |
743 |
|
} |
850 |
|
|
851 |
|
Object e4 = q.lower(zero); |
852 |
|
assertNull(e4); |
857 |
– |
|
853 |
|
} |
854 |
|
|
855 |
|
/** |
868 |
|
|
869 |
|
Object e4 = q.higher(m6); |
870 |
|
assertNull(e4); |
876 |
– |
|
871 |
|
} |
872 |
|
|
873 |
|
/** |
886 |
|
|
887 |
|
Object e4 = q.floor(zero); |
888 |
|
assertNull(e4); |
895 |
– |
|
889 |
|
} |
890 |
|
|
891 |
|
/** |
904 |
|
|
905 |
|
Object e4 = q.ceiling(m6); |
906 |
|
assertNull(e4); |
914 |
– |
|
907 |
|
} |
908 |
|
|
909 |
|
/** |
923 |
|
public void testDescendingToArray2() { |
924 |
|
NavigableSet q = populatedSet(SIZE); |
925 |
|
Integer[] ints = new Integer[SIZE]; |
926 |
< |
ints = (Integer[])q.toArray(ints); |
926 |
> |
assertSame(ints, q.toArray(ints)); |
927 |
|
Arrays.sort(ints); |
928 |
|
for (int i = 0; i < ints.length; i++) |
929 |
|
assertEquals(ints[i], q.pollFirst()); |
960 |
|
/** |
961 |
|
* iterator.remove removes current element |
962 |
|
*/ |
963 |
< |
public void testDescendingIteratorRemove () { |
963 |
> |
public void testDescendingIteratorRemove() { |
964 |
|
final NavigableSet q = dset0(); |
965 |
|
q.add(new Integer(2)); |
966 |
|
q.add(new Integer(1)); |