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.23 by jsr166, Tue Dec 1 06:28:43 2009 UTC vs.
Revision 1.27 by jsr166, Thu Oct 28 17:22:13 2010 UTC

# Line 18 | Line 18 | import java.util.List;
18   import java.util.NoSuchElementException;
19   import java.util.concurrent.*;
20   import static java.util.concurrent.TimeUnit.MILLISECONDS;
21 + import static java.util.concurrent.TimeUnit.NANOSECONDS;
22   import junit.framework.Test;
23   import junit.framework.TestSuite;
24  
25   @SuppressWarnings({"unchecked", "rawtypes"})
26   public class LinkedTransferQueueTest extends JSR166TestCase {
27  
28 +    public static class Generic extends BlockingQueueTest {
29 +        protected BlockingQueue emptyCollection() {
30 +            return new LinkedTransferQueue();
31 +        }
32 +    }
33 +
34      public static void main(String[] args) {
35          junit.textui.TestRunner.run(suite());
36      }
37  
38      public static Test suite() {
39 <        return new TestSuite(LinkedTransferQueueTest.class);
39 >        return newTestSuite(LinkedTransferQueueTest.class,
40 >                            new Generic().testSuite());
41      }
42  
43      void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
# Line 368 | Line 376 | public class LinkedTransferQueueTest ext
376      }
377  
378      /**
371 –     * timed poll before a delayed offer fails; after offer succeeds;
372 –     * on interruption throws
373 –     */
374 –    public void testTimedPollWithOffer() throws InterruptedException {
375 –        final LinkedTransferQueue q = new LinkedTransferQueue();
376 –        Thread t = new Thread(new CheckedRunnable() {
377 –            public void realRun() throws InterruptedException {
378 –                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
379 –                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
380 –                try {
381 –                    q.poll(LONG_DELAY_MS, MILLISECONDS);
382 –                    shouldThrow();
383 –                } catch (InterruptedException success) {}
384 –            }});
385 –
386 –        t.start();
387 –        Thread.sleep(SMALL_DELAY_MS);
388 –        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
389 –        t.interrupt();
390 –        t.join();
391 –    }
392 –
393 –    /**
379       * peek returns next element, or null if empty
380       */
381      public void testPeek() throws InterruptedException {
# Line 614 | Line 599 | public class LinkedTransferQueueTest ext
599          it.remove();
600  
601          it = q.iterator();
602 <        assertEquals(it.next(), one);
603 <        assertEquals(it.next(), three);
602 >        assertSame(it.next(), one);
603 >        assertSame(it.next(), three);
604          assertFalse(it.hasNext());
605      }
606  
# Line 680 | Line 665 | public class LinkedTransferQueueTest ext
665          executor.execute(new CheckedRunnable() {
666              public void realRun() throws InterruptedException {
667                  Thread.sleep(SMALL_DELAY_MS);
668 <                assertEquals(one, q.take());
668 >                assertSame(one, q.take());
669              }});
670  
671          joinPool(executor);
# Line 823 | Line 808 | public class LinkedTransferQueueTest ext
808      }
809  
810      /**
811 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
811 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
812       */
813      public void testDrainToN() {
814          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 891 | Line 876 | public class LinkedTransferQueueTest ext
876          Thread t = newStartedThread(new CheckedRunnable() {
877              public void realRun() throws InterruptedException {
878                  q.transfer(SIZE);
879 <                threadAssertTrue(q.isEmpty());
879 >                assertTrue(q.isEmpty());
880              }});
881  
882          Thread.sleep(SHORT_DELAY_MS);
# Line 912 | Line 897 | public class LinkedTransferQueueTest ext
897              public void realRun() throws InterruptedException {
898                  Integer i = SIZE + 1;
899                  q.transfer(i);
900 <                threadAssertTrue(!q.contains(i));
901 <                threadAssertEquals(1, q.size());
900 >                assertTrue(!q.contains(i));
901 >                assertEquals(1, q.size());
902              }});
903  
904          Thread interruptedThread = newStartedThread(
# Line 946 | Line 931 | public class LinkedTransferQueueTest ext
931          Thread t = newStartedThread(new CheckedRunnable() {
932              public void realRun() throws InterruptedException {
933                  q.transfer(four);
934 <                threadAssertFalse(q.contains(four));
935 <                threadAssertEquals(three, q.poll());
934 >                assertFalse(q.contains(four));
935 >                assertSame(three, q.poll());
936              }});
937  
938          Thread.sleep(SHORT_DELAY_MS);
939          assertTrue(q.offer(three));
940 <        assertEquals(four, q.poll());
940 >        assertSame(four, q.poll());
941          t.join();
942      }
943  
# Line 1010 | Line 995 | public class LinkedTransferQueueTest ext
995              public void realRun() {
996                  while (! q.hasWaitingConsumer())
997                      Thread.yield();
998 <                threadAssertTrue(q.hasWaitingConsumer());
999 <                threadAssertTrue(q.isEmpty());
1000 <                threadAssertTrue(q.size() == 0);
1001 <                threadAssertTrue(q.tryTransfer(hotPotato));
998 >                assertTrue(q.hasWaitingConsumer());
999 >                assertTrue(q.isEmpty());
1000 >                assertEquals(q.size(), 0);
1001 >                assertTrue(q.tryTransfer(hotPotato));
1002              }});
1003  
1004          assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
# Line 1033 | Line 1018 | public class LinkedTransferQueueTest ext
1018              public void realRun() {
1019                  while (! q.hasWaitingConsumer())
1020                      Thread.yield();
1021 <                threadAssertTrue(q.hasWaitingConsumer());
1022 <                threadAssertTrue(q.isEmpty());
1023 <                threadAssertTrue(q.size() == 0);
1024 <                threadAssertTrue(q.tryTransfer(hotPotato));
1021 >                assertTrue(q.hasWaitingConsumer());
1022 >                assertTrue(q.isEmpty());
1023 >                assertEquals(q.size(), 0);
1024 >                assertTrue(q.tryTransfer(hotPotato));
1025              }});
1026  
1027          assertSame(q.take(), hotPotato);
# Line 1069 | Line 1054 | public class LinkedTransferQueueTest ext
1054  
1055          Thread t = newStartedThread(new CheckedRunnable() {
1056              public void realRun() throws InterruptedException {
1057 +                long t0 = System.nanoTime();
1058                  assertFalse(q.tryTransfer(new Object(),
1059                                            SHORT_DELAY_MS, MILLISECONDS));
1060 +                long elapsed = NANOSECONDS.toMillis(System.nanoTime() - t0);
1061 +                assertTrue(elapsed >= SHORT_DELAY_MS);
1062              }});
1063  
1076 –        Thread.sleep(SMALL_DELAY_MS);
1064          checkEmpty(q);
1065 <        t.join();
1065 >        awaitTermination(t, MEDIUM_DELAY_MS);
1066 >        checkEmpty(q);
1067      }
1068  
1069      /**
# Line 1094 | Line 1082 | public class LinkedTransferQueueTest ext
1082  
1083          Thread.sleep(SHORT_DELAY_MS);
1084          assertEquals(2, q.size());
1085 <        assertEquals(four, q.poll());
1086 <        assertEquals(five, q.poll());
1085 >        assertSame(four, q.poll());
1086 >        assertSame(five, q.poll());
1087          checkEmpty(q);
1088          t.join();
1089      }
# Line 1110 | Line 1098 | public class LinkedTransferQueueTest ext
1098          assertEquals(1, q.size());
1099          assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1100          assertEquals(1, q.size());
1101 <        assertEquals(four, q.poll());
1101 >        assertSame(four, q.poll());
1102          assertNull(q.poll());
1103          checkEmpty(q);
1104      }

Diff Legend

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