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.12 by jsr166, Sat Nov 21 02:07:26 2009 UTC vs.
Revision 1.18 by jsr166, Wed Aug 25 01:47:17 2010 UTC

# Line 14 | Line 14 | import java.io.*;
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() {
# Line 49 | Line 49 | public class ConcurrentLinkedQueueTest e
49          try {
50              ConcurrentLinkedQueue q = new ConcurrentLinkedQueue((Collection)null);
51              shouldThrow();
52 <        }
53 <        catch (NullPointerException success) {}
52 >        } catch (NullPointerException success) {}
53      }
54  
55      /**
# Line 61 | Line 60 | public class ConcurrentLinkedQueueTest e
60              Integer[] ints = new Integer[SIZE];
61              ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(Arrays.asList(ints));
62              shouldThrow();
63 <        }
65 <        catch (NullPointerException success) {}
63 >        } catch (NullPointerException success) {}
64      }
65  
66      /**
# Line 75 | Line 73 | public class ConcurrentLinkedQueueTest e
73                  ints[i] = new Integer(i);
74              ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(Arrays.asList(ints));
75              shouldThrow();
76 <        }
79 <        catch (NullPointerException success) {}
76 >        } catch (NullPointerException success) {}
77      }
78  
79      /**
80       * Queue contains all elements of collection used to initialize
81       */
82      public void testConstructor6() {
83 <        try {
84 <            Integer[] ints = new Integer[SIZE];
85 <            for (int i = 0; i < SIZE; ++i)
86 <                ints[i] = new Integer(i);
87 <            ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(Arrays.asList(ints));
88 <            for (int i = 0; i < SIZE; ++i)
92 <                assertEquals(ints[i], q.poll());
93 <        }
94 <        finally {}
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      /**
# Line 131 | Line 125 | public class ConcurrentLinkedQueueTest e
125              ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
126              q.offer(null);
127              shouldThrow();
128 <        } catch (NullPointerException success) { }
128 >        } catch (NullPointerException success) {}
129      }
130  
131      /**
# Line 142 | Line 136 | public class ConcurrentLinkedQueueTest e
136              ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
137              q.add(null);
138              shouldThrow();
139 <        } catch (NullPointerException success) { }
139 >        } catch (NullPointerException success) {}
140      }
141  
142  
# Line 174 | Line 168 | public class ConcurrentLinkedQueueTest e
168              ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
169              q.addAll(null);
170              shouldThrow();
171 <        }
178 <        catch (NullPointerException success) {}
171 >        } catch (NullPointerException success) {}
172      }
173  
174      /**
# Line 186 | Line 179 | public class ConcurrentLinkedQueueTest e
179              ConcurrentLinkedQueue q = populatedQueue(SIZE);
180              q.addAll(q);
181              shouldThrow();
182 <        }
190 <        catch (IllegalArgumentException success) {}
182 >        } catch (IllegalArgumentException success) {}
183      }
184  
185      /**
# Line 199 | Line 191 | public class ConcurrentLinkedQueueTest e
191              Integer[] ints = new Integer[SIZE];
192              q.addAll(Arrays.asList(ints));
193              shouldThrow();
194 <        }
203 <        catch (NullPointerException success) {}
194 >        } catch (NullPointerException success) {}
195      }
196 +
197      /**
198 <     *  addAll of a collection with any null elements throws NPE after
198 >     * addAll of a collection with any null elements throws NPE after
199       * possibly adding some elements
200       */
201      public void testAddAll3() {
# Line 214 | Line 206 | public class ConcurrentLinkedQueueTest e
206                  ints[i] = new Integer(i);
207              q.addAll(Arrays.asList(ints));
208              shouldThrow();
209 <        }
218 <        catch (NullPointerException success) {}
209 >        } catch (NullPointerException success) {}
210      }
211  
212      /**
213       * Queue contains all elements, in traversal order, of successful addAll
214       */
215      public void testAddAll5() {
216 <        try {
217 <            Integer[] empty = new Integer[0];
218 <            Integer[] ints = new Integer[SIZE];
219 <            for (int i = 0; i < SIZE; ++i)
220 <                ints[i] = new Integer(i);
221 <            ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
222 <            assertFalse(q.addAll(Arrays.asList(empty)));
223 <            assertTrue(q.addAll(Arrays.asList(ints)));
224 <            for (int i = 0; i < SIZE; ++i)
234 <                assertEquals(ints[i], q.poll());
235 <        }
236 <        finally {}
216 >        Integer[] empty = new Integer[0];
217 >        Integer[] ints = new Integer[SIZE];
218 >        for (int i = 0; i < SIZE; ++i)
219 >            ints[i] = new Integer(i);
220 >        ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
221 >        assertFalse(q.addAll(Arrays.asList(empty)));
222 >        assertTrue(q.addAll(Arrays.asList(ints)));
223 >        for (int i = 0; i < SIZE; ++i)
224 >            assertEquals(ints[i], q.poll());
225      }
226  
227      /**
# Line 242 | Line 230 | public class ConcurrentLinkedQueueTest e
230      public void testPoll() {
231          ConcurrentLinkedQueue q = populatedQueue(SIZE);
232          for (int i = 0; i < SIZE; ++i) {
233 <            assertEquals(i, ((Integer)q.poll()).intValue());
233 >            assertEquals(i, q.poll());
234          }
235          assertNull(q.poll());
236      }
# Line 253 | Line 241 | public class ConcurrentLinkedQueueTest e
241      public void testPeek() {
242          ConcurrentLinkedQueue q = populatedQueue(SIZE);
243          for (int i = 0; i < SIZE; ++i) {
244 <            assertEquals(i, ((Integer)q.peek()).intValue());
245 <            q.poll();
244 >            assertEquals(i, q.peek());
245 >            assertEquals(i, q.poll());
246              assertTrue(q.peek() == null ||
247 <                       i != ((Integer)q.peek()).intValue());
247 >                       !q.peek().equals(i));
248          }
249          assertNull(q.peek());
250      }
# Line 267 | Line 255 | public class ConcurrentLinkedQueueTest e
255      public void testElement() {
256          ConcurrentLinkedQueue q = populatedQueue(SIZE);
257          for (int i = 0; i < SIZE; ++i) {
258 <            assertEquals(i, ((Integer)q.element()).intValue());
259 <            q.poll();
258 >            assertEquals(i, q.element());
259 >            assertEquals(i, q.poll());
260          }
261          try {
262              q.element();
263              shouldThrow();
264 <        }
277 <        catch (NoSuchElementException success) {}
264 >        } catch (NoSuchElementException success) {}
265      }
266  
267      /**
# Line 283 | Line 270 | public class ConcurrentLinkedQueueTest e
270      public void testRemove() {
271          ConcurrentLinkedQueue q = populatedQueue(SIZE);
272          for (int i = 0; i < SIZE; ++i) {
273 <            assertEquals(i, ((Integer)q.remove()).intValue());
273 >            assertEquals(i, q.remove());
274          }
275          try {
276              q.remove();
277              shouldThrow();
278 <        } catch (NoSuchElementException success) {
292 <        }
278 >        } catch (NoSuchElementException success) {}
279      }
280  
281      /**
# Line 409 | Line 395 | public class ConcurrentLinkedQueueTest e
395       * toArray(null) throws NPE
396       */
397      public void testToArray_BadArg() {
398 +        ConcurrentLinkedQueue q = populatedQueue(SIZE);
399          try {
413 –            ConcurrentLinkedQueue q = populatedQueue(SIZE);
400              Object o[] = q.toArray(null);
401              shouldThrow();
402          } catch (NullPointerException success) {}
# Line 420 | Line 406 | public class ConcurrentLinkedQueueTest e
406       * toArray with incompatible array type throws ArrayStoreException
407       */
408      public void testToArray1_BadArg() {
409 +        ConcurrentLinkedQueue q = populatedQueue(SIZE);
410          try {
411 <            ConcurrentLinkedQueue q = populatedQueue(SIZE);
425 <            Object o[] = q.toArray(new String[10] );
411 >            Object o[] = q.toArray(new String[10]);
412              shouldThrow();
413          } catch (ArrayStoreException success) {}
414      }
# Line 452 | Line 438 | public class ConcurrentLinkedQueueTest e
438  
439          int k = 0;
440          for (Iterator it = q.iterator(); it.hasNext();) {
441 <            int i = ((Integer)(it.next())).intValue();
456 <            assertEquals(++k, i);
441 >            assertEquals(++k, it.next());
442          }
443  
444          assertEquals(3, k);
# Line 462 | Line 447 | public class ConcurrentLinkedQueueTest e
447      /**
448       * Modifications do not cause iterators to fail
449       */
450 <    public void testWeaklyConsistentIteration () {
450 >    public void testWeaklyConsistentIteration() {
451          final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
452          q.add(one);
453          q.add(two);
454          q.add(three);
455  
456 <        try {
457 <            for (Iterator it = q.iterator(); it.hasNext();) {
458 <                q.remove();
474 <                it.next();
475 <            }
476 <        }
477 <        catch (ConcurrentModificationException e) {
478 <            shouldThrow();
456 >        for (Iterator it = q.iterator(); it.hasNext();) {
457 >            q.remove();
458 >            it.next();
459          }
460  
461          assertEquals("queue should be empty again", 0, q.size());
# Line 484 | Line 464 | public class ConcurrentLinkedQueueTest e
464      /**
465       * iterator.remove removes current element
466       */
467 <    public void testIteratorRemove () {
467 >    public void testIteratorRemove() {
468          final ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
469          q.add(one);
470          q.add(two);
# Line 493 | Line 473 | public class ConcurrentLinkedQueueTest e
473          it.next();
474          it.remove();
475          it = q.iterator();
476 <        assertEquals(it.next(), two);
477 <        assertEquals(it.next(), three);
476 >        assertSame(it.next(), two);
477 >        assertSame(it.next(), three);
478          assertFalse(it.hasNext());
479      }
480  
# Line 513 | Line 493 | public class ConcurrentLinkedQueueTest e
493      /**
494       * A deserialized serialized queue has same elements in same order
495       */
496 <    public void testSerialization() {
496 >    public void testSerialization() throws Exception {
497          ConcurrentLinkedQueue q = populatedQueue(SIZE);
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())
529 <                assertEquals(q.remove(), r.remove());
530 <        } catch (Exception e) {
531 <            unexpectedException();
532 <        }
498 >        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
499 >        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
500 >        out.writeObject(q);
501 >        out.close();
502 >
503 >        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
504 >        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
505 >        ConcurrentLinkedQueue r = (ConcurrentLinkedQueue)in.readObject();
506 >        assertEquals(q.size(), r.size());
507 >        while (!q.isEmpty())
508 >            assertEquals(q.remove(), r.remove());
509      }
510  
511   }

Diff Legend

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