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.30 by jsr166, Wed Dec 31 19:05:42 2014 UTC vs.
Revision 1.34 by jsr166, Sat Apr 25 04:55:30 2015 UTC

# Line 18 | Line 18 | import junit.framework.TestSuite;
18  
19   public class ArrayDequeTest extends JSR166TestCase {
20      public static void main(String[] args) {
21 <        junit.textui.TestRunner.run(suite());
21 >        main(suite(), args);
22      }
23  
24      public static Test suite() {
# Line 51 | Line 51 | public class ArrayDequeTest extends JSR1
51       */
52      public void testConstructor3() {
53          try {
54 <            ArrayDeque q = new ArrayDeque((Collection)null);
54 >            new ArrayDeque((Collection)null);
55              shouldThrow();
56          } catch (NullPointerException success) {}
57      }
# Line 62 | Line 62 | public class ArrayDequeTest extends JSR1
62      public void testConstructor4() {
63          try {
64              Integer[] ints = new Integer[SIZE];
65 <            ArrayDeque q = new ArrayDeque(Arrays.asList(ints));
65 >            new ArrayDeque(Arrays.asList(ints));
66              shouldThrow();
67          } catch (NullPointerException success) {}
68      }
# Line 75 | Line 75 | public class ArrayDequeTest extends JSR1
75              Integer[] ints = new Integer[SIZE];
76              for (int i = 0; i < SIZE-1; ++i)
77                  ints[i] = new Integer(i);
78 <            ArrayDeque q = new ArrayDeque(Arrays.asList(ints));
78 >            new ArrayDeque(Arrays.asList(ints));
79              shouldThrow();
80          } catch (NullPointerException success) {}
81      }
# Line 393 | 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 532 | 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 547 | 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 742 | Line 742 | public class ArrayDequeTest extends JSR1
742       */
743      public void testIterator() {
744          ArrayDeque q = populatedDeque(SIZE);
745        int i = 0;
745          Iterator it = q.iterator();
746 <        while (it.hasNext()) {
746 >        int i;
747 >        for (i = 0; it.hasNext(); i++)
748              assertTrue(q.contains(it.next()));
749            ++i;
750        }
749          assertEquals(i, SIZE);
750 +        assertIteratorExhausted(it);
751 +    }
752 +
753 +    /**
754 +     * iterator of empty collection has no elements
755 +     */
756 +    public void testEmptyIterator() {
757 +        Deque c = new ArrayDeque();
758 +        assertIteratorExhausted(c.iterator());
759 +        assertIteratorExhausted(c.descendingIterator());
760      }
761  
762      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines