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.35 by jsr166, Fri May 15 18:21:19 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 61 | Line 61 | public class ArrayDequeTest extends JSR1
61       */
62      public void testConstructor4() {
63          try {
64 <            Integer[] ints = new Integer[SIZE];
65 <            ArrayDeque q = new ArrayDeque(Arrays.asList(ints));
64 >            new ArrayDeque(Arrays.asList(new Integer[SIZE]));
65              shouldThrow();
66          } catch (NullPointerException success) {}
67      }
# Line 71 | Line 70 | public class ArrayDequeTest extends JSR1
70       * Initializing from Collection with some null elements throws NPE
71       */
72      public void testConstructor5() {
73 +        Integer[] ints = new Integer[SIZE];
74 +        for (int i = 0; i < SIZE-1; ++i)
75 +            ints[i] = new Integer(i);
76          try {
77 <            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));
77 >            new ArrayDeque(Arrays.asList(ints));
78              shouldThrow();
79          } catch (NullPointerException success) {}
80      }
# Line 125 | Line 124 | public class ArrayDequeTest extends JSR1
124       * push(null) throws NPE
125       */
126      public void testPushNull() {
127 +        ArrayDeque q = new ArrayDeque(1);
128          try {
129 –            ArrayDeque q = new ArrayDeque(1);
129              q.push(null);
130              shouldThrow();
131          } catch (NullPointerException success) {}
# Line 160 | Line 159 | public class ArrayDequeTest extends JSR1
159       * offer(null) throws NPE
160       */
161      public void testOfferNull() {
162 +        ArrayDeque q = new ArrayDeque();
163          try {
164 –            ArrayDeque q = new ArrayDeque();
164              q.offer(null);
165              shouldThrow();
166          } catch (NullPointerException success) {}
# Line 171 | Line 170 | public class ArrayDequeTest extends JSR1
170       * offerFirst(null) throws NPE
171       */
172      public void testOfferFirstNull() {
173 +        ArrayDeque q = new ArrayDeque();
174          try {
175 –            ArrayDeque q = new ArrayDeque();
175              q.offerFirst(null);
176              shouldThrow();
177          } catch (NullPointerException success) {}
# Line 182 | Line 181 | public class ArrayDequeTest extends JSR1
181       * offerLast(null) throws NPE
182       */
183      public void testOfferLastNull() {
184 +        ArrayDeque q = new ArrayDeque();
185          try {
186 –            ArrayDeque q = new ArrayDeque();
186              q.offerLast(null);
187              shouldThrow();
188          } catch (NullPointerException success) {}
# Line 226 | Line 225 | public class ArrayDequeTest extends JSR1
225       * add(null) throws NPE
226       */
227      public void testAddNull() {
228 +        ArrayDeque q = new ArrayDeque();
229          try {
230 –            ArrayDeque q = new ArrayDeque();
230              q.add(null);
231              shouldThrow();
232          } catch (NullPointerException success) {}
# Line 237 | Line 236 | public class ArrayDequeTest extends JSR1
236       * addFirst(null) throws NPE
237       */
238      public void testAddFirstNull() {
239 +        ArrayDeque q = new ArrayDeque();
240          try {
241 –            ArrayDeque q = new ArrayDeque();
241              q.addFirst(null);
242              shouldThrow();
243          } catch (NullPointerException success) {}
# Line 248 | Line 247 | public class ArrayDequeTest extends JSR1
247       * addLast(null) throws NPE
248       */
249      public void testAddLastNull() {
250 +        ArrayDeque q = new ArrayDeque();
251          try {
252 –            ArrayDeque q = new ArrayDeque();
252              q.addLast(null);
253              shouldThrow();
254          } catch (NullPointerException success) {}
# Line 292 | Line 291 | public class ArrayDequeTest extends JSR1
291       * addAll(null) throws NPE
292       */
293      public void testAddAll1() {
294 +        ArrayDeque q = new ArrayDeque();
295          try {
296 –            ArrayDeque q = new ArrayDeque();
296              q.addAll(null);
297              shouldThrow();
298          } catch (NullPointerException success) {}
# Line 303 | Line 302 | public class ArrayDequeTest extends JSR1
302       * addAll of a collection with null elements throws NPE
303       */
304      public void testAddAll2() {
305 +        ArrayDeque q = new ArrayDeque();
306          try {
307 <            ArrayDeque q = new ArrayDeque();
308 <            Integer[] ints = new Integer[SIZE];
309 <            q.addAll(Arrays.asList(ints));
307 >            q.addAll(Arrays.asList(new Integer[SIZE]));
308              shouldThrow();
309          } catch (NullPointerException success) {}
310      }
# Line 316 | Line 314 | public class ArrayDequeTest extends JSR1
314       * possibly adding some elements
315       */
316      public void testAddAll3() {
317 +        ArrayDeque q = new ArrayDeque();
318 +        Integer[] ints = new Integer[SIZE];
319 +        for (int i = 0; i < SIZE-1; ++i)
320 +            ints[i] = new Integer(i);
321          try {
320 –            ArrayDeque q = new ArrayDeque();
321 –            Integer[] ints = new Integer[SIZE];
322 –            for (int i = 0; i < SIZE-1; ++i)
323 –                ints[i] = new Integer(i);
322              q.addAll(Arrays.asList(ints));
323              shouldThrow();
324          } catch (NullPointerException success) {}
# Line 393 | Line 391 | public class ArrayDequeTest extends JSR1
391       */
392      public void testRemoveElement() {
393          ArrayDeque q = populatedDeque(SIZE);
394 <        for (int i = 1; i < SIZE; i+=2) {
394 >        for (int i = 1; i < SIZE; i += 2) {
395              assertTrue(q.contains(i));
396              assertTrue(q.remove(i));
397              assertFalse(q.contains(i));
398              assertTrue(q.contains(i-1));
399          }
400 <        for (int i = 0; i < SIZE; i+=2) {
400 >        for (int i = 0; i < SIZE; i += 2) {
401              assertTrue(q.contains(i));
402              assertTrue(q.remove(i));
403              assertFalse(q.contains(i));
# Line 532 | Line 530 | public class ArrayDequeTest extends JSR1
530       */
531      public void testRemoveFirstOccurrence() {
532          ArrayDeque q = populatedDeque(SIZE);
533 <        for (int i = 1; i < SIZE; i+=2) {
533 >        for (int i = 1; i < SIZE; i += 2) {
534              assertTrue(q.removeFirstOccurrence(new Integer(i)));
535          }
536 <        for (int i = 0; i < SIZE; i+=2) {
536 >        for (int i = 0; i < SIZE; i += 2) {
537              assertTrue(q.removeFirstOccurrence(new Integer(i)));
538              assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
539          }
# Line 547 | Line 545 | public class ArrayDequeTest extends JSR1
545       */
546      public void testRemoveLastOccurrence() {
547          ArrayDeque q = populatedDeque(SIZE);
548 <        for (int i = 1; i < SIZE; i+=2) {
548 >        for (int i = 1; i < SIZE; i += 2) {
549              assertTrue(q.removeLastOccurrence(new Integer(i)));
550          }
551 <        for (int i = 0; i < SIZE; i+=2) {
551 >        for (int i = 0; i < SIZE; i += 2) {
552              assertTrue(q.removeLastOccurrence(new Integer(i)));
553              assertFalse(q.removeLastOccurrence(new Integer(i+1)));
554          }
# Line 742 | Line 740 | public class ArrayDequeTest extends JSR1
740       */
741      public void testIterator() {
742          ArrayDeque q = populatedDeque(SIZE);
745 –        int i = 0;
743          Iterator it = q.iterator();
744 <        while (it.hasNext()) {
744 >        int i;
745 >        for (i = 0; it.hasNext(); i++)
746              assertTrue(q.contains(it.next()));
749 –            ++i;
750 –        }
747          assertEquals(i, SIZE);
748 +        assertIteratorExhausted(it);
749 +    }
750 +
751 +    /**
752 +     * iterator of empty collection has no elements
753 +     */
754 +    public void testEmptyIterator() {
755 +        Deque c = new ArrayDeque();
756 +        assertIteratorExhausted(c.iterator());
757 +        assertIteratorExhausted(c.descendingIterator());
758      }
759  
760      /**

Diff Legend

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