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.76 by jsr166, Fri Aug 4 03:30:21 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 305 | Line 314 | public class LinkedBlockingQueueTest ext
314                  pleaseTake.countDown();
315                  q.put(86);
316  
317 +                Thread.currentThread().interrupt();
318 +                try {
319 +                    q.put(99);
320 +                    shouldThrow();
321 +                } catch (InterruptedException success) {}
322 +                assertFalse(Thread.interrupted());
323 +
324                  pleaseInterrupt.countDown();
325                  try {
326                      q.put(99);
# Line 318 | Line 334 | public class LinkedBlockingQueueTest ext
334          assertEquals(0, q.take());
335  
336          await(pleaseInterrupt);
337 <        assertThreadStaysAlive(t);
337 >        assertThreadBlocks(t, Thread.State.WAITING);
338          t.interrupt();
339          awaitTermination(t);
340          assertEquals(0, q.remainingCapacity());
# Line 334 | Line 350 | public class LinkedBlockingQueueTest ext
350              public void realRun() throws InterruptedException {
351                  q.put(new Object());
352                  q.put(new Object());
353 +
354                  long startTime = System.nanoTime();
355                  assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
356                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
357 +
358 +                Thread.currentThread().interrupt();
359 +                try {
360 +                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
361 +                    shouldThrow();
362 +                } catch (InterruptedException success) {}
363 +                assertFalse(Thread.interrupted());
364 +
365                  pleaseInterrupt.countDown();
366                  try {
367                      q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
368                      shouldThrow();
369                  } catch (InterruptedException success) {}
370 +                assertFalse(Thread.interrupted());
371              }});
372  
373          await(pleaseInterrupt);
374 <        assertThreadStaysAlive(t);
374 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
375          t.interrupt();
376          awaitTermination(t);
377      }
# Line 368 | Line 394 | public class LinkedBlockingQueueTest ext
394          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
395          Thread t = newStartedThread(new CheckedRunnable() {
396              public void realRun() throws InterruptedException {
397 <                for (int i = 0; i < SIZE; ++i) {
372 <                    assertEquals(i, q.take());
373 <                }
397 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
398  
399                  Thread.currentThread().interrupt();
400                  try {
# Line 388 | Line 412 | public class LinkedBlockingQueueTest ext
412              }});
413  
414          await(pleaseInterrupt);
415 <        assertThreadStaysAlive(t);
415 >        assertThreadBlocks(t, Thread.State.WAITING);
416          t.interrupt();
417          awaitTermination(t);
418      }
# Line 437 | Line 461 | public class LinkedBlockingQueueTest ext
461       */
462      public void testInterruptedTimedPoll() throws InterruptedException {
463          final BlockingQueue<Integer> q = populatedQueue(SIZE);
464 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
464 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
465          Thread t = newStartedThread(new CheckedRunnable() {
466              public void realRun() throws InterruptedException {
467 <                for (int i = 0; i < SIZE; ++i) {
468 <                    long t0 = System.nanoTime();
467 >                long startTime = System.nanoTime();
468 >                for (int i = 0; i < SIZE; i++)
469                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
470 <                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
471 <                }
472 <                long t0 = System.nanoTime();
473 <                aboutToWait.countDown();
470 >
471 >                Thread.currentThread().interrupt();
472 >                try {
473 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
474 >                    shouldThrow();
475 >                } catch (InterruptedException success) {}
476 >                assertFalse(Thread.interrupted());
477 >
478 >                pleaseInterrupt.countDown();
479                  try {
480 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
480 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
481                      shouldThrow();
482 <                } catch (InterruptedException success) {
483 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
484 <                }
482 >                } catch (InterruptedException success) {}
483 >                assertFalse(Thread.interrupted());
484 >
485 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
486              }});
487  
488 <        aboutToWait.await();
489 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
488 >        await(pleaseInterrupt);
489 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
490          t.interrupt();
491 <        awaitTermination(t, MEDIUM_DELAY_MS);
491 >        awaitTermination(t);
492          checkEmpty(q);
493      }
494  
# Line 722 | Line 752 | public class LinkedBlockingQueueTest ext
752          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
753          q.add(one);
754          q.add(two);
725 –        ExecutorService executor = Executors.newFixedThreadPool(2);
755          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
756 <        executor.execute(new CheckedRunnable() {
757 <            public void realRun() throws InterruptedException {
758 <                assertFalse(q.offer(three));
759 <                threadsStarted.await();
760 <                assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
761 <                assertEquals(0, q.remainingCapacity());
762 <            }});
763 <
764 <        executor.execute(new CheckedRunnable() {
765 <            public void realRun() throws InterruptedException {
766 <                threadsStarted.await();
767 <                assertSame(one, q.take());
768 <            }});
769 <
770 <        joinPool(executor);
756 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
757 >        try (PoolCleaner cleaner = cleaner(executor)) {
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      }
773  
774      /**
# Line 747 | Line 777 | public class LinkedBlockingQueueTest ext
777      public void testPollInExecutor() {
778          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
779          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
780 <        ExecutorService executor = Executors.newFixedThreadPool(2);
781 <        executor.execute(new CheckedRunnable() {
782 <            public void realRun() throws InterruptedException {
783 <                assertNull(q.poll());
784 <                threadsStarted.await();
785 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
786 <                checkEmpty(q);
787 <            }});
788 <
789 <        executor.execute(new CheckedRunnable() {
790 <            public void realRun() throws InterruptedException {
791 <                threadsStarted.await();
792 <                q.put(one);
793 <            }});
794 <
795 <        joinPool(executor);
780 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
781 >        try (PoolCleaner cleaner = cleaner(executor)) {
782 >            executor.execute(new CheckedRunnable() {
783 >                public void realRun() throws InterruptedException {
784 >                    assertNull(q.poll());
785 >                    threadsStarted.await();
786 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
787 >                    checkEmpty(q);
788 >                }});
789 >
790 >            executor.execute(new CheckedRunnable() {
791 >                public void realRun() throws InterruptedException {
792 >                    threadsStarted.await();
793 >                    q.put(one);
794 >                }});
795 >        }
796      }
797  
798      /**
799 <     * A deserialized serialized queue has same elements in same order
799 >     * A deserialized/reserialized queue has same elements in same order
800       */
801      public void testSerialization() throws Exception {
802          Queue x = populatedQueue(SIZE);

Diff Legend

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