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.60 by jsr166, Sat May 23 00:53:08 2015 UTC vs.
Revision 1.69 by jsr166, Sat May 13 22:17:12 2017 UTC

# Line 41 | Line 41 | public class LinkedBlockingQueueTest ext
41      }
42  
43      public static Test suite() {
44 +        class Implementation implements CollectionImplementation {
45 +            public Class<?> klazz() { return LinkedBlockingQueue.class; }
46 +            public Collection emptyCollection() { return new LinkedBlockingQueue(); }
47 +            public Object makeElement(int i) { return i; }
48 +            public boolean isConcurrent() { return true; }
49 +            public boolean permitsNulls() { return false; }
50 +        }
51          return newTestSuite(LinkedBlockingQueueTest.class,
52                              new Unbounded().testSuite(),
53 <                            new Bounded().testSuite());
53 >                            new Bounded().testSuite(),
54 >                            CollectionTest.testSuite(new Implementation()));
55      }
56  
57      /**
58       * Returns a new queue of given size containing consecutive
59 <     * Integers 0 ... n.
59 >     * Integers 0 ... n - 1.
60       */
61 <    private LinkedBlockingQueue<Integer> populatedQueue(int n) {
61 >    private static LinkedBlockingQueue<Integer> populatedQueue(int n) {
62          LinkedBlockingQueue<Integer> q =
63              new LinkedBlockingQueue<Integer>(n);
64          assertTrue(q.isEmpty());
# Line 59 | Line 67 | public class LinkedBlockingQueueTest ext
67          assertFalse(q.isEmpty());
68          assertEquals(0, q.remainingCapacity());
69          assertEquals(n, q.size());
70 +        assertEquals((Integer) 0, q.peek());
71          return q;
72      }
73  
# Line 283 | Line 292 | public class LinkedBlockingQueueTest ext
292              }});
293  
294          await(pleaseInterrupt);
295 <        assertThreadStaysAlive(t);
295 >        assertThreadBlocks(t, Thread.State.WAITING);
296          t.interrupt();
297          awaitTermination(t);
298          assertEquals(SIZE, q.size());
# Line 318 | Line 327 | public class LinkedBlockingQueueTest ext
327          assertEquals(0, q.take());
328  
329          await(pleaseInterrupt);
330 <        assertThreadStaysAlive(t);
330 >        assertThreadBlocks(t, Thread.State.WAITING);
331          t.interrupt();
332          awaitTermination(t);
333          assertEquals(0, q.remainingCapacity());
# Line 345 | Line 354 | public class LinkedBlockingQueueTest ext
354              }});
355  
356          await(pleaseInterrupt);
357 <        assertThreadStaysAlive(t);
357 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
358          t.interrupt();
359          awaitTermination(t);
360      }
# Line 368 | Line 377 | public class LinkedBlockingQueueTest ext
377          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
378          Thread t = newStartedThread(new CheckedRunnable() {
379              public void realRun() throws InterruptedException {
380 <                for (int i = 0; i < SIZE; ++i) {
372 <                    assertEquals(i, q.take());
373 <                }
380 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
381  
382                  Thread.currentThread().interrupt();
383                  try {
# Line 388 | Line 395 | public class LinkedBlockingQueueTest ext
395              }});
396  
397          await(pleaseInterrupt);
398 <        assertThreadStaysAlive(t);
398 >        assertThreadBlocks(t, Thread.State.WAITING);
399          t.interrupt();
400          awaitTermination(t);
401      }
# Line 440 | Line 447 | public class LinkedBlockingQueueTest ext
447          final CountDownLatch aboutToWait = new CountDownLatch(1);
448          Thread t = newStartedThread(new CheckedRunnable() {
449              public void realRun() throws InterruptedException {
450 +                long startTime = System.nanoTime();
451                  for (int i = 0; i < SIZE; ++i) {
444 –                    long t0 = System.nanoTime();
452                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
446 –                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
453                  }
448 –                long t0 = System.nanoTime();
454                  aboutToWait.countDown();
455                  try {
456 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
456 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
457                      shouldThrow();
458                  } catch (InterruptedException success) {
459 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
459 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
460                  }
461              }});
462  
463 <        aboutToWait.await();
464 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
463 >        await(aboutToWait);
464 >        waitForThreadToEnterWaitState(t);
465          t.interrupt();
466 <        awaitTermination(t, MEDIUM_DELAY_MS);
466 >        awaitTermination(t);
467          checkEmpty(q);
468      }
469  
# Line 722 | Line 727 | public class LinkedBlockingQueueTest ext
727          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
728          q.add(one);
729          q.add(two);
725 –        ExecutorService executor = Executors.newFixedThreadPool(2);
730          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
731 <        executor.execute(new CheckedRunnable() {
732 <            public void realRun() throws InterruptedException {
733 <                assertFalse(q.offer(three));
734 <                threadsStarted.await();
735 <                assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
736 <                assertEquals(0, q.remainingCapacity());
737 <            }});
738 <
739 <        executor.execute(new CheckedRunnable() {
740 <            public void realRun() throws InterruptedException {
741 <                threadsStarted.await();
742 <                assertSame(one, q.take());
743 <            }});
744 <
745 <        joinPool(executor);
731 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
732 >        try (PoolCleaner cleaner = cleaner(executor)) {
733 >            executor.execute(new CheckedRunnable() {
734 >                public void realRun() throws InterruptedException {
735 >                    assertFalse(q.offer(three));
736 >                    threadsStarted.await();
737 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
738 >                    assertEquals(0, q.remainingCapacity());
739 >                }});
740 >
741 >            executor.execute(new CheckedRunnable() {
742 >                public void realRun() throws InterruptedException {
743 >                    threadsStarted.await();
744 >                    assertSame(one, q.take());
745 >                }});
746 >        }
747      }
748  
749      /**
# Line 747 | Line 752 | public class LinkedBlockingQueueTest ext
752      public void testPollInExecutor() {
753          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
754          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
755 <        ExecutorService executor = Executors.newFixedThreadPool(2);
756 <        executor.execute(new CheckedRunnable() {
757 <            public void realRun() throws InterruptedException {
758 <                assertNull(q.poll());
759 <                threadsStarted.await();
760 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
761 <                checkEmpty(q);
762 <            }});
763 <
764 <        executor.execute(new CheckedRunnable() {
765 <            public void realRun() throws InterruptedException {
766 <                threadsStarted.await();
767 <                q.put(one);
768 <            }});
769 <
770 <        joinPool(executor);
755 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
756 >        try (PoolCleaner cleaner = cleaner(executor)) {
757 >            executor.execute(new CheckedRunnable() {
758 >                public void realRun() throws InterruptedException {
759 >                    assertNull(q.poll());
760 >                    threadsStarted.await();
761 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
762 >                    checkEmpty(q);
763 >                }});
764 >
765 >            executor.execute(new CheckedRunnable() {
766 >                public void realRun() throws InterruptedException {
767 >                    threadsStarted.await();
768 >                    q.put(one);
769 >                }});
770 >        }
771      }
772  
773      /**

Diff Legend

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