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.3 by dl, Sun Sep 14 20:42:40 2003 UTC vs.
Revision 1.10 by jsr166, Mon Nov 16 05:30:07 2009 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
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
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9   import junit.framework.*;
# Line 10 | Line 11 | import java.util.*;
11   import java.util.concurrent.*;
12   import java.io.*;
13  
14 < public class CopyOnWriteArrayListTest extends JSR166TestCase{
15 <    
14 > public class CopyOnWriteArrayListTest extends JSR166TestCase {
15 >
16      public static void main(String[] args) {
17 <        junit.textui.TestRunner.run (suite());  
17 >        junit.textui.TestRunner.run (suite());
18      }
19  
20      public static Test suite() {
21          return new TestSuite(CopyOnWriteArrayListTest.class);
22      }
23  
24 <    static CopyOnWriteArrayList populatedArray(int n){
24 >    static CopyOnWriteArrayList populatedArray(int n) {
25          CopyOnWriteArrayList a = new CopyOnWriteArrayList();
26          assertTrue(a.isEmpty());
27 <        for (int i = 0; i < n; ++i)
27 >        for (int i = 0; i < n; ++i)
28              a.add(new Integer(i));
29          assertFalse(a.isEmpty());
30          assertEquals(n, a.size());
# Line 31 | Line 32 | public class CopyOnWriteArrayListTest ex
32      }
33  
34  
35 +    /**
36 +     * a new list is empty
37 +     */
38      public void testConstructor() {
39          CopyOnWriteArrayList a = new CopyOnWriteArrayList();
40          assertTrue(a.isEmpty());
41      }
42  
43 +    /**
44 +     * new list contains all elements of initializing array
45 +     */
46      public void testConstructor2() {
47          Integer[] ints = new Integer[SIZE];
48          for (int i = 0; i < SIZE-1; ++i)
49              ints[i] = new Integer(i);
50          CopyOnWriteArrayList a = new CopyOnWriteArrayList(ints);
51 <        for (int i = 0; i < SIZE; ++i)
51 >        for (int i = 0; i < SIZE; ++i)
52              assertEquals(ints[i], a.get(i));
53      }
54  
55 +    /**
56 +     * new list contains all elements of initializing collection
57 +     */
58      public void testConstructor3() {
59          Integer[] ints = new Integer[SIZE];
60          for (int i = 0; i < SIZE-1; ++i)
61              ints[i] = new Integer(i);
62          CopyOnWriteArrayList a = new CopyOnWriteArrayList(Arrays.asList(ints));
63 <        for (int i = 0; i < SIZE; ++i)
63 >        for (int i = 0; i < SIZE; ++i)
64              assertEquals(ints[i], a.get(i));
65      }
66 <        
66 >
67  
68      /**
69 <     *   addAll correctly adds each element from the given collection
69 >     *   addAll  adds each element from the given collection
70       */
71 <    public void testAddAll(){
71 >    public void testAddAll() {
72          CopyOnWriteArrayList full = populatedArray(3);
73          Vector v = new Vector();
74          v.add(three);
# Line 72 | Line 82 | public class CopyOnWriteArrayListTest ex
82       *   addAllAbsent adds each element from the given collection that did not
83       *  already exist in the List
84       */
85 <    public void testAddAllAbsent(){
85 >    public void testAddAllAbsent() {
86          CopyOnWriteArrayList full = populatedArray(3);
87          Vector v = new Vector();
88          v.add(three);
# Line 85 | Line 95 | public class CopyOnWriteArrayListTest ex
95      /**
96       *   addIfAbsent will not add the element if it already exists in the list
97       */
98 <    public void testAddIfAbsent(){
99 <        CopyOnWriteArrayList full = populatedArray(3);
98 >    public void testAddIfAbsent() {
99 >        CopyOnWriteArrayList full = populatedArray(SIZE);
100          full.addIfAbsent(one);
101 <        assertEquals(3, full.size());
101 >        assertEquals(SIZE, full.size());
102      }
103  
104      /**
105 <     *   addIfAbsent correctly adds the element when it does not exist in the list
105 >     *   addIfAbsent adds the element when it does not exist in the list
106       */
107 <    public void testAddIfAbsent2(){
108 <        CopyOnWriteArrayList full = populatedArray(3);
107 >    public void testAddIfAbsent2() {
108 >        CopyOnWriteArrayList full = populatedArray(SIZE);
109          full.addIfAbsent(three);
110          assertTrue(full.contains(three));
111      }
112  
113      /**
114 <     *   clear correctly removes all elements from the list
114 >     *   clear removes all elements from the list
115       */
116 <    public void testClear(){
117 <        CopyOnWriteArrayList full = populatedArray(3);
116 >    public void testClear() {
117 >        CopyOnWriteArrayList full = populatedArray(SIZE);
118          full.clear();
119          assertEquals(0, full.size());
120      }
121  
122 +
123      /**
124 <     *   contains returns the correct values
124 >     *  Cloned list is equal
125       */
126 <    public void testContains(){
126 >    public void testClone() {
127 >        CopyOnWriteArrayList l1 = populatedArray(SIZE);
128 >        CopyOnWriteArrayList l2 = (CopyOnWriteArrayList)(l1.clone());
129 >        assertEquals(l1, l2);
130 >        l1.clear();
131 >        assertFalse(l1.equals(l2));
132 >    }
133 >
134 >    /**
135 >     *   contains is true for added elements
136 >     */
137 >    public void testContains() {
138          CopyOnWriteArrayList full = populatedArray(3);
139          assertTrue(full.contains(one));
140          assertFalse(full.contains(five));
141      }
142  
143 +    /**
144 +     * adding at an index places it in the indicated index
145 +     */
146      public void testAddIndex() {
147          CopyOnWriteArrayList full = populatedArray(3);
148          full.add(0, m1);
# Line 131 | Line 156 | public class CopyOnWriteArrayListTest ex
156          assertEquals(two, full.get(4));
157      }
158  
159 +    /**
160 +     * lists with same elements are equal and have same hashCode
161 +     */
162      public void testEquals() {
163          CopyOnWriteArrayList a = populatedArray(3);
164          CopyOnWriteArrayList b = populatedArray(3);
# Line 146 | Line 174 | public class CopyOnWriteArrayListTest ex
174          assertEquals(a.hashCode(), b.hashCode());
175      }
176  
177 <    
177 >
178      /**
179 <     *   containsAll returns the correct values
179 >     *   containsAll returns true for collection with subset of elements
180       */
181 <    public void testContainsAll(){
181 >    public void testContainsAll() {
182          CopyOnWriteArrayList full = populatedArray(3);
183          Vector v = new Vector();
184          v.add(one);
# Line 161 | Line 189 | public class CopyOnWriteArrayListTest ex
189      }
190  
191      /**
192 <     *   get returns the correct value for the given index
192 >     *   get returns the  value at the given index
193       */
194 <    public void testGet(){
194 >    public void testGet() {
195          CopyOnWriteArrayList full = populatedArray(3);
196          assertEquals(0, ((Integer)full.get(0)).intValue());
197      }
198  
199      /**
200 <     *   indexOf gives the correct index for the given object
200 >     *   indexOf gives the index for the given object
201       */
202 <    public void testIndexOf(){
202 >    public void testIndexOf() {
203          CopyOnWriteArrayList full = populatedArray(3);
204          assertEquals(1, full.indexOf(one));
205          assertEquals(-1, full.indexOf("puppies"));
206      }
207  
208      /**
209 <     *   indexOf gives the correct index based on the given index
209 >     *   indexOf gives the index based on the given index
210       *  at which to start searching
211       */
212 <    public void testIndexOf2(){
212 >    public void testIndexOf2() {
213          CopyOnWriteArrayList full = populatedArray(3);
214          assertEquals(1, full.indexOf(one, 0));
215          assertEquals(-1, full.indexOf(one, 2));
216      }
217  
218      /**
219 <     *   isEmpty returns the correct values
219 >     *   isEmpty returns true when empty, else false
220       */
221 <    public void testIsEmpty(){
221 >    public void testIsEmpty() {
222          CopyOnWriteArrayList empty = new CopyOnWriteArrayList();
223 <        CopyOnWriteArrayList full = populatedArray(3);
223 >        CopyOnWriteArrayList full = populatedArray(SIZE);
224          assertTrue(empty.isEmpty());
225          assertFalse(full.isEmpty());
226      }
227  
228      /**
229 <     *   iterator() returns an iterator containing the elements of the list
229 >     *   iterator() returns an iterator containing the elements of the list
230       */
231 <    public void testIterator(){
232 <        CopyOnWriteArrayList full = populatedArray(3);
231 >    public void testIterator() {
232 >        CopyOnWriteArrayList full = populatedArray(SIZE);
233          Iterator i = full.iterator();
234          int j;
235 <        for(j = 0; i.hasNext(); j++)
235 >        for (j = 0; i.hasNext(); j++)
236              assertEquals(j, ((Integer)i.next()).intValue());
237 <        assertEquals(3, j);
237 >        assertEquals(SIZE, j);
238      }
239  
240 +    /**
241 +     * iterator.remove throws UnsupportedOperationException
242 +     */
243      public void testIteratorRemove () {
244 <        CopyOnWriteArrayList full = populatedArray(3);
244 >        CopyOnWriteArrayList full = populatedArray(SIZE);
245          Iterator it = full.iterator();
246          it.next();
247          try {
248              it.remove();
249 <            fail("should throw");
249 >            shouldThrow();
250          }
251          catch (UnsupportedOperationException success) {}
252      }
253  
254 <    public void testToString(){
254 >    /**
255 >     * toString contains toString of elements
256 >     */
257 >    public void testToString() {
258          CopyOnWriteArrayList full = populatedArray(3);
259          String s = full.toString();
260          for (int i = 0; i < 3; ++i) {
261              assertTrue(s.indexOf(String.valueOf(i)) >= 0);
262          }
263 <    }        
263 >    }
264  
265      /**
266 <     *   lastIndexOf returns the correct index for the given object
266 >     *   lastIndexOf returns the index for the given object
267       */
268 <    public void testLastIndexOf1(){
268 >    public void testLastIndexOf1() {
269          CopyOnWriteArrayList full = populatedArray(3);
270          full.add(one);
271          full.add(three);
# Line 240 | Line 274 | public class CopyOnWriteArrayListTest ex
274      }
275  
276      /**
277 <     *   lastIndexOf returns the correct index from the given starting point
277 >     *   lastIndexOf returns the index from the given starting point
278       */
279 <    public void testlastIndexOf2(){
279 >    public void testlastIndexOf2() {
280          CopyOnWriteArrayList full = populatedArray(3);
281          full.add(one);
282          full.add(three);
# Line 251 | Line 285 | public class CopyOnWriteArrayListTest ex
285      }
286  
287      /**
288 <     *  Identical to testIterator, except ListInterator has more functionality
288 >     *  listIterator traverses all elements
289       */
290 <    public void testListIterator1(){
291 <        CopyOnWriteArrayList full = populatedArray(3);
290 >    public void testListIterator1() {
291 >        CopyOnWriteArrayList full = populatedArray(SIZE);
292          ListIterator i = full.listIterator();
293          int j;
294 <        for(j = 0; i.hasNext(); j++)
294 >        for (j = 0; i.hasNext(); j++)
295              assertEquals(j, ((Integer)i.next()).intValue());
296 <        assertEquals(3, j);
296 >        assertEquals(SIZE, j);
297      }
298  
299      /**
300 <     *  Identical to testIterator and testListIterator1, but only returns those elements
267 <     *  after the given index
300 >     *  listIterator only returns those elements after the given index
301       */
302 <    public void testListIterator2(){
302 >    public void testListIterator2() {
303          CopyOnWriteArrayList full = populatedArray(3);
304          ListIterator i = full.listIterator(1);
305          int j;
306 <        for(j = 0; i.hasNext(); j++)
306 >        for (j = 0; i.hasNext(); j++)
307              assertEquals(j+1, ((Integer)i.next()).intValue());
308          assertEquals(2, j);
309      }
310  
311      /**
312 <     *   remove correctly removes and returns the object at the given index
312 >     *   remove  removes and returns the object at the given index
313       */
314 <    public void testRemove(){
314 >    public void testRemove() {
315          CopyOnWriteArrayList full = populatedArray(3);
316          assertEquals(two, full.remove(2));
317          assertEquals(2, full.size());
318      }
319  
320      /**
321 <     *   removeAll correctly removes all elements from the given collection
321 >     *   removeAll  removes all elements from the given collection
322       */
323 <    public void testRemoveAll(){
323 >    public void testRemoveAll() {
324          CopyOnWriteArrayList full = populatedArray(3);
325          Vector v = new Vector();
326          v.add(one);
# Line 297 | Line 330 | public class CopyOnWriteArrayListTest ex
330      }
331  
332      /**
333 <     *   set correctly changes the element at the given index
333 >     *   set  changes the element at the given index
334       */
335 <    public void testSet(){
335 >    public void testSet() {
336          CopyOnWriteArrayList full = populatedArray(3);
337          assertEquals(two, full.set(2, four));
338          assertEquals(4, ((Integer)full.get(2)).intValue());
339      }
340  
341      /**
342 <     *   size returns the correct values
342 >     *   size returns the number of elements
343       */
344 <    public void testSize(){
344 >    public void testSize() {
345          CopyOnWriteArrayList empty = new CopyOnWriteArrayList();
346 <        CopyOnWriteArrayList full = populatedArray(3);
347 <        assertEquals(3, full.size());
346 >        CopyOnWriteArrayList full = populatedArray(SIZE);
347 >        assertEquals(SIZE, full.size());
348          assertEquals(0, empty.size());
349      }
350  
351      /**
352       *   toArray returns an Object array containing all elements from the list
353       */
354 <    public void testToArray(){
354 >    public void testToArray() {
355          CopyOnWriteArrayList full = populatedArray(3);
356          Object[] o = full.toArray();
357          assertEquals(3, o.length);
# Line 328 | Line 361 | public class CopyOnWriteArrayListTest ex
361      }
362  
363      /**
364 <     *  test to verify toArray returns an Integer array containing all elements from the list
364 >     *   toArray returns an Integer array containing all elements from
365 >     *   the list
366       */
367 <    public void testToArray2(){
367 >    public void testToArray2() {
368          CopyOnWriteArrayList full = populatedArray(3);
369          Integer[] i = new Integer[3];
370          i = (Integer[])full.toArray(i);
# Line 341 | Line 375 | public class CopyOnWriteArrayListTest ex
375      }
376  
377  
378 +    /**
379 +     * sublists contains elements at indexes offset from their base
380 +     */
381      public void testSubList() {
382          CopyOnWriteArrayList a = populatedArray(10);
383          assertTrue(a.subList(1,1).isEmpty());
384 <        for(int j = 0; j < 9; ++j) {
385 <            for(int i = j ; i < 10; ++i) {
384 >        for (int j = 0; j < 9; ++j) {
385 >            for (int i = j ; i < 10; ++i) {
386                  List b = a.subList(j,i);
387 <                for(int k = j; k < i; ++k) {
387 >                for (int k = j; k < i; ++k) {
388                      assertEquals(new Integer(k), b.get(k-j));
389                  }
390              }
# Line 367 | Line 404 | public class CopyOnWriteArrayListTest ex
404       *   toArray throws an ArrayStoreException when the given array
405       *  can not store the objects inside the list
406       */
407 <    public void testToArray_ArrayStoreException(){
408 <        try{
407 >    public void testToArray_ArrayStoreException() {
408 >        try {
409              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
410              c.add("zfasdfsdf");
411              c.add("asdadasd");
412              c.toArray(new Long[5]);
413 <            fail("Object[] toArray(Object[]) should throw ArrayStoreException");
414 <        }catch(ArrayStoreException e){}
413 >            shouldThrow();
414 >        } catch (ArrayStoreException e) {}
415      }
416  
417      /**
418       *   get throws an IndexOutOfBoundsException on a negative index
419       */
420 <    public void testGet1_IndexOutOfBoundsException(){
421 <        try{
420 >    public void testGet1_IndexOutOfBoundsException() {
421 >        try {
422              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
423              c.get(-1);
424 <            fail("Object get(int) should throw IndexOutOfBounds exception");
425 <        }catch(IndexOutOfBoundsException e){}
424 >            shouldThrow();
425 >        } catch (IndexOutOfBoundsException e) {}
426      }
427 <    
427 >
428      /**
429       *   get throws an IndexOutOfBoundsException on a too high index
430       */
431 <    public void testGet2_IndexOutOfBoundsException(){
432 <        try{
431 >    public void testGet2_IndexOutOfBoundsException() {
432 >        try {
433              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
434              c.add("asdasd");
435              c.add("asdad");
436              c.get(100);
437 <            fail("Object get(int) should throw IndexOutOfBounds exception");
438 <        }catch(IndexOutOfBoundsException e){}
437 >            shouldThrow();
438 >        } catch (IndexOutOfBoundsException e) {}
439      }
440  
441      /**
442       *   set throws an IndexOutOfBoundsException on a negative index
443       */
444 <    public void testSet1_IndexOutOfBoundsException(){
445 <        try{
444 >    public void testSet1_IndexOutOfBoundsException() {
445 >        try {
446              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
447              c.set(-1,"qwerty");
448 <            fail("Object get(int, Object) should throw IndexOutOfBounds exception");
449 <        }catch(IndexOutOfBoundsException e){}
448 >            shouldThrow();
449 >        } catch (IndexOutOfBoundsException e) {}
450      }
451 <    
451 >
452      /**
453       *   set throws an IndexOutOfBoundsException on a too high index
454       */
455 <    public void testSet2(){
456 <        try{
455 >    public void testSet2() {
456 >        try {
457              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
458              c.add("asdasd");
459              c.add("asdad");
460              c.set(100, "qwerty");
461 <            fail("Object set(int, Object) should throw IndexOutOfBounds exception");
462 <        }catch(IndexOutOfBoundsException e){}
461 >            shouldThrow();
462 >        } catch (IndexOutOfBoundsException e) {}
463      }
464  
465      /**
466       *   add throws an IndexOutOfBoundsException on a negative index
467       */
468 <    public void testAdd1_IndexOutOfBoundsException(){
469 <        try{
468 >    public void testAdd1_IndexOutOfBoundsException() {
469 >        try {
470              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
471              c.add(-1,"qwerty");
472 <            fail("void add(int, Object) should throw IndexOutOfBounds exception");
473 <        }catch(IndexOutOfBoundsException e){}
472 >            shouldThrow();
473 >        } catch (IndexOutOfBoundsException e) {}
474      }
475 <    
475 >
476      /**
477       *   add throws an IndexOutOfBoundsException on a too high index
478       */
479 <    public void testAdd2_IndexOutOfBoundsException(){
480 <        try{
479 >    public void testAdd2_IndexOutOfBoundsException() {
480 >        try {
481              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
482              c.add("asdasd");
483              c.add("asdasdasd");
484              c.add(100, "qwerty");
485 <            fail("void add(int, Object) should throw IndexOutOfBounds exception");
486 <        }catch(IndexOutOfBoundsException e){}
485 >            shouldThrow();
486 >        } catch (IndexOutOfBoundsException e) {}
487      }
488  
489      /**
490       *   remove throws an IndexOutOfBoundsException on a negative index
491       */
492 <    public void testRemove1_IndexOutOfBounds(){
493 <        try{
492 >    public void testRemove1_IndexOutOfBounds() {
493 >        try {
494              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
495              c.remove(-1);
496 <            fail("Object remove(int) should throw IndexOutOfBounds exception");
497 <        }catch(IndexOutOfBoundsException e){}
496 >            shouldThrow();
497 >        } catch (IndexOutOfBoundsException e) {}
498      }
499  
500      /**
501       *   remove throws an IndexOutOfBoundsException on a too high index
502       */
503 <    public void testRemove2_IndexOutOfBounds(){
504 <        try{
503 >    public void testRemove2_IndexOutOfBounds() {
504 >        try {
505              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
506              c.add("asdasd");
507              c.add("adasdasd");
508              c.remove(100);
509 <            fail("Object remove(int) should throw IndexOutOfBounds exception");
510 <        }catch(IndexOutOfBoundsException e){}
509 >            shouldThrow();
510 >        } catch (IndexOutOfBoundsException e) {}
511      }
512 <    
512 >
513      /**
514       *   addAll throws an IndexOutOfBoundsException on a negative index
515       */
516 <    public void testAddAll1_IndexOutOfBoundsException(){
517 <        try{
516 >    public void testAddAll1_IndexOutOfBoundsException() {
517 >        try {
518              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
519              c.addAll(-1,new LinkedList());
520 <            fail("boolean add(int, Collection) should throw IndexOutOfBounds exception");
521 <        }catch(IndexOutOfBoundsException e){}
520 >            shouldThrow();
521 >        } catch (IndexOutOfBoundsException e) {}
522      }
523 <    
523 >
524      /**
525       *   addAll throws an IndexOutOfBoundsException on a too high index
526       */
527 <    public void testAddAll2_IndexOutOfBoundsException(){
528 <        try{
527 >    public void testAddAll2_IndexOutOfBoundsException() {
528 >        try {
529              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
530              c.add("asdasd");
531              c.add("asdasdasd");
532              c.addAll(100, new LinkedList());
533 <            fail("boolean addAll(int, Collection) should throw IndexOutOfBounds exception");
534 <        }catch(IndexOutOfBoundsException e){}
533 >            shouldThrow();
534 >        } catch (IndexOutOfBoundsException e) {}
535      }
536  
537      /**
538       *   listIterator throws an IndexOutOfBoundsException on a negative index
539       */
540 <    public void testListIterator1_IndexOutOfBoundsException(){
541 <        try{
540 >    public void testListIterator1_IndexOutOfBoundsException() {
541 >        try {
542              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
543              c.listIterator(-1);
544 <            fail("ListIterator listIterator(int) should throw IndexOutOfBounds exceptione");
545 <        }catch(IndexOutOfBoundsException e){}
544 >            shouldThrow();
545 >        } catch (IndexOutOfBoundsException e) {}
546      }
547  
548      /**
549       *   listIterator throws an IndexOutOfBoundsException on a too high index
550       */
551 <    public void testListIterator2_IndexOutOfBoundsException(){
552 <        try{
551 >    public void testListIterator2_IndexOutOfBoundsException() {
552 >        try {
553              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
554              c.add("adasd");
555              c.add("asdasdas");
556              c.listIterator(100);
557 <            fail("ListIterator listIterator(int) should throw IndexOutOfBounds exception");
558 <        }catch(IndexOutOfBoundsException e){}
557 >            shouldThrow();
558 >        } catch (IndexOutOfBoundsException e) {}
559      }
560  
561      /**
562       *   subList throws an IndexOutOfBoundsException on a negative index
563       */
564 <    public void testSubList1_IndexOutOfBoundsException(){
565 <        try{
564 >    public void testSubList1_IndexOutOfBoundsException() {
565 >        try {
566              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
567              c.subList(-1,100);
568  
569 <            fail("List subList(int, int) should throw IndexOutofBounds exception");
570 <        }catch(IndexOutOfBoundsException e){}
569 >            shouldThrow();
570 >        } catch (IndexOutOfBoundsException e) {}
571      }
572  
573      /**
574       *   subList throws an IndexOutOfBoundsException on a too high index
575       */
576 <    public void testSubList2_IndexOutOfBoundsException(){
577 <        try{
576 >    public void testSubList2_IndexOutOfBoundsException() {
577 >        try {
578              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
579              c.add("asdasd");
580              c.subList(1,100);
581 <            fail("List subList(int, int) should throw IndexOutofBounds exception");
582 <        }catch(IndexOutOfBoundsException e){}
581 >            shouldThrow();
582 >        } catch (IndexOutOfBoundsException e) {}
583      }
584  
585      /**
586       *   subList throws IndexOutOfBoundsException when the second index
587 <     *  is lower then the first
587 >     *  is lower then the first
588       */
589 <    public void testSubList3_IndexOutOfBoundsException(){
590 <        try{
589 >    public void testSubList3_IndexOutOfBoundsException() {
590 >        try {
591              CopyOnWriteArrayList c = new CopyOnWriteArrayList();
592              c.subList(3,1);
593  
594 <            fail("List subList(int, int) should throw IndexOutofBounds exception");
595 <        }catch(IndexOutOfBoundsException e){}
594 >            shouldThrow();
595 >        } catch (IndexOutOfBoundsException e) {}
596      }
597  
598 +    /**
599 +     * a deserialized serialiszed list is equal
600 +     */
601      public void testSerialization() {
602          CopyOnWriteArrayList q = populatedArray(SIZE);
603  
# Line 573 | Line 613 | public class CopyOnWriteArrayListTest ex
613              assertEquals(q.size(), r.size());
614              assertTrue(q.equals(r));
615              assertTrue(r.equals(q));
616 <        } catch(Exception e){
617 <            e.printStackTrace();
578 <            fail("unexpected exception");
616 >        } catch (Exception e) {
617 >            unexpectedException();
618          }
619      }
620 <    
620 >
621   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines