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.80 by jsr166, Thu Sep 5 20:54:24 2019 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) {
62 <        LinkedBlockingQueue<Integer> q =
55 <            new LinkedBlockingQueue<Integer>(n);
61 >    private static LinkedBlockingQueue<Integer> populatedQueue(int n) {
62 >        LinkedBlockingQueue<Integer> q = new LinkedBlockingQueue<>(n);
63          assertTrue(q.isEmpty());
64          for (int i = 0; i < n; i++)
65              assertTrue(q.offer(new Integer(i)));
66          assertFalse(q.isEmpty());
67          assertEquals(0, q.remainingCapacity());
68          assertEquals(n, q.size());
69 +        assertEquals((Integer) 0, q.peek());
70          return q;
71      }
72  
# Line 283 | Line 291 | public class LinkedBlockingQueueTest ext
291              }});
292  
293          await(pleaseInterrupt);
294 <        assertThreadStaysAlive(t);
294 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
295          t.interrupt();
296          awaitTermination(t);
297          assertEquals(SIZE, q.size());
# Line 305 | Line 313 | public class LinkedBlockingQueueTest ext
313                  pleaseTake.countDown();
314                  q.put(86);
315  
316 +                Thread.currentThread().interrupt();
317 +                try {
318 +                    q.put(99);
319 +                    shouldThrow();
320 +                } catch (InterruptedException success) {}
321 +                assertFalse(Thread.interrupted());
322 +
323                  pleaseInterrupt.countDown();
324                  try {
325                      q.put(99);
# Line 318 | Line 333 | public class LinkedBlockingQueueTest ext
333          assertEquals(0, q.take());
334  
335          await(pleaseInterrupt);
336 <        assertThreadStaysAlive(t);
336 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
337          t.interrupt();
338          awaitTermination(t);
339          assertEquals(0, q.remainingCapacity());
# Line 335 | Line 350 | public class LinkedBlockingQueueTest ext
350                  q.put(new Object());
351                  q.put(new Object());
352                  long startTime = System.nanoTime();
353 +
354                  assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
355                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
356 +
357 +                Thread.currentThread().interrupt();
358 +                try {
359 +                    q.offer(new Object(), randomTimeout(), randomTimeUnit());
360 +                    shouldThrow();
361 +                } catch (InterruptedException success) {}
362 +                assertFalse(Thread.interrupted());
363 +
364                  pleaseInterrupt.countDown();
365                  try {
366 <                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
366 >                    q.offer(new Object(), LONGER_DELAY_MS, MILLISECONDS);
367                      shouldThrow();
368                  } catch (InterruptedException success) {}
369 +                assertFalse(Thread.interrupted());
370              }});
371  
372          await(pleaseInterrupt);
373 <        assertThreadStaysAlive(t);
373 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
374          t.interrupt();
375          awaitTermination(t);
376      }
# Line 368 | Line 393 | public class LinkedBlockingQueueTest ext
393          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
394          Thread t = newStartedThread(new CheckedRunnable() {
395              public void realRun() throws InterruptedException {
396 <                for (int i = 0; i < SIZE; ++i) {
372 <                    assertEquals(i, q.take());
373 <                }
396 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
397  
398                  Thread.currentThread().interrupt();
399                  try {
# Line 388 | Line 411 | public class LinkedBlockingQueueTest ext
411              }});
412  
413          await(pleaseInterrupt);
414 <        assertThreadStaysAlive(t);
414 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
415          t.interrupt();
416          awaitTermination(t);
417      }
# Line 437 | Line 460 | public class LinkedBlockingQueueTest ext
460       */
461      public void testInterruptedTimedPoll() throws InterruptedException {
462          final BlockingQueue<Integer> q = populatedQueue(SIZE);
463 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
463 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
464          Thread t = newStartedThread(new CheckedRunnable() {
465              public void realRun() throws InterruptedException {
466 <                for (int i = 0; i < SIZE; ++i) {
467 <                    long t0 = System.nanoTime();
466 >                long startTime = System.nanoTime();
467 >                for (int i = 0; i < SIZE; i++)
468                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
469 <                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
470 <                }
448 <                long t0 = System.nanoTime();
449 <                aboutToWait.countDown();
469 >
470 >                Thread.currentThread().interrupt();
471                  try {
472 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
472 >                    q.poll(randomTimeout(), randomTimeUnit());
473                      shouldThrow();
474 <                } catch (InterruptedException success) {
475 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
476 <                }
474 >                } catch (InterruptedException success) {}
475 >                assertFalse(Thread.interrupted());
476 >
477 >                pleaseInterrupt.countDown();
478 >                try {
479 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
480 >                    shouldThrow();
481 >                } catch (InterruptedException success) {}
482 >                assertFalse(Thread.interrupted());
483 >
484 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
485              }});
486  
487 <        aboutToWait.await();
488 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
487 >        await(pleaseInterrupt);
488 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
489          t.interrupt();
490 <        awaitTermination(t, MEDIUM_DELAY_MS);
490 >        awaitTermination(t);
491          checkEmpty(q);
492      }
493  
# Line 600 | Line 629 | public class LinkedBlockingQueueTest ext
629       */
630      public void testToArray() {
631          LinkedBlockingQueue q = populatedQueue(SIZE);
632 <        Object[] o = q.toArray();
633 <        for (int i = 0; i < o.length; i++)
634 <            assertSame(o[i], q.poll());
632 >        Object[] a = q.toArray();
633 >        assertSame(Object[].class, a.getClass());
634 >        for (Object o : a)
635 >            assertSame(o, q.poll());
636 >        assertTrue(q.isEmpty());
637      }
638  
639      /**
# Line 613 | Line 644 | public class LinkedBlockingQueueTest ext
644          Integer[] ints = new Integer[SIZE];
645          Integer[] array = q.toArray(ints);
646          assertSame(ints, array);
647 <        for (int i = 0; i < ints.length; i++)
648 <            assertSame(ints[i], q.poll());
647 >        for (Integer o : ints)
648 >            assertSame(o, q.poll());
649 >        assertTrue(q.isEmpty());
650      }
651  
652      /**
# Line 722 | Line 754 | public class LinkedBlockingQueueTest ext
754          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
755          q.add(one);
756          q.add(two);
725 –        ExecutorService executor = Executors.newFixedThreadPool(2);
757          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
758 <        executor.execute(new CheckedRunnable() {
759 <            public void realRun() throws InterruptedException {
760 <                assertFalse(q.offer(three));
761 <                threadsStarted.await();
762 <                assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
763 <                assertEquals(0, q.remainingCapacity());
764 <            }});
765 <
766 <        executor.execute(new CheckedRunnable() {
767 <            public void realRun() throws InterruptedException {
768 <                threadsStarted.await();
769 <                assertSame(one, q.take());
770 <            }});
771 <
772 <        joinPool(executor);
758 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
759 >        try (PoolCleaner cleaner = cleaner(executor)) {
760 >            executor.execute(new CheckedRunnable() {
761 >                public void realRun() throws InterruptedException {
762 >                    assertFalse(q.offer(three));
763 >                    threadsStarted.await();
764 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
765 >                    assertEquals(0, q.remainingCapacity());
766 >                }});
767 >
768 >            executor.execute(new CheckedRunnable() {
769 >                public void realRun() throws InterruptedException {
770 >                    threadsStarted.await();
771 >                    assertSame(one, q.take());
772 >                }});
773 >        }
774      }
775  
776      /**
# Line 747 | Line 779 | public class LinkedBlockingQueueTest ext
779      public void testPollInExecutor() {
780          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
781          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
782 <        ExecutorService executor = Executors.newFixedThreadPool(2);
783 <        executor.execute(new CheckedRunnable() {
784 <            public void realRun() throws InterruptedException {
785 <                assertNull(q.poll());
786 <                threadsStarted.await();
787 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
788 <                checkEmpty(q);
789 <            }});
790 <
791 <        executor.execute(new CheckedRunnable() {
792 <            public void realRun() throws InterruptedException {
793 <                threadsStarted.await();
794 <                q.put(one);
795 <            }});
796 <
797 <        joinPool(executor);
782 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
783 >        try (PoolCleaner cleaner = cleaner(executor)) {
784 >            executor.execute(new CheckedRunnable() {
785 >                public void realRun() throws InterruptedException {
786 >                    assertNull(q.poll());
787 >                    threadsStarted.await();
788 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
789 >                    checkEmpty(q);
790 >                }});
791 >
792 >            executor.execute(new CheckedRunnable() {
793 >                public void realRun() throws InterruptedException {
794 >                    threadsStarted.await();
795 >                    q.put(one);
796 >                }});
797 >        }
798      }
799  
800      /**
801 <     * A deserialized serialized queue has same elements in same order
801 >     * A deserialized/reserialized queue has same elements in same order
802       */
803      public void testSerialization() throws Exception {
804          Queue x = populatedQueue(SIZE);

Diff Legend

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