35 |
|
|
36 |
|
/** |
37 |
|
* Returns a new set of given size containing consecutive |
38 |
< |
* Integers 0 ... n. |
38 |
> |
* Integers 0 ... n - 1. |
39 |
|
*/ |
40 |
< |
private ConcurrentSkipListSet<Integer> populatedSet(int n) { |
41 |
< |
ConcurrentSkipListSet<Integer> q = |
42 |
< |
new ConcurrentSkipListSet<Integer>(); |
40 |
> |
private static ConcurrentSkipListSet<Integer> populatedSet(int n) { |
41 |
> |
ConcurrentSkipListSet<Integer> q = new ConcurrentSkipListSet<>(); |
42 |
|
assertTrue(q.isEmpty()); |
43 |
< |
for (int i = n-1; i >= 0; i -= 2) |
43 |
> |
for (int i = n - 1; i >= 0; i -= 2) |
44 |
|
assertTrue(q.add(new Integer(i))); |
45 |
|
for (int i = (n & 1); i < n; i += 2) |
46 |
|
assertTrue(q.add(new Integer(i))); |
52 |
|
/** |
53 |
|
* Returns a new set of first 5 ints. |
54 |
|
*/ |
55 |
< |
private ConcurrentSkipListSet set5() { |
55 |
> |
private static ConcurrentSkipListSet set5() { |
56 |
|
ConcurrentSkipListSet q = new ConcurrentSkipListSet(); |
57 |
|
assertTrue(q.isEmpty()); |
58 |
|
q.add(one); |
198 |
|
q.add(new Object()); |
199 |
|
q.add(new Object()); |
200 |
|
shouldThrow(); |
201 |
< |
} catch (ClassCastException success) {} |
201 |
> |
} catch (ClassCastException success) { |
202 |
> |
assertTrue(q.size() < 2); |
203 |
> |
for (int i = 0, size = q.size(); i < size; i++) |
204 |
> |
assertSame(Object.class, q.pollFirst().getClass()); |
205 |
> |
assertNull(q.pollFirst()); |
206 |
> |
assertTrue(q.isEmpty()); |
207 |
> |
assertEquals(0, q.size()); |
208 |
> |
} |
209 |
|
} |
210 |
|
|
211 |
|
/** |
292 |
|
assertTrue(q.contains(i)); |
293 |
|
assertTrue(q.remove(i)); |
294 |
|
assertFalse(q.contains(i)); |
295 |
< |
assertTrue(q.contains(i-1)); |
295 |
> |
assertTrue(q.contains(i - 1)); |
296 |
|
} |
297 |
|
for (int i = 0; i < SIZE; i += 2) { |
298 |
|
assertTrue(q.contains(i)); |
299 |
|
assertTrue(q.remove(i)); |
300 |
|
assertFalse(q.contains(i)); |
301 |
< |
assertFalse(q.remove(i+1)); |
302 |
< |
assertFalse(q.contains(i+1)); |
301 |
> |
assertFalse(q.remove(i + 1)); |
302 |
> |
assertFalse(q.contains(i + 1)); |
303 |
|
} |
304 |
|
assertTrue(q.isEmpty()); |
305 |
|
} |
525 |
|
} |
526 |
|
|
527 |
|
/** |
528 |
< |
* A deserialized serialized set has same elements |
528 |
> |
* A cloned set equals original |
529 |
> |
*/ |
530 |
> |
public void testClone() { |
531 |
> |
ConcurrentSkipListSet x = populatedSet(SIZE); |
532 |
> |
ConcurrentSkipListSet y = x.clone(); |
533 |
> |
|
534 |
> |
assertNotSame(x, y); |
535 |
> |
assertEquals(x.size(), y.size()); |
536 |
> |
assertEquals(x, y); |
537 |
> |
assertEquals(y, x); |
538 |
> |
while (!x.isEmpty()) { |
539 |
> |
assertFalse(y.isEmpty()); |
540 |
> |
assertEquals(x.pollFirst(), y.pollFirst()); |
541 |
> |
} |
542 |
> |
assertTrue(y.isEmpty()); |
543 |
> |
} |
544 |
> |
|
545 |
> |
/** |
546 |
> |
* A deserialized/reserialized set equals original |
547 |
|
*/ |
548 |
|
public void testSerialization() throws Exception { |
549 |
|
NavigableSet x = populatedSet(SIZE); |
715 |
|
} |
716 |
|
|
717 |
|
static NavigableSet<Integer> newSet(Class cl) throws Exception { |
718 |
< |
NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance(); |
718 |
> |
NavigableSet<Integer> result = |
719 |
> |
(NavigableSet<Integer>) cl.getConstructor().newInstance(); |
720 |
|
assertEquals(0, result.size()); |
721 |
|
assertFalse(result.iterator().hasNext()); |
722 |
|
return result; |
999 |
|
} |
1000 |
|
|
1001 |
|
static boolean eq(Integer i, int j) { |
1002 |
< |
return i == null ? j == -1 : i == j; |
1002 |
> |
return (i == null) ? j == -1 : i == j; |
1003 |
|
} |
1004 |
|
|
1005 |
|
} |