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.60 by jsr166, Sat Feb 28 20:13:46 2015 UTC vs.
Revision 1.67 by jsr166, Wed Jun 1 16:08:04 2016 UTC

# Line 38 | Line 38 | public class PriorityBlockingQueueTest e
38      }
39  
40      public static void main(String[] args) {
41 <        junit.textui.TestRunner.run(suite());
41 >        main(suite(), args);
42      }
43  
44      public static Test suite() {
# Line 62 | Line 62 | public class PriorityBlockingQueueTest e
62          PriorityBlockingQueue<Integer> q =
63              new PriorityBlockingQueue<Integer>(n);
64          assertTrue(q.isEmpty());
65 <        for (int i = n-1; i >= 0; i -= 2)
65 >        for (int i = n - 1; i >= 0; i -= 2)
66              assertTrue(q.offer(new Integer(i)));
67          for (int i = (n & 1); i < n; i += 2)
68              assertTrue(q.offer(new Integer(i)));
# Line 116 | Line 116 | public class PriorityBlockingQueueTest e
116       */
117      public void testConstructor5() {
118          Integer[] ints = new Integer[SIZE];
119 <        for (int i = 0; i < SIZE-1; ++i)
119 >        for (int i = 0; i < SIZE - 1; ++i)
120              ints[i] = i;
121          Collection<Integer> elements = Arrays.asList(ints);
122          try {
# Line 148 | Line 148 | public class PriorityBlockingQueueTest e
148          for (int i = 0; i < SIZE; ++i)
149              ints[i] = new Integer(i);
150          q.addAll(Arrays.asList(ints));
151 <        for (int i = SIZE-1; i >= 0; --i)
151 >        for (int i = SIZE - 1; i >= 0; --i)
152              assertEquals(ints[i], q.poll());
153      }
154  
# Line 200 | Line 200 | public class PriorityBlockingQueueTest e
200          PriorityBlockingQueue q = new PriorityBlockingQueue(1);
201          try {
202              q.offer(new Object());
203 –            q.offer(new Object());
203              shouldThrow();
204 <        } catch (ClassCastException success) {}
204 >        } catch (ClassCastException success) {
205 >            assertTrue(q.isEmpty());
206 >            assertEquals(0, q.size());
207 >            assertNull(q.poll());
208 >        }
209      }
210  
211      /**
# Line 220 | Line 223 | public class PriorityBlockingQueueTest e
223       * addAll(this) throws IAE
224       */
225      public void testAddAllSelf() {
226 +        PriorityBlockingQueue q = populatedQueue(SIZE);
227          try {
224 –            PriorityBlockingQueue q = populatedQueue(SIZE);
228              q.addAll(q);
229              shouldThrow();
230          } catch (IllegalArgumentException success) {}
# Line 232 | Line 235 | public class PriorityBlockingQueueTest e
235       * possibly adding some elements
236       */
237      public void testAddAll3() {
238 +        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
239 +        Integer[] ints = new Integer[SIZE];
240 +        for (int i = 0; i < SIZE - 1; ++i)
241 +            ints[i] = new Integer(i);
242          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);
243              q.addAll(Arrays.asList(ints));
244              shouldThrow();
245          } catch (NullPointerException success) {}
# Line 248 | Line 251 | public class PriorityBlockingQueueTest e
251      public void testAddAll5() {
252          Integer[] empty = new Integer[0];
253          Integer[] ints = new Integer[SIZE];
254 <        for (int i = SIZE-1; i >= 0; --i)
254 >        for (int i = SIZE - 1; i >= 0; --i)
255              ints[i] = new Integer(i);
256          PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
257          assertFalse(q.addAll(Arrays.asList(empty)));
# Line 393 | Line 396 | public class PriorityBlockingQueueTest e
396          final CountDownLatch aboutToWait = new CountDownLatch(1);
397          Thread t = newStartedThread(new CheckedRunnable() {
398              public void realRun() throws InterruptedException {
399 +                long startTime = System.nanoTime();
400                  for (int i = 0; i < SIZE; ++i) {
397 –                    long t0 = System.nanoTime();
401                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
399 –                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
402                  }
401 –                long t0 = System.nanoTime();
403                  aboutToWait.countDown();
404                  try {
405                      q.poll(LONG_DELAY_MS, MILLISECONDS);
406                      shouldThrow();
407                  } catch (InterruptedException success) {
408 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
408 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
409                  }
410              }});
411  
412          aboutToWait.await();
413 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
413 >        waitForThreadToEnterWaitState(t, LONG_DELAY_MS);
414          t.interrupt();
415 <        awaitTermination(t, MEDIUM_DELAY_MS);
415 >        awaitTermination(t);
416      }
417  
418      /**
# Line 512 | Line 513 | public class PriorityBlockingQueueTest e
513                  assertTrue(changed);
514  
515              assertTrue(q.containsAll(p));
516 <            assertEquals(SIZE-i, q.size());
516 >            assertEquals(SIZE - i, q.size());
517              p.remove();
518          }
519      }
# Line 525 | Line 526 | public class PriorityBlockingQueueTest e
526              PriorityBlockingQueue q = populatedQueue(SIZE);
527              PriorityBlockingQueue p = populatedQueue(i);
528              assertTrue(q.removeAll(p));
529 <            assertEquals(SIZE-i, q.size());
529 >            assertEquals(SIZE - i, q.size());
530              for (int j = 0; j < i; ++j) {
531                  Integer x = (Integer)(p.remove());
532                  assertFalse(q.contains(x));
# Line 624 | Line 625 | public class PriorityBlockingQueueTest e
625      public void testPollInExecutor() {
626          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
627          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
628 <        ExecutorService executor = Executors.newFixedThreadPool(2);
629 <        executor.execute(new CheckedRunnable() {
630 <            public void realRun() throws InterruptedException {
631 <                assertNull(q.poll());
632 <                threadsStarted.await();
633 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
634 <                checkEmpty(q);
635 <            }});
636 <
637 <        executor.execute(new CheckedRunnable() {
638 <            public void realRun() throws InterruptedException {
639 <                threadsStarted.await();
640 <                q.put(one);
641 <            }});
642 <
643 <        joinPool(executor);
628 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
629 >        try (PoolCleaner cleaner = cleaner(executor)) {
630 >            executor.execute(new CheckedRunnable() {
631 >                public void realRun() throws InterruptedException {
632 >                    assertNull(q.poll());
633 >                    threadsStarted.await();
634 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
635 >                    checkEmpty(q);
636 >                }});
637 >
638 >            executor.execute(new CheckedRunnable() {
639 >                public void realRun() throws InterruptedException {
640 >                    threadsStarted.await();
641 >                    q.put(one);
642 >                }});
643 >        }
644      }
645  
646      /**
# Line 689 | Line 690 | public class PriorityBlockingQueueTest e
690          final PriorityBlockingQueue q = populatedQueue(SIZE);
691          Thread t = new Thread(new CheckedRunnable() {
692              public void realRun() {
693 <                q.put(new Integer(SIZE+1));
693 >                q.put(new Integer(SIZE + 1));
694              }});
695  
696          t.start();
# Line 706 | Line 707 | public class PriorityBlockingQueueTest e
707       * drainTo(c, n) empties first min(n, size) elements of queue into c
708       */
709      public void testDrainToN() {
710 <        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
710 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2);
711          for (int i = 0; i < SIZE + 2; ++i) {
712              for (int j = 0; j < SIZE; j++)
713                  assertTrue(q.offer(new Integer(j)));
# Line 714 | Line 715 | public class PriorityBlockingQueueTest e
715              q.drainTo(l, i);
716              int k = (i < SIZE) ? i : SIZE;
717              assertEquals(k, l.size());
718 <            assertEquals(SIZE-k, q.size());
718 >            assertEquals(SIZE - k, q.size());
719              for (int j = 0; j < k; ++j)
720                  assertEquals(l.get(j), new Integer(j));
721              do {} while (q.poll() != null);

Diff Legend

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