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.82 by jsr166, Tue May 24 23:34:03 2011 UTC vs.
Revision 1.85 by jsr166, Sun May 29 14:18:52 2011 UTC

# Line 260 | Line 260 | public class JSR166TestCase extends Test
260          return 50;
261      }
262  
263 –
263      /**
264       * Sets delays as multiples of SHORT_DELAY.
265       */
# Line 284 | Line 283 | public class JSR166TestCase extends Test
283       * milliseconds in the future.
284       */
285      Date delayedDate(long delayMillis) {
286 <        return new Date(new Date().getTime() + delayMillis);
286 >        return new Date(System.currentTimeMillis() + delayMillis);
287      }
288  
289      /**
# Line 308 | Line 307 | public class JSR166TestCase extends Test
307      }
308  
309      /**
310 +     * Extra checks that get done for all test cases.
311 +     *
312       * Triggers test case failure if any thread assertions have failed,
313       * by rethrowing, in the test harness thread, any exception recorded
314       * earlier by threadRecordFailure.
315 +     *
316 +     * Triggers test case failure if interrupt status is set in the main thread.
317       */
318      public void tearDown() throws Exception {
319          Throwable t = threadFailure.getAndSet(null);
# Line 328 | Line 331 | public class JSR166TestCase extends Test
331                  throw afe;
332              }
333          }
334 +
335 +        if (Thread.interrupted())
336 +            throw new AssertionFailedError("interrupt status set in main thread");
337      }
338  
339      /**
# Line 522 | Line 528 | public class JSR166TestCase extends Test
528      }
529  
530      /**
531 +     * Checks that future.get times out, with the default timeout of
532 +     * {@code timeoutMillis()}.
533 +     */
534 +    void assertFutureTimesOut(Future future) {
535 +        assertFutureTimesOut(future, timeoutMillis());
536 +    }
537 +
538 +    /**
539 +     * Checks that future.get times out, with the given millisecond timeout.
540 +     */
541 +    void assertFutureTimesOut(Future future, long timeoutMillis) {
542 +        long startTime = System.nanoTime();
543 +        try {
544 +            future.get(timeoutMillis, MILLISECONDS);
545 +            shouldThrow();
546 +        } catch (TimeoutException success) {
547 +        } catch (Exception e) {
548 +            threadUnexpectedException(e);
549 +        } finally { future.cancel(true); }
550 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
551 +    }
552 +
553 +    /**
554       * Fails with message "should throw exception".
555       */
556      public void shouldThrow() {
# Line 721 | Line 750 | public class JSR166TestCase extends Test
750          } catch (InterruptedException ie) {
751              threadUnexpectedException(ie);
752          } finally {
753 <            if (t.isAlive()) {
753 >            if (t.getState() != Thread.State.TERMINATED) {
754                  t.interrupt();
755                  fail("Test timed out");
756              }

Diff Legend

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