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.31 by jsr166, Thu Oct 28 22:42:05 2010 UTC vs.
Revision 1.32 by jsr166, Fri Oct 29 06:21:16 2010 UTC

# Line 739 | Line 739 | public class LinkedTransferQueueTest ext
739          LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
740  
741          assertEquals(q.size(), r.size());
742 +        assertEquals(q.toString(), r.toString());
743 +        assertTrue(Arrays.equals(q.toArray(), r.toArray()));
744          while (!q.isEmpty()) {
745              assertEquals(q.remove(), r.remove());
746          }
# Line 930 | Line 932 | public class LinkedTransferQueueTest ext
932  
933          Thread first = newStartedThread(new CheckedRunnable() {
934              public void realRun() throws InterruptedException {
935 <                Integer i = SIZE + 1;
936 <                q.transfer(i);
935 <                assertTrue(!q.contains(i));
935 >                q.transfer(four);
936 >                assertTrue(!q.contains(four));
937                  assertEquals(1, q.size());
938              }});
939  
940          Thread interruptedThread = newStartedThread(
941              new CheckedInterruptedRunnable() {
942                  public void realRun() throws InterruptedException {
943 <                    while (q.size() == 0)
943 >                    while (q.isEmpty())
944                          Thread.yield();
945 <                    q.transfer(SIZE);
945 >                    q.transfer(five);
946                  }});
947  
948          while (q.size() < 2)
949              Thread.yield();
950          assertEquals(2, q.size());
951 <        assertEquals(SIZE + 1, (int) q.poll());
951 >        assertSame(four, q.poll());
952          first.join();
953          assertEquals(1, q.size());
954          interruptedThread.interrupt();
# Line 1105 | Line 1106 | public class LinkedTransferQueueTest ext
1106                  assertFalse(q.tryTransfer(new Object(),
1107                                            SHORT_DELAY_MS, MILLISECONDS));
1108                  assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
1109 +                checkEmpty(q);
1110              }});
1111  
1110 –        checkEmpty(q);
1112          awaitTermination(t, MEDIUM_DELAY_MS);
1113          checkEmpty(q);
1114      }
# Line 1126 | Line 1127 | public class LinkedTransferQueueTest ext
1127                  checkEmpty(q);
1128              }});
1129  
1130 <        Thread.sleep(SHORT_DELAY_MS);
1130 >        while (q.size() != 2)
1131 >            Thread.yield();
1132          assertEquals(2, q.size());
1133          assertSame(four, q.poll());
1134          assertSame(five, q.poll());
# Line 1142 | Line 1144 | public class LinkedTransferQueueTest ext
1144          final LinkedTransferQueue q = new LinkedTransferQueue();
1145          assertTrue(q.offer(four));
1146          assertEquals(1, q.size());
1147 +        long t0 = System.nanoTime();
1148          assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1149 +        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
1150          assertEquals(1, q.size());
1151          assertSame(four, q.poll());
1152          assertNull(q.poll());

Diff Legend

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