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.52 by jsr166, Thu May 30 03:28:55 2013 UTC vs.
Revision 1.71 by jsr166, Sun May 14 00:48:20 2017 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.Arrays;
9 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 >
11   import java.util.ArrayList;
12 + import java.util.Arrays;
13   import java.util.Collection;
14   import java.util.Iterator;
15   import java.util.NoSuchElementException;
16   import java.util.Queue;
17   import java.util.concurrent.BlockingQueue;
18   import java.util.concurrent.CountDownLatch;
18 import java.util.concurrent.LinkedBlockingQueue;
19   import java.util.concurrent.Executors;
20   import java.util.concurrent.ExecutorService;
21 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
21 > import java.util.concurrent.LinkedBlockingQueue;
22 >
23 > import junit.framework.Test;
24  
25   public class LinkedBlockingQueueTest extends JSR166TestCase {
26  
# Line 35 | 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() {
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 57 | 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 106 | Line 117 | public class LinkedBlockingQueueTest ext
117       */
118      public void testConstructor5() {
119          Integer[] ints = new Integer[SIZE];
120 <        for (int i = 0; i < SIZE-1; ++i)
120 >        for (int i = 0; i < SIZE - 1; ++i)
121              ints[i] = new Integer(i);
122          Collection<Integer> elements = Arrays.asList(ints);
123          try {
# Line 146 | Line 157 | public class LinkedBlockingQueueTest ext
157       * remainingCapacity decreases on add, increases on remove
158       */
159      public void testRemainingCapacity() {
160 <        LinkedBlockingQueue q = populatedQueue(SIZE);
160 >        BlockingQueue q = populatedQueue(SIZE);
161          for (int i = 0; i < SIZE; ++i) {
162              assertEquals(i, q.remainingCapacity());
163 <            assertEquals(SIZE-i, q.size());
164 <            q.remove();
163 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
164 >            assertEquals(i, q.remove());
165          }
166          for (int i = 0; i < SIZE; ++i) {
167 <            assertEquals(SIZE-i, q.remainingCapacity());
168 <            assertEquals(i, q.size());
169 <            q.add(new Integer(i));
167 >            assertEquals(SIZE - i, q.remainingCapacity());
168 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
169 >            assertTrue(q.add(i));
170          }
171      }
172  
# Line 200 | Line 211 | public class LinkedBlockingQueueTest ext
211      public void testAddAll3() {
212          LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
213          Integer[] ints = new Integer[SIZE];
214 <        for (int i = 0; i < SIZE-1; ++i)
214 >        for (int i = 0; i < SIZE - 1; ++i)
215              ints[i] = new Integer(i);
216          Collection<Integer> elements = Arrays.asList(ints);
217          try {
# Line 245 | Line 256 | public class LinkedBlockingQueueTest ext
256      public void testPut() throws InterruptedException {
257          LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
258          for (int i = 0; i < SIZE; ++i) {
259 <            Integer I = new Integer(i);
260 <            q.put(I);
261 <            assertTrue(q.contains(I));
259 >            Integer x = new Integer(i);
260 >            q.put(x);
261 >            assertTrue(q.contains(x));
262          }
263          assertEquals(0, q.remainingCapacity());
264      }
# Line 281 | 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 316 | 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 343 | 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 366 | 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) {
370 <                    assertEquals(i, q.take());
371 <                }
380 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
381  
382                  Thread.currentThread().interrupt();
383                  try {
# Line 386 | 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 435 | Line 444 | public class LinkedBlockingQueueTest ext
444       */
445      public void testInterruptedTimedPoll() throws InterruptedException {
446          final BlockingQueue<Integer> q = populatedQueue(SIZE);
447 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
447 >        final CountDownLatch pleaseInterrupt = 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) {
442                    long t0 = System.nanoTime();
452                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
444                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
453                  }
454 <                long t0 = System.nanoTime();
455 <                aboutToWait.countDown();
454 >
455 >                pleaseInterrupt.countDown();
456                  try {
457 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
457 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
458                      shouldThrow();
459 <                } catch (InterruptedException success) {
460 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
461 <                }
459 >                } catch (InterruptedException success) {}
460 >                assertFalse(Thread.interrupted());
461 >
462 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
463              }});
464  
465 <        aboutToWait.await();
466 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
465 >        await(pleaseInterrupt);
466 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
467          t.interrupt();
468 <        awaitTermination(t, MEDIUM_DELAY_MS);
468 >        awaitTermination(t);
469          checkEmpty(q);
470      }
471  
# Line 572 | Line 581 | public class LinkedBlockingQueueTest ext
581                  assertTrue(changed);
582  
583              assertTrue(q.containsAll(p));
584 <            assertEquals(SIZE-i, q.size());
584 >            assertEquals(SIZE - i, q.size());
585              p.remove();
586          }
587      }
# Line 585 | Line 594 | public class LinkedBlockingQueueTest ext
594              LinkedBlockingQueue q = populatedQueue(SIZE);
595              LinkedBlockingQueue p = populatedQueue(i);
596              assertTrue(q.removeAll(p));
597 <            assertEquals(SIZE-i, q.size());
597 >            assertEquals(SIZE - i, q.size());
598              for (int j = 0; j < i; ++j) {
599 <                Integer I = (Integer)(p.remove());
600 <                assertFalse(q.contains(I));
599 >                Integer x = (Integer)(p.remove());
600 >                assertFalse(q.contains(x));
601              }
602          }
603      }
# Line 632 | Line 641 | public class LinkedBlockingQueueTest ext
641      public void testIterator() throws InterruptedException {
642          LinkedBlockingQueue q = populatedQueue(SIZE);
643          Iterator it = q.iterator();
644 <        while (it.hasNext()) {
644 >        int i;
645 >        for (i = 0; it.hasNext(); i++)
646 >            assertTrue(q.contains(it.next()));
647 >        assertEquals(i, SIZE);
648 >        assertIteratorExhausted(it);
649 >
650 >        it = q.iterator();
651 >        for (i = 0; it.hasNext(); i++)
652              assertEquals(it.next(), q.take());
653 <        }
653 >        assertEquals(i, SIZE);
654 >        assertIteratorExhausted(it);
655 >    }
656 >
657 >    /**
658 >     * iterator of empty collection has no elements
659 >     */
660 >    public void testEmptyIterator() {
661 >        assertIteratorExhausted(new LinkedBlockingQueue().iterator());
662      }
663  
664      /**
# Line 705 | Line 729 | public class LinkedBlockingQueueTest ext
729          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
730          q.add(one);
731          q.add(two);
708        ExecutorService executor = Executors.newFixedThreadPool(2);
732          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
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 <        joinPool(executor);
733 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
734 >        try (PoolCleaner cleaner = cleaner(executor)) {
735 >            executor.execute(new CheckedRunnable() {
736 >                public void realRun() throws InterruptedException {
737 >                    assertFalse(q.offer(three));
738 >                    threadsStarted.await();
739 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
740 >                    assertEquals(0, q.remainingCapacity());
741 >                }});
742 >
743 >            executor.execute(new CheckedRunnable() {
744 >                public void realRun() throws InterruptedException {
745 >                    threadsStarted.await();
746 >                    assertSame(one, q.take());
747 >                }});
748 >        }
749      }
750  
751      /**
# Line 730 | Line 754 | public class LinkedBlockingQueueTest ext
754      public void testPollInExecutor() {
755          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
756          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
757 <        ExecutorService executor = Executors.newFixedThreadPool(2);
758 <        executor.execute(new CheckedRunnable() {
759 <            public void realRun() throws InterruptedException {
760 <                assertNull(q.poll());
761 <                threadsStarted.await();
762 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
763 <                checkEmpty(q);
764 <            }});
765 <
766 <        executor.execute(new CheckedRunnable() {
767 <            public void realRun() throws InterruptedException {
768 <                threadsStarted.await();
769 <                q.put(one);
770 <            }});
771 <
772 <        joinPool(executor);
757 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
758 >        try (PoolCleaner cleaner = cleaner(executor)) {
759 >            executor.execute(new CheckedRunnable() {
760 >                public void realRun() throws InterruptedException {
761 >                    assertNull(q.poll());
762 >                    threadsStarted.await();
763 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
764 >                    checkEmpty(q);
765 >                }});
766 >
767 >            executor.execute(new CheckedRunnable() {
768 >                public void realRun() throws InterruptedException {
769 >                    threadsStarted.await();
770 >                    q.put(one);
771 >                }});
772 >        }
773      }
774  
775      /**
# Line 797 | Line 821 | public class LinkedBlockingQueueTest ext
821          final LinkedBlockingQueue q = populatedQueue(SIZE);
822          Thread t = new Thread(new CheckedRunnable() {
823              public void realRun() throws InterruptedException {
824 <                q.put(new Integer(SIZE+1));
824 >                q.put(new Integer(SIZE + 1));
825              }});
826  
827          t.start();
# Line 822 | Line 846 | public class LinkedBlockingQueueTest ext
846              q.drainTo(l, i);
847              int k = (i < SIZE) ? i : SIZE;
848              assertEquals(k, l.size());
849 <            assertEquals(SIZE-k, q.size());
849 >            assertEquals(SIZE - k, q.size());
850              for (int j = 0; j < k; ++j)
851                  assertEquals(l.get(j), new Integer(j));
852 <            while (q.poll() != null) ;
852 >            do {} while (q.poll() != null);
853 >        }
854 >    }
855 >
856 >    /**
857 >     * remove(null), contains(null) always return false
858 >     */
859 >    public void testNeverContainsNull() {
860 >        Collection<?>[] qs = {
861 >            new LinkedBlockingQueue<Object>(),
862 >            populatedQueue(2),
863 >        };
864 >
865 >        for (Collection<?> q : qs) {
866 >            assertFalse(q.contains(null));
867 >            assertFalse(q.remove(null));
868          }
869      }
870  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines