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

Comparing jsr166/src/test/tck/DelayQueueTest.java (file contents):
Revision 1.84 by jsr166, Sat May 13 22:21:55 2017 UTC vs.
Revision 1.90 by jsr166, Sun Jul 22 21:42:14 2018 UTC

# Line 69 | Line 69 | public class DelayQueueTest extends JSR1
69          // suppress [overrides] javac warning
70          public int hashCode() { return pseudodelay; }
71          public long getDelay(TimeUnit ignore) {
72 <            return Integer.MIN_VALUE + pseudodelay;
72 >            return (long) Integer.MIN_VALUE + pseudodelay;
73          }
74          public String toString() {
75              return String.valueOf(pseudodelay);
# Line 234 | Line 234 | public class DelayQueueTest extends JSR1
234      }
235  
236      /**
237 <     * addAll(this) throws IAE
237 >     * addAll(this) throws IllegalArgumentException
238       */
239      public void testAddAllSelf() {
240          DelayQueue q = populatedQueue(SIZE);
# Line 410 | Line 410 | public class DelayQueueTest extends JSR1
410          Thread t = newStartedThread(new CheckedRunnable() {
411              public void realRun() throws InterruptedException {
412                  long startTime = System.nanoTime();
413 <                for (int i = 0; i < SIZE; ++i) {
413 >                for (int i = 0; i < SIZE; i++)
414                      assertEquals(new PDelay(i),
415                                   ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
416 –                }
416  
417                  Thread.currentThread().interrupt();
418                  try {
# Line 428 | Line 427 | public class DelayQueueTest extends JSR1
427                      shouldThrow();
428                  } catch (InterruptedException success) {}
429                  assertFalse(Thread.interrupted());
430 +
431                  assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
432              }});
433  
434          await(pleaseInterrupt);
435 <        assertThreadStaysAlive(t);
435 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
436          t.interrupt();
437          awaitTermination(t);
438          checkEmpty(q);
# Line 566 | Line 566 | public class DelayQueueTest extends JSR1
566       */
567      public void testToArray() throws InterruptedException {
568          DelayQueue q = populatedQueue(SIZE);
569 <        Object[] o = q.toArray();
570 <        Arrays.sort(o);
571 <        for (int i = 0; i < o.length; i++)
572 <            assertSame(o[i], q.take());
569 >        Object[] a = q.toArray();
570 >        assertSame(Object[].class, a.getClass());
571 >        Arrays.sort(a);
572 >        for (Object o : a)
573 >            assertSame(o, q.take());
574 >        assertTrue(q.isEmpty());
575      }
576  
577      /**
# Line 581 | Line 583 | public class DelayQueueTest extends JSR1
583          PDelay[] array = q.toArray(ints);
584          assertSame(ints, array);
585          Arrays.sort(ints);
586 <        for (int i = 0; i < ints.length; i++)
587 <            assertSame(ints[i], q.remove());
586 >        for (PDelay o : ints)
587 >            assertSame(o, q.remove());
588 >        assertTrue(q.isEmpty());
589      }
590  
591      /**

Diff Legend

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