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.21 by jsr166, Thu Nov 26 15:42:15 2009 UTC vs.
Revision 1.22 by jsr166, Tue Dec 1 06:03:49 2009 UTC

# Line 697 | Line 697 | public class LinkedTransferQueueTest ext
697  
698          executor.execute(new CheckedRunnable() {
699              public void realRun() throws InterruptedException {
700 <                threadAssertNull(q.poll());
701 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
702 <                                                MILLISECONDS));
703 <                threadAssertTrue(q.isEmpty());
700 >                assertNull(q.poll());
701 >                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
702 >                assertTrue(q.isEmpty());
703              }});
704  
705          executor.execute(new CheckedRunnable() {
# Line 859 | Line 858 | public class LinkedTransferQueueTest ext
858          Thread t = newStartedThread(new CheckedRunnable() {
859              public void realRun() throws InterruptedException {
860                  Thread.sleep(SMALL_DELAY_MS);
861 <                threadAssertTrue(q.hasWaitingConsumer());
862 <                threadAssertEquals(q.getWaitingConsumerCount(), 1);
863 <                threadAssertTrue(q.offer(new Object()));
864 <                threadAssertFalse(q.hasWaitingConsumer());
865 <                threadAssertEquals(q.getWaitingConsumerCount(), 0);
861 >                assertTrue(q.hasWaitingConsumer());
862 >                assertEquals(q.getWaitingConsumerCount(), 1);
863 >                assertTrue(q.offer(one));
864 >                assertFalse(q.hasWaitingConsumer());
865 >                assertEquals(q.getWaitingConsumerCount(), 0);
866              }});
867  
868 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
868 >        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
869          assertEquals(q.getWaitingConsumerCount(), 0);
870          assertFalse(q.hasWaitingConsumer());
871          t.join();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines