55 |
|
} |
56 |
|
|
57 |
|
/** |
58 |
< |
* Create a queue of given size containing consecutive |
58 |
> |
* Returns a new queue of given size containing consecutive |
59 |
|
* Integers 0 ... n. |
60 |
|
*/ |
61 |
|
private PriorityBlockingQueue<Integer> populatedQueue(int n) { |
644 |
|
Queue x = populatedQueue(SIZE); |
645 |
|
Queue y = serialClone(x); |
646 |
|
|
647 |
< |
assertTrue(x != y); |
647 |
> |
assertNotSame(x, y); |
648 |
|
assertEquals(x.size(), y.size()); |
649 |
|
while (!x.isEmpty()) { |
650 |
|
assertFalse(y.isEmpty()); |
708 |
|
ArrayList l = new ArrayList(); |
709 |
|
q.drainTo(l, i); |
710 |
|
int k = (i < SIZE) ? i : SIZE; |
711 |
< |
assertEquals(l.size(), k); |
712 |
< |
assertEquals(q.size(), SIZE-k); |
711 |
> |
assertEquals(k, l.size()); |
712 |
> |
assertEquals(SIZE-k, q.size()); |
713 |
|
for (int j = 0; j < k; ++j) |
714 |
|
assertEquals(l.get(j), new Integer(j)); |
715 |
|
while (q.poll() != null) ; |
716 |
|
} |
717 |
|
} |
718 |
|
|
719 |
+ |
/** |
720 |
+ |
* remove(null), contains(null) always return false |
721 |
+ |
*/ |
722 |
+ |
public void testNeverContainsNull() { |
723 |
+ |
Collection<?>[] qs = { |
724 |
+ |
new PriorityBlockingQueue<Object>(), |
725 |
+ |
populatedQueue(2), |
726 |
+ |
}; |
727 |
+ |
|
728 |
+ |
for (Collection<?> q : qs) { |
729 |
+ |
assertFalse(q.contains(null)); |
730 |
+ |
assertFalse(q.remove(null)); |
731 |
+ |
} |
732 |
+ |
} |
733 |
+ |
|
734 |
|
} |