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

Comparing jsr166/src/test/tck/ArrayBlockingQueueTest.java (file contents):
Revision 1.50 by jsr166, Fri Jul 15 18:49:31 2011 UTC vs.
Revision 1.53 by jsr166, Tue Feb 21 01:54:03 2012 UTC

# Line 45 | Line 45 | public class ArrayBlockingQueueTest exte
45      }
46  
47      /**
48 <     * Create a queue of given size containing consecutive
48 >     * Creates a queue of given size containing consecutive
49       * Integers 0 ... n.
50       */
51      private ArrayBlockingQueue<Integer> populatedQueue(int n) {
# Line 322 | Line 322 | public class ArrayBlockingQueueTest exte
322              }});
323  
324          await(pleaseTake);
325 <        assertEquals(q.remainingCapacity(), 0);
325 >        assertEquals(0, q.remainingCapacity());
326          assertEquals(0, q.take());
327  
328          await(pleaseInterrupt);
329          assertThreadStaysAlive(t);
330          t.interrupt();
331          awaitTermination(t);
332 <        assertEquals(q.remainingCapacity(), 0);
332 >        assertEquals(0, q.remainingCapacity());
333      }
334  
335      /**
# Line 774 | Line 774 | public class ArrayBlockingQueueTest exte
774          ArrayBlockingQueue q = populatedQueue(SIZE);
775          ArrayList l = new ArrayList();
776          q.drainTo(l);
777 <        assertEquals(q.size(), 0);
778 <        assertEquals(l.size(), SIZE);
777 >        assertEquals(0, q.size());
778 >        assertEquals(SIZE, l.size());
779          for (int i = 0; i < SIZE; ++i)
780              assertEquals(l.get(i), new Integer(i));
781          q.add(zero);
# Line 785 | Line 785 | public class ArrayBlockingQueueTest exte
785          assertTrue(q.contains(one));
786          l.clear();
787          q.drainTo(l);
788 <        assertEquals(q.size(), 0);
789 <        assertEquals(l.size(), 2);
788 >        assertEquals(0, q.size());
789 >        assertEquals(2, l.size());
790          for (int i = 0; i < 2; ++i)
791              assertEquals(l.get(i), new Integer(i));
792      }
# Line 822 | Line 822 | public class ArrayBlockingQueueTest exte
822              ArrayList l = new ArrayList();
823              q.drainTo(l, i);
824              int k = (i < SIZE) ? i : SIZE;
825 <            assertEquals(l.size(), k);
826 <            assertEquals(q.size(), SIZE-k);
825 >            assertEquals(k, l.size());
826 >            assertEquals(SIZE-k, q.size());
827              for (int j = 0; j < k; ++j)
828                  assertEquals(l.get(j), new Integer(j));
829              while (q.poll() != null) ;

Diff Legend

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