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

Comparing jsr166/src/test/tck/PriorityBlockingQueueTest.java (file contents):
Revision 1.36 by jsr166, Wed Nov 3 16:46:34 2010 UTC vs.
Revision 1.39 by jsr166, Thu Nov 18 20:21:53 2010 UTC

# Line 49 | Line 49 | public class PriorityBlockingQueueTest e
49       * Create a queue of given size containing consecutive
50       * Integers 0 ... n.
51       */
52 <    private PriorityBlockingQueue populatedQueue(int n) {
53 <        PriorityBlockingQueue q = new PriorityBlockingQueue(n);
52 >    private PriorityBlockingQueue<Integer> populatedQueue(int n) {
53 >        PriorityBlockingQueue<Integer> q =
54 >            new PriorityBlockingQueue<Integer>(n);
55          assertTrue(q.isEmpty());
56          for (int i = n-1; i >= 0; i-=2)
57              assertTrue(q.offer(new Integer(i)));
# Line 493 | Line 494 | public class PriorityBlockingQueueTest e
494      public void testRemoveElement() {
495          PriorityBlockingQueue q = populatedQueue(SIZE);
496          for (int i = 1; i < SIZE; i+=2) {
497 <            assertTrue(q.remove(new Integer(i)));
497 >            assertTrue(q.contains(i));
498 >            assertTrue(q.remove(i));
499 >            assertFalse(q.contains(i));
500 >            assertTrue(q.contains(i-1));
501          }
502          for (int i = 0; i < SIZE; i+=2) {
503 <            assertTrue(q.remove(new Integer(i)));
504 <            assertFalse(q.remove(new Integer(i+1)));
503 >            assertTrue(q.contains(i));
504 >            assertTrue(q.remove(i));
505 >            assertFalse(q.contains(i));
506 >            assertFalse(q.remove(i+1));
507 >            assertFalse(q.contains(i+1));
508          }
509          assertTrue(q.isEmpty());
510      }
# Line 586 | Line 593 | public class PriorityBlockingQueueTest e
593          Object[] o = q.toArray();
594          Arrays.sort(o);
595          for (int i = 0; i < o.length; i++)
596 <            assertEquals(o[i], q.take());
596 >            assertSame(o[i], q.take());
597      }
598  
599      /**
600       * toArray(a) contains all elements
601       */
602      public void testToArray2() throws InterruptedException {
603 <        PriorityBlockingQueue q = populatedQueue(SIZE);
603 >        PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
604          Integer[] ints = new Integer[SIZE];
605 <        ints = (Integer[])q.toArray(ints);
605 >        Integer[] array = q.toArray(ints);
606 >        assertSame(ints, array);
607          Arrays.sort(ints);
608          for (int i = 0; i < ints.length; i++)
609 <            assertEquals(ints[i], q.take());
609 >            assertSame(ints[i], q.take());
610      }
611  
612      /**

Diff Legend

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