369 |
|
assertTrue(q.removeAll(p)); |
370 |
|
assertEquals(SIZE-i, q.size()); |
371 |
|
for (int j = 0; j < i; ++j) { |
372 |
< |
Integer I = (Integer)(p.pollFirst()); |
373 |
< |
assertFalse(q.contains(I)); |
372 |
> |
Integer x = (Integer)(p.pollFirst()); |
373 |
> |
assertFalse(q.contains(x)); |
374 |
|
} |
375 |
|
} |
376 |
|
} |
473 |
|
*/ |
474 |
|
public void testIterator() { |
475 |
|
ConcurrentSkipListSet q = populatedSet(SIZE); |
476 |
– |
int i = 0; |
476 |
|
Iterator it = q.iterator(); |
477 |
< |
while (it.hasNext()) { |
477 |
> |
int i; |
478 |
> |
for (i = 0; it.hasNext(); i++) |
479 |
|
assertTrue(q.contains(it.next())); |
480 |
– |
++i; |
481 |
– |
} |
480 |
|
assertEquals(i, SIZE); |
481 |
+ |
assertIteratorExhausted(it); |
482 |
|
} |
483 |
|
|
484 |
|
/** |
485 |
|
* iterator of empty set has no elements |
486 |
|
*/ |
487 |
|
public void testEmptyIterator() { |
488 |
< |
ConcurrentSkipListSet q = new ConcurrentSkipListSet(); |
489 |
< |
int i = 0; |
490 |
< |
Iterator it = q.iterator(); |
492 |
< |
while (it.hasNext()) { |
493 |
< |
assertTrue(q.contains(it.next())); |
494 |
< |
++i; |
495 |
< |
} |
496 |
< |
assertEquals(0, i); |
488 |
> |
NavigableSet s = new ConcurrentSkipListSet(); |
489 |
> |
assertIteratorExhausted(s.iterator()); |
490 |
> |
assertIteratorExhausted(s.descendingSet().iterator()); |
491 |
|
} |
492 |
|
|
493 |
|
/** |
726 |
|
// Add entries till we're back to original size |
727 |
|
while (set.size() < size) { |
728 |
|
int element = min + rnd.nextInt(rangeSize); |
729 |
< |
assertTrue(element >= min && element<= max); |
729 |
> |
assertTrue(element >= min && element <= max); |
730 |
|
put(set, element, bs); |
731 |
|
} |
732 |
|
} |
752 |
|
// Add entries till we're back to original size |
753 |
|
while (set.size() < size) { |
754 |
|
int element = min - 5 + rnd.nextInt(rangeSize + 10); |
755 |
< |
if (element >= min && element<= max) { |
755 |
> |
if (element >= min && element <= max) { |
756 |
|
put(set, element, bs); |
757 |
|
} else { |
758 |
|
try { |