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.7 by jsr166, Mon Nov 16 05:30:07 2009 UTC vs.
Revision 1.8 by jsr166, Sat Nov 21 02:07:26 2009 UTC

# Line 10 | Line 10 | import java.util.concurrent.*;
10  
11   public class ArrayDequeTest extends JSR166TestCase {
12      public static void main(String[] args) {
13 <        junit.textui.TestRunner.run (suite());
13 >        junit.textui.TestRunner.run (suite());
14      }
15  
16      public static Test suite() {
17 <        return new TestSuite(ArrayDequeTest.class);
17 >        return new TestSuite(ArrayDequeTest.class);
18      }
19  
20      /**
# Line 24 | Line 24 | public class ArrayDequeTest extends JSR1
24      private ArrayDeque populatedDeque(int n) {
25          ArrayDeque q = new ArrayDeque();
26          assertTrue(q.isEmpty());
27 <        for (int i = 0; i < n; ++i)
28 <            assertTrue(q.offerLast(new Integer(i)));
27 >        for (int i = 0; i < n; ++i)
28 >            assertTrue(q.offerLast(new Integer(i)));
29          assertFalse(q.isEmpty());
30 <        assertEquals(n, q.size());
30 >        assertEquals(n, q.size());
31          return q;
32      }
33  
# Line 98 | Line 98 | public class ArrayDequeTest extends JSR1
98       * push(null) throws NPE
99       */
100      public void testPushNull() {
101 <        try {
101 >        try {
102              ArrayDeque q = new ArrayDeque(1);
103              q.push(null);
104              shouldThrow();
# Line 111 | Line 111 | public class ArrayDequeTest extends JSR1
111      public void testPush() {
112          ArrayDeque q = populatedDeque(3);
113          q.pollLast();
114 <        q.push(four);
115 <        assertEquals(four,q.peekFirst());
114 >        q.push(four);
115 >        assertEquals(four,q.peekFirst());
116      }
117  
118      /**
# Line 127 | Line 127 | public class ArrayDequeTest extends JSR1
127              q.pop();
128              shouldThrow();
129          } catch (NoSuchElementException success) {
130 <        }
130 >        }
131      }
132  
133      /**
134       * offer(null) throws NPE
135       */
136      public void testOfferFirstNull() {
137 <        try {
137 >        try {
138              ArrayDeque q = new ArrayDeque();
139              q.offerFirst(null);
140              shouldThrow();
# Line 209 | Line 209 | public class ArrayDequeTest extends JSR1
209          for (int i = 0; i < SIZE; ++i) {
210              assertEquals(i, ((Integer)q.pollFirst()).intValue());
211          }
212 <        assertNull(q.pollFirst());
212 >        assertNull(q.pollFirst());
213      }
214  
215      /**
# Line 220 | Line 220 | public class ArrayDequeTest extends JSR1
220          for (int i = SIZE-1; i >= 0; --i) {
221              assertEquals(i, ((Integer)q.pollLast()).intValue());
222          }
223 <        assertNull(q.pollLast());
223 >        assertNull(q.pollLast());
224      }
225  
226      /**
# Line 231 | Line 231 | public class ArrayDequeTest extends JSR1
231          for (int i = 0; i < SIZE; ++i) {
232              assertEquals(i, ((Integer)q.poll()).intValue());
233          }
234 <        assertNull(q.poll());
234 >        assertNull(q.poll());
235      }
236  
237      /**
# Line 246 | Line 246 | public class ArrayDequeTest extends JSR1
246              q.remove();
247              shouldThrow();
248          } catch (NoSuchElementException success) {
249 <        }
249 >        }
250      }
251  
252      /**
# Line 260 | Line 260 | public class ArrayDequeTest extends JSR1
260              assertTrue(q.peekFirst() == null ||
261                         i != ((Integer)q.peekFirst()).intValue());
262          }
263 <        assertNull(q.peekFirst());
263 >        assertNull(q.peekFirst());
264      }
265  
266      /**
# Line 274 | Line 274 | public class ArrayDequeTest extends JSR1
274              assertTrue(q.peek() == null ||
275                         i != ((Integer)q.peek()).intValue());
276          }
277 <        assertNull(q.peek());
277 >        assertNull(q.peek());
278      }
279  
280      /**
# Line 288 | Line 288 | public class ArrayDequeTest extends JSR1
288              assertTrue(q.peekLast() == null ||
289                         i != ((Integer)q.peekLast()).intValue());
290          }
291 <        assertNull(q.peekLast());
291 >        assertNull(q.peekLast());
292      }
293  
294      /**
# Line 321 | Line 321 | public class ArrayDequeTest extends JSR1
321              shouldThrow();
322          }
323          catch (NoSuchElementException success) {}
324 <        assertNull(q.peekLast());
324 >        assertNull(q.peekLast());
325      }
326  
327  
# Line 337 | Line 337 | public class ArrayDequeTest extends JSR1
337              q.removeFirst();
338              shouldThrow();
339          } catch (NoSuchElementException success) {
340 <        }
340 >        }
341      }
342  
343      /**
# Line 450 | Line 450 | public class ArrayDequeTest extends JSR1
450       */
451      public void testToArray() {
452          ArrayDeque q = populatedDeque(SIZE);
453 <        Object[] o = q.toArray();
453 >        Object[] o = q.toArray();
454          Arrays.sort(o);
455 <        for (int i = 0; i < o.length; i++)
456 <            assertEquals(o[i], q.pollFirst());
455 >        for (int i = 0; i < o.length; i++)
456 >            assertEquals(o[i], q.pollFirst());
457      }
458  
459      /**
# Line 461 | Line 461 | public class ArrayDequeTest extends JSR1
461       */
462      public void testToArray2() {
463          ArrayDeque q = populatedDeque(SIZE);
464 <        Integer[] ints = new Integer[SIZE];
465 <        ints = (Integer[])q.toArray(ints);
464 >        Integer[] ints = new Integer[SIZE];
465 >        ints = (Integer[])q.toArray(ints);
466          Arrays.sort(ints);
467          for (int i = 0; i < ints.length; i++)
468              assertEquals(ints[i], q.pollFirst());
# Line 472 | Line 472 | public class ArrayDequeTest extends JSR1
472       * toArray(null) throws NPE
473       */
474      public void testToArray_BadArg() {
475 <        try {
476 <            ArrayDeque l = new ArrayDeque();
477 <            l.add(new Object());
478 <            Object o[] = l.toArray(null);
479 <            shouldThrow();
480 <        } catch (NullPointerException success) {}
475 >        try {
476 >            ArrayDeque l = new ArrayDeque();
477 >            l.add(new Object());
478 >            Object o[] = l.toArray(null);
479 >            shouldThrow();
480 >        } catch (NullPointerException success) {}
481      }
482  
483      /**
484       * toArray with incompatable aray type throws CCE
485       */
486      public void testToArray1_BadArg() {
487 <        try {
488 <            ArrayDeque l = new ArrayDeque();
489 <            l.add(new Integer(5));
490 <            Object o[] = l.toArray(new String[10] );
491 <            shouldThrow();
492 <        } catch (ArrayStoreException  success) {}
487 >        try {
488 >            ArrayDeque l = new ArrayDeque();
489 >            l.add(new Integer(5));
490 >            Object o[] = l.toArray(new String[10] );
491 >            shouldThrow();
492 >        } catch (ArrayStoreException  success) {}
493      }
494  
495      /**
# Line 498 | Line 498 | public class ArrayDequeTest extends JSR1
498      public void testIterator() {
499          ArrayDeque q = populatedDeque(SIZE);
500          int i = 0;
501 <        Iterator it = q.iterator();
501 >        Iterator it = q.iterator();
502          while (it.hasNext()) {
503              assertTrue(q.contains(it.next()));
504              ++i;
# Line 557 | Line 557 | public class ArrayDequeTest extends JSR1
557      public void testDescendingIterator() {
558          ArrayDeque q = populatedDeque(SIZE);
559          int i = 0;
560 <        Iterator it = q.descendingIterator();
560 >        Iterator it = q.descendingIterator();
561          while (it.hasNext()) {
562              assertTrue(q.contains(it.next()));
563              ++i;
# Line 637 | Line 637 | public class ArrayDequeTest extends JSR1
637       */
638      public void testAddFirst() {
639          ArrayDeque q = populatedDeque(3);
640 <        q.addFirst(four);
641 <        assertEquals(four,q.peekFirst());
640 >        q.addFirst(four);
641 >        assertEquals(four,q.peekFirst());
642      }
643  
644      /**
# Line 646 | Line 646 | public class ArrayDequeTest extends JSR1
646       */
647      public void testAddLast() {
648          ArrayDeque q = populatedDeque(3);
649 <        q.addLast(four);
650 <        assertEquals(four,q.peekLast());
649 >        q.addLast(four);
650 >        assertEquals(four,q.peekLast());
651      }
652  
653   }

Diff Legend

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