11 |
|
|
12 |
|
public class TreeSetTest 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(TreeSetTest.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 |
|
|
104 |
|
* Set contains all elements of collection used to initialize |
105 |
|
*/ |
106 |
|
public void testConstructor6() { |
107 |
< |
try { |
108 |
< |
Integer[] ints = new Integer[SIZE]; |
109 |
< |
for (int i = 0; i < SIZE; ++i) |
110 |
< |
ints[i] = new Integer(i); |
111 |
< |
TreeSet q = new TreeSet(Arrays.asList(ints)); |
112 |
< |
for (int i = 0; i < SIZE; ++i) |
117 |
< |
assertEquals(ints[i], q.pollFirst()); |
118 |
< |
} |
119 |
< |
finally {} |
107 |
> |
Integer[] ints = new Integer[SIZE]; |
108 |
> |
for (int i = 0; i < SIZE; ++i) |
109 |
> |
ints[i] = new Integer(i); |
110 |
> |
TreeSet q = new TreeSet(Arrays.asList(ints)); |
111 |
> |
for (int i = 0; i < SIZE; ++i) |
112 |
> |
assertEquals(ints[i], q.pollFirst()); |
113 |
|
} |
114 |
|
|
115 |
|
/** |
116 |
|
* The comparator used in constructor is used |
117 |
|
*/ |
118 |
|
public void testConstructor7() { |
119 |
< |
try { |
120 |
< |
MyReverseComparator cmp = new MyReverseComparator(); |
121 |
< |
TreeSet q = new TreeSet(cmp); |
122 |
< |
assertEquals(cmp, q.comparator()); |
123 |
< |
Integer[] ints = new Integer[SIZE]; |
124 |
< |
for (int i = 0; i < SIZE; ++i) |
125 |
< |
ints[i] = new Integer(i); |
126 |
< |
q.addAll(Arrays.asList(ints)); |
127 |
< |
for (int i = SIZE-1; i >= 0; --i) |
135 |
< |
assertEquals(ints[i], q.pollFirst()); |
136 |
< |
} |
137 |
< |
finally {} |
119 |
> |
MyReverseComparator cmp = new MyReverseComparator(); |
120 |
> |
TreeSet q = new TreeSet(cmp); |
121 |
> |
assertEquals(cmp, q.comparator()); |
122 |
> |
Integer[] ints = new Integer[SIZE]; |
123 |
> |
for (int i = 0; i < SIZE; ++i) |
124 |
> |
ints[i] = new Integer(i); |
125 |
> |
q.addAll(Arrays.asList(ints)); |
126 |
> |
for (int i = SIZE-1; i >= 0; --i) |
127 |
> |
assertEquals(ints[i], q.pollFirst()); |
128 |
|
} |
129 |
|
|
130 |
|
/** |
208 |
|
shouldThrow(); |
209 |
|
} catch (NullPointerException success) {} |
210 |
|
} |
211 |
+ |
|
212 |
|
/** |
213 |
|
* addAll of a collection with null elements throws NPE |
214 |
|
*/ |
220 |
|
shouldThrow(); |
221 |
|
} catch (NullPointerException success) {} |
222 |
|
} |
223 |
+ |
|
224 |
|
/** |
225 |
|
* addAll of a collection with any null elements throws NPE after |
226 |
|
* possibly adding some elements |
240 |
|
* Set contains all elements of successful addAll |
241 |
|
*/ |
242 |
|
public void testAddAll5() { |
243 |
< |
try { |
244 |
< |
Integer[] empty = new Integer[0]; |
245 |
< |
Integer[] ints = new Integer[SIZE]; |
246 |
< |
for (int i = 0; i < SIZE; ++i) |
247 |
< |
ints[i] = new Integer(SIZE-1-i); |
248 |
< |
TreeSet q = new TreeSet(); |
249 |
< |
assertFalse(q.addAll(Arrays.asList(empty))); |
250 |
< |
assertTrue(q.addAll(Arrays.asList(ints))); |
251 |
< |
for (int i = 0; i < SIZE; ++i) |
260 |
< |
assertEquals(new Integer(i), q.pollFirst()); |
261 |
< |
} |
262 |
< |
finally {} |
243 |
> |
Integer[] empty = new Integer[0]; |
244 |
> |
Integer[] ints = new Integer[SIZE]; |
245 |
> |
for (int i = 0; i < SIZE; ++i) |
246 |
> |
ints[i] = new Integer(SIZE-1-i); |
247 |
> |
TreeSet q = new TreeSet(); |
248 |
> |
assertFalse(q.addAll(Arrays.asList(empty))); |
249 |
> |
assertTrue(q.addAll(Arrays.asList(ints))); |
250 |
> |
for (int i = 0; i < SIZE; ++i) |
251 |
> |
assertEquals(new Integer(i), q.pollFirst()); |
252 |
|
} |
253 |
|
|
254 |
|
/** |
257 |
|
public void testPollFirst() { |
258 |
|
TreeSet q = populatedSet(SIZE); |
259 |
|
for (int i = 0; i < SIZE; ++i) { |
260 |
< |
assertEquals(i, ((Integer)q.pollFirst()).intValue()); |
260 |
> |
assertEquals(i, q.pollFirst()); |
261 |
|
} |
262 |
|
assertNull(q.pollFirst()); |
263 |
|
} |
268 |
|
public void testPollLast() { |
269 |
|
TreeSet q = populatedSet(SIZE); |
270 |
|
for (int i = SIZE-1; i >= 0; --i) { |
271 |
< |
assertEquals(i, ((Integer)q.pollLast()).intValue()); |
271 |
> |
assertEquals(i, q.pollLast()); |
272 |
|
} |
273 |
|
assertNull(q.pollFirst()); |
274 |
|
} |
382 |
|
|
383 |
|
Object e4 = q.lower(zero); |
384 |
|
assertNull(e4); |
396 |
– |
|
385 |
|
} |
386 |
|
|
387 |
|
/** |
400 |
|
|
401 |
|
Object e4 = q.higher(six); |
402 |
|
assertNull(e4); |
415 |
– |
|
403 |
|
} |
404 |
|
|
405 |
|
/** |
418 |
|
|
419 |
|
Object e4 = q.floor(zero); |
420 |
|
assertNull(e4); |
434 |
– |
|
421 |
|
} |
422 |
|
|
423 |
|
/** |
436 |
|
|
437 |
|
Object e4 = q.ceiling(six); |
438 |
|
assertNull(e4); |
453 |
– |
|
439 |
|
} |
440 |
|
|
441 |
|
/** |
492 |
|
/** |
493 |
|
* iterator.remove removes current element |
494 |
|
*/ |
495 |
< |
public void testIteratorRemove () { |
495 |
> |
public void testIteratorRemove() { |
496 |
|
final TreeSet q = new TreeSet(); |
497 |
|
q.add(new Integer(2)); |
498 |
|
q.add(new Integer(1)); |
663 |
|
/** |
664 |
|
* Subsets of subsets subdivide correctly |
665 |
|
*/ |
666 |
< |
public void testRecursiveSubSets() { |
666 |
> |
public void testRecursiveSubSets() throws Exception { |
667 |
|
int setSize = 1000; |
668 |
|
Class cl = TreeSet.class; |
669 |
|
|
682 |
|
0, setSize - 1, true); |
683 |
|
} |
684 |
|
|
685 |
< |
static NavigableSet<Integer> newSet(Class cl) { |
686 |
< |
NavigableSet<Integer> result = null; |
702 |
< |
try { |
703 |
< |
result = (NavigableSet<Integer>) cl.newInstance(); |
704 |
< |
} catch (Exception e) { |
705 |
< |
fail(); |
706 |
< |
} |
685 |
> |
static NavigableSet<Integer> newSet(Class cl) throws Exception { |
686 |
> |
NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance(); |
687 |
|
assertEquals(result.size(), 0); |
688 |
|
assertFalse(result.iterator().hasNext()); |
689 |
|
return result; |
746 |
|
} else { |
747 |
|
try { |
748 |
|
set.add(element); |
749 |
< |
fail(); |
750 |
< |
} catch (IllegalArgumentException e) { |
771 |
< |
// expected |
772 |
< |
} |
749 |
> |
shouldThrow(); |
750 |
> |
} catch (IllegalArgumentException success) {} |
751 |
|
} |
752 |
|
} |
753 |
|
} |
880 |
|
// BitSet should support this! Test would run much faster |
881 |
|
while (element >= min) { |
882 |
|
if (bs.get(element)) |
883 |
< |
return(element); |
883 |
> |
return element; |
884 |
|
element--; |
885 |
|
} |
886 |
|
return -1; |
946 |
|
assertEq(rs.last(), -1); |
947 |
|
try { |
948 |
|
set.first(); |
949 |
< |
fail(); |
950 |
< |
} catch (NoSuchElementException e) { |
973 |
< |
// expected |
974 |
< |
} |
949 |
> |
shouldThrow(); |
950 |
> |
} catch (NoSuchElementException success) {} |
951 |
|
try { |
952 |
|
set.last(); |
953 |
< |
fail(); |
954 |
< |
} catch (NoSuchElementException e) { |
979 |
< |
// expected |
980 |
< |
} |
953 |
> |
shouldThrow(); |
954 |
> |
} catch (NoSuchElementException success) {} |
955 |
|
} |
956 |
|
} |
957 |
|
|