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

Comparing jsr166/src/test/tck/ArrayDequeTest.java (file contents):
Revision 1.27 by jsr166, Wed Feb 20 12:07:45 2013 UTC vs.
Revision 1.31 by jsr166, Wed Dec 31 20:09:08 2014 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 – import junit.framework.*;
8 – import java.util.Arrays;
7   import java.util.ArrayDeque;
8 + import java.util.Arrays;
9   import java.util.Collection;
10   import java.util.Deque;
11   import java.util.Iterator;
# Line 14 | Line 13 | import java.util.NoSuchElementException;
13   import java.util.Queue;
14   import java.util.Random;
15  
16 + import junit.framework.Test;
17 + import junit.framework.TestSuite;
18 +
19   public class ArrayDequeTest extends JSR166TestCase {
20      public static void main(String[] args) {
21          junit.textui.TestRunner.run(suite());
# Line 391 | Line 393 | public class ArrayDequeTest extends JSR1
393       */
394      public void testRemoveElement() {
395          ArrayDeque q = populatedDeque(SIZE);
396 <        for (int i = 1; i < SIZE; i+=2) {
396 >        for (int i = 1; i < SIZE; i += 2) {
397              assertTrue(q.contains(i));
398              assertTrue(q.remove(i));
399              assertFalse(q.contains(i));
400              assertTrue(q.contains(i-1));
401          }
402 <        for (int i = 0; i < SIZE; i+=2) {
402 >        for (int i = 0; i < SIZE; i += 2) {
403              assertTrue(q.contains(i));
404              assertTrue(q.remove(i));
405              assertFalse(q.contains(i));
# Line 530 | Line 532 | public class ArrayDequeTest extends JSR1
532       */
533      public void testRemoveFirstOccurrence() {
534          ArrayDeque q = populatedDeque(SIZE);
535 <        for (int i = 1; i < SIZE; i+=2) {
535 >        for (int i = 1; i < SIZE; i += 2) {
536              assertTrue(q.removeFirstOccurrence(new Integer(i)));
537          }
538 <        for (int i = 0; i < SIZE; i+=2) {
538 >        for (int i = 0; i < SIZE; i += 2) {
539              assertTrue(q.removeFirstOccurrence(new Integer(i)));
540              assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
541          }
# Line 545 | Line 547 | public class ArrayDequeTest extends JSR1
547       */
548      public void testRemoveLastOccurrence() {
549          ArrayDeque q = populatedDeque(SIZE);
550 <        for (int i = 1; i < SIZE; i+=2) {
550 >        for (int i = 1; i < SIZE; i += 2) {
551              assertTrue(q.removeLastOccurrence(new Integer(i)));
552          }
553 <        for (int i = 0; i < SIZE; i+=2) {
553 >        for (int i = 0; i < SIZE; i += 2) {
554              assertTrue(q.removeLastOccurrence(new Integer(i)));
555              assertFalse(q.removeLastOccurrence(new Integer(i+1)));
556          }
# Line 879 | Line 881 | public class ArrayDequeTest extends JSR1
881          Queue x = populatedDeque(SIZE);
882          Queue y = serialClone(x);
883  
884 <        assertTrue(x != y);
884 >        assertNotSame(y, x);
885          assertEquals(x.size(), y.size());
886          assertEquals(x.toString(), y.toString());
887          assertTrue(Arrays.equals(x.toArray(), y.toArray()));
# Line 890 | Line 892 | public class ArrayDequeTest extends JSR1
892          assertTrue(y.isEmpty());
893      }
894  
895 +    /**
896 +     * remove(null), contains(null) always return false
897 +     */
898 +    public void testNeverContainsNull() {
899 +        Deque<?>[] qs = {
900 +            new ArrayDeque<Object>(),
901 +            populatedDeque(2),
902 +        };
903 +
904 +        for (Deque<?> q : qs) {
905 +            assertFalse(q.contains(null));
906 +            assertFalse(q.remove(null));
907 +            assertFalse(q.removeFirstOccurrence(null));
908 +            assertFalse(q.removeLastOccurrence(null));
909 +        }
910 +    }
911 +
912   }

Diff Legend

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