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

Comparing jsr166/src/test/tck/LinkedTransferQueueTest.java (file contents):
Revision 1.48 by jsr166, Tue May 31 16:16:24 2011 UTC vs.
Revision 1.50 by jsr166, Sat Nov 26 05:19:17 2011 UTC

# Line 368 | Line 368 | public class LinkedTransferQueueTest ext
368      }
369  
370      /**
371 –     * remove(x) removes x and returns true if present
372 –     */
373 –    public void testRemoveElement() throws InterruptedException {
374 –        LinkedTransferQueue q = populatedQueue(SIZE);
375 –        for (int i = 1; i < SIZE; i+=2) {
376 –            assertTrue(q.contains(i));
377 –            assertTrue(q.remove(i));
378 –            assertFalse(q.contains(i));
379 –            assertTrue(q.contains(i-1));
380 –        }
381 –        for (int i = 0; i < SIZE; i+=2) {
382 –            assertTrue(q.contains(i));
383 –            assertTrue(q.remove(i));
384 –            assertFalse(q.contains(i));
385 –            assertFalse(q.remove(i+1));
386 –            assertFalse(q.contains(i+1));
387 –        }
388 –        checkEmpty(q);
389 –    }
390 –
391 –    /**
371       * An add following remove(x) succeeds
372       */
373      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 664 | Line 643 | public class LinkedTransferQueueTest ext
643          LinkedTransferQueue q = populatedQueue(SIZE);
644          ArrayList l = new ArrayList();
645          q.drainTo(l);
646 <        assertEquals(q.size(), 0);
647 <        assertEquals(l.size(), SIZE);
646 >        assertEquals(0, q.size());
647 >        assertEquals(SIZE, l.size());
648          for (int i = 0; i < SIZE; ++i) {
649              assertEquals(l.get(i), i);
650          }
# Line 676 | Line 655 | public class LinkedTransferQueueTest ext
655          assertTrue(q.contains(one));
656          l.clear();
657          q.drainTo(l);
658 <        assertEquals(q.size(), 0);
659 <        assertEquals(l.size(), 2);
658 >        assertEquals(0, q.size());
659 >        assertEquals(2, l.size());
660          for (int i = 0; i < 2; ++i) {
661              assertEquals(l.get(i), i);
662          }
# Line 730 | Line 709 | public class LinkedTransferQueueTest ext
709       */
710      public void testWaitingConsumer() throws InterruptedException {
711          final LinkedTransferQueue q = new LinkedTransferQueue();
712 <        assertEquals(q.getWaitingConsumerCount(), 0);
712 >        assertEquals(0, q.getWaitingConsumerCount());
713          assertFalse(q.hasWaitingConsumer());
714          final CountDownLatch threadStarted = new CountDownLatch(1);
715  
# Line 738 | Line 717 | public class LinkedTransferQueueTest ext
717              public void realRun() throws InterruptedException {
718                  threadStarted.countDown();
719                  assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
720 <                assertEquals(q.getWaitingConsumerCount(), 0);
720 >                assertEquals(0, q.getWaitingConsumerCount());
721                  assertFalse(q.hasWaitingConsumer());
722              }});
723  
724          threadStarted.await();
725          waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
726 <        assertEquals(q.getWaitingConsumerCount(), 1);
726 >        assertEquals(1, q.getWaitingConsumerCount());
727          assertTrue(q.hasWaitingConsumer());
728  
729          assertTrue(q.offer(one));
730 <        assertEquals(q.getWaitingConsumerCount(), 0);
730 >        assertEquals(0, q.getWaitingConsumerCount());
731          assertFalse(q.hasWaitingConsumer());
732  
733          awaitTermination(t, MEDIUM_DELAY_MS);

Diff Legend

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