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.22 by jsr166, Tue Dec 1 06:03:49 2009 UTC vs.
Revision 1.26 by jsr166, Tue Oct 19 00:41:14 2010 UTC

# Line 24 | Line 24 | import junit.framework.TestSuite;
24   @SuppressWarnings({"unchecked", "rawtypes"})
25   public class LinkedTransferQueueTest extends JSR166TestCase {
26  
27 +    public static class Generic extends BlockingQueueTest {
28 +        protected BlockingQueue emptyCollection() {
29 +            return new LinkedTransferQueue();
30 +        }
31 +    }
32 +
33      public static void main(String[] args) {
34          junit.textui.TestRunner.run(suite());
35      }
36  
37      public static Test suite() {
38 <        return new TestSuite(LinkedTransferQueueTest.class);
38 >        return newTestSuite(LinkedTransferQueueTest.class,
39 >                            new Generic().testSuite());
40      }
41  
42      void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
# Line 351 | Line 358 | public class LinkedTransferQueueTest ext
358              public void realRun() throws InterruptedException {
359                  for (int i = 0; i < SIZE; ++i) {
360                      long t0 = System.nanoTime();
361 <                    threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
355 <                                                       MILLISECONDS));
361 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
362                      long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
363                      assertTrue(millisElapsed < SMALL_DELAY_MS);
364                  }
# Line 369 | Line 375 | public class LinkedTransferQueueTest ext
375      }
376  
377      /**
372 –     * timed poll before a delayed offer fails; after offer succeeds;
373 –     * on interruption throws
374 –     */
375 –    public void testTimedPollWithOffer() throws InterruptedException {
376 –        final LinkedTransferQueue q = new LinkedTransferQueue();
377 –        Thread t = new Thread(new CheckedRunnable() {
378 –            public void realRun() throws InterruptedException {
379 –                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
380 –                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
381 –                try {
382 –                    q.poll(LONG_DELAY_MS, MILLISECONDS);
383 –                    shouldThrow();
384 –                } catch (InterruptedException success) {}
385 –            }});
386 –
387 –        t.start();
388 –        Thread.sleep(SMALL_DELAY_MS);
389 –        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
390 –        t.interrupt();
391 –        t.join();
392 –    }
393 –
394 –    /**
378       * peek returns next element, or null if empty
379       */
380      public void testPeek() throws InterruptedException {
# Line 462 | Line 445 | public class LinkedTransferQueueTest ext
445          assertTrue(q.remove(one));
446          assertTrue(q.remove(two));
447          assertTrue(q.add(three));
448 <        assertTrue(q.take() == three);
448 >        assertSame(q.take(), three);
449      }
450  
451      /**
# Line 615 | Line 598 | public class LinkedTransferQueueTest ext
598          it.remove();
599  
600          it = q.iterator();
601 <        assertEquals(it.next(), one);
602 <        assertEquals(it.next(), three);
601 >        assertSame(it.next(), one);
602 >        assertSame(it.next(), three);
603          assertFalse(it.hasNext());
604      }
605  
# Line 675 | Line 658 | public class LinkedTransferQueueTest ext
658  
659          executor.execute(new CheckedRunnable() {
660              public void realRun() {
661 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
679 <                                         MILLISECONDS));
661 >                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
662              }});
663  
664          executor.execute(new CheckedRunnable() {
665              public void realRun() throws InterruptedException {
666                  Thread.sleep(SMALL_DELAY_MS);
667 <                threadAssertEquals(one, q.take());
667 >                assertSame(one, q.take());
668              }});
669  
670          joinPool(executor);
# Line 825 | Line 807 | public class LinkedTransferQueueTest ext
807      }
808  
809      /**
810 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
810 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
811       */
812      public void testDrainToN() {
813          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 893 | Line 875 | public class LinkedTransferQueueTest ext
875          Thread t = newStartedThread(new CheckedRunnable() {
876              public void realRun() throws InterruptedException {
877                  q.transfer(SIZE);
878 <                threadAssertTrue(q.isEmpty());
878 >                assertTrue(q.isEmpty());
879              }});
880  
881          Thread.sleep(SHORT_DELAY_MS);
# Line 914 | Line 896 | public class LinkedTransferQueueTest ext
896              public void realRun() throws InterruptedException {
897                  Integer i = SIZE + 1;
898                  q.transfer(i);
899 <                threadAssertTrue(!q.contains(i));
900 <                threadAssertEquals(1, q.size());
899 >                assertTrue(!q.contains(i));
900 >                assertEquals(1, q.size());
901              }});
902  
903          Thread interruptedThread = newStartedThread(
# Line 948 | Line 930 | public class LinkedTransferQueueTest ext
930          Thread t = newStartedThread(new CheckedRunnable() {
931              public void realRun() throws InterruptedException {
932                  q.transfer(four);
933 <                threadAssertFalse(q.contains(four));
934 <                threadAssertEquals(three, q.poll());
933 >                assertFalse(q.contains(four));
934 >                assertSame(three, q.poll());
935              }});
936  
937          Thread.sleep(SHORT_DELAY_MS);
938          assertTrue(q.offer(three));
939 <        assertEquals(four, q.poll());
939 >        assertSame(four, q.poll());
940          t.join();
941      }
942  
# Line 1012 | Line 994 | public class LinkedTransferQueueTest ext
994              public void realRun() {
995                  while (! q.hasWaitingConsumer())
996                      Thread.yield();
997 <                threadAssertTrue(q.hasWaitingConsumer());
998 <                threadAssertTrue(q.isEmpty());
999 <                threadAssertTrue(q.size() == 0);
1000 <                threadAssertTrue(q.tryTransfer(hotPotato));
997 >                assertTrue(q.hasWaitingConsumer());
998 >                assertTrue(q.isEmpty());
999 >                assertEquals(q.size(), 0);
1000 >                assertTrue(q.tryTransfer(hotPotato));
1001              }});
1002  
1003 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
1003 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1004          checkEmpty(q);
1005          t.join();
1006      }
# Line 1035 | Line 1017 | public class LinkedTransferQueueTest ext
1017              public void realRun() {
1018                  while (! q.hasWaitingConsumer())
1019                      Thread.yield();
1020 <                threadAssertTrue(q.hasWaitingConsumer());
1021 <                threadAssertTrue(q.isEmpty());
1022 <                threadAssertTrue(q.size() == 0);
1023 <                threadAssertTrue(q.tryTransfer(hotPotato));
1020 >                assertTrue(q.hasWaitingConsumer());
1021 >                assertTrue(q.isEmpty());
1022 >                assertEquals(q.size(), 0);
1023 >                assertTrue(q.tryTransfer(hotPotato));
1024              }});
1025  
1026 <        assertTrue(q.take() == hotPotato);
1026 >        assertSame(q.take(), hotPotato);
1027          checkEmpty(q);
1028          t.join();
1029      }
# Line 1071 | Line 1053 | public class LinkedTransferQueueTest ext
1053  
1054          Thread t = newStartedThread(new CheckedRunnable() {
1055              public void realRun() throws InterruptedException {
1056 <                threadAssertFalse
1057 <                    (q.tryTransfer(new Object(),
1076 <                                   SHORT_DELAY_MS, MILLISECONDS));
1056 >                assertFalse(q.tryTransfer(new Object(),
1057 >                                          SHORT_DELAY_MS, MILLISECONDS));
1058              }});
1059  
1060          Thread.sleep(SMALL_DELAY_MS);
# Line 1091 | Line 1072 | public class LinkedTransferQueueTest ext
1072  
1073          Thread t = newStartedThread(new CheckedRunnable() {
1074              public void realRun() throws InterruptedException {
1075 <                threadAssertTrue(q.tryTransfer(five,
1076 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
1096 <                threadAssertTrue(q.isEmpty());
1075 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1076 >                assertTrue(q.isEmpty());
1077              }});
1078  
1079          Thread.sleep(SHORT_DELAY_MS);
1080          assertEquals(2, q.size());
1081 <        assertEquals(four, q.poll());
1082 <        assertEquals(five, q.poll());
1081 >        assertSame(four, q.poll());
1082 >        assertSame(five, q.poll());
1083          checkEmpty(q);
1084          t.join();
1085      }
# Line 1114 | Line 1094 | public class LinkedTransferQueueTest ext
1094          assertEquals(1, q.size());
1095          assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1096          assertEquals(1, q.size());
1097 <        assertEquals(four, q.poll());
1097 >        assertSame(four, q.poll());
1098          assertNull(q.poll());
1099          checkEmpty(q);
1100      }

Diff Legend

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