ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/PriorityBlockingQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/PriorityBlockingQueueTest.java (file contents):
Revision 1.51 by jsr166, Tue Feb 21 02:04:17 2012 UTC vs.
Revision 1.55 by jsr166, Wed Dec 31 19:21:20 2014 UTC

# Line 6 | Line 6
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  
# Line 644 | Line 646 | public class PriorityBlockingQueueTest e
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());
# Line 712 | Line 714 | public class PriorityBlockingQueueTest e
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  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines