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

Comparing jsr166/src/test/tck/ConcurrentLinkedQueueTest.java (file contents):
Revision 1.2 by dl, Sun Sep 7 20:39:11 2003 UTC vs.
Revision 1.26 by jsr166, Fri May 27 19:49:56 2011 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/publicdomain/zero/1.0/
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 ConcurrentLinkedQueueTest extends TestCase {
14 <    private static final int N = 10;
15 <    private static final long SHORT_DELAY_MS = 100;
16 <    private static final long MEDIUM_DELAY_MS = 1000;
17 <    private static final long LONG_DELAY_MS = 10000;
14 > public class ConcurrentLinkedQueueTest 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(ConcurrentLinkedQueueTest.class);
21 >        return new TestSuite(ConcurrentLinkedQueueTest.class);
22      }
23  
24      /**
25       * Create a queue of given size containing consecutive
26       * Integers 0 ... n.
27       */
28 <    private ConcurrentLinkedQueue fullQueue(int n) {
29 <        ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
28 >    private ConcurrentLinkedQueue<Integer> populatedQueue(int n) {
29 >        ConcurrentLinkedQueue<Integer> q = new ConcurrentLinkedQueue<Integer>();
30          assertTrue(q.isEmpty());
31 <        for(int i = 0; i < n; ++i)
32 <            assertTrue(q.offer(new Integer(i)));
31 >        for (int i = 0; i < n; ++i)
32 >            assertTrue(q.offer(new Integer(i)));
33          assertFalse(q.isEmpty());
34 <        assertEquals(n, q.size());
34 >        assertEquals(n, q.size());
35          return q;
36      }
37 <
38 <    public void testConstructor1(){
37 >
38 >    /**
39 >     * new queue is empty
40 >     */
41 >    public void testConstructor1() {
42          assertEquals(0, new ConcurrentLinkedQueue().size());
43      }
44  
45 +    /**
46 +     * Initializing from null Collection throws NPE
47 +     */
48      public void testConstructor3() {
49          try {
50              ConcurrentLinkedQueue q = new ConcurrentLinkedQueue((Collection)null);
51 <            fail("Cannot make from null collection");
52 <        }
50 <        catch (NullPointerException success) {}
51 >            shouldThrow();
52 >        } catch (NullPointerException success) {}
53      }
54  
55 <    public void testConstructor4(){
55 >    /**
56 >     * Initializing from Collection of null elements throws NPE
57 >     */
58 >    public void testConstructor4() {
59          try {
60 <            Integer[] ints = new Integer[N];
60 >            Integer[] ints = new Integer[SIZE];
61              ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(Arrays.asList(ints));
62 <            fail("Cannot make with null elements");
63 <        }
59 <        catch (NullPointerException success) {}
62 >            shouldThrow();
63 >        } catch (NullPointerException success) {}
64      }
65  
66 <    public void testConstructor5(){
66 >    /**
67 >     * Initializing from Collection with some null elements throws NPE
68 >     */
69 >    public void testConstructor5() {
70          try {
71 <            Integer[] ints = new Integer[N];
72 <            for (int i = 0; i < N-1; ++i)
71 >            Integer[] ints = new Integer[SIZE];
72 >            for (int i = 0; i < SIZE-1; ++i)
73                  ints[i] = new Integer(i);
74              ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(Arrays.asList(ints));
75 <            fail("Cannot make with null elements");
76 <        }
70 <        catch (NullPointerException success) {}
75 >            shouldThrow();
76 >        } catch (NullPointerException success) {}
77      }
78  
79 <    public void testConstructor6(){
80 <        try {
81 <            Integer[] ints = new Integer[N];
82 <            for (int i = 0; i < N; ++i)
83 <                ints[i] = new Integer(i);
84 <            ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(Arrays.asList(ints));
85 <            for (int i = 0; i < N; ++i)
86 <                assertEquals(ints[i], q.poll());
87 <        }
88 <        finally {}
79 >    /**
80 >     * Queue contains all elements of collection used to initialize
81 >     */
82 >    public void testConstructor6() {
83 >        Integer[] ints = new Integer[SIZE];
84 >        for (int i = 0; i < SIZE; ++i)
85 >            ints[i] = new Integer(i);
86 >        ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(Arrays.asList(ints));
87 >        for (int i = 0; i < SIZE; ++i)
88 >            assertEquals(ints[i], q.poll());
89      }
90  
91 +    /**
92 +     * isEmpty is true before add, false after
93 +     */
94      public void testEmpty() {
95          ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
96          assertTrue(q.isEmpty());
97 <        q.add(new Integer(1));
97 >        q.add(one);
98          assertFalse(q.isEmpty());
99 <        q.add(new Integer(2));
99 >        q.add(two);
100          q.remove();
101          q.remove();
102          assertTrue(q.isEmpty());
103      }
104  
105 +    /**
106 +     * size changes when elements added and removed
107 +     */
108      public void testSize() {
109 <        ConcurrentLinkedQueue q = fullQueue(N);
110 <        for (int i = 0; i < N; ++i) {
111 <            assertEquals(N-i, q.size());
109 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
110 >        for (int i = 0; i < SIZE; ++i) {
111 >            assertEquals(SIZE-i, q.size());
112              q.remove();
113          }
114 <        for (int i = 0; i < N; ++i) {
114 >        for (int i = 0; i < SIZE; ++i) {
115              assertEquals(i, q.size());
116              q.add(new Integer(i));
117          }
118      }
119  
120 <    public void testOfferNull(){
121 <        try {
120 >    /**
121 >     * offer(null) throws NPE
122 >     */
123 >    public void testOfferNull() {
124 >        try {
125              ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
126              q.offer(null);
127 <            fail("should throw NPE");
128 <        } catch (NullPointerException success) { }  
127 >            shouldThrow();
128 >        } catch (NullPointerException success) {}
129 >    }
130 >
131 >    /**
132 >     * add(null) throws NPE
133 >     */
134 >    public void testAddNull() {
135 >        try {
136 >            ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
137 >            q.add(null);
138 >            shouldThrow();
139 >        } catch (NullPointerException success) {}
140      }
141  
142 +    /**
143 +     * Offer returns true
144 +     */
145      public void testOffer() {
146          ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
147 <        assertTrue(q.offer(new Integer(0)));
148 <        assertTrue(q.offer(new Integer(1)));
147 >        assertTrue(q.offer(zero));
148 >        assertTrue(q.offer(one));
149      }
150  
151 <    public void testAdd(){
151 >    /**
152 >     * add returns true
153 >     */
154 >    public void testAdd() {
155          ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
156 <        for (int i = 0; i < N; ++i) {
156 >        for (int i = 0; i < SIZE; ++i) {
157              assertEquals(i, q.size());
158              assertTrue(q.add(new Integer(i)));
159          }
160      }
161  
162 <    public void testAddAll1(){
162 >    /**
163 >     * addAll(null) throws NPE
164 >     */
165 >    public void testAddAll1() {
166          try {
167              ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
168              q.addAll(null);
169 <            fail("Cannot add null collection");
170 <        }
136 <        catch (NullPointerException success) {}
169 >            shouldThrow();
170 >        } catch (NullPointerException success) {}
171      }
172 <    public void testAddAll2(){
172 >
173 >    /**
174 >     * addAll(this) throws IAE
175 >     */
176 >    public void testAddAllSelf() {
177 >        try {
178 >            ConcurrentLinkedQueue q = populatedQueue(SIZE);
179 >            q.addAll(q);
180 >            shouldThrow();
181 >        } catch (IllegalArgumentException success) {}
182 >    }
183 >
184 >    /**
185 >     * addAll of a collection with null elements throws NPE
186 >     */
187 >    public void testAddAll2() {
188          try {
189              ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
190 <            Integer[] ints = new Integer[N];
190 >            Integer[] ints = new Integer[SIZE];
191              q.addAll(Arrays.asList(ints));
192 <            fail("Cannot add null elements");
193 <        }
145 <        catch (NullPointerException success) {}
192 >            shouldThrow();
193 >        } catch (NullPointerException success) {}
194      }
195 <    public void testAddAll3(){
195 >
196 >    /**
197 >     * addAll of a collection with any null elements throws NPE after
198 >     * possibly adding some elements
199 >     */
200 >    public void testAddAll3() {
201          try {
202              ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
203 <            Integer[] ints = new Integer[N];
204 <            for (int i = 0; i < N-1; ++i)
203 >            Integer[] ints = new Integer[SIZE];
204 >            for (int i = 0; i < SIZE-1; ++i)
205                  ints[i] = new Integer(i);
206              q.addAll(Arrays.asList(ints));
207 <            fail("Cannot add null elements");
208 <        }
156 <        catch (NullPointerException success) {}
207 >            shouldThrow();
208 >        } catch (NullPointerException success) {}
209      }
210  
211 <    public void testAddAll5(){
212 <        try {
213 <            Integer[] empty = new Integer[0];
214 <            Integer[] ints = new Integer[N];
215 <            for (int i = 0; i < N; ++i)
216 <                ints[i] = new Integer(i);
217 <            ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
218 <            assertFalse(q.addAll(Arrays.asList(empty)));
219 <            assertTrue(q.addAll(Arrays.asList(ints)));
220 <            for (int i = 0; i < N; ++i)
221 <                assertEquals(ints[i], q.poll());
222 <        }
223 <        finally {}
211 >    /**
212 >     * Queue contains all elements, in traversal order, of successful addAll
213 >     */
214 >    public void testAddAll5() {
215 >        Integer[] empty = new Integer[0];
216 >        Integer[] ints = new Integer[SIZE];
217 >        for (int i = 0; i < SIZE; ++i)
218 >            ints[i] = new Integer(i);
219 >        ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
220 >        assertFalse(q.addAll(Arrays.asList(empty)));
221 >        assertTrue(q.addAll(Arrays.asList(ints)));
222 >        for (int i = 0; i < SIZE; ++i)
223 >            assertEquals(ints[i], q.poll());
224      }
225  
226 <    public void testPoll(){
227 <        ConcurrentLinkedQueue q = fullQueue(N);
228 <        for (int i = 0; i < N; ++i) {
229 <            assertEquals(i, ((Integer)q.poll()).intValue());
226 >    /**
227 >     * poll succeeds unless empty
228 >     */
229 >    public void testPoll() {
230 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
231 >        for (int i = 0; i < SIZE; ++i) {
232 >            assertEquals(i, q.poll());
233          }
234 <        assertNull(q.poll());
234 >        assertNull(q.poll());
235      }
236  
237 <    public void testPeek(){
238 <        ConcurrentLinkedQueue q = fullQueue(N);
239 <        for (int i = 0; i < N; ++i) {
240 <            assertEquals(i, ((Integer)q.peek()).intValue());
241 <            q.poll();
237 >    /**
238 >     * peek returns next element, or null if empty
239 >     */
240 >    public void testPeek() {
241 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
242 >        for (int i = 0; i < SIZE; ++i) {
243 >            assertEquals(i, q.peek());
244 >            assertEquals(i, q.poll());
245              assertTrue(q.peek() == null ||
246 <                       i != ((Integer)q.peek()).intValue());
246 >                       !q.peek().equals(i));
247          }
248 <        assertNull(q.peek());
248 >        assertNull(q.peek());
249      }
250  
251 <    public void testElement(){
252 <        ConcurrentLinkedQueue q = fullQueue(N);
253 <        for (int i = 0; i < N; ++i) {
254 <            assertEquals(i, ((Integer)q.element()).intValue());
255 <            q.poll();
251 >    /**
252 >     * element returns next element, or throws NSEE if empty
253 >     */
254 >    public void testElement() {
255 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
256 >        for (int i = 0; i < SIZE; ++i) {
257 >            assertEquals(i, q.element());
258 >            assertEquals(i, q.poll());
259          }
260          try {
261              q.element();
262 <            fail("no such element");
263 <        }
203 <        catch (NoSuchElementException success) {}
262 >            shouldThrow();
263 >        } catch (NoSuchElementException success) {}
264      }
265  
266 <    public void testRemove(){
267 <        ConcurrentLinkedQueue q = fullQueue(N);
268 <        for (int i = 0; i < N; ++i) {
269 <            assertEquals(i, ((Integer)q.remove()).intValue());
266 >    /**
267 >     * remove removes next element, or throws NSEE if empty
268 >     */
269 >    public void testRemove() {
270 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
271 >        for (int i = 0; i < SIZE; ++i) {
272 >            assertEquals(i, q.remove());
273          }
274          try {
275              q.remove();
276 <            fail("remove should throw");
277 <        } catch (NoSuchElementException success){
215 <        }  
276 >            shouldThrow();
277 >        } catch (NoSuchElementException success) {}
278      }
279  
280 <    public void testRemoveElement(){
281 <        ConcurrentLinkedQueue q = fullQueue(N);
282 <        for (int i = 1; i < N; i+=2) {
283 <            assertTrue(q.remove(new Integer(i)));
284 <        }
285 <        for (int i = 0; i < N; i+=2) {
286 <            assertTrue(q.remove(new Integer(i)));
287 <            assertFalse(q.remove(new Integer(i+1)));
280 >    /**
281 >     * remove(x) removes x and returns true if present
282 >     */
283 >    public void testRemoveElement() {
284 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
285 >        for (int i = 1; i < SIZE; i+=2) {
286 >            assertTrue(q.contains(i));
287 >            assertTrue(q.remove(i));
288 >            assertFalse(q.contains(i));
289 >            assertTrue(q.contains(i-1));
290 >        }
291 >        for (int i = 0; i < SIZE; i+=2) {
292 >            assertTrue(q.contains(i));
293 >            assertTrue(q.remove(i));
294 >            assertFalse(q.contains(i));
295 >            assertFalse(q.remove(i+1));
296 >            assertFalse(q.contains(i+1));
297          }
298          assertTrue(q.isEmpty());
299      }
300 <        
301 <    public void testContains(){
302 <        ConcurrentLinkedQueue q = fullQueue(N);
303 <        for (int i = 0; i < N; ++i) {
300 >
301 >    /**
302 >     * contains(x) reports true when elements added but not yet removed
303 >     */
304 >    public void testContains() {
305 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
306 >        for (int i = 0; i < SIZE; ++i) {
307              assertTrue(q.contains(new Integer(i)));
308              q.poll();
309              assertFalse(q.contains(new Integer(i)));
310          }
311      }
312  
313 <    public void testClear(){
314 <        ConcurrentLinkedQueue q = fullQueue(N);
313 >    /**
314 >     * clear removes all elements
315 >     */
316 >    public void testClear() {
317 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
318          q.clear();
319          assertTrue(q.isEmpty());
320          assertEquals(0, q.size());
321 <        q.add(new Integer(1));
321 >        q.add(one);
322          assertFalse(q.isEmpty());
323          q.clear();
324          assertTrue(q.isEmpty());
325      }
326  
327 <    public void testContainsAll(){
328 <        ConcurrentLinkedQueue q = fullQueue(N);
327 >    /**
328 >     * containsAll(c) is true when c contains a subset of elements
329 >     */
330 >    public void testContainsAll() {
331 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
332          ConcurrentLinkedQueue p = new ConcurrentLinkedQueue();
333 <        for (int i = 0; i < N; ++i) {
333 >        for (int i = 0; i < SIZE; ++i) {
334              assertTrue(q.containsAll(p));
335              assertFalse(p.containsAll(q));
336              p.add(new Integer(i));
# Line 258 | Line 338 | public class ConcurrentLinkedQueueTest e
338          assertTrue(p.containsAll(q));
339      }
340  
341 <    public void testRetainAll(){
342 <        ConcurrentLinkedQueue q = fullQueue(N);
343 <        ConcurrentLinkedQueue p = fullQueue(N);
344 <        for (int i = 0; i < N; ++i) {
341 >    /**
342 >     * retainAll(c) retains only those elements of c and reports true if change
343 >     */
344 >    public void testRetainAll() {
345 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
346 >        ConcurrentLinkedQueue p = populatedQueue(SIZE);
347 >        for (int i = 0; i < SIZE; ++i) {
348              boolean changed = q.retainAll(p);
349              if (i == 0)
350                  assertFalse(changed);
# Line 269 | Line 352 | public class ConcurrentLinkedQueueTest e
352                  assertTrue(changed);
353  
354              assertTrue(q.containsAll(p));
355 <            assertEquals(N-i, q.size());
355 >            assertEquals(SIZE-i, q.size());
356              p.remove();
357          }
358      }
359  
360 <    public void testRemoveAll(){
361 <        for (int i = 1; i < N; ++i) {
362 <            ConcurrentLinkedQueue q = fullQueue(N);
363 <            ConcurrentLinkedQueue p = fullQueue(i);
360 >    /**
361 >     * removeAll(c) removes only those elements of c and reports true if changed
362 >     */
363 >    public void testRemoveAll() {
364 >        for (int i = 1; i < SIZE; ++i) {
365 >            ConcurrentLinkedQueue q = populatedQueue(SIZE);
366 >            ConcurrentLinkedQueue p = populatedQueue(i);
367              assertTrue(q.removeAll(p));
368 <            assertEquals(N-i, q.size());
368 >            assertEquals(SIZE-i, q.size());
369              for (int j = 0; j < i; ++j) {
370                  Integer I = (Integer)(p.remove());
371                  assertFalse(q.contains(I));
# Line 287 | Line 373 | public class ConcurrentLinkedQueueTest e
373          }
374      }
375  
376 <    public void testToArray(){
377 <        ConcurrentLinkedQueue q = fullQueue(N);
378 <        Object[] o = q.toArray();
379 <        Arrays.sort(o);
380 <        for(int i = 0; i < o.length; i++)
381 <            assertEquals(o[i], q.poll());
376 >    /**
377 >     * toArray contains all elements in FIFO order
378 >     */
379 >    public void testToArray() {
380 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
381 >        Object[] o = q.toArray();
382 >        for (int i = 0; i < o.length; i++)
383 >            assertSame(o[i], q.poll());
384      }
385  
386 <    public void testToArray2(){
387 <        ConcurrentLinkedQueue q = fullQueue(N);
388 <        Integer[] ints = new Integer[N];
389 <        ints = (Integer[])q.toArray(ints);
390 <        Arrays.sort(ints);
391 <        for(int i = 0; i < ints.length; i++)
392 <            assertEquals(ints[i], q.poll());
386 >    /**
387 >     * toArray(a) contains all elements in FIFO order
388 >     */
389 >    public void testToArray2() {
390 >        ConcurrentLinkedQueue<Integer> q = populatedQueue(SIZE);
391 >        Integer[] ints = new Integer[SIZE];
392 >        Integer[] array = q.toArray(ints);
393 >        assertSame(ints, array);
394 >        for (int i = 0; i < ints.length; i++)
395 >            assertSame(ints[i], q.poll());
396 >    }
397 >
398 >    /**
399 >     * toArray(null) throws NullPointerException
400 >     */
401 >    public void testToArray_NullArg() {
402 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
403 >        try {
404 >            q.toArray(null);
405 >            shouldThrow();
406 >        } catch (NullPointerException success) {}
407      }
408 <    
409 <    public void testIterator(){
410 <        ConcurrentLinkedQueue q = fullQueue(N);
408 >
409 >    /**
410 >     * toArray(incompatible array type) throws ArrayStoreException
411 >     */
412 >    public void testToArray1_BadArg() {
413 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
414 >        try {
415 >            q.toArray(new String[10]);
416 >            shouldThrow();
417 >        } catch (ArrayStoreException success) {}
418 >    }
419 >
420 >    /**
421 >     * iterator iterates through all elements
422 >     */
423 >    public void testIterator() {
424 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
425          int i = 0;
426 <        Iterator it = q.iterator();
427 <        while(it.hasNext()) {
426 >        Iterator it = q.iterator();
427 >        while (it.hasNext()) {
428              assertTrue(q.contains(it.next()));
429              ++i;
430          }
431 <        assertEquals(i, N);
431 >        assertEquals(i, SIZE);
432      }
433  
434 +    /**
435 +     * iterator ordering is FIFO
436 +     */
437      public void testIteratorOrdering() {
319
438          final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
439 <
440 <        q.add(new Integer(1));
441 <        q.add(new Integer(2));
324 <        q.add(new Integer(3));
439 >        q.add(one);
440 >        q.add(two);
441 >        q.add(three);
442  
443          int k = 0;
444          for (Iterator it = q.iterator(); it.hasNext();) {
445 <            int i = ((Integer)(it.next())).intValue();
329 <            assertEquals("items should come out in order", ++k, i);
445 >            assertEquals(++k, it.next());
446          }
447  
448 <        assertEquals("should go through 3 elements", 3, k);
448 >        assertEquals(3, k);
449      }
450  
451 <    public void testWeaklyConsistentIteration () {
452 <
451 >    /**
452 >     * Modifications do not cause iterators to fail
453 >     */
454 >    public void testWeaklyConsistentIteration() {
455          final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
456 +        q.add(one);
457 +        q.add(two);
458 +        q.add(three);
459  
460 <        q.add(new Integer(1));
461 <        q.add(new Integer(2));
462 <        q.add(new Integer(3));
342 <
343 <        try {
344 <            for (Iterator it = q.iterator(); it.hasNext();) {
345 <                q.remove();
346 <                it.next();
347 <            }
348 <        }
349 <        catch (ConcurrentModificationException e) {
350 <            fail("weakly consistent iterator; should not get CME");
460 >        for (Iterator it = q.iterator(); it.hasNext();) {
461 >            q.remove();
462 >            it.next();
463          }
464  
465          assertEquals("queue should be empty again", 0, q.size());
466      }
467  
468 <    public void testIteratorRemove () {
469 <
468 >    /**
469 >     * iterator.remove removes current element
470 >     */
471 >    public void testIteratorRemove() {
472          final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
473 <
474 <        q.add(new Integer(1));
475 <        q.add(new Integer(2));
362 <        q.add(new Integer(3));
363 <
473 >        q.add(one);
474 >        q.add(two);
475 >        q.add(three);
476          Iterator it = q.iterator();
477          it.next();
478          it.remove();
367
479          it = q.iterator();
480 <        assertEquals(it.next(), new Integer(2));
481 <        assertEquals(it.next(), new Integer(3));
480 >        assertSame(it.next(), two);
481 >        assertSame(it.next(), three);
482          assertFalse(it.hasNext());
483      }
484  
485 <
486 <    public void testToString(){
487 <        ConcurrentLinkedQueue q = fullQueue(N);
485 >    /**
486 >     * toString contains toStrings of elements
487 >     */
488 >    public void testToString() {
489 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
490          String s = q.toString();
491 <        for (int i = 0; i < N; ++i) {
492 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
491 >        for (int i = 0; i < SIZE; ++i) {
492 >            assertTrue(s.contains(String.valueOf(i)));
493          }
494 <    }        
494 >    }
495  
496 <    public void testSerialization() {
497 <        ConcurrentLinkedQueue q = fullQueue(N);
498 <        try {
499 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
500 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
501 <            out.writeObject(q);
502 <            out.close();
503 <
504 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
505 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
506 <            ConcurrentLinkedQueue r = (ConcurrentLinkedQueue)in.readObject();
507 <            assertEquals(q.size(), r.size());
508 <            while (!q.isEmpty())
509 <                assertEquals(q.remove(), r.remove());
510 <        } catch(Exception e){
511 <            e.printStackTrace();
399 <            fail("unexpected exception");
400 <        }
496 >    /**
497 >     * A deserialized serialized queue has same elements in same order
498 >     */
499 >    public void testSerialization() throws Exception {
500 >        ConcurrentLinkedQueue q = populatedQueue(SIZE);
501 >        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
502 >        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
503 >        out.writeObject(q);
504 >        out.close();
505 >
506 >        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
507 >        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
508 >        ConcurrentLinkedQueue r = (ConcurrentLinkedQueue)in.readObject();
509 >        assertEquals(q.size(), r.size());
510 >        while (!q.isEmpty())
511 >            assertEquals(q.remove(), r.remove());
512      }
513  
514   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines