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

Comparing jsr166/src/test/tck/LinkedBlockingQueueTest.java (file contents):
Revision 1.58 by jsr166, Sat Feb 28 19:59:23 2015 UTC vs.
Revision 1.64 by jsr166, Sun Oct 16 20:44:18 2016 UTC

# Line 37 | Line 37 | public class LinkedBlockingQueueTest ext
37      }
38  
39      public static void main(String[] args) {
40 <        junit.textui.TestRunner.run(suite());
40 >        main(suite(), args);
41      }
42  
43      public static Test suite() {
# Line 48 | Line 48 | public class LinkedBlockingQueueTest ext
48  
49      /**
50       * Returns a new queue of given size containing consecutive
51 <     * Integers 0 ... n.
51 >     * Integers 0 ... n - 1.
52       */
53      private LinkedBlockingQueue<Integer> populatedQueue(int n) {
54          LinkedBlockingQueue<Integer> q =
# Line 59 | Line 59 | public class LinkedBlockingQueueTest ext
59          assertFalse(q.isEmpty());
60          assertEquals(0, q.remainingCapacity());
61          assertEquals(n, q.size());
62 +        assertEquals((Integer) 0, q.peek());
63          return q;
64      }
65  
# Line 108 | Line 109 | public class LinkedBlockingQueueTest ext
109       */
110      public void testConstructor5() {
111          Integer[] ints = new Integer[SIZE];
112 <        for (int i = 0; i < SIZE-1; ++i)
112 >        for (int i = 0; i < SIZE - 1; ++i)
113              ints[i] = new Integer(i);
114          Collection<Integer> elements = Arrays.asList(ints);
115          try {
# Line 155 | Line 156 | public class LinkedBlockingQueueTest ext
156              assertEquals(i, q.remove());
157          }
158          for (int i = 0; i < SIZE; ++i) {
159 <            assertEquals(SIZE-i, q.remainingCapacity());
159 >            assertEquals(SIZE - i, q.remainingCapacity());
160              assertEquals(SIZE, q.size() + q.remainingCapacity());
161              assertTrue(q.add(i));
162          }
# Line 202 | Line 203 | public class LinkedBlockingQueueTest ext
203      public void testAddAll3() {
204          LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
205          Integer[] ints = new Integer[SIZE];
206 <        for (int i = 0; i < SIZE-1; ++i)
206 >        for (int i = 0; i < SIZE - 1; ++i)
207              ints[i] = new Integer(i);
208          Collection<Integer> elements = Arrays.asList(ints);
209          try {
# Line 440 | Line 441 | public class LinkedBlockingQueueTest ext
441          final CountDownLatch aboutToWait = new CountDownLatch(1);
442          Thread t = newStartedThread(new CheckedRunnable() {
443              public void realRun() throws InterruptedException {
444 +                long startTime = System.nanoTime();
445                  for (int i = 0; i < SIZE; ++i) {
444 –                    long t0 = System.nanoTime();
446                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
446 –                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
447                  }
448 –                long t0 = System.nanoTime();
448                  aboutToWait.countDown();
449                  try {
450 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
450 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
451                      shouldThrow();
452                  } catch (InterruptedException success) {
453 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
453 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
454                  }
455              }});
456  
457 <        aboutToWait.await();
458 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
457 >        await(aboutToWait);
458 >        waitForThreadToEnterWaitState(t);
459          t.interrupt();
460 <        awaitTermination(t, MEDIUM_DELAY_MS);
460 >        awaitTermination(t);
461          checkEmpty(q);
462      }
463  
# Line 574 | Line 573 | public class LinkedBlockingQueueTest ext
573                  assertTrue(changed);
574  
575              assertTrue(q.containsAll(p));
576 <            assertEquals(SIZE-i, q.size());
576 >            assertEquals(SIZE - i, q.size());
577              p.remove();
578          }
579      }
# Line 587 | Line 586 | public class LinkedBlockingQueueTest ext
586              LinkedBlockingQueue q = populatedQueue(SIZE);
587              LinkedBlockingQueue p = populatedQueue(i);
588              assertTrue(q.removeAll(p));
589 <            assertEquals(SIZE-i, q.size());
589 >            assertEquals(SIZE - i, q.size());
590              for (int j = 0; j < i; ++j) {
591                  Integer x = (Integer)(p.remove());
592                  assertFalse(q.contains(x));
# Line 722 | Line 721 | public class LinkedBlockingQueueTest ext
721          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
722          q.add(one);
723          q.add(two);
725 –        ExecutorService executor = Executors.newFixedThreadPool(2);
724          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
725 <        executor.execute(new CheckedRunnable() {
726 <            public void realRun() throws InterruptedException {
727 <                assertFalse(q.offer(three));
728 <                threadsStarted.await();
729 <                assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
730 <                assertEquals(0, q.remainingCapacity());
731 <            }});
732 <
733 <        executor.execute(new CheckedRunnable() {
734 <            public void realRun() throws InterruptedException {
735 <                threadsStarted.await();
736 <                assertSame(one, q.take());
737 <            }});
738 <
739 <        joinPool(executor);
725 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
726 >        try (PoolCleaner cleaner = cleaner(executor)) {
727 >            executor.execute(new CheckedRunnable() {
728 >                public void realRun() throws InterruptedException {
729 >                    assertFalse(q.offer(three));
730 >                    threadsStarted.await();
731 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
732 >                    assertEquals(0, q.remainingCapacity());
733 >                }});
734 >
735 >            executor.execute(new CheckedRunnable() {
736 >                public void realRun() throws InterruptedException {
737 >                    threadsStarted.await();
738 >                    assertSame(one, q.take());
739 >                }});
740 >        }
741      }
742  
743      /**
# Line 747 | Line 746 | public class LinkedBlockingQueueTest ext
746      public void testPollInExecutor() {
747          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
748          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
749 <        ExecutorService executor = Executors.newFixedThreadPool(2);
750 <        executor.execute(new CheckedRunnable() {
751 <            public void realRun() throws InterruptedException {
752 <                assertNull(q.poll());
753 <                threadsStarted.await();
754 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
755 <                checkEmpty(q);
756 <            }});
757 <
758 <        executor.execute(new CheckedRunnable() {
759 <            public void realRun() throws InterruptedException {
760 <                threadsStarted.await();
761 <                q.put(one);
762 <            }});
763 <
764 <        joinPool(executor);
749 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
750 >        try (PoolCleaner cleaner = cleaner(executor)) {
751 >            executor.execute(new CheckedRunnable() {
752 >                public void realRun() throws InterruptedException {
753 >                    assertNull(q.poll());
754 >                    threadsStarted.await();
755 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
756 >                    checkEmpty(q);
757 >                }});
758 >
759 >            executor.execute(new CheckedRunnable() {
760 >                public void realRun() throws InterruptedException {
761 >                    threadsStarted.await();
762 >                    q.put(one);
763 >                }});
764 >        }
765      }
766  
767      /**
# Line 814 | Line 813 | public class LinkedBlockingQueueTest ext
813          final LinkedBlockingQueue q = populatedQueue(SIZE);
814          Thread t = new Thread(new CheckedRunnable() {
815              public void realRun() throws InterruptedException {
816 <                q.put(new Integer(SIZE+1));
816 >                q.put(new Integer(SIZE + 1));
817              }});
818  
819          t.start();
# Line 839 | Line 838 | public class LinkedBlockingQueueTest ext
838              q.drainTo(l, i);
839              int k = (i < SIZE) ? i : SIZE;
840              assertEquals(k, l.size());
841 <            assertEquals(SIZE-k, q.size());
841 >            assertEquals(SIZE - k, q.size());
842              for (int j = 0; j < k; ++j)
843                  assertEquals(l.get(j), new Integer(j));
844              do {} while (q.poll() != null);

Diff Legend

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