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

Comparing jsr166/src/test/tck/LinkedBlockingQueueTest.java (file contents):
Revision 1.48 by jsr166, Sat Nov 26 05:19:17 2011 UTC vs.
Revision 1.54 by jsr166, Wed Dec 31 19:05:42 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.Iterator;
15   import java.util.NoSuchElementException;
16   import java.util.Queue;
17   import java.util.concurrent.BlockingQueue;
18   import java.util.concurrent.CountDownLatch;
18 – import java.util.concurrent.LinkedBlockingQueue;
19   import java.util.concurrent.Executors;
20   import java.util.concurrent.ExecutorService;
21 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
21 > import java.util.concurrent.LinkedBlockingQueue;
22 >
23 > import junit.framework.Test;
24  
25   public class LinkedBlockingQueueTest extends JSR166TestCase {
26  
# Line 45 | Line 47 | public class LinkedBlockingQueueTest ext
47      }
48  
49      /**
50 <     * Create a queue of given size containing consecutive
50 >     * Returns a new queue of given size containing consecutive
51       * Integers 0 ... n.
52       */
53      private LinkedBlockingQueue<Integer> populatedQueue(int n) {
# Line 513 | Line 515 | public class LinkedBlockingQueueTest ext
515          assertTrue(q.remove(new Integer(1)));
516          assertTrue(q.remove(new Integer(2)));
517          assertTrue(q.add(new Integer(3)));
518 <        assertTrue(q.take() != null);
518 >        assertNotNull(q.take());
519      }
520  
521      /**
# Line 755 | Line 757 | public class LinkedBlockingQueueTest ext
757          Queue x = populatedQueue(SIZE);
758          Queue y = serialClone(x);
759  
760 <        assertTrue(x != y);
760 >        assertNotSame(x, y);
761          assertEquals(x.size(), y.size());
762          assertEquals(x.toString(), y.toString());
763          assertTrue(Arrays.equals(x.toArray(), y.toArray()));
# Line 821 | Line 823 | public class LinkedBlockingQueueTest ext
823              ArrayList l = new ArrayList();
824              q.drainTo(l, i);
825              int k = (i < SIZE) ? i : SIZE;
826 <            assertEquals(l.size(), k);
827 <            assertEquals(q.size(), SIZE-k);
826 >            assertEquals(k, l.size());
827 >            assertEquals(SIZE-k, q.size());
828              for (int j = 0; j < k; ++j)
829                  assertEquals(l.get(j), new Integer(j));
830              while (q.poll() != null) ;
831          }
832      }
833  
834 +    /**
835 +     * remove(null), contains(null) always return false
836 +     */
837 +    public void testNeverContainsNull() {
838 +        Collection<?>[] qs = {
839 +            new LinkedBlockingQueue<Object>(),
840 +            populatedQueue(2),
841 +        };
842 +
843 +        for (Collection<?> q : qs) {
844 +            assertFalse(q.contains(null));
845 +            assertFalse(q.remove(null));
846 +        }
847 +    }
848 +
849   }

Diff Legend

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