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

Comparing jsr166/src/test/tck/PriorityBlockingQueueTest.java (file contents):
Revision 1.61 by jsr166, Sat Apr 25 04:55:31 2015 UTC vs.
Revision 1.75 by jsr166, Sun May 14 00:48:20 2017 UTC

# Line 42 | Line 42 | public class PriorityBlockingQueueTest e
42      }
43  
44      public static Test suite() {
45 +        class Implementation implements CollectionImplementation {
46 +            public Class<?> klazz() { return PriorityBlockingQueue.class; }
47 +            public Collection emptyCollection() { return new PriorityBlockingQueue(); }
48 +            public Object makeElement(int i) { return i; }
49 +            public boolean isConcurrent() { return true; }
50 +            public boolean permitsNulls() { return false; }
51 +        }
52          return newTestSuite(PriorityBlockingQueueTest.class,
53                              new Generic().testSuite(),
54 <                            new InitialCapacity().testSuite());
54 >                            new InitialCapacity().testSuite(),
55 >                            CollectionTest.testSuite(new Implementation()));
56      }
57  
58      /** Sample Comparator */
# Line 56 | Line 64 | public class PriorityBlockingQueueTest e
64  
65      /**
66       * Returns a new queue of given size containing consecutive
67 <     * Integers 0 ... n.
67 >     * Integers 0 ... n - 1.
68       */
69 <    private PriorityBlockingQueue<Integer> populatedQueue(int n) {
69 >    private static PriorityBlockingQueue<Integer> populatedQueue(int n) {
70          PriorityBlockingQueue<Integer> q =
71              new PriorityBlockingQueue<Integer>(n);
72          assertTrue(q.isEmpty());
73 <        for (int i = n-1; i >= 0; i -= 2)
73 >        for (int i = n - 1; i >= 0; i -= 2)
74              assertTrue(q.offer(new Integer(i)));
75          for (int i = (n & 1); i < n; i += 2)
76              assertTrue(q.offer(new Integer(i)));
77          assertFalse(q.isEmpty());
78          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
79          assertEquals(n, q.size());
80 +        assertEquals((Integer) 0, q.peek());
81          return q;
82      }
83  
# Line 116 | Line 125 | public class PriorityBlockingQueueTest e
125       */
126      public void testConstructor5() {
127          Integer[] ints = new Integer[SIZE];
128 <        for (int i = 0; i < SIZE-1; ++i)
128 >        for (int i = 0; i < SIZE - 1; ++i)
129              ints[i] = i;
130          Collection<Integer> elements = Arrays.asList(ints);
131          try {
# Line 148 | Line 157 | public class PriorityBlockingQueueTest e
157          for (int i = 0; i < SIZE; ++i)
158              ints[i] = new Integer(i);
159          q.addAll(Arrays.asList(ints));
160 <        for (int i = SIZE-1; i >= 0; --i)
160 >        for (int i = SIZE - 1; i >= 0; --i)
161              assertEquals(ints[i], q.poll());
162      }
163  
# Line 200 | Line 209 | public class PriorityBlockingQueueTest e
209          PriorityBlockingQueue q = new PriorityBlockingQueue(1);
210          try {
211              q.offer(new Object());
203 –            q.offer(new Object());
212              shouldThrow();
213 <        } catch (ClassCastException success) {}
213 >        } catch (ClassCastException success) {
214 >            assertTrue(q.isEmpty());
215 >            assertEquals(0, q.size());
216 >            assertNull(q.poll());
217 >        }
218      }
219  
220      /**
# Line 220 | Line 232 | public class PriorityBlockingQueueTest e
232       * addAll(this) throws IAE
233       */
234      public void testAddAllSelf() {
235 +        PriorityBlockingQueue q = populatedQueue(SIZE);
236          try {
224 –            PriorityBlockingQueue q = populatedQueue(SIZE);
237              q.addAll(q);
238              shouldThrow();
239          } catch (IllegalArgumentException success) {}
# Line 232 | Line 244 | public class PriorityBlockingQueueTest e
244       * possibly adding some elements
245       */
246      public void testAddAll3() {
247 +        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
248 +        Integer[] ints = new Integer[SIZE];
249 +        for (int i = 0; i < SIZE - 1; ++i)
250 +            ints[i] = new Integer(i);
251          try {
236 –            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
237 –            Integer[] ints = new Integer[SIZE];
238 –            for (int i = 0; i < SIZE-1; ++i)
239 –                ints[i] = new Integer(i);
252              q.addAll(Arrays.asList(ints));
253              shouldThrow();
254          } catch (NullPointerException success) {}
# Line 248 | Line 260 | public class PriorityBlockingQueueTest e
260      public void testAddAll5() {
261          Integer[] empty = new Integer[0];
262          Integer[] ints = new Integer[SIZE];
263 <        for (int i = SIZE-1; i >= 0; --i)
263 >        for (int i = SIZE - 1; i >= 0; --i)
264              ints[i] = new Integer(i);
265          PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
266          assertFalse(q.addAll(Arrays.asList(empty)));
# Line 321 | Line 333 | public class PriorityBlockingQueueTest e
333          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
334          Thread t = newStartedThread(new CheckedRunnable() {
335              public void realRun() throws InterruptedException {
336 <                for (int i = 0; i < SIZE; ++i) {
325 <                    assertEquals(i, q.take());
326 <                }
336 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
337  
338                  Thread.currentThread().interrupt();
339                  try {
# Line 341 | Line 351 | public class PriorityBlockingQueueTest e
351              }});
352  
353          await(pleaseInterrupt);
354 <        assertThreadStaysAlive(t);
354 >        assertThreadBlocks(t, Thread.State.WAITING);
355          t.interrupt();
356          awaitTermination(t);
357      }
# Line 390 | Line 400 | public class PriorityBlockingQueueTest e
400       */
401      public void testInterruptedTimedPoll() throws InterruptedException {
402          final BlockingQueue<Integer> q = populatedQueue(SIZE);
403 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
403 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
404          Thread t = newStartedThread(new CheckedRunnable() {
405              public void realRun() throws InterruptedException {
406 +                long startTime = System.nanoTime();
407                  for (int i = 0; i < SIZE; ++i) {
397 –                    long t0 = System.nanoTime();
408                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
399 –                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
409                  }
410 <                long t0 = System.nanoTime();
411 <                aboutToWait.countDown();
410 >
411 >                pleaseInterrupt.countDown();
412                  try {
413                      q.poll(LONG_DELAY_MS, MILLISECONDS);
414                      shouldThrow();
415 <                } catch (InterruptedException success) {
416 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
417 <                }
415 >                } catch (InterruptedException success) {}
416 >                assertFalse(Thread.interrupted());
417 >
418 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
419              }});
420  
421 <        aboutToWait.await();
422 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
421 >        await(pleaseInterrupt);
422 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
423          t.interrupt();
424 <        awaitTermination(t, MEDIUM_DELAY_MS);
424 >        awaitTermination(t);
425      }
426  
427      /**
# Line 512 | Line 522 | public class PriorityBlockingQueueTest e
522                  assertTrue(changed);
523  
524              assertTrue(q.containsAll(p));
525 <            assertEquals(SIZE-i, q.size());
525 >            assertEquals(SIZE - i, q.size());
526              p.remove();
527          }
528      }
# Line 525 | Line 535 | public class PriorityBlockingQueueTest e
535              PriorityBlockingQueue q = populatedQueue(SIZE);
536              PriorityBlockingQueue p = populatedQueue(i);
537              assertTrue(q.removeAll(p));
538 <            assertEquals(SIZE-i, q.size());
538 >            assertEquals(SIZE - i, q.size());
539              for (int j = 0; j < i; ++j) {
540                  Integer x = (Integer)(p.remove());
541                  assertFalse(q.contains(x));
# Line 624 | Line 634 | public class PriorityBlockingQueueTest e
634      public void testPollInExecutor() {
635          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
636          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
637 <        ExecutorService executor = Executors.newFixedThreadPool(2);
638 <        executor.execute(new CheckedRunnable() {
639 <            public void realRun() throws InterruptedException {
640 <                assertNull(q.poll());
641 <                threadsStarted.await();
642 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
643 <                checkEmpty(q);
644 <            }});
645 <
646 <        executor.execute(new CheckedRunnable() {
647 <            public void realRun() throws InterruptedException {
648 <                threadsStarted.await();
649 <                q.put(one);
650 <            }});
651 <
652 <        joinPool(executor);
637 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
638 >        try (PoolCleaner cleaner = cleaner(executor)) {
639 >            executor.execute(new CheckedRunnable() {
640 >                public void realRun() throws InterruptedException {
641 >                    assertNull(q.poll());
642 >                    threadsStarted.await();
643 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
644 >                    checkEmpty(q);
645 >                }});
646 >
647 >            executor.execute(new CheckedRunnable() {
648 >                public void realRun() throws InterruptedException {
649 >                    threadsStarted.await();
650 >                    q.put(one);
651 >                }});
652 >        }
653      }
654  
655      /**
# Line 689 | Line 699 | public class PriorityBlockingQueueTest e
699          final PriorityBlockingQueue q = populatedQueue(SIZE);
700          Thread t = new Thread(new CheckedRunnable() {
701              public void realRun() {
702 <                q.put(new Integer(SIZE+1));
702 >                q.put(new Integer(SIZE + 1));
703              }});
704  
705          t.start();
# Line 706 | Line 716 | public class PriorityBlockingQueueTest e
716       * drainTo(c, n) empties first min(n, size) elements of queue into c
717       */
718      public void testDrainToN() {
719 <        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
719 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2);
720          for (int i = 0; i < SIZE + 2; ++i) {
721              for (int j = 0; j < SIZE; j++)
722                  assertTrue(q.offer(new Integer(j)));
# Line 714 | Line 724 | public class PriorityBlockingQueueTest e
724              q.drainTo(l, i);
725              int k = (i < SIZE) ? i : SIZE;
726              assertEquals(k, l.size());
727 <            assertEquals(SIZE-k, q.size());
727 >            assertEquals(SIZE - k, q.size());
728              for (int j = 0; j < k; ++j)
729                  assertEquals(l.get(j), new Integer(j));
730              do {} while (q.poll() != null);

Diff Legend

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