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

Comparing jsr166/src/test/tck/PhaserTest.java (file contents):
Revision 1.45 by jsr166, Sat Feb 18 15:05:55 2017 UTC vs.
Revision 1.48 by jsr166, Sun Aug 11 22:29:27 2019 UTC

# Line 476 | Line 476 | public class PhaserTest extends JSR166Te
476  
477          Thread t2 = newStartedThread(new CheckedRunnable() {
478              public void realRun() throws TimeoutException {
479 +                long startTime = System.nanoTime();
480 +
481                  Thread.currentThread().interrupt();
482                  try {
483 <                    phaser.awaitAdvanceInterruptibly(0, 2*LONG_DELAY_MS, MILLISECONDS);
483 >                    phaser.awaitAdvanceInterruptibly(0, randomTimeout(), randomTimeUnit());
484                      shouldThrow();
485                  } catch (InterruptedException success) {}
486                  assertFalse(Thread.interrupted());
487  
488                  pleaseInterrupt.countDown();
489                  try {
490 <                    phaser.awaitAdvanceInterruptibly(0, 2*LONG_DELAY_MS, MILLISECONDS);
490 >                    phaser.awaitAdvanceInterruptibly(0, LONG_DELAY_MS, MILLISECONDS);
491                      shouldThrow();
492                  } catch (InterruptedException success) {}
493                  assertFalse(Thread.interrupted());
494 +
495 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
496              }});
497  
498          await(pleaseInterrupt);
499          assertState(phaser, 0, 1, 1);
500 <        assertThreadsStayAlive(t1, t2);
500 >        assertThreadBlocks(t1, Thread.State.WAITING);
501 >        assertThreadBlocks(t2, Thread.State.TIMED_WAITING);
502          t1.interrupt();
503          t2.interrupt();
504          awaitTermination(t1);
# Line 523 | Line 528 | public class PhaserTest extends JSR166Te
528              }});
529  
530          await(pleaseArrive);
531 <        waitForThreadToEnterWaitState(t);
531 >        assertThreadBlocks(t, Thread.State.WAITING);
532          assertEquals(0, phaser.arrive());
533          awaitTermination(t);
534  
# Line 551 | Line 556 | public class PhaserTest extends JSR166Te
556              }});
557  
558          await(pleaseArrive);
559 <        waitForThreadToEnterWaitState(t);
559 >        assertThreadBlocks(t, Thread.State.WAITING);
560          t.interrupt();
561          assertEquals(0, phaser.arrive());
562          awaitTermination(t);
# Line 580 | Line 585 | public class PhaserTest extends JSR166Te
585              }});
586  
587          await(pleaseArrive);
588 <        waitForThreadToEnterWaitState(t);
588 >        assertThreadBlocks(t, Thread.State.WAITING);
589          Thread.currentThread().interrupt();
590          assertEquals(1, phaser.arriveAndAwaitAdvance());
591          assertTrue(Thread.interrupted());
# Line 605 | Line 610 | public class PhaserTest extends JSR166Te
610              }});
611  
612          await(pleaseInterrupt);
613 <        waitForThreadToEnterWaitState(t);
613 >        assertThreadBlocks(t, Thread.State.WAITING);
614          t.interrupt();
615          Thread.currentThread().interrupt();
616          assertEquals(1, phaser.arriveAndAwaitAdvance());
# Line 780 | Line 785 | public class PhaserTest extends JSR166Te
785          assertEquals(THREADS, phaser.getArrivedParties());
786          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
787          for (Thread thread : threads)
788 <            waitForThreadToEnterWaitState(thread);
788 >            assertThreadBlocks(thread, Thread.State.WAITING);
789          for (Thread thread : threads)
790              assertTrue(thread.isAlive());
791          assertState(phaser, 0, THREADS + 1, 1);

Diff Legend

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