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.23 by jsr166, Fri Nov 5 00:17:22 2010 UTC

# Line 25 | Line 25 | public class ConcurrentLinkedQueueTest e
25       * Create a queue of given size containing consecutive
26       * Integers 0 ... n.
27       */
28 <    private ConcurrentLinkedQueue populatedQueue(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)));
# Line 43 | Line 43 | public class ConcurrentLinkedQueueTest e
43      }
44  
45      /**
46 <     *  Initializing from null Collection throws NPE
46 >     * Initializing from null Collection throws NPE
47       */
48      public void testConstructor3() {
49          try {
# Line 265 | Line 265 | public class ConcurrentLinkedQueueTest e
265      }
266  
267      /**
268 <     *  remove removes next element, or throws NSEE if empty
268 >     * remove removes next element, or throws NSEE if empty
269       */
270      public void testRemove() {
271          ConcurrentLinkedQueue q = populatedQueue(SIZE);
# Line 369 | Line 369 | public class ConcurrentLinkedQueueTest e
369      }
370  
371      /**
372 <     * toArray contains all elements
372 >     * toArray contains all elements in FIFO order
373       */
374      public void testToArray() {
375          ConcurrentLinkedQueue q = populatedQueue(SIZE);
376          Object[] o = q.toArray();
377 –        Arrays.sort(o);
377          for (int i = 0; i < o.length; i++)
378 <            assertEquals(o[i], q.poll());
378 >            assertSame(o[i], q.poll());
379      }
380  
381      /**
382 <     *  toArray(a) contains all elements
382 >     * toArray(a) contains all elements in FIFO order
383       */
384      public void testToArray2() {
385 <        ConcurrentLinkedQueue q = populatedQueue(SIZE);
385 >        ConcurrentLinkedQueue<Integer> q = populatedQueue(SIZE);
386          Integer[] ints = new Integer[SIZE];
387 <        ints = (Integer[])q.toArray(ints);
388 <        Arrays.sort(ints);
387 >        Integer[] array = q.toArray(ints);
388 >        assertSame(ints, array);
389          for (int i = 0; i < ints.length; i++)
390 <            assertEquals(ints[i], q.poll());
390 >            assertSame(ints[i], q.poll());
391      }
392  
393      /**
394 <     * toArray(null) throws NPE
394 >     * toArray(null) throws NullPointerException
395       */
396 <    public void testToArray_BadArg() {
396 >    public void testToArray_NullArg() {
397          ConcurrentLinkedQueue q = populatedQueue(SIZE);
398          try {
399 <            Object o[] = q.toArray(null);
399 >            q.toArray(null);
400              shouldThrow();
401          } catch (NullPointerException success) {}
402      }
403  
404      /**
405 <     * toArray with incompatible array type throws ArrayStoreException
405 >     * toArray(incompatible array type) throws ArrayStoreException
406       */
407      public void testToArray1_BadArg() {
408          ConcurrentLinkedQueue q = populatedQueue(SIZE);
409          try {
410 <            Object o[] = q.toArray(new String[10]);
410 >            q.toArray(new String[10]);
411              shouldThrow();
412          } catch (ArrayStoreException success) {}
413      }
414  
415      /**
416 <     *  iterator iterates through all elements
416 >     * iterator iterates through all elements
417       */
418      public void testIterator() {
419          ConcurrentLinkedQueue q = populatedQueue(SIZE);

Diff Legend

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