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 |
|
|
178 |
|
shouldThrow(); |
179 |
|
} catch (NullPointerException success) {} |
180 |
|
} |
181 |
+ |
|
182 |
|
/** |
183 |
|
* addAll of a collection with null elements throws NPE |
184 |
|
*/ |
190 |
|
shouldThrow(); |
191 |
|
} catch (NullPointerException success) {} |
192 |
|
} |
193 |
+ |
|
194 |
|
/** |
195 |
|
* addAll of a collection with any null elements throws NPE after |
196 |
|
* possibly adding some elements |
227 |
|
public void testPoll() { |
228 |
|
NavigableSet q = populatedSet(SIZE); |
229 |
|
for (int i = 0; i < SIZE; ++i) { |
230 |
< |
assertEquals(i, ((Integer)q.pollFirst()).intValue()); |
230 |
> |
assertEquals(i, q.pollFirst()); |
231 |
|
} |
232 |
|
assertNull(q.pollFirst()); |
233 |
|
} |
340 |
|
|
341 |
|
Object e4 = q.lower(zero); |
342 |
|
assertNull(e4); |
345 |
– |
|
343 |
|
} |
344 |
|
|
345 |
|
/** |
358 |
|
|
359 |
|
Object e4 = q.higher(six); |
360 |
|
assertNull(e4); |
364 |
– |
|
361 |
|
} |
362 |
|
|
363 |
|
/** |
376 |
|
|
377 |
|
Object e4 = q.floor(zero); |
378 |
|
assertNull(e4); |
383 |
– |
|
379 |
|
} |
380 |
|
|
381 |
|
/** |
394 |
|
|
395 |
|
Object e4 = q.ceiling(six); |
396 |
|
assertNull(e4); |
402 |
– |
|
397 |
|
} |
398 |
|
|
399 |
|
/** |
400 |
< |
* toArray contains all elements |
400 |
> |
* toArray contains all elements in sorted order |
401 |
|
*/ |
402 |
|
public void testToArray() { |
403 |
|
NavigableSet q = populatedSet(SIZE); |
404 |
|
Object[] o = q.toArray(); |
411 |
– |
Arrays.sort(o); |
405 |
|
for (int i = 0; i < o.length; i++) |
406 |
< |
assertEquals(o[i], q.pollFirst()); |
406 |
> |
assertSame(o[i], q.pollFirst()); |
407 |
|
} |
408 |
|
|
409 |
|
/** |
410 |
< |
* toArray(a) contains all elements |
410 |
> |
* toArray(a) contains all elements in sorted order |
411 |
|
*/ |
412 |
|
public void testToArray2() { |
413 |
|
NavigableSet q = populatedSet(SIZE); |
414 |
|
Integer[] ints = new Integer[SIZE]; |
415 |
< |
ints = (Integer[])q.toArray(ints); |
423 |
< |
Arrays.sort(ints); |
415 |
> |
assertSame(ints, q.toArray(ints)); |
416 |
|
for (int i = 0; i < ints.length; i++) |
417 |
< |
assertEquals(ints[i], q.pollFirst()); |
417 |
> |
assertSame(ints[i], q.pollFirst()); |
418 |
|
} |
419 |
|
|
420 |
|
/** |
448 |
|
/** |
449 |
|
* iterator.remove removes current element |
450 |
|
*/ |
451 |
< |
public void testIteratorRemove () { |
451 |
> |
public void testIteratorRemove() { |
452 |
|
final NavigableSet q = set0(); |
453 |
|
q.add(new Integer(2)); |
454 |
|
q.add(new Integer(1)); |
680 |
|
shouldThrow(); |
681 |
|
} catch (NullPointerException success) {} |
682 |
|
} |
683 |
+ |
|
684 |
|
/** |
685 |
|
* addAll of a collection with null elements throws NPE |
686 |
|
*/ |
692 |
|
shouldThrow(); |
693 |
|
} catch (NullPointerException success) {} |
694 |
|
} |
695 |
+ |
|
696 |
|
/** |
697 |
|
* addAll of a collection with any null elements throws NPE after |
698 |
|
* possibly adding some elements |
729 |
|
public void testDescendingPoll() { |
730 |
|
NavigableSet q = populatedSet(SIZE); |
731 |
|
for (int i = 0; i < SIZE; ++i) { |
732 |
< |
assertEquals(i, ((Integer)q.pollFirst()).intValue()); |
732 |
> |
assertEquals(i, q.pollFirst()); |
733 |
|
} |
734 |
|
assertNull(q.pollFirst()); |
735 |
|
} |
842 |
|
|
843 |
|
Object e4 = q.lower(zero); |
844 |
|
assertNull(e4); |
851 |
– |
|
845 |
|
} |
846 |
|
|
847 |
|
/** |
860 |
|
|
861 |
|
Object e4 = q.higher(m6); |
862 |
|
assertNull(e4); |
870 |
– |
|
863 |
|
} |
864 |
|
|
865 |
|
/** |
878 |
|
|
879 |
|
Object e4 = q.floor(zero); |
880 |
|
assertNull(e4); |
889 |
– |
|
881 |
|
} |
882 |
|
|
883 |
|
/** |
896 |
|
|
897 |
|
Object e4 = q.ceiling(m6); |
898 |
|
assertNull(e4); |
908 |
– |
|
899 |
|
} |
900 |
|
|
901 |
|
/** |
915 |
|
public void testDescendingToArray2() { |
916 |
|
NavigableSet q = populatedSet(SIZE); |
917 |
|
Integer[] ints = new Integer[SIZE]; |
918 |
< |
ints = (Integer[])q.toArray(ints); |
918 |
> |
assertSame(ints, q.toArray(ints)); |
919 |
|
Arrays.sort(ints); |
920 |
|
for (int i = 0; i < ints.length; i++) |
921 |
|
assertEquals(ints[i], q.pollFirst()); |
952 |
|
/** |
953 |
|
* iterator.remove removes current element |
954 |
|
*/ |
955 |
< |
public void testDescendingIteratorRemove () { |
955 |
> |
public void testDescendingIteratorRemove() { |
956 |
|
final NavigableSet q = dset0(); |
957 |
|
q.add(new Integer(2)); |
958 |
|
q.add(new Integer(1)); |