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.53 by jsr166, Sun Nov 23 22:27:06 2014 UTC

# Line 45 | Line 45 | public class LinkedBlockingQueueTest ext
45      }
46  
47      /**
48 <     * Create a queue of given size containing consecutive
48 >     * Returns a new queue of given size containing consecutive
49       * Integers 0 ... n.
50       */
51      private LinkedBlockingQueue<Integer> populatedQueue(int n) {
# Line 513 | Line 513 | public class LinkedBlockingQueueTest ext
513          assertTrue(q.remove(new Integer(1)));
514          assertTrue(q.remove(new Integer(2)));
515          assertTrue(q.add(new Integer(3)));
516 <        assertTrue(q.take() != null);
516 >        assertNotNull(q.take());
517      }
518  
519      /**
# Line 755 | Line 755 | public class LinkedBlockingQueueTest ext
755          Queue x = populatedQueue(SIZE);
756          Queue y = serialClone(x);
757  
758 <        assertTrue(x != y);
758 >        assertNotSame(x, y);
759          assertEquals(x.size(), y.size());
760          assertEquals(x.toString(), y.toString());
761          assertTrue(Arrays.equals(x.toArray(), y.toArray()));
# Line 821 | Line 821 | public class LinkedBlockingQueueTest ext
821              ArrayList l = new ArrayList();
822              q.drainTo(l, i);
823              int k = (i < SIZE) ? i : SIZE;
824 <            assertEquals(l.size(), k);
825 <            assertEquals(q.size(), SIZE-k);
824 >            assertEquals(k, l.size());
825 >            assertEquals(SIZE-k, q.size());
826              for (int j = 0; j < k; ++j)
827                  assertEquals(l.get(j), new Integer(j));
828              while (q.poll() != null) ;
829          }
830      }
831  
832 +    /**
833 +     * remove(null), contains(null) always return false
834 +     */
835 +    public void testNeverContainsNull() {
836 +        Collection<?>[] qs = {
837 +            new LinkedBlockingQueue<Object>(),
838 +            populatedQueue(2),
839 +        };
840 +
841 +        for (Collection<?> q : qs) {
842 +            assertFalse(q.contains(null));
843 +            assertFalse(q.remove(null));
844 +        }
845 +    }
846 +
847   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines