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

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.87 by jsr166, Mon May 30 22:53:21 2011 UTC vs.
Revision 1.90 by jsr166, Wed Jun 22 07:46:57 2011 UTC

# Line 528 | Line 528 | public class JSR166TestCase extends Test
528      }
529  
530      /**
531 +     * Checks that the threads do not terminate within the default
532 +     * millisecond delay of {@code timeoutMillis()}.
533 +     */
534 +    void assertThreadsStayAlive(Thread... threads) {
535 +        assertThreadsStayAlive(timeoutMillis(), threads);
536 +    }
537 +
538 +    /**
539 +     * Checks that the threads do not terminate within the given millisecond delay.
540 +     */
541 +    void assertThreadsStayAlive(long millis, Thread... threads) {
542 +        try {
543 +            // No need to optimize the failing case via Thread.join.
544 +            delay(millis);
545 +            for (Thread thread : threads)
546 +                assertTrue(thread.isAlive());
547 +        } catch (InterruptedException ie) {
548 +            fail("Unexpected InterruptedException");
549 +        }
550 +    }
551 +
552 +    /**
553       * Checks that future.get times out, with the default timeout of
554       * {@code timeoutMillis()}.
555       */
# Line 690 | Line 712 | public class JSR166TestCase extends Test
712      }
713  
714      /**
715 <     * Waits up to the specified number of milliseconds for the given
715 >     * Spin-waits up to the specified number of milliseconds for the given
716       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
717       */
718      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
719 <        long timeoutNanos = timeoutMillis * 1000L * 1000L;
698 <        long t0 = System.nanoTime();
719 >        long startTime = System.nanoTime();
720          for (;;) {
721              Thread.State s = thread.getState();
722              if (s == Thread.State.BLOCKED ||
# Line 704 | Line 725 | public class JSR166TestCase extends Test
725                  return;
726              else if (s == Thread.State.TERMINATED)
727                  fail("Unexpected thread termination");
728 <            else if (System.nanoTime() - t0 > timeoutNanos) {
728 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
729                  threadAssertTrue(thread.isAlive());
730                  return;
731              }
# Line 903 | Line 924 | public class JSR166TestCase extends Test
924          } catch (Throwable t) {
925              threadUnexpectedException(t);
926          }
927 +    }
928 +
929 +    public void await(Semaphore semaphore) {
930 +        try {
931 +            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
932 +        } catch (Throwable t) {
933 +            threadUnexpectedException(t);
934 +        }
935      }
936  
937   //     /**

Diff Legend

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