1 |
|
/* |
2 |
|
* Written by Doug Lea with assistance from members of JCP JSR-166 |
3 |
|
* Expert Group and released to the public domain, as explained at |
4 |
< |
* http://creativecommons.org/licenses/publicdomain |
4 |
> |
* http://creativecommons.org/publicdomain/zero/1.0/ |
5 |
|
*/ |
6 |
|
|
7 |
|
import junit.framework.*; |
8 |
< |
import java.util.*; |
9 |
< |
import java.util.concurrent.*; |
10 |
< |
import java.io.*; |
8 |
> |
import java.util.Arrays; |
9 |
> |
import java.util.Comparator; |
10 |
> |
import java.util.Iterator; |
11 |
> |
import java.util.NavigableSet; |
12 |
> |
import java.util.SortedSet; |
13 |
> |
import java.util.concurrent.ConcurrentSkipListSet; |
14 |
|
|
15 |
|
public class ConcurrentSkipListSubSetTest extends JSR166TestCase { |
16 |
|
public static void main(String[] args) { |
17 |
< |
junit.textui.TestRunner.run (suite()); |
17 |
> |
junit.textui.TestRunner.run(suite()); |
18 |
|
} |
19 |
|
public static Test suite() { |
20 |
< |
return new TestSuite(ConcurrentSkipListSubSetTest.class); |
20 |
> |
return new TestSuite(ConcurrentSkipListSubSetTest.class); |
21 |
|
} |
22 |
|
|
23 |
< |
static class MyReverseComparator implements Comparator { |
23 |
> |
static class MyReverseComparator implements Comparator { |
24 |
|
public int compare(Object x, Object y) { |
25 |
< |
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; |
25 |
> |
return ((Comparable)y).compareTo(x); |
26 |
|
} |
27 |
|
} |
28 |
|
|
29 |
|
/** |
30 |
< |
* Create a set of given size containing consecutive |
30 |
> |
* Returns a new set of given size containing consecutive |
31 |
|
* Integers 0 ... n. |
32 |
|
*/ |
33 |
< |
private NavigableSet populatedSet(int n) { |
34 |
< |
ConcurrentSkipListSet q = new ConcurrentSkipListSet(); |
33 |
> |
private NavigableSet<Integer> populatedSet(int n) { |
34 |
> |
ConcurrentSkipListSet<Integer> q = |
35 |
> |
new ConcurrentSkipListSet<Integer>(); |
36 |
|
assertTrue(q.isEmpty()); |
37 |
|
|
38 |
< |
for(int i = n-1; i >= 0; i-=2) |
39 |
< |
assertTrue(q.add(new Integer(i))); |
40 |
< |
for(int i = (n & 1); i < n; i+=2) |
41 |
< |
assertTrue(q.add(new Integer(i))); |
38 |
> |
for (int i = n-1; i >= 0; i-=2) |
39 |
> |
assertTrue(q.add(new Integer(i))); |
40 |
> |
for (int i = (n & 1); i < n; i+=2) |
41 |
> |
assertTrue(q.add(new Integer(i))); |
42 |
|
assertTrue(q.add(new Integer(-n))); |
43 |
|
assertTrue(q.add(new Integer(n))); |
44 |
|
NavigableSet s = q.subSet(new Integer(0), true, new Integer(n), false); |
45 |
|
assertFalse(s.isEmpty()); |
46 |
< |
assertEquals(n, s.size()); |
46 |
> |
assertEquals(n, s.size()); |
47 |
|
return s; |
48 |
|
} |
49 |
|
|
50 |
|
/** |
51 |
< |
* Create set of first 5 ints |
51 |
> |
* Returns a new set of first 5 ints. |
52 |
|
*/ |
53 |
|
private NavigableSet set5() { |
54 |
|
ConcurrentSkipListSet q = new ConcurrentSkipListSet(); |
61 |
|
q.add(zero); |
62 |
|
q.add(seven); |
63 |
|
NavigableSet s = q.subSet(one, true, seven, false); |
64 |
< |
assertEquals(5, s.size()); |
64 |
> |
assertEquals(5, s.size()); |
65 |
|
return s; |
66 |
|
} |
67 |
|
|
68 |
|
/** |
69 |
< |
* Create set of first 5 negative ints |
69 |
> |
* Returns a new set of first 5 negative ints. |
70 |
|
*/ |
71 |
|
private NavigableSet dset5() { |
72 |
|
ConcurrentSkipListSet q = new ConcurrentSkipListSet(); |
77 |
|
q.add(m4); |
78 |
|
q.add(m5); |
79 |
|
NavigableSet s = q.descendingSet(); |
80 |
< |
assertEquals(5, s.size()); |
80 |
> |
assertEquals(5, s.size()); |
81 |
|
return s; |
82 |
|
} |
83 |
|
|
84 |
< |
private static NavigableSet set0() { |
85 |
< |
ConcurrentSkipListSet set = new ConcurrentSkipListSet(); |
84 |
> |
private static NavigableSet set0() { |
85 |
> |
ConcurrentSkipListSet set = new ConcurrentSkipListSet(); |
86 |
|
assertTrue(set.isEmpty()); |
87 |
|
return set.tailSet(m1, true); |
88 |
|
} |
89 |
|
|
90 |
< |
private static NavigableSet dset0() { |
91 |
< |
ConcurrentSkipListSet set = new ConcurrentSkipListSet(); |
90 |
> |
private static NavigableSet dset0() { |
91 |
> |
ConcurrentSkipListSet set = new ConcurrentSkipListSet(); |
92 |
|
assertTrue(set.isEmpty()); |
93 |
|
return set; |
94 |
|
} |
95 |
< |
|
95 |
> |
|
96 |
|
/** |
97 |
|
* A new set has unbounded capacity |
98 |
|
*/ |
100 |
|
assertEquals(0, set0().size()); |
101 |
|
} |
102 |
|
|
103 |
– |
|
103 |
|
/** |
104 |
|
* isEmpty is true before add, false after |
105 |
|
*/ |
133 |
|
* add(null) throws NPE |
134 |
|
*/ |
135 |
|
public void testAddNull() { |
136 |
< |
try { |
136 |
> |
try { |
137 |
|
NavigableSet q = set0(); |
138 |
|
q.add(null); |
139 |
|
shouldThrow(); |
140 |
< |
} catch (NullPointerException success) { } |
140 |
> |
} catch (NullPointerException success) {} |
141 |
|
} |
142 |
|
|
143 |
|
/** |
167 |
|
q.add(new Object()); |
168 |
|
q.add(new Object()); |
169 |
|
shouldThrow(); |
170 |
< |
} |
172 |
< |
catch(ClassCastException success) {} |
170 |
> |
} catch (ClassCastException success) {} |
171 |
|
} |
172 |
|
|
175 |
– |
|
173 |
|
/** |
174 |
|
* addAll(null) throws NPE |
175 |
|
*/ |
178 |
|
NavigableSet q = set0(); |
179 |
|
q.addAll(null); |
180 |
|
shouldThrow(); |
181 |
< |
} |
185 |
< |
catch (NullPointerException success) {} |
181 |
> |
} catch (NullPointerException success) {} |
182 |
|
} |
183 |
+ |
|
184 |
|
/** |
185 |
|
* addAll of a collection with null elements throws NPE |
186 |
|
*/ |
190 |
|
Integer[] ints = new Integer[SIZE]; |
191 |
|
q.addAll(Arrays.asList(ints)); |
192 |
|
shouldThrow(); |
193 |
< |
} |
197 |
< |
catch (NullPointerException success) {} |
193 |
> |
} catch (NullPointerException success) {} |
194 |
|
} |
195 |
+ |
|
196 |
|
/** |
197 |
|
* addAll of a collection with any null elements throws NPE after |
198 |
|
* possibly adding some elements |
205 |
|
ints[i] = new Integer(i+SIZE); |
206 |
|
q.addAll(Arrays.asList(ints)); |
207 |
|
shouldThrow(); |
208 |
< |
} |
212 |
< |
catch (NullPointerException success) {} |
208 |
> |
} catch (NullPointerException success) {} |
209 |
|
} |
210 |
|
|
211 |
|
/** |
212 |
|
* Set contains all elements of successful addAll |
213 |
|
*/ |
214 |
|
public void testAddAll5() { |
215 |
< |
try { |
216 |
< |
Integer[] empty = new Integer[0]; |
217 |
< |
Integer[] ints = new Integer[SIZE]; |
218 |
< |
for (int i = 0; i < SIZE; ++i) |
219 |
< |
ints[i] = new Integer(SIZE-1- i); |
220 |
< |
NavigableSet q = set0(); |
221 |
< |
assertFalse(q.addAll(Arrays.asList(empty))); |
222 |
< |
assertTrue(q.addAll(Arrays.asList(ints))); |
223 |
< |
for (int i = 0; i < SIZE; ++i) |
228 |
< |
assertEquals(new Integer(i), q.pollFirst()); |
229 |
< |
} |
230 |
< |
finally {} |
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) |
223 |
> |
assertEquals(new Integer(i), q.pollFirst()); |
224 |
|
} |
225 |
|
|
226 |
|
/** |
229 |
|
public void testPoll() { |
230 |
|
NavigableSet q = populatedSet(SIZE); |
231 |
|
for (int i = 0; i < SIZE; ++i) { |
232 |
< |
assertEquals(i, ((Integer)q.pollFirst()).intValue()); |
232 |
> |
assertEquals(i, q.pollFirst()); |
233 |
|
} |
234 |
< |
assertNull(q.pollFirst()); |
234 |
> |
assertNull(q.pollFirst()); |
235 |
|
} |
236 |
|
|
237 |
|
/** |
240 |
|
public void testRemoveElement() { |
241 |
|
NavigableSet q = populatedSet(SIZE); |
242 |
|
for (int i = 1; i < SIZE; i+=2) { |
243 |
< |
assertTrue(q.remove(new Integer(i))); |
243 |
> |
assertTrue(q.contains(i)); |
244 |
> |
assertTrue(q.remove(i)); |
245 |
> |
assertFalse(q.contains(i)); |
246 |
> |
assertTrue(q.contains(i-1)); |
247 |
|
} |
248 |
|
for (int i = 0; i < SIZE; i+=2) { |
249 |
< |
assertTrue(q.remove(new Integer(i))); |
250 |
< |
assertFalse(q.remove(new Integer(i+1))); |
249 |
> |
assertTrue(q.contains(i)); |
250 |
> |
assertTrue(q.remove(i)); |
251 |
> |
assertFalse(q.contains(i)); |
252 |
> |
assertFalse(q.remove(i+1)); |
253 |
> |
assertFalse(q.contains(i+1)); |
254 |
|
} |
255 |
|
assertTrue(q.isEmpty()); |
256 |
|
} |
257 |
< |
|
257 |
> |
|
258 |
|
/** |
259 |
|
* contains(x) reports true when elements added but not yet removed |
260 |
|
*/ |
330 |
|
} |
331 |
|
} |
332 |
|
|
334 |
– |
|
335 |
– |
|
333 |
|
/** |
334 |
|
* lower returns preceding element |
335 |
|
*/ |
346 |
|
|
347 |
|
Object e4 = q.lower(zero); |
348 |
|
assertNull(e4); |
352 |
– |
|
349 |
|
} |
350 |
|
|
351 |
|
/** |
364 |
|
|
365 |
|
Object e4 = q.higher(six); |
366 |
|
assertNull(e4); |
371 |
– |
|
367 |
|
} |
368 |
|
|
369 |
|
/** |
382 |
|
|
383 |
|
Object e4 = q.floor(zero); |
384 |
|
assertNull(e4); |
390 |
– |
|
385 |
|
} |
386 |
|
|
387 |
|
/** |
400 |
|
|
401 |
|
Object e4 = q.ceiling(six); |
402 |
|
assertNull(e4); |
409 |
– |
|
403 |
|
} |
404 |
|
|
405 |
|
/** |
406 |
< |
* toArray contains all elements |
406 |
> |
* toArray contains all elements in sorted order |
407 |
|
*/ |
408 |
|
public void testToArray() { |
409 |
|
NavigableSet q = populatedSet(SIZE); |
410 |
< |
Object[] o = q.toArray(); |
411 |
< |
Arrays.sort(o); |
412 |
< |
for(int i = 0; i < o.length; i++) |
420 |
< |
assertEquals(o[i], q.pollFirst()); |
410 |
> |
Object[] o = q.toArray(); |
411 |
> |
for (int i = 0; i < o.length; i++) |
412 |
> |
assertSame(o[i], q.pollFirst()); |
413 |
|
} |
414 |
|
|
415 |
|
/** |
416 |
< |
* toArray(a) contains all elements |
416 |
> |
* toArray(a) contains all elements in sorted order |
417 |
|
*/ |
418 |
|
public void testToArray2() { |
419 |
< |
NavigableSet q = populatedSet(SIZE); |
420 |
< |
Integer[] ints = new Integer[SIZE]; |
421 |
< |
ints = (Integer[])q.toArray(ints); |
422 |
< |
Arrays.sort(ints); |
423 |
< |
for(int i = 0; i < ints.length; i++) |
424 |
< |
assertEquals(ints[i], q.pollFirst()); |
419 |
> |
NavigableSet<Integer> q = populatedSet(SIZE); |
420 |
> |
Integer[] ints = new Integer[SIZE]; |
421 |
> |
Integer[] array = q.toArray(ints); |
422 |
> |
assertSame(ints, array); |
423 |
> |
for (int i = 0; i < ints.length; i++) |
424 |
> |
assertSame(ints[i], q.pollFirst()); |
425 |
|
} |
426 |
< |
|
426 |
> |
|
427 |
|
/** |
428 |
|
* iterator iterates through all elements |
429 |
|
*/ |
430 |
|
public void testIterator() { |
431 |
|
NavigableSet q = populatedSet(SIZE); |
432 |
|
int i = 0; |
433 |
< |
Iterator it = q.iterator(); |
434 |
< |
while(it.hasNext()) { |
433 |
> |
Iterator it = q.iterator(); |
434 |
> |
while (it.hasNext()) { |
435 |
|
assertTrue(q.contains(it.next())); |
436 |
|
++i; |
437 |
|
} |
444 |
|
public void testEmptyIterator() { |
445 |
|
NavigableSet q = set0(); |
446 |
|
int i = 0; |
447 |
< |
Iterator it = q.iterator(); |
448 |
< |
while(it.hasNext()) { |
447 |
> |
Iterator it = q.iterator(); |
448 |
> |
while (it.hasNext()) { |
449 |
|
assertTrue(q.contains(it.next())); |
450 |
|
++i; |
451 |
|
} |
452 |
< |
assertEquals(i, 0); |
452 |
> |
assertEquals(0, i); |
453 |
|
} |
454 |
|
|
455 |
|
/** |
456 |
|
* iterator.remove removes current element |
457 |
|
*/ |
458 |
< |
public void testIteratorRemove () { |
458 |
> |
public void testIteratorRemove() { |
459 |
|
final NavigableSet q = set0(); |
460 |
|
q.add(new Integer(2)); |
461 |
|
q.add(new Integer(1)); |
471 |
|
assertFalse(it.hasNext()); |
472 |
|
} |
473 |
|
|
482 |
– |
|
474 |
|
/** |
475 |
|
* toString contains toStrings of elements |
476 |
|
*/ |
478 |
|
NavigableSet q = populatedSet(SIZE); |
479 |
|
String s = q.toString(); |
480 |
|
for (int i = 0; i < SIZE; ++i) { |
481 |
< |
assertTrue(s.indexOf(String.valueOf(i)) >= 0); |
481 |
> |
assertTrue(s.contains(String.valueOf(i))); |
482 |
|
} |
483 |
< |
} |
483 |
> |
} |
484 |
|
|
485 |
|
/** |
486 |
< |
* A deserialized serialized set has same elements |
486 |
> |
* A deserialized serialized set has same elements |
487 |
|
*/ |
488 |
< |
public void testSerialization() { |
489 |
< |
NavigableSet q = populatedSet(SIZE); |
490 |
< |
try { |
491 |
< |
ByteArrayOutputStream bout = new ByteArrayOutputStream(10000); |
492 |
< |
ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout)); |
493 |
< |
out.writeObject(q); |
494 |
< |
out.close(); |
495 |
< |
|
496 |
< |
ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); |
497 |
< |
ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin)); |
498 |
< |
NavigableSet r = (NavigableSet)in.readObject(); |
508 |
< |
assertEquals(q.size(), r.size()); |
509 |
< |
while (!q.isEmpty()) |
510 |
< |
assertEquals(q.pollFirst(), r.pollFirst()); |
511 |
< |
} catch(Exception e){ |
512 |
< |
e.printStackTrace(); |
513 |
< |
unexpectedException(); |
488 |
> |
public void testSerialization() throws Exception { |
489 |
> |
NavigableSet x = populatedSet(SIZE); |
490 |
> |
NavigableSet y = serialClone(x); |
491 |
> |
|
492 |
> |
assertNotSame(y, x); |
493 |
> |
assertEquals(x.size(), y.size()); |
494 |
> |
assertEquals(x, y); |
495 |
> |
assertEquals(y, x); |
496 |
> |
while (!x.isEmpty()) { |
497 |
> |
assertFalse(y.isEmpty()); |
498 |
> |
assertEquals(x.pollFirst(), y.pollFirst()); |
499 |
|
} |
500 |
+ |
assertTrue(y.isEmpty()); |
501 |
|
} |
502 |
|
|
503 |
|
/** |
638 |
|
* add(null) throws NPE |
639 |
|
*/ |
640 |
|
public void testDescendingAddNull() { |
641 |
< |
try { |
641 |
> |
try { |
642 |
|
NavigableSet q = dset0(); |
643 |
|
q.add(null); |
644 |
|
shouldThrow(); |
645 |
< |
} catch (NullPointerException success) { } |
645 |
> |
} catch (NullPointerException success) {} |
646 |
|
} |
647 |
|
|
648 |
|
/** |
672 |
|
q.add(new Object()); |
673 |
|
q.add(new Object()); |
674 |
|
shouldThrow(); |
675 |
< |
} |
690 |
< |
catch(ClassCastException success) {} |
675 |
> |
} catch (ClassCastException success) {} |
676 |
|
} |
677 |
|
|
693 |
– |
|
678 |
|
/** |
679 |
|
* addAll(null) throws NPE |
680 |
|
*/ |
683 |
|
NavigableSet q = dset0(); |
684 |
|
q.addAll(null); |
685 |
|
shouldThrow(); |
686 |
< |
} |
703 |
< |
catch (NullPointerException success) {} |
686 |
> |
} catch (NullPointerException success) {} |
687 |
|
} |
688 |
+ |
|
689 |
|
/** |
690 |
|
* addAll of a collection with null elements throws NPE |
691 |
|
*/ |
695 |
|
Integer[] ints = new Integer[SIZE]; |
696 |
|
q.addAll(Arrays.asList(ints)); |
697 |
|
shouldThrow(); |
698 |
< |
} |
715 |
< |
catch (NullPointerException success) {} |
698 |
> |
} catch (NullPointerException success) {} |
699 |
|
} |
700 |
+ |
|
701 |
|
/** |
702 |
|
* addAll of a collection with any null elements throws NPE after |
703 |
|
* possibly adding some elements |
710 |
|
ints[i] = new Integer(i+SIZE); |
711 |
|
q.addAll(Arrays.asList(ints)); |
712 |
|
shouldThrow(); |
713 |
< |
} |
730 |
< |
catch (NullPointerException success) {} |
713 |
> |
} catch (NullPointerException success) {} |
714 |
|
} |
715 |
|
|
716 |
|
/** |
717 |
|
* Set contains all elements of successful addAll |
718 |
|
*/ |
719 |
|
public void testDescendingAddAll5() { |
720 |
< |
try { |
721 |
< |
Integer[] empty = new Integer[0]; |
722 |
< |
Integer[] ints = new Integer[SIZE]; |
723 |
< |
for (int i = 0; i < SIZE; ++i) |
724 |
< |
ints[i] = new Integer(SIZE-1- i); |
725 |
< |
NavigableSet q = dset0(); |
726 |
< |
assertFalse(q.addAll(Arrays.asList(empty))); |
727 |
< |
assertTrue(q.addAll(Arrays.asList(ints))); |
728 |
< |
for (int i = 0; i < SIZE; ++i) |
746 |
< |
assertEquals(new Integer(i), q.pollFirst()); |
747 |
< |
} |
748 |
< |
finally {} |
720 |
> |
Integer[] empty = new Integer[0]; |
721 |
> |
Integer[] ints = new Integer[SIZE]; |
722 |
> |
for (int i = 0; i < SIZE; ++i) |
723 |
> |
ints[i] = new Integer(SIZE-1- i); |
724 |
> |
NavigableSet q = dset0(); |
725 |
> |
assertFalse(q.addAll(Arrays.asList(empty))); |
726 |
> |
assertTrue(q.addAll(Arrays.asList(ints))); |
727 |
> |
for (int i = 0; i < SIZE; ++i) |
728 |
> |
assertEquals(new Integer(i), q.pollFirst()); |
729 |
|
} |
730 |
|
|
731 |
|
/** |
734 |
|
public void testDescendingPoll() { |
735 |
|
NavigableSet q = populatedSet(SIZE); |
736 |
|
for (int i = 0; i < SIZE; ++i) { |
737 |
< |
assertEquals(i, ((Integer)q.pollFirst()).intValue()); |
737 |
> |
assertEquals(i, q.pollFirst()); |
738 |
|
} |
739 |
< |
assertNull(q.pollFirst()); |
739 |
> |
assertNull(q.pollFirst()); |
740 |
|
} |
741 |
|
|
742 |
|
/** |
753 |
|
} |
754 |
|
assertTrue(q.isEmpty()); |
755 |
|
} |
756 |
< |
|
756 |
> |
|
757 |
|
/** |
758 |
|
* contains(x) reports true when elements added but not yet removed |
759 |
|
*/ |
829 |
|
} |
830 |
|
} |
831 |
|
|
852 |
– |
|
853 |
– |
|
832 |
|
/** |
833 |
|
* lower returns preceding element |
834 |
|
*/ |
845 |
|
|
846 |
|
Object e4 = q.lower(zero); |
847 |
|
assertNull(e4); |
870 |
– |
|
848 |
|
} |
849 |
|
|
850 |
|
/** |
863 |
|
|
864 |
|
Object e4 = q.higher(m6); |
865 |
|
assertNull(e4); |
889 |
– |
|
866 |
|
} |
867 |
|
|
868 |
|
/** |
881 |
|
|
882 |
|
Object e4 = q.floor(zero); |
883 |
|
assertNull(e4); |
908 |
– |
|
884 |
|
} |
885 |
|
|
886 |
|
/** |
899 |
|
|
900 |
|
Object e4 = q.ceiling(m6); |
901 |
|
assertNull(e4); |
927 |
– |
|
902 |
|
} |
903 |
|
|
904 |
|
/** |
906 |
|
*/ |
907 |
|
public void testDescendingToArray() { |
908 |
|
NavigableSet q = populatedSet(SIZE); |
909 |
< |
Object[] o = q.toArray(); |
909 |
> |
Object[] o = q.toArray(); |
910 |
|
Arrays.sort(o); |
911 |
< |
for(int i = 0; i < o.length; i++) |
912 |
< |
assertEquals(o[i], q.pollFirst()); |
911 |
> |
for (int i = 0; i < o.length; i++) |
912 |
> |
assertEquals(o[i], q.pollFirst()); |
913 |
|
} |
914 |
|
|
915 |
|
/** |
917 |
|
*/ |
918 |
|
public void testDescendingToArray2() { |
919 |
|
NavigableSet q = populatedSet(SIZE); |
920 |
< |
Integer[] ints = new Integer[SIZE]; |
921 |
< |
ints = (Integer[])q.toArray(ints); |
920 |
> |
Integer[] ints = new Integer[SIZE]; |
921 |
> |
assertSame(ints, q.toArray(ints)); |
922 |
|
Arrays.sort(ints); |
923 |
< |
for(int i = 0; i < ints.length; i++) |
923 |
> |
for (int i = 0; i < ints.length; i++) |
924 |
|
assertEquals(ints[i], q.pollFirst()); |
925 |
|
} |
926 |
< |
|
926 |
> |
|
927 |
|
/** |
928 |
|
* iterator iterates through all elements |
929 |
|
*/ |
930 |
|
public void testDescendingIterator() { |
931 |
|
NavigableSet q = populatedSet(SIZE); |
932 |
|
int i = 0; |
933 |
< |
Iterator it = q.iterator(); |
934 |
< |
while(it.hasNext()) { |
933 |
> |
Iterator it = q.iterator(); |
934 |
> |
while (it.hasNext()) { |
935 |
|
assertTrue(q.contains(it.next())); |
936 |
|
++i; |
937 |
|
} |
944 |
|
public void testDescendingEmptyIterator() { |
945 |
|
NavigableSet q = dset0(); |
946 |
|
int i = 0; |
947 |
< |
Iterator it = q.iterator(); |
948 |
< |
while(it.hasNext()) { |
947 |
> |
Iterator it = q.iterator(); |
948 |
> |
while (it.hasNext()) { |
949 |
|
assertTrue(q.contains(it.next())); |
950 |
|
++i; |
951 |
|
} |
952 |
< |
assertEquals(i, 0); |
952 |
> |
assertEquals(0, i); |
953 |
|
} |
954 |
|
|
955 |
|
/** |
956 |
|
* iterator.remove removes current element |
957 |
|
*/ |
958 |
< |
public void testDescendingIteratorRemove () { |
958 |
> |
public void testDescendingIteratorRemove() { |
959 |
|
final NavigableSet q = dset0(); |
960 |
|
q.add(new Integer(2)); |
961 |
|
q.add(new Integer(1)); |
971 |
|
assertFalse(it.hasNext()); |
972 |
|
} |
973 |
|
|
1000 |
– |
|
974 |
|
/** |
975 |
|
* toString contains toStrings of elements |
976 |
|
*/ |
978 |
|
NavigableSet q = populatedSet(SIZE); |
979 |
|
String s = q.toString(); |
980 |
|
for (int i = 0; i < SIZE; ++i) { |
981 |
< |
assertTrue(s.indexOf(String.valueOf(i)) >= 0); |
981 |
> |
assertTrue(s.contains(String.valueOf(i))); |
982 |
|
} |
983 |
< |
} |
983 |
> |
} |
984 |
|
|
985 |
|
/** |
986 |
< |
* A deserialized serialized set has same elements |
986 |
> |
* A deserialized serialized set has same elements |
987 |
|
*/ |
988 |
< |
public void testDescendingSerialization() { |
989 |
< |
NavigableSet q = populatedSet(SIZE); |
990 |
< |
try { |
991 |
< |
ByteArrayOutputStream bout = new ByteArrayOutputStream(10000); |
992 |
< |
ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout)); |
993 |
< |
out.writeObject(q); |
994 |
< |
out.close(); |
995 |
< |
|
996 |
< |
ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); |
997 |
< |
ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin)); |
998 |
< |
NavigableSet r = (NavigableSet)in.readObject(); |
1026 |
< |
assertEquals(q.size(), r.size()); |
1027 |
< |
while (!q.isEmpty()) |
1028 |
< |
assertEquals(q.pollFirst(), r.pollFirst()); |
1029 |
< |
} catch(Exception e){ |
1030 |
< |
e.printStackTrace(); |
1031 |
< |
unexpectedException(); |
988 |
> |
public void testDescendingSerialization() throws Exception { |
989 |
> |
NavigableSet x = dset5(); |
990 |
> |
NavigableSet y = serialClone(x); |
991 |
> |
|
992 |
> |
assertNotSame(y, x); |
993 |
> |
assertEquals(x.size(), y.size()); |
994 |
> |
assertEquals(x, y); |
995 |
> |
assertEquals(y, x); |
996 |
> |
while (!x.isEmpty()) { |
997 |
> |
assertFalse(y.isEmpty()); |
998 |
> |
assertEquals(x.pollFirst(), y.pollFirst()); |
999 |
|
} |
1000 |
+ |
assertTrue(y.isEmpty()); |
1001 |
|
} |
1002 |
|
|
1003 |
|
/** |