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

Comparing jsr166/src/test/tck/CopyOnWriteArrayListTest.java (file contents):
Revision 1.18 by jsr166, Sat Oct 9 19:30:35 2010 UTC vs.
Revision 1.38 by jsr166, Wed Aug 10 01:28:14 2016 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.*;
11 < import java.util.concurrent.*;
12 < import java.io.*;
9 > import java.util.ArrayList;
10 > import java.util.Arrays;
11 > import java.util.Collection;
12 > import java.util.Collections;
13 > import java.util.Iterator;
14 > import java.util.LinkedList;
15 > import java.util.List;
16 > import java.util.ListIterator;
17 > import java.util.NoSuchElementException;
18 > import java.util.concurrent.CopyOnWriteArrayList;
19 >
20 > import junit.framework.Test;
21 > import junit.framework.TestSuite;
22  
23   public class CopyOnWriteArrayListTest extends JSR166TestCase {
24  
25      public static void main(String[] args) {
26 <        junit.textui.TestRunner.run(suite());
26 >        main(suite(), args);
27      }
28  
29      public static Test suite() {
30          return new TestSuite(CopyOnWriteArrayListTest.class);
31      }
32  
33 <    static CopyOnWriteArrayList populatedArray(int n) {
34 <        CopyOnWriteArrayList a = new CopyOnWriteArrayList();
33 >    static CopyOnWriteArrayList<Integer> populatedArray(int n) {
34 >        CopyOnWriteArrayList<Integer> a = new CopyOnWriteArrayList<Integer>();
35          assertTrue(a.isEmpty());
36 <        for (int i = 0; i < n; ++i)
37 <            a.add(new Integer(i));
36 >        for (int i = 0; i < n; i++)
37 >            a.add(i);
38          assertFalse(a.isEmpty());
39          assertEquals(n, a.size());
40          return a;
41      }
42  
43 +    static CopyOnWriteArrayList<Integer> populatedArray(Integer[] elements) {
44 +        CopyOnWriteArrayList<Integer> a = new CopyOnWriteArrayList<Integer>();
45 +        assertTrue(a.isEmpty());
46 +        for (int i = 0; i < elements.length; i++)
47 +            a.add(elements[i]);
48 +        assertFalse(a.isEmpty());
49 +        assertEquals(elements.length, a.size());
50 +        return a;
51 +    }
52  
53      /**
54       * a new list is empty
# Line 45 | Line 63 | public class CopyOnWriteArrayListTest ex
63       */
64      public void testConstructor2() {
65          Integer[] ints = new Integer[SIZE];
66 <        for (int i = 0; i < SIZE-1; ++i)
66 >        for (int i = 0; i < SIZE - 1; ++i)
67              ints[i] = new Integer(i);
68          CopyOnWriteArrayList a = new CopyOnWriteArrayList(ints);
69          for (int i = 0; i < SIZE; ++i)
# Line 57 | Line 75 | public class CopyOnWriteArrayListTest ex
75       */
76      public void testConstructor3() {
77          Integer[] ints = new Integer[SIZE];
78 <        for (int i = 0; i < SIZE-1; ++i)
78 >        for (int i = 0; i < SIZE - 1; ++i)
79              ints[i] = new Integer(i);
80          CopyOnWriteArrayList a = new CopyOnWriteArrayList(Arrays.asList(ints));
81          for (int i = 0; i < SIZE; ++i)
82              assertEquals(ints[i], a.get(i));
83      }
84  
67
85      /**
86 <     * addAll adds each element from the given collection
86 >     * addAll adds each element from the given collection, including duplicates
87       */
88      public void testAddAll() {
89          CopyOnWriteArrayList full = populatedArray(3);
90 <        Vector v = new Vector();
74 <        v.add(three);
75 <        v.add(four);
76 <        v.add(five);
77 <        full.addAll(v);
90 >        assertTrue(full.addAll(Arrays.asList(three, four, five)));
91          assertEquals(6, full.size());
92 +        assertTrue(full.addAll(Arrays.asList(three, four, five)));
93 +        assertEquals(9, full.size());
94      }
95  
96      /**
# Line 84 | Line 99 | public class CopyOnWriteArrayListTest ex
99       */
100      public void testAddAllAbsent() {
101          CopyOnWriteArrayList full = populatedArray(3);
102 <        Vector v = new Vector();
103 <        v.add(three);
104 <        v.add(four);
105 <        v.add(one); // will not add this element
91 <        full.addAllAbsent(v);
102 >        // "one" is duplicate and will not be added
103 >        assertEquals(2, full.addAllAbsent(Arrays.asList(three, four, one)));
104 >        assertEquals(5, full.size());
105 >        assertEquals(0, full.addAllAbsent(Arrays.asList(three, four, one)));
106          assertEquals(5, full.size());
107      }
108  
# Line 119 | Line 133 | public class CopyOnWriteArrayListTest ex
133          assertEquals(0, full.size());
134      }
135  
122
136      /**
137       * Cloned list is equal
138       */
# Line 164 | Line 177 | public class CopyOnWriteArrayListTest ex
177          CopyOnWriteArrayList b = populatedArray(3);
178          assertTrue(a.equals(b));
179          assertTrue(b.equals(a));
180 +        assertTrue(a.containsAll(b));
181 +        assertTrue(b.containsAll(a));
182          assertEquals(a.hashCode(), b.hashCode());
183          a.add(m1);
184          assertFalse(a.equals(b));
185          assertFalse(b.equals(a));
186 +        assertTrue(a.containsAll(b));
187 +        assertFalse(b.containsAll(a));
188          b.add(m1);
189          assertTrue(a.equals(b));
190          assertTrue(b.equals(a));
191 +        assertTrue(a.containsAll(b));
192 +        assertTrue(b.containsAll(a));
193          assertEquals(a.hashCode(), b.hashCode());
175    }
194  
195 +        assertFalse(a.equals(null));
196 +    }
197  
198      /**
199 <     * containsAll returns true for collection with subset of elements
199 >     * containsAll returns true for collections with subset of elements
200       */
201      public void testContainsAll() {
202          CopyOnWriteArrayList full = populatedArray(3);
203 <        Vector v = new Vector();
204 <        v.add(one);
205 <        v.add(two);
206 <        assertTrue(full.containsAll(v));
207 <        v.add(six);
208 <        assertFalse(full.containsAll(v));
203 >        assertTrue(full.containsAll(Arrays.asList()));
204 >        assertTrue(full.containsAll(Arrays.asList(one)));
205 >        assertTrue(full.containsAll(Arrays.asList(one, two)));
206 >        assertFalse(full.containsAll(Arrays.asList(one, two, six)));
207 >        assertFalse(full.containsAll(Arrays.asList(six)));
208 >
209 >        try {
210 >            full.containsAll(null);
211 >            shouldThrow();
212 >        } catch (NullPointerException success) {}
213      }
214  
215      /**
# Line 226 | Line 250 | public class CopyOnWriteArrayListTest ex
250      }
251  
252      /**
253 <     * iterator() returns an iterator containing the elements of the list
253 >     * iterator() returns an iterator containing the elements of the
254 >     * list in insertion order
255       */
256      public void testIterator() {
257 <        CopyOnWriteArrayList full = populatedArray(SIZE);
258 <        Iterator i = full.iterator();
259 <        int j;
260 <        for (j = 0; i.hasNext(); j++)
261 <            assertEquals(j, i.next());
262 <        assertEquals(SIZE, j);
257 >        Collection empty = new CopyOnWriteArrayList();
258 >        assertFalse(empty.iterator().hasNext());
259 >        try {
260 >            empty.iterator().next();
261 >            shouldThrow();
262 >        } catch (NoSuchElementException success) {}
263 >
264 >        Integer[] elements = new Integer[SIZE];
265 >        for (int i = 0; i < SIZE; i++)
266 >            elements[i] = i;
267 >        shuffle(elements);
268 >        Collection<Integer> full = populatedArray(elements);
269 >
270 >        Iterator it = full.iterator();
271 >        for (int j = 0; j < SIZE; j++) {
272 >            assertTrue(it.hasNext());
273 >            assertEquals(elements[j], it.next());
274 >        }
275 >        assertIteratorExhausted(it);
276 >    }
277 >
278 >    /**
279 >     * iterator of empty collection has no elements
280 >     */
281 >    public void testEmptyIterator() {
282 >        Collection c = new CopyOnWriteArrayList();
283 >        assertIteratorExhausted(c.iterator());
284      }
285  
286      /**
# Line 254 | Line 300 | public class CopyOnWriteArrayListTest ex
300       * toString contains toString of elements
301       */
302      public void testToString() {
303 +        assertEquals("[]", new CopyOnWriteArrayList().toString());
304          CopyOnWriteArrayList full = populatedArray(3);
305          String s = full.toString();
306 <        for (int i = 0; i < 3; ++i) {
307 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
308 <        }
306 >        for (int i = 0; i < 3; ++i)
307 >            assertTrue(s.contains(String.valueOf(i)));
308 >        assertEquals(new ArrayList(full).toString(),
309 >                     full.toString());
310      }
311  
312      /**
# Line 275 | Line 323 | public class CopyOnWriteArrayListTest ex
323      /**
324       * lastIndexOf returns the index from the given starting point
325       */
326 <    public void testlastIndexOf2() {
326 >    public void testLastIndexOf2() {
327          CopyOnWriteArrayList full = populatedArray(3);
328          full.add(one);
329          full.add(three);
# Line 303 | Line 351 | public class CopyOnWriteArrayListTest ex
351          ListIterator i = full.listIterator(1);
352          int j;
353          for (j = 0; i.hasNext(); j++)
354 <            assertEquals(j+1, i.next());
354 >            assertEquals(j + 1, i.next());
355          assertEquals(2, j);
356      }
357  
358      /**
359 <     * remove removes and returns the object at the given index
359 >     * remove(int) removes and returns the object at the given index
360       */
361 <    public void testRemove() {
362 <        CopyOnWriteArrayList full = populatedArray(3);
363 <        assertEquals(2, full.remove(2));
364 <        assertEquals(2, full.size());
361 >    public void testRemove_int() {
362 >        int SIZE = 3;
363 >        for (int i = 0; i < SIZE; i++) {
364 >            CopyOnWriteArrayList full = populatedArray(SIZE);
365 >            assertEquals(i, full.remove(i));
366 >            assertEquals(SIZE - 1, full.size());
367 >            assertFalse(full.contains(new Integer(i)));
368 >        }
369 >    }
370 >
371 >    /**
372 >     * remove(Object) removes the object if found and returns true
373 >     */
374 >    public void testRemove_Object() {
375 >        int SIZE = 3;
376 >        for (int i = 0; i < SIZE; i++) {
377 >            CopyOnWriteArrayList full = populatedArray(SIZE);
378 >            assertFalse(full.remove(new Integer(-42)));
379 >            assertTrue(full.remove(new Integer(i)));
380 >            assertEquals(SIZE - 1, full.size());
381 >            assertFalse(full.contains(new Integer(i)));
382 >        }
383 >        CopyOnWriteArrayList x = new CopyOnWriteArrayList(Arrays.asList(4, 5, 6));
384 >        assertTrue(x.remove(new Integer(6)));
385 >        assertEquals(x, Arrays.asList(4, 5));
386 >        assertTrue(x.remove(new Integer(4)));
387 >        assertEquals(x, Arrays.asList(5));
388 >        assertTrue(x.remove(new Integer(5)));
389 >        assertEquals(x, Arrays.asList());
390 >        assertFalse(x.remove(new Integer(5)));
391      }
392  
393      /**
# Line 321 | Line 395 | public class CopyOnWriteArrayListTest ex
395       */
396      public void testRemoveAll() {
397          CopyOnWriteArrayList full = populatedArray(3);
398 <        Vector v = new Vector();
399 <        v.add(one);
400 <        v.add(two);
327 <        full.removeAll(v);
398 >        assertTrue(full.removeAll(Arrays.asList(one, two)));
399 >        assertEquals(1, full.size());
400 >        assertFalse(full.removeAll(Arrays.asList(one, two)));
401          assertEquals(1, full.size());
402      }
403  
# Line 348 | Line 421 | public class CopyOnWriteArrayListTest ex
421      }
422  
423      /**
424 <     * toArray returns an Object array containing all elements from the list
424 >     * toArray() returns an Object array containing all elements from
425 >     * the list in insertion order
426       */
427      public void testToArray() {
428 <        CopyOnWriteArrayList full = populatedArray(3);
429 <        Object[] o = full.toArray();
430 <        assertEquals(3, o.length);
431 <        assertEquals(0, o[0]);
432 <        assertEquals(1, o[1]);
433 <        assertEquals(2, o[2]);
428 >        Object[] a = new CopyOnWriteArrayList().toArray();
429 >        assertTrue(Arrays.equals(new Object[0], a));
430 >        assertSame(Object[].class, a.getClass());
431 >
432 >        Integer[] elements = new Integer[SIZE];
433 >        for (int i = 0; i < SIZE; i++)
434 >            elements[i] = i;
435 >        shuffle(elements);
436 >        Collection<Integer> full = populatedArray(elements);
437 >
438 >        assertTrue(Arrays.equals(elements, full.toArray()));
439 >        assertSame(Object[].class, full.toArray().getClass());
440      }
441  
442      /**
443 <     * toArray returns an Integer array containing all elements from
444 <     * the list
443 >     * toArray(Integer array) returns an Integer array containing all
444 >     * elements from the list in insertion order
445       */
446      public void testToArray2() {
447 <        CopyOnWriteArrayList full = populatedArray(3);
448 <        Integer[] i = new Integer[3];
369 <        i = (Integer[])full.toArray(i);
370 <        assertEquals(3, i.length);
371 <        assertEquals(0, i[0].intValue());
372 <        assertEquals(1, i[1].intValue());
373 <        assertEquals(2, i[2].intValue());
374 <    }
447 >        Collection empty = new CopyOnWriteArrayList();
448 >        Integer[] a;
449  
450 +        a = new Integer[0];
451 +        assertSame(a, empty.toArray(a));
452 +
453 +        a = new Integer[SIZE / 2];
454 +        Arrays.fill(a, 42);
455 +        assertSame(a, empty.toArray(a));
456 +        assertNull(a[0]);
457 +        for (int i = 1; i < a.length; i++)
458 +            assertEquals(42, (int) a[i]);
459 +
460 +        Integer[] elements = new Integer[SIZE];
461 +        for (int i = 0; i < SIZE; i++)
462 +            elements[i] = i;
463 +        shuffle(elements);
464 +        Collection<Integer> full = populatedArray(elements);
465 +
466 +        Arrays.fill(a, 42);
467 +        assertTrue(Arrays.equals(elements, full.toArray(a)));
468 +        for (int i = 0; i < a.length; i++)
469 +            assertEquals(42, (int) a[i]);
470 +        assertSame(Integer[].class, full.toArray(a).getClass());
471 +
472 +        a = new Integer[SIZE];
473 +        Arrays.fill(a, 42);
474 +        assertSame(a, full.toArray(a));
475 +        assertTrue(Arrays.equals(elements, a));
476 +
477 +        a = new Integer[2 * SIZE];
478 +        Arrays.fill(a, 42);
479 +        assertSame(a, full.toArray(a));
480 +        assertTrue(Arrays.equals(elements, Arrays.copyOf(a, SIZE)));
481 +        assertNull(a[SIZE]);
482 +        for (int i = SIZE + 1; i < a.length; i++)
483 +            assertEquals(42, (int) a[i]);
484 +    }
485  
486      /**
487       * sublists contains elements at indexes offset from their base
# Line 390 | Line 499 | public class CopyOnWriteArrayListTest ex
499          }
500  
501          List s = a.subList(2, 5);
502 <        assertEquals(s.size(), 3);
502 >        assertEquals(3, s.size());
503          s.set(2, m1);
504          assertEquals(a.get(4), m1);
505          s.clear();
506 <        assertEquals(a.size(), 7);
506 >        assertEquals(7, a.size());
507      }
508  
509      // Exception tests
# Line 404 | Line 513 | public class CopyOnWriteArrayListTest ex
513       * can not store the objects inside the list
514       */
515      public void testToArray_ArrayStoreException() {
516 +        CopyOnWriteArrayList c = new CopyOnWriteArrayList();
517 +        c.add("zfasdfsdf");
518 +        c.add("asdadasd");
519          try {
408            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
409            c.add("zfasdfsdf");
410            c.add("asdadasd");
520              c.toArray(new Long[5]);
521              shouldThrow();
522          } catch (ArrayStoreException success) {}
# Line 417 | Line 526 | public class CopyOnWriteArrayListTest ex
526       * get throws an IndexOutOfBoundsException on a negative index
527       */
528      public void testGet1_IndexOutOfBoundsException() {
529 <        try {
530 <            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
531 <            c.get(-1);
532 <            shouldThrow();
533 <        } catch (IndexOutOfBoundsException success) {}
529 >        CopyOnWriteArrayList c = populatedArray(5);
530 >        List[] lists = { c, c.subList(1, c.size() - 1) };
531 >        for (List list : lists) {
532 >            try {
533 >                list.get(-1);
534 >                shouldThrow();
535 >            } catch (IndexOutOfBoundsException success) {}
536 >        }
537      }
538  
539      /**
540       * get throws an IndexOutOfBoundsException on a too high index
541       */
542      public void testGet2_IndexOutOfBoundsException() {
543 <        try {
544 <            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
545 <            c.add("asdasd");
546 <            c.add("asdad");
547 <            c.get(100);
548 <            shouldThrow();
549 <        } catch (IndexOutOfBoundsException success) {}
543 >        CopyOnWriteArrayList c = populatedArray(5);
544 >        List[] lists = { c, c.subList(1, c.size() - 1) };
545 >        for (List list : lists) {
546 >            try {
547 >                list.get(list.size());
548 >                shouldThrow();
549 >            } catch (IndexOutOfBoundsException success) {}
550 >        }
551      }
552  
553      /**
554       * set throws an IndexOutOfBoundsException on a negative index
555       */
556      public void testSet1_IndexOutOfBoundsException() {
557 <        try {
558 <            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
559 <            c.set(-1,"qwerty");
560 <            shouldThrow();
561 <        } catch (IndexOutOfBoundsException success) {}
557 >        CopyOnWriteArrayList c = populatedArray(5);
558 >        List[] lists = { c, c.subList(1, c.size() - 1) };
559 >        for (List list : lists) {
560 >            try {
561 >                list.set(-1, "qwerty");
562 >                shouldThrow();
563 >            } catch (IndexOutOfBoundsException success) {}
564 >        }
565      }
566  
567      /**
568       * set throws an IndexOutOfBoundsException on a too high index
569       */
570      public void testSet2() {
571 <        try {
572 <            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
573 <            c.add("asdasd");
574 <            c.add("asdad");
575 <            c.set(100, "qwerty");
576 <            shouldThrow();
577 <        } catch (IndexOutOfBoundsException success) {}
571 >        CopyOnWriteArrayList c = populatedArray(5);
572 >        List[] lists = { c, c.subList(1, c.size() - 1) };
573 >        for (List list : lists) {
574 >            try {
575 >                list.set(list.size(), "qwerty");
576 >                shouldThrow();
577 >            } catch (IndexOutOfBoundsException success) {}
578 >        }
579      }
580  
581      /**
582       * add throws an IndexOutOfBoundsException on a negative index
583       */
584      public void testAdd1_IndexOutOfBoundsException() {
585 <        try {
586 <            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
587 <            c.add(-1,"qwerty");
588 <            shouldThrow();
589 <        } catch (IndexOutOfBoundsException success) {}
585 >        CopyOnWriteArrayList c = populatedArray(5);
586 >        List[] lists = { c, c.subList(1, c.size() - 1) };
587 >        for (List list : lists) {
588 >            try {
589 >                list.add(-1, "qwerty");
590 >                shouldThrow();
591 >            } catch (IndexOutOfBoundsException success) {}
592 >        }
593      }
594  
595      /**
596       * add throws an IndexOutOfBoundsException on a too high index
597       */
598      public void testAdd2_IndexOutOfBoundsException() {
599 <        try {
600 <            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
601 <            c.add("asdasd");
602 <            c.add("asdasdasd");
603 <            c.add(100, "qwerty");
604 <            shouldThrow();
605 <        } catch (IndexOutOfBoundsException success) {}
599 >        CopyOnWriteArrayList c = populatedArray(5);
600 >        List[] lists = { c, c.subList(1, c.size() - 1) };
601 >        for (List list : lists) {
602 >            try {
603 >                list.add(list.size() + 1, "qwerty");
604 >                shouldThrow();
605 >            } catch (IndexOutOfBoundsException success) {}
606 >        }
607      }
608  
609      /**
610       * remove throws an IndexOutOfBoundsException on a negative index
611       */
612      public void testRemove1_IndexOutOfBounds() {
613 <        try {
614 <            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
615 <            c.remove(-1);
616 <            shouldThrow();
617 <        } catch (IndexOutOfBoundsException success) {}
613 >        CopyOnWriteArrayList c = populatedArray(5);
614 >        List[] lists = { c, c.subList(1, c.size() - 1) };
615 >        for (List list : lists) {
616 >            try {
617 >                list.remove(-1);
618 >                shouldThrow();
619 >            } catch (IndexOutOfBoundsException success) {}
620 >        }
621      }
622  
623      /**
624       * remove throws an IndexOutOfBoundsException on a too high index
625       */
626      public void testRemove2_IndexOutOfBounds() {
627 <        try {
628 <            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
629 <            c.add("asdasd");
630 <            c.add("adasdasd");
631 <            c.remove(100);
632 <            shouldThrow();
633 <        } catch (IndexOutOfBoundsException success) {}
627 >        CopyOnWriteArrayList c = populatedArray(5);
628 >        List[] lists = { c, c.subList(1, c.size() - 1) };
629 >        for (List list : lists) {
630 >            try {
631 >                list.remove(list.size());
632 >                shouldThrow();
633 >            } catch (IndexOutOfBoundsException success) {}
634 >        }
635      }
636  
637      /**
638       * addAll throws an IndexOutOfBoundsException on a negative index
639       */
640      public void testAddAll1_IndexOutOfBoundsException() {
641 <        try {
642 <            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
643 <            c.addAll(-1,new LinkedList());
644 <            shouldThrow();
645 <        } catch (IndexOutOfBoundsException success) {}
641 >        CopyOnWriteArrayList c = populatedArray(5);
642 >        List[] lists = { c, c.subList(1, c.size() - 1) };
643 >        for (List list : lists) {
644 >            try {
645 >                list.addAll(-1, new LinkedList());
646 >                shouldThrow();
647 >            } catch (IndexOutOfBoundsException success) {}
648 >        }
649      }
650  
651      /**
652       * addAll throws an IndexOutOfBoundsException on a too high index
653       */
654      public void testAddAll2_IndexOutOfBoundsException() {
655 <        try {
656 <            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
657 <            c.add("asdasd");
658 <            c.add("asdasdasd");
659 <            c.addAll(100, new LinkedList());
660 <            shouldThrow();
661 <        } catch (IndexOutOfBoundsException success) {}
655 >        CopyOnWriteArrayList c = populatedArray(5);
656 >        List[] lists = { c, c.subList(1, c.size() - 1) };
657 >        for (List list : lists) {
658 >            try {
659 >                list.addAll(list.size() + 1, new LinkedList());
660 >                shouldThrow();
661 >            } catch (IndexOutOfBoundsException success) {}
662 >        }
663      }
664  
665      /**
666       * listIterator throws an IndexOutOfBoundsException on a negative index
667       */
668      public void testListIterator1_IndexOutOfBoundsException() {
669 <        try {
670 <            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
671 <            c.listIterator(-1);
672 <            shouldThrow();
673 <        } catch (IndexOutOfBoundsException success) {}
669 >        CopyOnWriteArrayList c = populatedArray(5);
670 >        List[] lists = { c, c.subList(1, c.size() - 1) };
671 >        for (List list : lists) {
672 >            try {
673 >                list.listIterator(-1);
674 >                shouldThrow();
675 >            } catch (IndexOutOfBoundsException success) {}
676 >        }
677      }
678  
679      /**
680       * listIterator throws an IndexOutOfBoundsException on a too high index
681       */
682      public void testListIterator2_IndexOutOfBoundsException() {
683 <        try {
684 <            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
685 <            c.add("adasd");
686 <            c.add("asdasdas");
687 <            c.listIterator(100);
688 <            shouldThrow();
689 <        } catch (IndexOutOfBoundsException success) {}
683 >        CopyOnWriteArrayList c = populatedArray(5);
684 >        List[] lists = { c, c.subList(1, c.size() - 1) };
685 >        for (List list : lists) {
686 >            try {
687 >                list.listIterator(list.size() + 1);
688 >                shouldThrow();
689 >            } catch (IndexOutOfBoundsException success) {}
690 >        }
691      }
692  
693      /**
694       * subList throws an IndexOutOfBoundsException on a negative index
695       */
696      public void testSubList1_IndexOutOfBoundsException() {
697 <        try {
698 <            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
699 <            c.subList(-1,100);
700 <            shouldThrow();
701 <        } catch (IndexOutOfBoundsException success) {}
697 >        CopyOnWriteArrayList c = populatedArray(5);
698 >        List[] lists = { c, c.subList(1, c.size() - 1) };
699 >        for (List list : lists) {
700 >            try {
701 >                list.subList(-1, list.size());
702 >                shouldThrow();
703 >            } catch (IndexOutOfBoundsException success) {}
704 >        }
705      }
706  
707      /**
708       * subList throws an IndexOutOfBoundsException on a too high index
709       */
710      public void testSubList2_IndexOutOfBoundsException() {
711 <        try {
712 <            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
713 <            c.add("asdasd");
714 <            c.subList(1,100);
715 <            shouldThrow();
716 <        } catch (IndexOutOfBoundsException success) {}
711 >        CopyOnWriteArrayList c = populatedArray(5);
712 >        List[] lists = { c, c.subList(1, c.size() - 1) };
713 >        for (List list : lists) {
714 >            try {
715 >                list.subList(0, list.size() + 1);
716 >                shouldThrow();
717 >            } catch (IndexOutOfBoundsException success) {}
718 >        }
719      }
720  
721      /**
# Line 585 | Line 723 | public class CopyOnWriteArrayListTest ex
723       * is lower then the first
724       */
725      public void testSubList3_IndexOutOfBoundsException() {
726 <        try {
727 <            CopyOnWriteArrayList c = new CopyOnWriteArrayList();
728 <            c.subList(3,1);
729 <            shouldThrow();
730 <        } catch (IndexOutOfBoundsException success) {}
726 >        CopyOnWriteArrayList c = populatedArray(5);
727 >        List[] lists = { c, c.subList(1, c.size() - 1) };
728 >        for (List list : lists) {
729 >            try {
730 >                list.subList(list.size() - 1, 1);
731 >                shouldThrow();
732 >            } catch (IndexOutOfBoundsException success) {}
733 >        }
734      }
735  
736      /**
737       * a deserialized serialized list is equal
738       */
739      public void testSerialization() throws Exception {
740 <        CopyOnWriteArrayList q = populatedArray(SIZE);
740 >        List x = populatedArray(SIZE);
741 >        List y = serialClone(x);
742  
743 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
744 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
745 <        out.writeObject(q);
746 <        out.close();
747 <
748 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
749 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
750 <        CopyOnWriteArrayList r = (CopyOnWriteArrayList)in.readObject();
751 <        assertEquals(q.size(), r.size());
752 <        assertTrue(q.equals(r));
753 <        assertTrue(r.equals(q));
743 >        assertNotSame(x, y);
744 >        assertEquals(x.size(), y.size());
745 >        assertEquals(x.toString(), y.toString());
746 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
747 >        assertEquals(x, y);
748 >        assertEquals(y, x);
749 >        while (!x.isEmpty()) {
750 >            assertFalse(y.isEmpty());
751 >            assertEquals(x.remove(0), y.remove(0));
752 >        }
753 >        assertTrue(y.isEmpty());
754      }
755  
756   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines