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.18 by jsr166, Wed Aug 25 01:47:17 2010 UTC vs.
Revision 1.50 by dl, Tue Jan 26 13:33:05 2021 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.Arrays;
10 > import java.util.Collection;
11 > import java.util.Iterator;
12 > import java.util.NoSuchElementException;
13 > import java.util.Queue;
14 > import java.util.concurrent.ConcurrentLinkedQueue;
15 >
16 > import junit.framework.Test;
17  
18   public class ConcurrentLinkedQueueTest extends JSR166TestCase {
19  
20      public static void main(String[] args) {
21 <        junit.textui.TestRunner.run(suite());
21 >        main(suite(), args);
22      }
23  
24      public static Test suite() {
25 <        return new TestSuite(ConcurrentLinkedQueueTest.class);
25 >        class Implementation implements CollectionImplementation {
26 >            public Class<?> klazz() { return ConcurrentLinkedQueue.class; }
27 >            public Collection emptyCollection() { return new ConcurrentLinkedQueue(); }
28 >            public Object makeElement(int i) { return JSR166TestCase.itemFor(i); }
29 >            public boolean isConcurrent() { return true; }
30 >            public boolean permitsNulls() { return false; }
31 >        }
32 >        return newTestSuite(ConcurrentLinkedQueueTest.class,
33 >                            CollectionTest.testSuite(new Implementation()));
34      }
35  
36      /**
37 <     * Create a queue of given size containing consecutive
38 <     * Integers 0 ... n.
37 >     * Returns a new queue of given size containing consecutive
38 >     * Items 0 ... n - 1.
39       */
40 <    private ConcurrentLinkedQueue populatedQueue(int n) {
41 <        ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
40 >    private static ConcurrentLinkedQueue<Item> populatedQueue(int n) {
41 >        ConcurrentLinkedQueue<Item> q = new ConcurrentLinkedQueue<>();
42          assertTrue(q.isEmpty());
43          for (int i = 0; i < n; ++i)
44 <            assertTrue(q.offer(new Integer(i)));
44 >            mustOffer(q, i);
45          assertFalse(q.isEmpty());
46 <        assertEquals(n, q.size());
46 >        mustEqual(n, q.size());
47 >        mustEqual(0, q.peek());
48          return q;
49      }
50  
# Line 39 | Line 52 | public class ConcurrentLinkedQueueTest e
52       * new queue is empty
53       */
54      public void testConstructor1() {
55 <        assertEquals(0, new ConcurrentLinkedQueue().size());
55 >        mustEqual(0, new ConcurrentLinkedQueue<Item>().size());
56      }
57  
58      /**
59 <     *  Initializing from null Collection throws NPE
59 >     * Initializing from null Collection throws NPE
60       */
61      public void testConstructor3() {
62          try {
63 <            ConcurrentLinkedQueue q = new ConcurrentLinkedQueue((Collection)null);
63 >            new ConcurrentLinkedQueue<Item>((Collection<Item>)null);
64              shouldThrow();
65          } catch (NullPointerException success) {}
66      }
# Line 57 | Line 70 | public class ConcurrentLinkedQueueTest e
70       */
71      public void testConstructor4() {
72          try {
73 <            Integer[] ints = new Integer[SIZE];
61 <            ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(Arrays.asList(ints));
73 >            new ConcurrentLinkedQueue<Item>(Arrays.asList(new Item[SIZE]));
74              shouldThrow();
75          } catch (NullPointerException success) {}
76      }
# Line 67 | Line 79 | public class ConcurrentLinkedQueueTest e
79       * Initializing from Collection with some null elements throws NPE
80       */
81      public void testConstructor5() {
82 +        Item[] items = new Item[2];
83 +        items[0] = zero;
84          try {
85 <            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));
85 >            new ConcurrentLinkedQueue<Item>(Arrays.asList(items));
86              shouldThrow();
87          } catch (NullPointerException success) {}
88      }
# Line 80 | Line 91 | public class ConcurrentLinkedQueueTest e
91       * Queue contains all elements of collection used to initialize
92       */
93      public void testConstructor6() {
94 <        Integer[] ints = new Integer[SIZE];
95 <        for (int i = 0; i < SIZE; ++i)
85 <            ints[i] = new Integer(i);
86 <        ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(Arrays.asList(ints));
94 >        Item[] items = defaultItems;
95 >        ConcurrentLinkedQueue<Item> q = new ConcurrentLinkedQueue<Item>(Arrays.asList(items));
96          for (int i = 0; i < SIZE; ++i)
97 <            assertEquals(ints[i], q.poll());
97 >            mustEqual(items[i], q.poll());
98      }
99  
100      /**
101       * isEmpty is true before add, false after
102       */
103      public void testEmpty() {
104 <        ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
104 >        ConcurrentLinkedQueue<Item> q = new ConcurrentLinkedQueue<Item>();
105          assertTrue(q.isEmpty());
106          q.add(one);
107          assertFalse(q.isEmpty());
# Line 106 | Line 115 | public class ConcurrentLinkedQueueTest e
115       * size changes when elements added and removed
116       */
117      public void testSize() {
118 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
118 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
119          for (int i = 0; i < SIZE; ++i) {
120 <            assertEquals(SIZE-i, q.size());
120 >            mustEqual(SIZE - i, q.size());
121              q.remove();
122          }
123          for (int i = 0; i < SIZE; ++i) {
124 <            assertEquals(i, q.size());
125 <            q.add(new Integer(i));
124 >            mustEqual(i, q.size());
125 >            mustAdd(q, i);
126          }
127      }
128  
# Line 121 | Line 130 | public class ConcurrentLinkedQueueTest e
130       * offer(null) throws NPE
131       */
132      public void testOfferNull() {
133 +        ConcurrentLinkedQueue<Item> q = new ConcurrentLinkedQueue<Item>();
134          try {
125            ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
135              q.offer(null);
136              shouldThrow();
137          } catch (NullPointerException success) {}
# Line 132 | Line 141 | public class ConcurrentLinkedQueueTest e
141       * add(null) throws NPE
142       */
143      public void testAddNull() {
144 +        ConcurrentLinkedQueue<Item> q = new ConcurrentLinkedQueue<Item>();
145          try {
136            ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
146              q.add(null);
147              shouldThrow();
148          } catch (NullPointerException success) {}
149      }
150  
142
151      /**
152       * Offer returns true
153       */
154      public void testOffer() {
155 <        ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
155 >        ConcurrentLinkedQueue<Item> q = new ConcurrentLinkedQueue<Item>();
156          assertTrue(q.offer(zero));
157          assertTrue(q.offer(one));
158      }
# Line 153 | Line 161 | public class ConcurrentLinkedQueueTest e
161       * add returns true
162       */
163      public void testAdd() {
164 <        ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
164 >        ConcurrentLinkedQueue<Item> q = new ConcurrentLinkedQueue<Item>();
165          for (int i = 0; i < SIZE; ++i) {
166 <            assertEquals(i, q.size());
167 <            assertTrue(q.add(new Integer(i)));
166 >            mustEqual(i, q.size());
167 >            mustAdd(q, i);
168          }
169      }
170  
171      /**
172 <     * addAll(null) throws NPE
172 >     * addAll(null) throws NullPointerException
173       */
174      public void testAddAll1() {
175 +        ConcurrentLinkedQueue<Item> q = new ConcurrentLinkedQueue<Item>();
176          try {
168            ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
177              q.addAll(null);
178              shouldThrow();
179          } catch (NullPointerException success) {}
180      }
181  
182      /**
183 <     * addAll(this) throws IAE
183 >     * addAll(this) throws IllegalArgumentException
184       */
185      public void testAddAllSelf() {
186 +        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
187          try {
179            ConcurrentLinkedQueue q = populatedQueue(SIZE);
188              q.addAll(q);
189              shouldThrow();
190          } catch (IllegalArgumentException success) {}
191      }
192  
193      /**
194 <     * addAll of a collection with null elements throws NPE
194 >     * addAll of a collection with null elements throws NullPointerException
195       */
196      public void testAddAll2() {
197 +        ConcurrentLinkedQueue<Item> q = new ConcurrentLinkedQueue<Item>();
198          try {
199 <            ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
191 <            Integer[] ints = new Integer[SIZE];
192 <            q.addAll(Arrays.asList(ints));
199 >            q.addAll(Arrays.asList(new Item[SIZE]));
200              shouldThrow();
201          } catch (NullPointerException success) {}
202      }
# Line 199 | Line 206 | public class ConcurrentLinkedQueueTest e
206       * possibly adding some elements
207       */
208      public void testAddAll3() {
209 +        ConcurrentLinkedQueue<Item> q = new ConcurrentLinkedQueue<Item>();
210 +        Item[] items = new Item[2];
211 +        items[0] = zero;
212          try {
213 <            ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
204 <            Integer[] ints = new Integer[SIZE];
205 <            for (int i = 0; i < SIZE-1; ++i)
206 <                ints[i] = new Integer(i);
207 <            q.addAll(Arrays.asList(ints));
213 >            q.addAll(Arrays.asList(items));
214              shouldThrow();
215          } catch (NullPointerException success) {}
216      }
# Line 213 | Line 219 | public class ConcurrentLinkedQueueTest e
219       * Queue contains all elements, in traversal order, of successful addAll
220       */
221      public void testAddAll5() {
222 <        Integer[] empty = new Integer[0];
223 <        Integer[] ints = new Integer[SIZE];
224 <        for (int i = 0; i < SIZE; ++i)
219 <            ints[i] = new Integer(i);
220 <        ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
222 >        Item[] empty = new Item[0];
223 >        Item[] items = defaultItems;
224 >        ConcurrentLinkedQueue<Item> q = new ConcurrentLinkedQueue<Item>();
225          assertFalse(q.addAll(Arrays.asList(empty)));
226 <        assertTrue(q.addAll(Arrays.asList(ints)));
226 >        assertTrue(q.addAll(Arrays.asList(items)));
227          for (int i = 0; i < SIZE; ++i)
228 <            assertEquals(ints[i], q.poll());
228 >            mustEqual(items[i], q.poll());
229      }
230  
231      /**
232       * poll succeeds unless empty
233       */
234      public void testPoll() {
235 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
235 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
236          for (int i = 0; i < SIZE; ++i) {
237 <            assertEquals(i, q.poll());
237 >            mustEqual(i, q.poll());
238          }
239          assertNull(q.poll());
240      }
# Line 239 | Line 243 | public class ConcurrentLinkedQueueTest e
243       * peek returns next element, or null if empty
244       */
245      public void testPeek() {
246 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
246 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
247          for (int i = 0; i < SIZE; ++i) {
248 <            assertEquals(i, q.peek());
249 <            assertEquals(i, q.poll());
248 >            mustEqual(i, q.peek());
249 >            mustEqual(i, q.poll());
250              assertTrue(q.peek() == null ||
251                         !q.peek().equals(i));
252          }
# Line 253 | Line 257 | public class ConcurrentLinkedQueueTest e
257       * element returns next element, or throws NSEE if empty
258       */
259      public void testElement() {
260 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
260 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
261          for (int i = 0; i < SIZE; ++i) {
262 <            assertEquals(i, q.element());
263 <            assertEquals(i, q.poll());
262 >            mustEqual(i, q.element());
263 >            mustEqual(i, q.poll());
264          }
265          try {
266              q.element();
# Line 265 | Line 269 | public class ConcurrentLinkedQueueTest e
269      }
270  
271      /**
272 <     *  remove removes next element, or throws NSEE if empty
272 >     * remove removes next element, or throws NSEE if empty
273       */
274      public void testRemove() {
275 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
275 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
276          for (int i = 0; i < SIZE; ++i) {
277 <            assertEquals(i, q.remove());
277 >            mustEqual(i, q.remove());
278          }
279          try {
280              q.remove();
# Line 282 | Line 286 | public class ConcurrentLinkedQueueTest e
286       * remove(x) removes x and returns true if present
287       */
288      public void testRemoveElement() {
289 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
290 <        for (int i = 1; i < SIZE; i+=2) {
291 <            assertTrue(q.remove(new Integer(i)));
292 <        }
293 <        for (int i = 0; i < SIZE; i+=2) {
294 <            assertTrue(q.remove(new Integer(i)));
295 <            assertFalse(q.remove(new Integer(i+1)));
289 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
290 >        for (int i = 1; i < SIZE; i += 2) {
291 >            mustContain(q, i);
292 >            mustRemove(q, i);
293 >            mustNotContain(q, i);
294 >            mustContain(q, i - 1);
295 >        }
296 >        for (int i = 0; i < SIZE; i += 2) {
297 >            mustContain(q, i);
298 >            mustRemove(q, i);
299 >            mustNotContain(q, i);
300 >            mustNotRemove(q, i + 1);
301 >            mustNotContain(q, i + 1);
302          }
303          assertTrue(q.isEmpty());
304      }
# Line 297 | Line 307 | public class ConcurrentLinkedQueueTest e
307       * contains(x) reports true when elements added but not yet removed
308       */
309      public void testContains() {
310 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
310 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
311          for (int i = 0; i < SIZE; ++i) {
312 <            assertTrue(q.contains(new Integer(i)));
312 >            mustContain(q, i);
313              q.poll();
314 <            assertFalse(q.contains(new Integer(i)));
314 >            mustNotContain(q, i);
315          }
316      }
317  
# Line 309 | Line 319 | public class ConcurrentLinkedQueueTest e
319       * clear removes all elements
320       */
321      public void testClear() {
322 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
322 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
323          q.clear();
324          assertTrue(q.isEmpty());
325 <        assertEquals(0, q.size());
325 >        mustEqual(0, q.size());
326          q.add(one);
327          assertFalse(q.isEmpty());
328          q.clear();
# Line 323 | Line 333 | public class ConcurrentLinkedQueueTest e
333       * containsAll(c) is true when c contains a subset of elements
334       */
335      public void testContainsAll() {
336 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
337 <        ConcurrentLinkedQueue p = new ConcurrentLinkedQueue();
336 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
337 >        ConcurrentLinkedQueue<Item> p = new ConcurrentLinkedQueue<Item>();
338          for (int i = 0; i < SIZE; ++i) {
339              assertTrue(q.containsAll(p));
340              assertFalse(p.containsAll(q));
341 <            p.add(new Integer(i));
341 >            mustAdd(p, i);
342          }
343          assertTrue(p.containsAll(q));
344      }
# Line 337 | Line 347 | public class ConcurrentLinkedQueueTest e
347       * retainAll(c) retains only those elements of c and reports true if change
348       */
349      public void testRetainAll() {
350 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
351 <        ConcurrentLinkedQueue p = populatedQueue(SIZE);
350 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
351 >        ConcurrentLinkedQueue<Item> p = populatedQueue(SIZE);
352          for (int i = 0; i < SIZE; ++i) {
353              boolean changed = q.retainAll(p);
354              if (i == 0)
# Line 347 | Line 357 | public class ConcurrentLinkedQueueTest e
357                  assertTrue(changed);
358  
359              assertTrue(q.containsAll(p));
360 <            assertEquals(SIZE-i, q.size());
360 >            mustEqual(SIZE - i, q.size());
361              p.remove();
362          }
363      }
# Line 357 | Line 367 | public class ConcurrentLinkedQueueTest e
367       */
368      public void testRemoveAll() {
369          for (int i = 1; i < SIZE; ++i) {
370 <            ConcurrentLinkedQueue q = populatedQueue(SIZE);
371 <            ConcurrentLinkedQueue p = populatedQueue(i);
370 >            ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
371 >            ConcurrentLinkedQueue<Item> p = populatedQueue(i);
372              assertTrue(q.removeAll(p));
373 <            assertEquals(SIZE-i, q.size());
373 >            mustEqual(SIZE - i, q.size());
374              for (int j = 0; j < i; ++j) {
375 <                Integer I = (Integer)(p.remove());
376 <                assertFalse(q.contains(I));
375 >                Item x = p.remove();
376 >                assertFalse(q.contains(x));
377              }
378          }
379      }
380  
381      /**
382 <     * toArray contains all elements
382 >     * toArray contains all elements in FIFO order
383       */
384      public void testToArray() {
385 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
386 <        Object[] o = q.toArray();
387 <        Arrays.sort(o);
388 <        for (int i = 0; i < o.length; i++)
389 <            assertEquals(o[i], q.poll());
385 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
386 >        Object[] a = q.toArray();
387 >        assertSame(Object[].class, a.getClass());
388 >        for (Object o : a)
389 >            assertSame(o, q.poll());
390 >        assertTrue(q.isEmpty());
391      }
392  
393      /**
394 <     *  toArray(a) contains all elements
394 >     * toArray(a) contains all elements in FIFO order
395       */
396      public void testToArray2() {
397 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
398 <        Integer[] ints = new Integer[SIZE];
399 <        ints = (Integer[])q.toArray(ints);
400 <        Arrays.sort(ints);
401 <        for (int i = 0; i < ints.length; i++)
402 <            assertEquals(ints[i], q.poll());
397 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
398 >        Item[] items = new Item[SIZE];
399 >        Item[] array = q.toArray(items);
400 >        assertSame(items, array);
401 >        for (Item o : items)
402 >            assertSame(o, q.poll());
403 >        assertTrue(q.isEmpty());
404      }
405  
406      /**
407 <     * toArray(null) throws NPE
407 >     * toArray(null) throws NullPointerException
408       */
409 <    public void testToArray_BadArg() {
410 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
409 >    public void testToArray_NullArg() {
410 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
411          try {
412 <            Object o[] = q.toArray(null);
412 >            q.toArray((Object[])null);
413              shouldThrow();
414          } catch (NullPointerException success) {}
415      }
416  
417      /**
418 <     * toArray with incompatible array type throws ArrayStoreException
418 >     * toArray(incompatible array type) throws ArrayStoreException
419       */
420      public void testToArray1_BadArg() {
421 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
421 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
422          try {
423 <            Object o[] = q.toArray(new String[10]);
423 >            q.toArray(new String[10]);
424              shouldThrow();
425          } catch (ArrayStoreException success) {}
426      }
427  
428      /**
429 <     *  iterator iterates through all elements
429 >     * iterator iterates through all elements
430       */
431      public void testIterator() {
432 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
433 <        int i = 0;
434 <        Iterator it = q.iterator();
435 <        while (it.hasNext()) {
436 <            assertTrue(q.contains(it.next()));
437 <            ++i;
438 <        }
439 <        assertEquals(i, SIZE);
432 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
433 >        Iterator<? extends Item> it = q.iterator();
434 >        int i;
435 >        for (i = 0; it.hasNext(); i++)
436 >            mustContain(q, it.next());
437 >        mustEqual(i, SIZE);
438 >        assertIteratorExhausted(it);
439 >    }
440 >
441 >    /**
442 >     * iterator of empty collection has no elements
443 >     */
444 >    public void testEmptyIterator() {
445 >        assertIteratorExhausted(new ConcurrentLinkedQueue<Item>().iterator());
446      }
447  
448      /**
449       * iterator ordering is FIFO
450       */
451      public void testIteratorOrdering() {
452 <        final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
452 >        final ConcurrentLinkedQueue<Item> q = new ConcurrentLinkedQueue<Item>();
453          q.add(one);
454          q.add(two);
455          q.add(three);
456  
457          int k = 0;
458 <        for (Iterator it = q.iterator(); it.hasNext();) {
459 <            assertEquals(++k, it.next());
458 >        for (Iterator<? extends Item> it = q.iterator(); it.hasNext();) {
459 >            mustEqual(++k, it.next());
460          }
461  
462 <        assertEquals(3, k);
462 >        mustEqual(3, k);
463      }
464  
465      /**
466       * Modifications do not cause iterators to fail
467       */
468      public void testWeaklyConsistentIteration() {
469 <        final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
469 >        final ConcurrentLinkedQueue<Item> q = new ConcurrentLinkedQueue<Item>();
470          q.add(one);
471          q.add(two);
472          q.add(three);
473  
474 <        for (Iterator it = q.iterator(); it.hasNext();) {
474 >        for (Iterator<? extends Item> it = q.iterator(); it.hasNext();) {
475              q.remove();
476              it.next();
477          }
478  
479 <        assertEquals("queue should be empty again", 0, q.size());
479 >        mustEqual(0, q.size());
480      }
481  
482      /**
483       * iterator.remove removes current element
484       */
485      public void testIteratorRemove() {
486 <        final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
486 >        final ConcurrentLinkedQueue<Item> q = new ConcurrentLinkedQueue<Item>();
487          q.add(one);
488          q.add(two);
489          q.add(three);
490 <        Iterator it = q.iterator();
490 >        Iterator<? extends Item> it = q.iterator();
491          it.next();
492          it.remove();
493          it = q.iterator();
# Line 478 | Line 496 | public class ConcurrentLinkedQueueTest e
496          assertFalse(it.hasNext());
497      }
498  
481
499      /**
500       * toString contains toStrings of elements
501       */
502      public void testToString() {
503 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
503 >        ConcurrentLinkedQueue<Item> q = populatedQueue(SIZE);
504          String s = q.toString();
505          for (int i = 0; i < SIZE; ++i) {
506 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
506 >            assertTrue(s.contains(String.valueOf(i)));
507          }
508      }
509  
510      /**
511 <     * A deserialized serialized queue has same elements in same order
511 >     * A deserialized/reserialized queue has same elements in same order
512       */
513      public void testSerialization() throws Exception {
514 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
515 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
516 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
517 <        out.writeObject(q);
518 <        out.close();
519 <
520 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
521 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
522 <        ConcurrentLinkedQueue r = (ConcurrentLinkedQueue)in.readObject();
523 <        assertEquals(q.size(), r.size());
524 <        while (!q.isEmpty())
525 <            assertEquals(q.remove(), r.remove());
514 >        Queue<Item> x = populatedQueue(SIZE);
515 >        Queue<Item> y = serialClone(x);
516 >
517 >        assertNotSame(x, y);
518 >        mustEqual(x.size(), y.size());
519 >        mustEqual(x.toString(), y.toString());
520 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
521 >        while (!x.isEmpty()) {
522 >            assertFalse(y.isEmpty());
523 >            mustEqual(x.remove(), y.remove());
524 >        }
525 >        assertTrue(y.isEmpty());
526      }
527  
528 +    /**
529 +     * remove(null), contains(null) always return false
530 +     */
531 +    public void testNeverContainsNull() {
532 +        Collection<?>[] qs = {
533 +            new ConcurrentLinkedQueue<Object>(),
534 +            populatedQueue(2),
535 +        };
536 +
537 +        for (Collection<?> q : qs) {
538 +            assertFalse(q.contains(null));
539 +            assertFalse(q.remove(null));
540 +        }
541 +    }
542   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines