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.65 by jsr166, Sun Oct 4 18:49:02 2015 UTC vs.
Revision 1.69 by jsr166, Sun Oct 16 20:44:18 2016 UTC

# Line 56 | Line 56 | public class PriorityBlockingQueueTest e
56  
57      /**
58       * Returns a new queue of given size containing consecutive
59 <     * Integers 0 ... n.
59 >     * Integers 0 ... n - 1.
60       */
61      private PriorityBlockingQueue<Integer> populatedQueue(int n) {
62          PriorityBlockingQueue<Integer> q =
# Line 69 | Line 69 | public class PriorityBlockingQueueTest e
69          assertFalse(q.isEmpty());
70          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
71          assertEquals(n, q.size());
72 +        assertEquals((Integer) 0, q.peek());
73          return q;
74      }
75  
# Line 200 | Line 201 | public class PriorityBlockingQueueTest e
201          PriorityBlockingQueue q = new PriorityBlockingQueue(1);
202          try {
203              q.offer(new Object());
203 –            q.offer(new Object());
204              shouldThrow();
205 <        } catch (ClassCastException success) {}
205 >        } catch (ClassCastException success) {
206 >            assertTrue(q.isEmpty());
207 >            assertEquals(0, q.size());
208 >            assertNull(q.poll());
209 >        }
210      }
211  
212      /**
# Line 393 | Line 397 | public class PriorityBlockingQueueTest e
397          final CountDownLatch aboutToWait = new CountDownLatch(1);
398          Thread t = newStartedThread(new CheckedRunnable() {
399              public void realRun() throws InterruptedException {
400 +                long startTime = System.nanoTime();
401                  for (int i = 0; i < SIZE; ++i) {
397 –                    long t0 = System.nanoTime();
402                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
399 –                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
403                  }
401 –                long t0 = System.nanoTime();
404                  aboutToWait.countDown();
405                  try {
406                      q.poll(LONG_DELAY_MS, MILLISECONDS);
407                      shouldThrow();
408                  } catch (InterruptedException success) {
409 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
409 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
410                  }
411              }});
412  
413          aboutToWait.await();
414 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
414 >        waitForThreadToEnterWaitState(t);
415          t.interrupt();
416 <        awaitTermination(t, MEDIUM_DELAY_MS);
416 >        awaitTermination(t);
417      }
418  
419      /**

Diff Legend

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