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.64 by jsr166, Fri Oct 15 22:30:07 2010 UTC vs.
Revision 1.148 by jsr166, Mon Sep 28 08:23:49 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import junit.framework.*;
10 import java.util.PropertyPermission;
11 import java.util.concurrent.*;
12 import java.util.concurrent.atomic.AtomicReference;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 + import static java.util.concurrent.TimeUnit.NANOSECONDS;
11 +
12 + import java.io.ByteArrayInputStream;
13 + import java.io.ByteArrayOutputStream;
14 + import java.io.ObjectInputStream;
15 + import java.io.ObjectOutputStream;
16 + import java.lang.management.ManagementFactory;
17 + import java.lang.management.ThreadInfo;
18 + import java.lang.reflect.Constructor;
19 + import java.lang.reflect.Method;
20 + import java.lang.reflect.Modifier;
21   import java.security.CodeSource;
22   import java.security.Permission;
23   import java.security.PermissionCollection;
# Line 18 | Line 25 | import java.security.Permissions;
25   import java.security.Policy;
26   import java.security.ProtectionDomain;
27   import java.security.SecurityPermission;
28 + import java.util.ArrayList;
29 + import java.util.Arrays;
30 + import java.util.Date;
31 + import java.util.Enumeration;
32 + import java.util.Iterator;
33 + import java.util.List;
34 + import java.util.NoSuchElementException;
35 + import java.util.PropertyPermission;
36 + import java.util.concurrent.BlockingQueue;
37 + import java.util.concurrent.Callable;
38 + import java.util.concurrent.CountDownLatch;
39 + import java.util.concurrent.CyclicBarrier;
40 + import java.util.concurrent.ExecutionException;
41 + import java.util.concurrent.Executors;
42 + import java.util.concurrent.ExecutorService;
43 + import java.util.concurrent.ForkJoinPool;
44 + import java.util.concurrent.Future;
45 + import java.util.concurrent.RecursiveAction;
46 + import java.util.concurrent.RecursiveTask;
47 + import java.util.concurrent.RejectedExecutionHandler;
48 + import java.util.concurrent.Semaphore;
49 + import java.util.concurrent.ThreadFactory;
50 + import java.util.concurrent.ThreadPoolExecutor;
51 + import java.util.concurrent.TimeoutException;
52 + import java.util.concurrent.atomic.AtomicReference;
53 + import java.util.regex.Pattern;
54 +
55 + import junit.framework.AssertionFailedError;
56 + import junit.framework.Test;
57 + import junit.framework.TestCase;
58 + import junit.framework.TestResult;
59 + import junit.framework.TestSuite;
60  
61   /**
62   * Base class for JSR166 Junit TCK tests.  Defines some constants,
# Line 29 | Line 68 | import java.security.SecurityPermission;
68   *
69   * <ol>
70   *
71 < * <li> All assertions in code running in generated threads must use
71 > * <li>All assertions in code running in generated threads must use
72   * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
73   * #threadAssertEquals}, or {@link #threadAssertNull}, (not
74   * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
75   * particularly recommended) for other code to use these forms too.
76   * Only the most typically used JUnit assertion methods are defined
77 < * this way, but enough to live with.</li>
77 > * this way, but enough to live with.
78   *
79 < * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
79 > * <li>If you override {@link #setUp} or {@link #tearDown}, make sure
80   * to invoke {@code super.setUp} and {@code super.tearDown} within
81   * them. These methods are used to clear and check for thread
82 < * assertion failures.</li>
82 > * assertion failures.
83   *
84   * <li>All delays and timeouts must use one of the constants {@code
85   * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
# Line 51 | Line 90 | import java.security.SecurityPermission;
90   * is always discriminable as larger than SHORT and smaller than
91   * MEDIUM.  And so on. These constants are set to conservative values,
92   * but even so, if there is ever any doubt, they can all be increased
93 < * in one spot to rerun tests on slower platforms.</li>
93 > * in one spot to rerun tests on slower platforms.
94   *
95 < * <li> All threads generated must be joined inside each test case
95 > * <li>All threads generated must be joined inside each test case
96   * method (or {@code fail} to do so) before returning from the
97   * method. The {@code joinPool} method can be used to do this when
98 < * using Executors.</li>
98 > * using Executors.
99   *
100   * </ol>
101   *
102 < * <p> <b>Other notes</b>
102 > * <p><b>Other notes</b>
103   * <ul>
104   *
105 < * <li> Usually, there is one testcase method per JSR166 method
105 > * <li>Usually, there is one testcase method per JSR166 method
106   * covering "normal" operation, and then as many exception-testing
107   * methods as there are exceptions the method can throw. Sometimes
108   * there are multiple tests per JSR166 method when the different
109   * "normal" behaviors differ significantly. And sometimes testcases
110   * cover multiple methods when they cannot be tested in
111 < * isolation.</li>
111 > * isolation.
112   *
113 < * <li> The documentation style for testcases is to provide as javadoc
113 > * <li>The documentation style for testcases is to provide as javadoc
114   * a simple sentence or two describing the property that the testcase
115   * method purports to test. The javadocs do not say anything about how
116 < * the property is tested. To find out, read the code.</li>
116 > * the property is tested. To find out, read the code.
117   *
118 < * <li> These tests are "conformance tests", and do not attempt to
118 > * <li>These tests are "conformance tests", and do not attempt to
119   * test throughput, latency, scalability or other performance factors
120   * (see the separate "jtreg" tests for a set intended to check these
121   * for the most central aspects of functionality.) So, most tests use
122   * the smallest sensible numbers of threads, collection sizes, etc
123 < * needed to check basic conformance.</li>
123 > * needed to check basic conformance.
124   *
125   * <li>The test classes currently do not declare inclusion in
126   * any particular package to simplify things for people integrating
127 < * them in TCK test suites.</li>
127 > * them in TCK test suites.
128   *
129 < * <li> As a convenience, the {@code main} of this class (JSR166TestCase)
130 < * runs all JSR166 unit tests.</li>
129 > * <li>As a convenience, the {@code main} of this class (JSR166TestCase)
130 > * runs all JSR166 unit tests.
131   *
132   * </ul>
133   */
# Line 100 | Line 139 | public class JSR166TestCase extends Test
139          Boolean.getBoolean("jsr166.expensiveTests");
140  
141      /**
142 +     * If true, also run tests that are not part of the official tck
143 +     * because they test unspecified implementation details.
144 +     */
145 +    protected static final boolean testImplementationDetails =
146 +        Boolean.getBoolean("jsr166.testImplementationDetails");
147 +
148 +    /**
149       * If true, report on stdout all "slow" tests, that is, ones that
150       * take more than profileThreshold milliseconds to execute.
151       */
# Line 113 | Line 159 | public class JSR166TestCase extends Test
159      private static final long profileThreshold =
160          Long.getLong("jsr166.profileThreshold", 100);
161  
162 +    /**
163 +     * The number of repetitions per test (for tickling rare bugs).
164 +     */
165 +    private static final int runsPerTest =
166 +        Integer.getInteger("jsr166.runsPerTest", 1);
167 +
168 +    /**
169 +     * The number of repetitions of the test suite (for finding leaks?).
170 +     */
171 +    private static final int suiteRuns =
172 +        Integer.getInteger("jsr166.suiteRuns", 1);
173 +
174 +    public JSR166TestCase() { super(); }
175 +    public JSR166TestCase(String name) { super(name); }
176 +
177 +    /**
178 +     * A filter for tests to run, matching strings of the form
179 +     * methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
180 +     * Usefully combined with jsr166.runsPerTest.
181 +     */
182 +    private static final Pattern methodFilter = methodFilter();
183 +
184 +    private static Pattern methodFilter() {
185 +        String regex = System.getProperty("jsr166.methodFilter");
186 +        return (regex == null) ? null : Pattern.compile(regex);
187 +    }
188 +
189 +    public void runBare() throws Throwable {
190 +        if (methodFilter == null
191 +            || methodFilter.matcher(toString()).find())
192 +            super.runBare();
193 +    }
194 +
195      protected void runTest() throws Throwable {
196 <        if (profileTests)
197 <            runTestProfiled();
198 <        else
199 <            super.runTest();
196 >        for (int i = 0; i < runsPerTest; i++) {
197 >            if (profileTests)
198 >                runTestProfiled();
199 >            else
200 >                super.runTest();
201 >        }
202      }
203  
204      protected void runTestProfiled() throws Throwable {
205 <        long t0 = System.nanoTime();
206 <        try {
205 >        for (int i = 0; i < 2; i++) {
206 >            long startTime = System.nanoTime();
207              super.runTest();
208 <        } finally {
209 <            long elapsedMillis =
210 <                (System.nanoTime() - t0) / (1000L * 1000L);
211 <            if (elapsedMillis >= profileThreshold)
208 >            long elapsedMillis = millisElapsedSince(startTime);
209 >            if (elapsedMillis < profileThreshold)
210 >                break;
211 >            // Never report first run of any test; treat it as a
212 >            // warmup run, notably to trigger all needed classloading,
213 >            if (i > 0)
214                  System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
215          }
216      }
217  
218      /**
219 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
219 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
220       */
221      public static void main(String[] args) {
222 +        main(suite(), args);
223 +    }
224 +
225 +    /**
226 +     * Runs all unit tests in the given test suite.
227 +     * Actual behavior influenced by jsr166.* system properties.
228 +     */
229 +    static void main(Test suite, String[] args) {
230          if (useSecurityManager) {
231              System.err.println("Setting a permissive security manager");
232              Policy.setPolicy(permissivePolicy());
233              System.setSecurityManager(new SecurityManager());
234          }
235 <        int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
236 <
237 <        Test s = suite();
238 <        for (int i = 0; i < iters; ++i) {
148 <            junit.textui.TestRunner.run(s);
235 >        for (int i = 0; i < suiteRuns; i++) {
236 >            TestResult result = junit.textui.TestRunner.run(suite);
237 >            if (!result.wasSuccessful())
238 >                System.exit(1);
239              System.gc();
240              System.runFinalization();
241          }
152        System.exit(0);
242      }
243  
244      public static TestSuite newTestSuite(Object... suiteOrClasses) {
# Line 165 | Line 254 | public class JSR166TestCase extends Test
254          return suite;
255      }
256  
257 +    public static void addNamedTestClasses(TestSuite suite,
258 +                                           String... testClassNames) {
259 +        for (String testClassName : testClassNames) {
260 +            try {
261 +                Class<?> testClass = Class.forName(testClassName);
262 +                Method m = testClass.getDeclaredMethod("suite",
263 +                                                       new Class<?>[0]);
264 +                suite.addTest(newTestSuite((Test)m.invoke(null)));
265 +            } catch (Exception e) {
266 +                throw new Error("Missing test class", e);
267 +            }
268 +        }
269 +    }
270 +
271 +    public static final double JAVA_CLASS_VERSION;
272 +    public static final String JAVA_SPECIFICATION_VERSION;
273 +    static {
274 +        try {
275 +            JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
276 +                new java.security.PrivilegedAction<Double>() {
277 +                public Double run() {
278 +                    return Double.valueOf(System.getProperty("java.class.version"));}});
279 +            JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
280 +                new java.security.PrivilegedAction<String>() {
281 +                public String run() {
282 +                    return System.getProperty("java.specification.version");}});
283 +        } catch (Throwable t) {
284 +            throw new Error(t);
285 +        }
286 +    }
287 +
288 +    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
289 +    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
290 +    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
291 +    public static boolean atLeastJava9() {
292 +        return JAVA_CLASS_VERSION >= 53.0
293 +            // As of 2015-09, java9 still uses 52.0 class file version
294 +            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
295 +    }
296 +    public static boolean atLeastJava10() {
297 +        return JAVA_CLASS_VERSION >= 54.0
298 +            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
299 +    }
300 +
301      /**
302       * Collects all JSR166 unit tests as one suite.
303       */
304      public static Test suite() {
305 <        return newTestSuite(
305 >        // Java7+ test classes
306 >        TestSuite suite = newTestSuite(
307              ForkJoinPoolTest.suite(),
308              ForkJoinTaskTest.suite(),
309              RecursiveActionTest.suite(),
# Line 234 | Line 368 | public class JSR166TestCase extends Test
368              TreeSetTest.suite(),
369              TreeSubMapTest.suite(),
370              TreeSubSetTest.suite());
371 +
372 +        // Java8+ test classes
373 +        if (atLeastJava8()) {
374 +            String[] java8TestClassNames = {
375 +                "Atomic8Test",
376 +                "CompletableFutureTest",
377 +                "ConcurrentHashMap8Test",
378 +                "CountedCompleterTest",
379 +                "DoubleAccumulatorTest",
380 +                "DoubleAdderTest",
381 +                "ForkJoinPool8Test",
382 +                "ForkJoinTask8Test",
383 +                "LongAccumulatorTest",
384 +                "LongAdderTest",
385 +                "SplittableRandomTest",
386 +                "StampedLockTest",
387 +                "SubmissionPublisherTest",
388 +                "ThreadLocalRandom8Test",
389 +            };
390 +            addNamedTestClasses(suite, java8TestClassNames);
391 +        }
392 +
393 +        // Java9+ test classes
394 +        if (atLeastJava9()) {
395 +            String[] java9TestClassNames = {
396 +                // Currently empty, but expecting varhandle tests
397 +            };
398 +            addNamedTestClasses(suite, java9TestClassNames);
399 +        }
400 +
401 +        return suite;
402 +    }
403 +
404 +    /** Returns list of junit-style test method names in given class. */
405 +    public static ArrayList<String> testMethodNames(Class<?> testClass) {
406 +        Method[] methods = testClass.getDeclaredMethods();
407 +        ArrayList<String> names = new ArrayList<String>(methods.length);
408 +        for (Method method : methods) {
409 +            if (method.getName().startsWith("test")
410 +                && Modifier.isPublic(method.getModifiers())
411 +                // method.getParameterCount() requires jdk8+
412 +                && method.getParameterTypes().length == 0) {
413 +                names.add(method.getName());
414 +            }
415 +        }
416 +        return names;
417      }
418  
419 +    /**
420 +     * Returns junit-style testSuite for the given test class, but
421 +     * parameterized by passing extra data to each test.
422 +     */
423 +    public static <ExtraData> Test parameterizedTestSuite
424 +        (Class<? extends JSR166TestCase> testClass,
425 +         Class<ExtraData> dataClass,
426 +         ExtraData data) {
427 +        try {
428 +            TestSuite suite = new TestSuite();
429 +            Constructor c =
430 +                testClass.getDeclaredConstructor(dataClass, String.class);
431 +            for (String methodName : testMethodNames(testClass))
432 +                suite.addTest((Test) c.newInstance(data, methodName));
433 +            return suite;
434 +        } catch (Exception e) {
435 +            throw new Error(e);
436 +        }
437 +    }
438 +
439 +    /**
440 +     * Returns junit-style testSuite for the jdk8 extension of the
441 +     * given test class, but parameterized by passing extra data to
442 +     * each test.  Uses reflection to allow compilation in jdk7.
443 +     */
444 +    public static <ExtraData> Test jdk8ParameterizedTestSuite
445 +        (Class<? extends JSR166TestCase> testClass,
446 +         Class<ExtraData> dataClass,
447 +         ExtraData data) {
448 +        if (atLeastJava8()) {
449 +            String name = testClass.getName();
450 +            String name8 = name.replaceAll("Test$", "8Test");
451 +            if (name.equals(name8)) throw new Error(name);
452 +            try {
453 +                return (Test)
454 +                    Class.forName(name8)
455 +                    .getMethod("testSuite", new Class[] { dataClass })
456 +                    .invoke(null, data);
457 +            } catch (Exception e) {
458 +                throw new Error(e);
459 +            }
460 +        } else {
461 +            return new TestSuite();
462 +        }
463 +
464 +    }
465 +
466 +    // Delays for timing-dependent tests, in milliseconds.
467  
468      public static long SHORT_DELAY_MS;
469      public static long SMALL_DELAY_MS;
470      public static long MEDIUM_DELAY_MS;
471      public static long LONG_DELAY_MS;
472  
245
473      /**
474       * Returns the shortest timed delay. This could
475       * be reimplemented to use for example a Property.
# Line 251 | Line 478 | public class JSR166TestCase extends Test
478          return 50;
479      }
480  
254
481      /**
482       * Sets delays as multiples of SHORT_DELAY.
483       */
# Line 259 | Line 485 | public class JSR166TestCase extends Test
485          SHORT_DELAY_MS = getShortDelay();
486          SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
487          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
488 <        LONG_DELAY_MS   = SHORT_DELAY_MS * 50;
488 >        LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
489 >    }
490 >
491 >    /**
492 >     * Returns a timeout in milliseconds to be used in tests that
493 >     * verify that operations block or time out.
494 >     */
495 >    long timeoutMillis() {
496 >        return SHORT_DELAY_MS / 4;
497 >    }
498 >
499 >    /**
500 >     * Returns a new Date instance representing a time at least
501 >     * delayMillis milliseconds in the future.
502 >     */
503 >    Date delayedDate(long delayMillis) {
504 >        // Add 1 because currentTimeMillis is known to round into the past.
505 >        return new Date(System.currentTimeMillis() + delayMillis + 1);
506      }
507  
508      /**
# Line 282 | Line 525 | public class JSR166TestCase extends Test
525          setDelays();
526      }
527  
528 +    void tearDownFail(String format, Object... args) {
529 +        String msg = toString() + ": " + String.format(format, args);
530 +        System.err.println(msg);
531 +        printAllStackTraces();
532 +        throw new AssertionFailedError(msg);
533 +    }
534 +
535      /**
536 +     * Extra checks that get done for all test cases.
537 +     *
538       * Triggers test case failure if any thread assertions have failed,
539       * by rethrowing, in the test harness thread, any exception recorded
540       * earlier by threadRecordFailure.
541 +     *
542 +     * Triggers test case failure if interrupt status is set in the main thread.
543       */
544      public void tearDown() throws Exception {
545 <        Throwable t = threadFailure.get();
545 >        Throwable t = threadFailure.getAndSet(null);
546          if (t != null) {
547              if (t instanceof Error)
548                  throw (Error) t;
# Line 303 | Line 557 | public class JSR166TestCase extends Test
557                  throw afe;
558              }
559          }
560 +
561 +        if (Thread.interrupted())
562 +            tearDownFail("interrupt status set in main thread");
563 +
564 +        checkForkJoinPoolThreadLeaks();
565 +    }
566 +
567 +    /**
568 +     * Finds missing try { ... } finally { joinPool(e); }
569 +     */
570 +    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
571 +        Thread[] survivors = new Thread[7];
572 +        int count = Thread.enumerate(survivors);
573 +        for (int i = 0; i < count; i++) {
574 +            Thread thread = survivors[i];
575 +            String name = thread.getName();
576 +            if (name.startsWith("ForkJoinPool-")) {
577 +                // give thread some time to terminate
578 +                thread.join(LONG_DELAY_MS);
579 +                if (thread.isAlive())
580 +                    tearDownFail("Found leaked ForkJoinPool thread thread=%s",
581 +                                 thread);
582 +            }
583 +        }
584 +
585 +        if (!ForkJoinPool.commonPool()
586 +            .awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
587 +            tearDownFail("ForkJoin common pool thread stuck");
588      }
589  
590      /**
# Line 383 | Line 665 | public class JSR166TestCase extends Test
665      public void threadAssertEquals(Object x, Object y) {
666          try {
667              assertEquals(x, y);
668 <        } catch (AssertionFailedError t) {
669 <            threadRecordFailure(t);
670 <            throw t;
671 <        } catch (Throwable t) {
672 <            threadUnexpectedException(t);
668 >        } catch (AssertionFailedError fail) {
669 >            threadRecordFailure(fail);
670 >            throw fail;
671 >        } catch (Throwable fail) {
672 >            threadUnexpectedException(fail);
673          }
674      }
675  
# Line 399 | Line 681 | public class JSR166TestCase extends Test
681      public void threadAssertSame(Object x, Object y) {
682          try {
683              assertSame(x, y);
684 <        } catch (AssertionFailedError t) {
685 <            threadRecordFailure(t);
686 <            throw t;
684 >        } catch (AssertionFailedError fail) {
685 >            threadRecordFailure(fail);
686 >            throw fail;
687          }
688      }
689  
# Line 434 | Line 716 | public class JSR166TestCase extends Test
716          else {
717              AssertionFailedError afe =
718                  new AssertionFailedError("unexpected exception: " + t);
719 <            t.initCause(t);
719 >            afe.initCause(t);
720              throw afe;
721          }
722      }
723  
724      /**
725 +     * Delays, via Thread.sleep, for the given millisecond delay, but
726 +     * if the sleep is shorter than specified, may re-sleep or yield
727 +     * until time elapses.
728 +     */
729 +    static void delay(long millis) throws InterruptedException {
730 +        long startTime = System.nanoTime();
731 +        long ns = millis * 1000 * 1000;
732 +        for (;;) {
733 +            if (millis > 0L)
734 +                Thread.sleep(millis);
735 +            else // too short to sleep
736 +                Thread.yield();
737 +            long d = ns - (System.nanoTime() - startTime);
738 +            if (d > 0L)
739 +                millis = d / (1000 * 1000);
740 +            else
741 +                break;
742 +        }
743 +    }
744 +
745 +    /**
746       * Waits out termination of a thread pool or fails doing so.
747       */
748 <    public void joinPool(ExecutorService exec) {
748 >    void joinPool(ExecutorService pool) {
749          try {
750 <            exec.shutdown();
751 <            assertTrue("ExecutorService did not terminate in a timely manner",
752 <                       exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
750 >            pool.shutdown();
751 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
752 >                fail("ExecutorService " + pool +
753 >                     " did not terminate in a timely manner");
754          } catch (SecurityException ok) {
755              // Allowed in case test doesn't have privs
756 <        } catch (InterruptedException ie) {
756 >        } catch (InterruptedException fail) {
757 >            fail("Unexpected InterruptedException");
758 >        }
759 >    }
760 >
761 >    /** Like Runnable, but with the freedom to throw anything */
762 >    interface Action { public void run() throws Throwable; }
763 >
764 >    /**
765 >     * Runs all the given actions in parallel, failing if any fail.
766 >     * Useful for running multiple variants of tests that are
767 >     * necessarily individually slow because they must block.
768 >     */
769 >    void testInParallel(Action ... actions) {
770 >        ExecutorService pool = Executors.newCachedThreadPool();
771 >        try {
772 >            ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
773 >            for (final Action action : actions)
774 >                futures.add(pool.submit(new CheckedRunnable() {
775 >                    public void realRun() throws Throwable { action.run();}}));
776 >            for (Future<?> future : futures)
777 >                try {
778 >                    assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
779 >                } catch (ExecutionException ex) {
780 >                    threadUnexpectedException(ex.getCause());
781 >                } catch (Exception ex) {
782 >                    threadUnexpectedException(ex);
783 >                }
784 >        } finally {
785 >            joinPool(pool);
786 >        }
787 >    }
788 >
789 >    /**
790 >     * A debugging tool to print all stack traces, as jstack does.
791 >     */
792 >    static void printAllStackTraces() {
793 >        for (ThreadInfo info :
794 >                 ManagementFactory.getThreadMXBean()
795 >                 .dumpAllThreads(true, true))
796 >            System.err.print(info);
797 >    }
798 >
799 >    /**
800 >     * Checks that thread does not terminate within the default
801 >     * millisecond delay of {@code timeoutMillis()}.
802 >     */
803 >    void assertThreadStaysAlive(Thread thread) {
804 >        assertThreadStaysAlive(thread, timeoutMillis());
805 >    }
806 >
807 >    /**
808 >     * Checks that thread does not terminate within the given millisecond delay.
809 >     */
810 >    void assertThreadStaysAlive(Thread thread, long millis) {
811 >        try {
812 >            // No need to optimize the failing case via Thread.join.
813 >            delay(millis);
814 >            assertTrue(thread.isAlive());
815 >        } catch (InterruptedException fail) {
816 >            fail("Unexpected InterruptedException");
817 >        }
818 >    }
819 >
820 >    /**
821 >     * Checks that the threads do not terminate within the default
822 >     * millisecond delay of {@code timeoutMillis()}.
823 >     */
824 >    void assertThreadsStayAlive(Thread... threads) {
825 >        assertThreadsStayAlive(timeoutMillis(), threads);
826 >    }
827 >
828 >    /**
829 >     * Checks that the threads do not terminate within the given millisecond delay.
830 >     */
831 >    void assertThreadsStayAlive(long millis, Thread... threads) {
832 >        try {
833 >            // No need to optimize the failing case via Thread.join.
834 >            delay(millis);
835 >            for (Thread thread : threads)
836 >                assertTrue(thread.isAlive());
837 >        } catch (InterruptedException fail) {
838              fail("Unexpected InterruptedException");
839          }
840      }
841  
842 +    /**
843 +     * Checks that future.get times out, with the default timeout of
844 +     * {@code timeoutMillis()}.
845 +     */
846 +    void assertFutureTimesOut(Future future) {
847 +        assertFutureTimesOut(future, timeoutMillis());
848 +    }
849 +
850 +    /**
851 +     * Checks that future.get times out, with the given millisecond timeout.
852 +     */
853 +    void assertFutureTimesOut(Future future, long timeoutMillis) {
854 +        long startTime = System.nanoTime();
855 +        try {
856 +            future.get(timeoutMillis, MILLISECONDS);
857 +            shouldThrow();
858 +        } catch (TimeoutException success) {
859 +        } catch (Exception fail) {
860 +            threadUnexpectedException(fail);
861 +        } finally { future.cancel(true); }
862 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
863 +    }
864  
865      /**
866       * Fails with message "should throw exception".
# Line 494 | Line 901 | public class JSR166TestCase extends Test
901      public static final Integer m6  = new Integer(-6);
902      public static final Integer m10 = new Integer(-10);
903  
497
904      /**
905       * Runs Runnable r with a security policy that permits precisely
906       * the specified permissions.  If there is no current security
# Line 506 | Line 912 | public class JSR166TestCase extends Test
912          SecurityManager sm = System.getSecurityManager();
913          if (sm == null) {
914              r.run();
915 +        }
916 +        runWithSecurityManagerWithPermissions(r, permissions);
917 +    }
918 +
919 +    /**
920 +     * Runs Runnable r with a security policy that permits precisely
921 +     * the specified permissions.  If there is no current security
922 +     * manager, a temporary one is set for the duration of the
923 +     * Runnable.  We require that any security manager permit
924 +     * getPolicy/setPolicy.
925 +     */
926 +    public void runWithSecurityManagerWithPermissions(Runnable r,
927 +                                                      Permission... permissions) {
928 +        SecurityManager sm = System.getSecurityManager();
929 +        if (sm == null) {
930              Policy savedPolicy = Policy.getPolicy();
931              try {
932                  Policy.setPolicy(permissivePolicy());
933                  System.setSecurityManager(new SecurityManager());
934 <                runWithPermissions(r, permissions);
934 >                runWithSecurityManagerWithPermissions(r, permissions);
935              } finally {
936                  System.setSecurityManager(null);
937                  Policy.setPolicy(savedPolicy);
# Line 558 | Line 979 | public class JSR166TestCase extends Test
979              return perms.implies(p);
980          }
981          public void refresh() {}
982 +        public String toString() {
983 +            List<Permission> ps = new ArrayList<Permission>();
984 +            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
985 +                ps.add(e.nextElement());
986 +            return "AdjustablePolicy with permissions " + ps;
987 +        }
988      }
989  
990      /**
# Line 585 | Line 1012 | public class JSR166TestCase extends Test
1012       */
1013      void sleep(long millis) {
1014          try {
1015 <            Thread.sleep(millis);
1016 <        } catch (InterruptedException ie) {
1015 >            delay(millis);
1016 >        } catch (InterruptedException fail) {
1017              AssertionFailedError afe =
1018                  new AssertionFailedError("Unexpected InterruptedException");
1019 <            afe.initCause(ie);
1019 >            afe.initCause(fail);
1020              throw afe;
1021          }
1022      }
1023  
1024      /**
1025 <     * Sleeps until the timeout has elapsed, or interrupted.
1026 <     * Does <em>NOT</em> throw InterruptedException.
1025 >     * Spin-waits up to the specified number of milliseconds for the given
1026 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1027 >     */
1028 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1029 >        long startTime = System.nanoTime();
1030 >        for (;;) {
1031 >            Thread.State s = thread.getState();
1032 >            if (s == Thread.State.BLOCKED ||
1033 >                s == Thread.State.WAITING ||
1034 >                s == Thread.State.TIMED_WAITING)
1035 >                return;
1036 >            else if (s == Thread.State.TERMINATED)
1037 >                fail("Unexpected thread termination");
1038 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1039 >                threadAssertTrue(thread.isAlive());
1040 >                return;
1041 >            }
1042 >            Thread.yield();
1043 >        }
1044 >    }
1045 >
1046 >    /**
1047 >     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1048 >     * state: BLOCKED, WAITING, or TIMED_WAITING.
1049 >     */
1050 >    void waitForThreadToEnterWaitState(Thread thread) {
1051 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1052 >    }
1053 >
1054 >    /**
1055 >     * Returns the number of milliseconds since time given by
1056 >     * startNanoTime, which must have been previously returned from a
1057 >     * call to {@link System#nanoTime()}.
1058 >     */
1059 >    static long millisElapsedSince(long startNanoTime) {
1060 >        return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1061 >    }
1062 >
1063 > //     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1064 > //         long startTime = System.nanoTime();
1065 > //         try {
1066 > //             r.run();
1067 > //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1068 > //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1069 > //             throw new AssertionFailedError("did not return promptly");
1070 > //     }
1071 >
1072 > //     void assertTerminatesPromptly(Runnable r) {
1073 > //         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1074 > //     }
1075 >
1076 >    /**
1077 >     * Checks that timed f.get() returns the expected value, and does not
1078 >     * wait for the timeout to elapse before returning.
1079       */
1080 <    void sleepTillInterrupted(long timeoutMillis) {
1080 >    <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1081 >        long startTime = System.nanoTime();
1082          try {
1083 <            Thread.sleep(timeoutMillis);
1084 <        } catch (InterruptedException wakeup) {}
1083 >            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1084 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
1085 >        if (millisElapsedSince(startTime) > timeoutMillis/2)
1086 >            throw new AssertionFailedError("timed get did not return promptly");
1087 >    }
1088 >
1089 >    <T> void checkTimedGet(Future<T> f, T expectedValue) {
1090 >        checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1091      }
1092  
1093      /**
# Line 622 | Line 1108 | public class JSR166TestCase extends Test
1108      void awaitTermination(Thread t, long timeoutMillis) {
1109          try {
1110              t.join(timeoutMillis);
1111 <        } catch (InterruptedException ie) {
1112 <            threadUnexpectedException(ie);
1111 >        } catch (InterruptedException fail) {
1112 >            threadUnexpectedException(fail);
1113          } finally {
1114 <            if (t.isAlive()) {
1114 >            if (t.getState() != Thread.State.TERMINATED) {
1115                  t.interrupt();
1116                  fail("Test timed out");
1117              }
1118          }
1119      }
1120  
1121 +    /**
1122 +     * Waits for LONG_DELAY_MS milliseconds for the thread to
1123 +     * terminate (using {@link Thread#join(long)}), else interrupts
1124 +     * the thread (in the hope that it may terminate later) and fails.
1125 +     */
1126 +    void awaitTermination(Thread t) {
1127 +        awaitTermination(t, LONG_DELAY_MS);
1128 +    }
1129 +
1130      // Some convenient Runnable classes
1131  
1132      public abstract class CheckedRunnable implements Runnable {
# Line 640 | Line 1135 | public class JSR166TestCase extends Test
1135          public final void run() {
1136              try {
1137                  realRun();
1138 <            } catch (Throwable t) {
1139 <                threadUnexpectedException(t);
1138 >            } catch (Throwable fail) {
1139 >                threadUnexpectedException(fail);
1140              }
1141          }
1142      }
# Line 694 | Line 1189 | public class JSR166TestCase extends Test
1189                  realRun();
1190                  threadShouldThrow("InterruptedException");
1191              } catch (InterruptedException success) {
1192 <            } catch (Throwable t) {
1193 <                threadUnexpectedException(t);
1192 >                threadAssertFalse(Thread.interrupted());
1193 >            } catch (Throwable fail) {
1194 >                threadUnexpectedException(fail);
1195              }
1196          }
1197      }
# Line 706 | Line 1202 | public class JSR166TestCase extends Test
1202          public final T call() {
1203              try {
1204                  return realCall();
1205 <            } catch (Throwable t) {
1206 <                threadUnexpectedException(t);
1205 >            } catch (Throwable fail) {
1206 >                threadUnexpectedException(fail);
1207                  return null;
1208              }
1209          }
# Line 723 | Line 1219 | public class JSR166TestCase extends Test
1219                  threadShouldThrow("InterruptedException");
1220                  return result;
1221              } catch (InterruptedException success) {
1222 <            } catch (Throwable t) {
1223 <                threadUnexpectedException(t);
1222 >                threadAssertFalse(Thread.interrupted());
1223 >            } catch (Throwable fail) {
1224 >                threadUnexpectedException(fail);
1225              }
1226              return null;
1227          }
# Line 741 | Line 1238 | public class JSR166TestCase extends Test
1238      public static final String TEST_STRING = "a test string";
1239  
1240      public static class StringTask implements Callable<String> {
1241 <        public String call() { return TEST_STRING; }
1241 >        final String value;
1242 >        public StringTask() { this(TEST_STRING); }
1243 >        public StringTask(String value) { this.value = value; }
1244 >        public String call() { return value; }
1245      }
1246  
1247      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
# Line 754 | Line 1254 | public class JSR166TestCase extends Test
1254              }};
1255      }
1256  
1257 +    public Runnable countDowner(final CountDownLatch latch) {
1258 +        return new CheckedRunnable() {
1259 +            public void realRun() throws InterruptedException {
1260 +                latch.countDown();
1261 +            }};
1262 +    }
1263 +
1264 +    public Runnable awaiter(final CountDownLatch latch) {
1265 +        return new CheckedRunnable() {
1266 +            public void realRun() throws InterruptedException {
1267 +                await(latch);
1268 +            }};
1269 +    }
1270 +
1271 +    public void await(CountDownLatch latch) {
1272 +        try {
1273 +            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1274 +        } catch (Throwable fail) {
1275 +            threadUnexpectedException(fail);
1276 +        }
1277 +    }
1278 +
1279 +    public void await(Semaphore semaphore) {
1280 +        try {
1281 +            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1282 +        } catch (Throwable fail) {
1283 +            threadUnexpectedException(fail);
1284 +        }
1285 +    }
1286 +
1287 + //     /**
1288 + //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1289 + //      */
1290 + //     public void await(AtomicBoolean flag) {
1291 + //         await(flag, LONG_DELAY_MS);
1292 + //     }
1293 +
1294 + //     /**
1295 + //      * Spin-waits up to the specified timeout until flag becomes true.
1296 + //      */
1297 + //     public void await(AtomicBoolean flag, long timeoutMillis) {
1298 + //         long startTime = System.nanoTime();
1299 + //         while (!flag.get()) {
1300 + //             if (millisElapsedSince(startTime) > timeoutMillis)
1301 + //                 throw new AssertionFailedError("timed out");
1302 + //             Thread.yield();
1303 + //         }
1304 + //     }
1305 +
1306      public static class NPETask implements Callable<String> {
1307          public String call() { throw new NullPointerException(); }
1308      }
# Line 764 | Line 1313 | public class JSR166TestCase extends Test
1313  
1314      public class ShortRunnable extends CheckedRunnable {
1315          protected void realRun() throws Throwable {
1316 <            Thread.sleep(SHORT_DELAY_MS);
1316 >            delay(SHORT_DELAY_MS);
1317          }
1318      }
1319  
1320      public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1321          protected void realRun() throws InterruptedException {
1322 <            Thread.sleep(SHORT_DELAY_MS);
1322 >            delay(SHORT_DELAY_MS);
1323          }
1324      }
1325  
1326      public class SmallRunnable extends CheckedRunnable {
1327          protected void realRun() throws Throwable {
1328 <            Thread.sleep(SMALL_DELAY_MS);
1328 >            delay(SMALL_DELAY_MS);
1329          }
1330      }
1331  
1332      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1333          protected void realRun() {
1334              try {
1335 <                Thread.sleep(SMALL_DELAY_MS);
1335 >                delay(SMALL_DELAY_MS);
1336              } catch (InterruptedException ok) {}
1337          }
1338      }
1339  
1340      public class SmallCallable extends CheckedCallable {
1341          protected Object realCall() throws InterruptedException {
1342 <            Thread.sleep(SMALL_DELAY_MS);
1342 >            delay(SMALL_DELAY_MS);
1343              return Boolean.TRUE;
1344          }
1345      }
1346  
1347      public class MediumRunnable extends CheckedRunnable {
1348          protected void realRun() throws Throwable {
1349 <            Thread.sleep(MEDIUM_DELAY_MS);
1349 >            delay(MEDIUM_DELAY_MS);
1350          }
1351      }
1352  
1353      public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1354          protected void realRun() throws InterruptedException {
1355 <            Thread.sleep(MEDIUM_DELAY_MS);
1355 >            delay(MEDIUM_DELAY_MS);
1356          }
1357      }
1358  
# Line 811 | Line 1360 | public class JSR166TestCase extends Test
1360          return new CheckedRunnable() {
1361              protected void realRun() {
1362                  try {
1363 <                    Thread.sleep(timeoutMillis);
1363 >                    delay(timeoutMillis);
1364                  } catch (InterruptedException ok) {}
1365              }};
1366      }
# Line 819 | Line 1368 | public class JSR166TestCase extends Test
1368      public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1369          protected void realRun() {
1370              try {
1371 <                Thread.sleep(MEDIUM_DELAY_MS);
1371 >                delay(MEDIUM_DELAY_MS);
1372              } catch (InterruptedException ok) {}
1373          }
1374      }
# Line 827 | Line 1376 | public class JSR166TestCase extends Test
1376      public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1377          protected void realRun() {
1378              try {
1379 <                Thread.sleep(LONG_DELAY_MS);
1379 >                delay(LONG_DELAY_MS);
1380              } catch (InterruptedException ok) {}
1381          }
1382      }
# Line 851 | Line 1400 | public class JSR166TestCase extends Test
1400                  public boolean isDone() { return done; }
1401                  public void run() {
1402                      try {
1403 <                        Thread.sleep(timeoutMillis);
1403 >                        delay(timeoutMillis);
1404                          done = true;
1405                      } catch (InterruptedException ok) {}
1406                  }
# Line 862 | Line 1411 | public class JSR166TestCase extends Test
1411          public volatile boolean done = false;
1412          public void run() {
1413              try {
1414 <                Thread.sleep(SHORT_DELAY_MS);
1414 >                delay(SHORT_DELAY_MS);
1415                  done = true;
1416              } catch (InterruptedException ok) {}
1417          }
# Line 872 | Line 1421 | public class JSR166TestCase extends Test
1421          public volatile boolean done = false;
1422          public void run() {
1423              try {
1424 <                Thread.sleep(SMALL_DELAY_MS);
1424 >                delay(SMALL_DELAY_MS);
1425                  done = true;
1426              } catch (InterruptedException ok) {}
1427          }
# Line 882 | Line 1431 | public class JSR166TestCase extends Test
1431          public volatile boolean done = false;
1432          public void run() {
1433              try {
1434 <                Thread.sleep(MEDIUM_DELAY_MS);
1434 >                delay(MEDIUM_DELAY_MS);
1435                  done = true;
1436              } catch (InterruptedException ok) {}
1437          }
# Line 892 | Line 1441 | public class JSR166TestCase extends Test
1441          public volatile boolean done = false;
1442          public void run() {
1443              try {
1444 <                Thread.sleep(LONG_DELAY_MS);
1444 >                delay(LONG_DELAY_MS);
1445                  done = true;
1446              } catch (InterruptedException ok) {}
1447          }
# Line 909 | Line 1458 | public class JSR166TestCase extends Test
1458          public volatile boolean done = false;
1459          public Object call() {
1460              try {
1461 <                Thread.sleep(SMALL_DELAY_MS);
1461 >                delay(SMALL_DELAY_MS);
1462                  done = true;
1463              } catch (InterruptedException ok) {}
1464              return Boolean.TRUE;
# Line 922 | Line 1471 | public class JSR166TestCase extends Test
1471      public abstract class CheckedRecursiveAction extends RecursiveAction {
1472          protected abstract void realCompute() throws Throwable;
1473  
1474 <        public final void compute() {
1474 >        @Override protected final void compute() {
1475              try {
1476                  realCompute();
1477 <            } catch (Throwable t) {
1478 <                threadUnexpectedException(t);
1477 >            } catch (Throwable fail) {
1478 >                threadUnexpectedException(fail);
1479              }
1480          }
1481      }
# Line 937 | Line 1486 | public class JSR166TestCase extends Test
1486      public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1487          protected abstract T realCompute() throws Throwable;
1488  
1489 <        public final T compute() {
1489 >        @Override protected final T compute() {
1490              try {
1491                  return realCompute();
1492 <            } catch (Throwable t) {
1493 <                threadUnexpectedException(t);
1492 >            } catch (Throwable fail) {
1493 >                threadUnexpectedException(fail);
1494                  return null;
1495              }
1496          }
# Line 956 | Line 1505 | public class JSR166TestCase extends Test
1505      }
1506  
1507      /**
1508 <     * A CyclicBarrier that fails with AssertionFailedErrors instead
1509 <     * of throwing checked exceptions.
1508 >     * A CyclicBarrier that uses timed await and fails with
1509 >     * AssertionFailedErrors instead of throwing checked exceptions.
1510       */
1511      public class CheckedBarrier extends CyclicBarrier {
1512          public CheckedBarrier(int parties) { super(parties); }
1513  
1514          public int await() {
1515              try {
1516 <                return super.await();
1517 <            } catch (Exception e) {
1516 >                return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1517 >            } catch (TimeoutException timedOut) {
1518 >                throw new AssertionFailedError("timed out");
1519 >            } catch (Exception fail) {
1520                  AssertionFailedError afe =
1521 <                    new AssertionFailedError("Unexpected exception: " + e);
1522 <                afe.initCause(e);
1521 >                    new AssertionFailedError("Unexpected exception: " + fail);
1522 >                afe.initCause(fail);
1523                  throw afe;
1524              }
1525          }
1526      }
1527  
1528 +    void checkEmpty(BlockingQueue q) {
1529 +        try {
1530 +            assertTrue(q.isEmpty());
1531 +            assertEquals(0, q.size());
1532 +            assertNull(q.peek());
1533 +            assertNull(q.poll());
1534 +            assertNull(q.poll(0, MILLISECONDS));
1535 +            assertEquals(q.toString(), "[]");
1536 +            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1537 +            assertFalse(q.iterator().hasNext());
1538 +            try {
1539 +                q.element();
1540 +                shouldThrow();
1541 +            } catch (NoSuchElementException success) {}
1542 +            try {
1543 +                q.iterator().next();
1544 +                shouldThrow();
1545 +            } catch (NoSuchElementException success) {}
1546 +            try {
1547 +                q.remove();
1548 +                shouldThrow();
1549 +            } catch (NoSuchElementException success) {}
1550 +        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
1551 +    }
1552 +
1553 +    void assertSerialEquals(Object x, Object y) {
1554 +        assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1555 +    }
1556 +
1557 +    void assertNotSerialEquals(Object x, Object y) {
1558 +        assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1559 +    }
1560 +
1561 +    byte[] serialBytes(Object o) {
1562 +        try {
1563 +            ByteArrayOutputStream bos = new ByteArrayOutputStream();
1564 +            ObjectOutputStream oos = new ObjectOutputStream(bos);
1565 +            oos.writeObject(o);
1566 +            oos.flush();
1567 +            oos.close();
1568 +            return bos.toByteArray();
1569 +        } catch (Throwable fail) {
1570 +            threadUnexpectedException(fail);
1571 +            return new byte[0];
1572 +        }
1573 +    }
1574 +
1575 +    @SuppressWarnings("unchecked")
1576 +    <T> T serialClone(T o) {
1577 +        try {
1578 +            ObjectInputStream ois = new ObjectInputStream
1579 +                (new ByteArrayInputStream(serialBytes(o)));
1580 +            T clone = (T) ois.readObject();
1581 +            assertSame(o.getClass(), clone.getClass());
1582 +            return clone;
1583 +        } catch (Throwable fail) {
1584 +            threadUnexpectedException(fail);
1585 +            return null;
1586 +        }
1587 +    }
1588 +
1589 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1590 +                             Runnable... throwingActions) {
1591 +        for (Runnable throwingAction : throwingActions) {
1592 +            boolean threw = false;
1593 +            try { throwingAction.run(); }
1594 +            catch (Throwable t) {
1595 +                threw = true;
1596 +                if (!expectedExceptionClass.isInstance(t)) {
1597 +                    AssertionFailedError afe =
1598 +                        new AssertionFailedError
1599 +                        ("Expected " + expectedExceptionClass.getName() +
1600 +                         ", got " + t.getClass().getName());
1601 +                    afe.initCause(t);
1602 +                    threadUnexpectedException(afe);
1603 +                }
1604 +            }
1605 +            if (!threw)
1606 +                shouldThrow(expectedExceptionClass.getName());
1607 +        }
1608 +    }
1609 +
1610 +    public void assertIteratorExhausted(Iterator<?> it) {
1611 +        try {
1612 +            it.next();
1613 +            shouldThrow();
1614 +        } catch (NoSuchElementException success) {}
1615 +        assertFalse(it.hasNext());
1616 +    }
1617   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines