6 |
|
* Pat Fisher, Mike Judd. |
7 |
|
*/ |
8 |
|
|
9 |
< |
import junit.framework.*; |
10 |
< |
import java.util.Arrays; |
9 |
> |
import static java.util.concurrent.TimeUnit.MILLISECONDS; |
10 |
> |
|
11 |
|
import java.util.ArrayList; |
12 |
+ |
import java.util.Arrays; |
13 |
|
import java.util.Collection; |
14 |
|
import java.util.Comparator; |
15 |
|
import java.util.Iterator; |
16 |
|
import java.util.NoSuchElementException; |
17 |
|
import java.util.Queue; |
17 |
– |
import java.util.concurrent.PriorityBlockingQueue; |
18 |
|
import java.util.concurrent.BlockingQueue; |
19 |
|
import java.util.concurrent.CountDownLatch; |
20 |
|
import java.util.concurrent.Executors; |
21 |
|
import java.util.concurrent.ExecutorService; |
22 |
< |
import static java.util.concurrent.TimeUnit.MILLISECONDS; |
22 |
> |
import java.util.concurrent.PriorityBlockingQueue; |
23 |
> |
|
24 |
> |
import junit.framework.Test; |
25 |
|
|
26 |
|
public class PriorityBlockingQueueTest extends JSR166TestCase { |
27 |
|
|
57 |
|
} |
58 |
|
|
59 |
|
/** |
60 |
< |
* Create a queue of given size containing consecutive |
60 |
> |
* Returns a new queue of given size containing consecutive |
61 |
|
* Integers 0 ... n. |
62 |
|
*/ |
63 |
|
private PriorityBlockingQueue<Integer> populatedQueue(int n) { |
646 |
|
Queue x = populatedQueue(SIZE); |
647 |
|
Queue y = serialClone(x); |
648 |
|
|
649 |
< |
assertTrue(x != y); |
649 |
> |
assertNotSame(x, y); |
650 |
|
assertEquals(x.size(), y.size()); |
651 |
|
while (!x.isEmpty()) { |
652 |
|
assertFalse(y.isEmpty()); |
714 |
|
assertEquals(SIZE-k, q.size()); |
715 |
|
for (int j = 0; j < k; ++j) |
716 |
|
assertEquals(l.get(j), new Integer(j)); |
717 |
< |
while (q.poll() != null) ; |
717 |
> |
do {} while (q.poll() != null); |
718 |
> |
} |
719 |
> |
} |
720 |
> |
|
721 |
> |
/** |
722 |
> |
* remove(null), contains(null) always return false |
723 |
> |
*/ |
724 |
> |
public void testNeverContainsNull() { |
725 |
> |
Collection<?>[] qs = { |
726 |
> |
new PriorityBlockingQueue<Object>(), |
727 |
> |
populatedQueue(2), |
728 |
> |
}; |
729 |
> |
|
730 |
> |
for (Collection<?> q : qs) { |
731 |
> |
assertFalse(q.contains(null)); |
732 |
> |
assertFalse(q.remove(null)); |
733 |
|
} |
734 |
|
} |
735 |
|
|