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.66 by jsr166, Thu Oct 28 17:57:26 2010 UTC vs.
Revision 1.153 by jsr166, Sat Oct 3 19:37:43 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.management.ThreadMXBean;
19 + import java.lang.reflect.Constructor;
20 + import java.lang.reflect.Method;
21 + import java.lang.reflect.Modifier;
22   import java.security.CodeSource;
23   import java.security.Permission;
24   import java.security.PermissionCollection;
# Line 19 | Line 26 | import java.security.Permissions;
26   import java.security.Policy;
27   import java.security.ProtectionDomain;
28   import java.security.SecurityPermission;
29 + import java.util.ArrayList;
30 + import java.util.Arrays;
31 + import java.util.Date;
32 + import java.util.Enumeration;
33 + import java.util.Iterator;
34 + import java.util.List;
35 + import java.util.NoSuchElementException;
36 + import java.util.PropertyPermission;
37 + import java.util.concurrent.BlockingQueue;
38 + import java.util.concurrent.Callable;
39 + import java.util.concurrent.CountDownLatch;
40 + import java.util.concurrent.CyclicBarrier;
41 + import java.util.concurrent.ExecutionException;
42 + import java.util.concurrent.Executors;
43 + import java.util.concurrent.ExecutorService;
44 + import java.util.concurrent.ForkJoinPool;
45 + import java.util.concurrent.Future;
46 + import java.util.concurrent.RecursiveAction;
47 + import java.util.concurrent.RecursiveTask;
48 + import java.util.concurrent.RejectedExecutionHandler;
49 + import java.util.concurrent.Semaphore;
50 + import java.util.concurrent.ThreadFactory;
51 + import java.util.concurrent.ThreadPoolExecutor;
52 + import java.util.concurrent.TimeoutException;
53 + import java.util.concurrent.atomic.AtomicReference;
54 + import java.util.regex.Pattern;
55 +
56 + import junit.framework.AssertionFailedError;
57 + import junit.framework.Test;
58 + import junit.framework.TestCase;
59 + import junit.framework.TestResult;
60 + import junit.framework.TestSuite;
61  
62   /**
63   * Base class for JSR166 Junit TCK tests.  Defines some constants,
# Line 30 | Line 69 | import java.security.SecurityPermission;
69   *
70   * <ol>
71   *
72 < * <li> All assertions in code running in generated threads must use
72 > * <li>All assertions in code running in generated threads must use
73   * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
74   * #threadAssertEquals}, or {@link #threadAssertNull}, (not
75   * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
76   * particularly recommended) for other code to use these forms too.
77   * Only the most typically used JUnit assertion methods are defined
78 < * this way, but enough to live with.</li>
78 > * this way, but enough to live with.
79   *
80 < * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
80 > * <li>If you override {@link #setUp} or {@link #tearDown}, make sure
81   * to invoke {@code super.setUp} and {@code super.tearDown} within
82   * them. These methods are used to clear and check for thread
83 < * assertion failures.</li>
83 > * assertion failures.
84   *
85   * <li>All delays and timeouts must use one of the constants {@code
86   * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
# Line 52 | Line 91 | import java.security.SecurityPermission;
91   * is always discriminable as larger than SHORT and smaller than
92   * MEDIUM.  And so on. These constants are set to conservative values,
93   * but even so, if there is ever any doubt, they can all be increased
94 < * in one spot to rerun tests on slower platforms.</li>
94 > * in one spot to rerun tests on slower platforms.
95   *
96 < * <li> All threads generated must be joined inside each test case
96 > * <li>All threads generated must be joined inside each test case
97   * method (or {@code fail} to do so) before returning from the
98   * method. The {@code joinPool} method can be used to do this when
99 < * using Executors.</li>
99 > * using Executors.
100   *
101   * </ol>
102   *
103 < * <p> <b>Other notes</b>
103 > * <p><b>Other notes</b>
104   * <ul>
105   *
106 < * <li> Usually, there is one testcase method per JSR166 method
106 > * <li>Usually, there is one testcase method per JSR166 method
107   * covering "normal" operation, and then as many exception-testing
108   * methods as there are exceptions the method can throw. Sometimes
109   * there are multiple tests per JSR166 method when the different
110   * "normal" behaviors differ significantly. And sometimes testcases
111   * cover multiple methods when they cannot be tested in
112 < * isolation.</li>
112 > * isolation.
113   *
114 < * <li> The documentation style for testcases is to provide as javadoc
114 > * <li>The documentation style for testcases is to provide as javadoc
115   * a simple sentence or two describing the property that the testcase
116   * method purports to test. The javadocs do not say anything about how
117 < * the property is tested. To find out, read the code.</li>
117 > * the property is tested. To find out, read the code.
118   *
119 < * <li> These tests are "conformance tests", and do not attempt to
119 > * <li>These tests are "conformance tests", and do not attempt to
120   * test throughput, latency, scalability or other performance factors
121   * (see the separate "jtreg" tests for a set intended to check these
122   * for the most central aspects of functionality.) So, most tests use
123   * the smallest sensible numbers of threads, collection sizes, etc
124 < * needed to check basic conformance.</li>
124 > * needed to check basic conformance.
125   *
126   * <li>The test classes currently do not declare inclusion in
127   * any particular package to simplify things for people integrating
128 < * them in TCK test suites.</li>
128 > * them in TCK test suites.
129   *
130 < * <li> As a convenience, the {@code main} of this class (JSR166TestCase)
131 < * runs all JSR166 unit tests.</li>
130 > * <li>As a convenience, the {@code main} of this class (JSR166TestCase)
131 > * runs all JSR166 unit tests.
132   *
133   * </ul>
134   */
# Line 101 | Line 140 | public class JSR166TestCase extends Test
140          Boolean.getBoolean("jsr166.expensiveTests");
141  
142      /**
143 +     * If true, also run tests that are not part of the official tck
144 +     * because they test unspecified implementation details.
145 +     */
146 +    protected static final boolean testImplementationDetails =
147 +        Boolean.getBoolean("jsr166.testImplementationDetails");
148 +
149 +    /**
150       * If true, report on stdout all "slow" tests, that is, ones that
151       * take more than profileThreshold milliseconds to execute.
152       */
# Line 114 | Line 160 | public class JSR166TestCase extends Test
160      private static final long profileThreshold =
161          Long.getLong("jsr166.profileThreshold", 100);
162  
163 +    /**
164 +     * The number of repetitions per test (for tickling rare bugs).
165 +     */
166 +    private static final int runsPerTest =
167 +        Integer.getInteger("jsr166.runsPerTest", 1);
168 +
169 +    /**
170 +     * The number of repetitions of the test suite (for finding leaks?).
171 +     */
172 +    private static final int suiteRuns =
173 +        Integer.getInteger("jsr166.suiteRuns", 1);
174 +
175 +    public JSR166TestCase() { super(); }
176 +    public JSR166TestCase(String name) { super(name); }
177 +
178 +    /**
179 +     * A filter for tests to run, matching strings of the form
180 +     * methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
181 +     * Usefully combined with jsr166.runsPerTest.
182 +     */
183 +    private static final Pattern methodFilter = methodFilter();
184 +
185 +    private static Pattern methodFilter() {
186 +        String regex = System.getProperty("jsr166.methodFilter");
187 +        return (regex == null) ? null : Pattern.compile(regex);
188 +    }
189 +
190 +    public void runBare() throws Throwable {
191 +        if (methodFilter == null
192 +            || methodFilter.matcher(toString()).find())
193 +            super.runBare();
194 +    }
195 +
196      protected void runTest() throws Throwable {
197 <        if (profileTests)
198 <            runTestProfiled();
199 <        else
200 <            super.runTest();
197 >        for (int i = 0; i < runsPerTest; i++) {
198 >            if (profileTests)
199 >                runTestProfiled();
200 >            else
201 >                super.runTest();
202 >        }
203      }
204  
205      protected void runTestProfiled() throws Throwable {
206 <        long t0 = System.nanoTime();
207 <        try {
206 >        for (int i = 0; i < 2; i++) {
207 >            long startTime = System.nanoTime();
208              super.runTest();
209 <        } finally {
210 <            long elapsedMillis =
211 <                (System.nanoTime() - t0) / (1000L * 1000L);
212 <            if (elapsedMillis >= profileThreshold)
209 >            long elapsedMillis = millisElapsedSince(startTime);
210 >            if (elapsedMillis < profileThreshold)
211 >                break;
212 >            // Never report first run of any test; treat it as a
213 >            // warmup run, notably to trigger all needed classloading,
214 >            if (i > 0)
215                  System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
216          }
217      }
218  
219      /**
220 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
220 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
221       */
222      public static void main(String[] args) {
223 +        main(suite(), args);
224 +    }
225 +
226 +    /**
227 +     * Runs all unit tests in the given test suite.
228 +     * Actual behavior influenced by jsr166.* system properties.
229 +     */
230 +    static void main(Test suite, String[] args) {
231          if (useSecurityManager) {
232              System.err.println("Setting a permissive security manager");
233              Policy.setPolicy(permissivePolicy());
234              System.setSecurityManager(new SecurityManager());
235          }
236 <        int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
237 <
238 <        Test s = suite();
239 <        for (int i = 0; i < iters; ++i) {
149 <            junit.textui.TestRunner.run(s);
236 >        for (int i = 0; i < suiteRuns; i++) {
237 >            TestResult result = junit.textui.TestRunner.run(suite);
238 >            if (!result.wasSuccessful())
239 >                System.exit(1);
240              System.gc();
241              System.runFinalization();
242          }
153        System.exit(0);
243      }
244  
245      public static TestSuite newTestSuite(Object... suiteOrClasses) {
# Line 166 | Line 255 | public class JSR166TestCase extends Test
255          return suite;
256      }
257  
258 +    public static void addNamedTestClasses(TestSuite suite,
259 +                                           String... testClassNames) {
260 +        for (String testClassName : testClassNames) {
261 +            try {
262 +                Class<?> testClass = Class.forName(testClassName);
263 +                Method m = testClass.getDeclaredMethod("suite",
264 +                                                       new Class<?>[0]);
265 +                suite.addTest(newTestSuite((Test)m.invoke(null)));
266 +            } catch (Exception e) {
267 +                throw new Error("Missing test class", e);
268 +            }
269 +        }
270 +    }
271 +
272 +    public static final double JAVA_CLASS_VERSION;
273 +    public static final String JAVA_SPECIFICATION_VERSION;
274 +    static {
275 +        try {
276 +            JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
277 +                new java.security.PrivilegedAction<Double>() {
278 +                public Double run() {
279 +                    return Double.valueOf(System.getProperty("java.class.version"));}});
280 +            JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
281 +                new java.security.PrivilegedAction<String>() {
282 +                public String run() {
283 +                    return System.getProperty("java.specification.version");}});
284 +        } catch (Throwable t) {
285 +            throw new Error(t);
286 +        }
287 +    }
288 +
289 +    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
290 +    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
291 +    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
292 +    public static boolean atLeastJava9() {
293 +        return JAVA_CLASS_VERSION >= 53.0
294 +            // As of 2015-09, java9 still uses 52.0 class file version
295 +            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
296 +    }
297 +    public static boolean atLeastJava10() {
298 +        return JAVA_CLASS_VERSION >= 54.0
299 +            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
300 +    }
301 +
302      /**
303       * Collects all JSR166 unit tests as one suite.
304       */
305      public static Test suite() {
306 <        return newTestSuite(
306 >        // Java7+ test classes
307 >        TestSuite suite = newTestSuite(
308              ForkJoinPoolTest.suite(),
309              ForkJoinTaskTest.suite(),
310              RecursiveActionTest.suite(),
# Line 235 | Line 369 | public class JSR166TestCase extends Test
369              TreeSetTest.suite(),
370              TreeSubMapTest.suite(),
371              TreeSubSetTest.suite());
372 +
373 +        // Java8+ test classes
374 +        if (atLeastJava8()) {
375 +            String[] java8TestClassNames = {
376 +                "Atomic8Test",
377 +                "CompletableFutureTest",
378 +                "ConcurrentHashMap8Test",
379 +                "CountedCompleterTest",
380 +                "DoubleAccumulatorTest",
381 +                "DoubleAdderTest",
382 +                "ForkJoinPool8Test",
383 +                "ForkJoinTask8Test",
384 +                "LongAccumulatorTest",
385 +                "LongAdderTest",
386 +                "SplittableRandomTest",
387 +                "StampedLockTest",
388 +                "SubmissionPublisherTest",
389 +                "ThreadLocalRandom8Test",
390 +            };
391 +            addNamedTestClasses(suite, java8TestClassNames);
392 +        }
393 +
394 +        // Java9+ test classes
395 +        if (atLeastJava9()) {
396 +            String[] java9TestClassNames = {
397 +                // Currently empty, but expecting varhandle tests
398 +            };
399 +            addNamedTestClasses(suite, java9TestClassNames);
400 +        }
401 +
402 +        return suite;
403 +    }
404 +
405 +    /** Returns list of junit-style test method names in given class. */
406 +    public static ArrayList<String> testMethodNames(Class<?> testClass) {
407 +        Method[] methods = testClass.getDeclaredMethods();
408 +        ArrayList<String> names = new ArrayList<String>(methods.length);
409 +        for (Method method : methods) {
410 +            if (method.getName().startsWith("test")
411 +                && Modifier.isPublic(method.getModifiers())
412 +                // method.getParameterCount() requires jdk8+
413 +                && method.getParameterTypes().length == 0) {
414 +                names.add(method.getName());
415 +            }
416 +        }
417 +        return names;
418 +    }
419 +
420 +    /**
421 +     * Returns junit-style testSuite for the given test class, but
422 +     * parameterized by passing extra data to each test.
423 +     */
424 +    public static <ExtraData> Test parameterizedTestSuite
425 +        (Class<? extends JSR166TestCase> testClass,
426 +         Class<ExtraData> dataClass,
427 +         ExtraData data) {
428 +        try {
429 +            TestSuite suite = new TestSuite();
430 +            Constructor c =
431 +                testClass.getDeclaredConstructor(dataClass, String.class);
432 +            for (String methodName : testMethodNames(testClass))
433 +                suite.addTest((Test) c.newInstance(data, methodName));
434 +            return suite;
435 +        } catch (Exception e) {
436 +            throw new Error(e);
437 +        }
438 +    }
439 +
440 +    /**
441 +     * Returns junit-style testSuite for the jdk8 extension of the
442 +     * given test class, but parameterized by passing extra data to
443 +     * each test.  Uses reflection to allow compilation in jdk7.
444 +     */
445 +    public static <ExtraData> Test jdk8ParameterizedTestSuite
446 +        (Class<? extends JSR166TestCase> testClass,
447 +         Class<ExtraData> dataClass,
448 +         ExtraData data) {
449 +        if (atLeastJava8()) {
450 +            String name = testClass.getName();
451 +            String name8 = name.replaceAll("Test$", "8Test");
452 +            if (name.equals(name8)) throw new Error(name);
453 +            try {
454 +                return (Test)
455 +                    Class.forName(name8)
456 +                    .getMethod("testSuite", new Class[] { dataClass })
457 +                    .invoke(null, data);
458 +            } catch (Exception e) {
459 +                throw new Error(e);
460 +            }
461 +        } else {
462 +            return new TestSuite();
463 +        }
464 +
465      }
466  
467 +    // Delays for timing-dependent tests, in milliseconds.
468  
469      public static long SHORT_DELAY_MS;
470      public static long SMALL_DELAY_MS;
471      public static long MEDIUM_DELAY_MS;
472      public static long LONG_DELAY_MS;
473  
246
474      /**
475       * Returns the shortest timed delay. This could
476       * be reimplemented to use for example a Property.
# Line 252 | Line 479 | public class JSR166TestCase extends Test
479          return 50;
480      }
481  
255
482      /**
483       * Sets delays as multiples of SHORT_DELAY.
484       */
# Line 260 | Line 486 | public class JSR166TestCase extends Test
486          SHORT_DELAY_MS = getShortDelay();
487          SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
488          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
489 <        LONG_DELAY_MS   = SHORT_DELAY_MS * 50;
489 >        LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
490 >    }
491 >
492 >    /**
493 >     * Returns a timeout in milliseconds to be used in tests that
494 >     * verify that operations block or time out.
495 >     */
496 >    long timeoutMillis() {
497 >        return SHORT_DELAY_MS / 4;
498 >    }
499 >
500 >    /**
501 >     * Returns a new Date instance representing a time at least
502 >     * delayMillis milliseconds in the future.
503 >     */
504 >    Date delayedDate(long delayMillis) {
505 >        // Add 1 because currentTimeMillis is known to round into the past.
506 >        return new Date(System.currentTimeMillis() + delayMillis + 1);
507      }
508  
509      /**
# Line 276 | Line 519 | public class JSR166TestCase extends Test
519       * the same test have no effect.
520       */
521      public void threadRecordFailure(Throwable t) {
522 +        printAllStackTraces();
523          threadFailure.compareAndSet(null, t);
524      }
525  
# Line 283 | Line 527 | public class JSR166TestCase extends Test
527          setDelays();
528      }
529  
530 +    void tearDownFail(String format, Object... args) {
531 +        String msg = toString() + ": " + String.format(format, args);
532 +        System.err.println(msg);
533 +        printAllStackTraces();
534 +        throw new AssertionFailedError(msg);
535 +    }
536 +
537      /**
538 +     * Extra checks that get done for all test cases.
539 +     *
540       * Triggers test case failure if any thread assertions have failed,
541       * by rethrowing, in the test harness thread, any exception recorded
542       * earlier by threadRecordFailure.
543 +     *
544 +     * Triggers test case failure if interrupt status is set in the main thread.
545       */
546      public void tearDown() throws Exception {
547 <        Throwable t = threadFailure.get();
547 >        Throwable t = threadFailure.getAndSet(null);
548          if (t != null) {
549              if (t instanceof Error)
550                  throw (Error) t;
# Line 304 | Line 559 | public class JSR166TestCase extends Test
559                  throw afe;
560              }
561          }
562 +
563 +        if (Thread.interrupted())
564 +            tearDownFail("interrupt status set in main thread");
565 +
566 +        checkForkJoinPoolThreadLeaks();
567 +    }
568 +
569 +    /**
570 +     * Finds missing try { ... } finally { joinPool(e); }
571 +     */
572 +    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
573 +        Thread[] survivors = new Thread[7];
574 +        int count = Thread.enumerate(survivors);
575 +        for (int i = 0; i < count; i++) {
576 +            Thread thread = survivors[i];
577 +            String name = thread.getName();
578 +            if (name.startsWith("ForkJoinPool-")) {
579 +                // give thread some time to terminate
580 +                thread.join(LONG_DELAY_MS);
581 +                if (thread.isAlive())
582 +                    tearDownFail("Found leaked ForkJoinPool thread thread=%s",
583 +                                 thread);
584 +            }
585 +        }
586 +
587 +        if (!ForkJoinPool.commonPool()
588 +            .awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
589 +            tearDownFail("ForkJoin common pool thread stuck");
590      }
591  
592      /**
# Line 316 | Line 599 | public class JSR166TestCase extends Test
599              fail(reason);
600          } catch (AssertionFailedError t) {
601              threadRecordFailure(t);
602 <            fail(reason);
602 >            throw t;
603          }
604      }
605  
# Line 384 | Line 667 | public class JSR166TestCase extends Test
667      public void threadAssertEquals(Object x, Object y) {
668          try {
669              assertEquals(x, y);
670 <        } catch (AssertionFailedError t) {
671 <            threadRecordFailure(t);
672 <            throw t;
673 <        } catch (Throwable t) {
674 <            threadUnexpectedException(t);
670 >        } catch (AssertionFailedError fail) {
671 >            threadRecordFailure(fail);
672 >            throw fail;
673 >        } catch (Throwable fail) {
674 >            threadUnexpectedException(fail);
675          }
676      }
677  
# Line 400 | Line 683 | public class JSR166TestCase extends Test
683      public void threadAssertSame(Object x, Object y) {
684          try {
685              assertSame(x, y);
686 <        } catch (AssertionFailedError t) {
687 <            threadRecordFailure(t);
688 <            throw t;
686 >        } catch (AssertionFailedError fail) {
687 >            threadRecordFailure(fail);
688 >            throw fail;
689          }
690      }
691  
# Line 435 | Line 718 | public class JSR166TestCase extends Test
718          else {
719              AssertionFailedError afe =
720                  new AssertionFailedError("unexpected exception: " + t);
721 <            t.initCause(t);
721 >            afe.initCause(t);
722              throw afe;
723          }
724      }
725  
726      /**
727 +     * Delays, via Thread.sleep, for the given millisecond delay, but
728 +     * if the sleep is shorter than specified, may re-sleep or yield
729 +     * until time elapses.
730 +     */
731 +    static void delay(long millis) throws InterruptedException {
732 +        long startTime = System.nanoTime();
733 +        long ns = millis * 1000 * 1000;
734 +        for (;;) {
735 +            if (millis > 0L)
736 +                Thread.sleep(millis);
737 +            else // too short to sleep
738 +                Thread.yield();
739 +            long d = ns - (System.nanoTime() - startTime);
740 +            if (d > 0L)
741 +                millis = d / (1000 * 1000);
742 +            else
743 +                break;
744 +        }
745 +    }
746 +
747 +    /**
748 +     * Allows use of try-with-resources with per-test thread pools.
749 +     */
750 +    static class PoolCloser<T extends ExecutorService>
751 +            implements AutoCloseable {
752 +        public final T pool;
753 +        public PoolCloser(T pool) { this.pool = pool; }
754 +        public void close() { joinPool(pool); }
755 +    }
756 +
757 +    /**
758       * Waits out termination of a thread pool or fails doing so.
759       */
760 <    public void joinPool(ExecutorService exec) {
760 >    static void joinPool(ExecutorService pool) {
761          try {
762 <            exec.shutdown();
763 <            assertTrue("ExecutorService did not terminate in a timely manner",
764 <                       exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
762 >            pool.shutdown();
763 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
764 >                fail("ExecutorService " + pool +
765 >                     " did not terminate in a timely manner");
766          } catch (SecurityException ok) {
767              // Allowed in case test doesn't have privs
768 <        } catch (InterruptedException ie) {
768 >        } catch (InterruptedException fail) {
769              fail("Unexpected InterruptedException");
770          }
771      }
772  
773 +    /** Like Runnable, but with the freedom to throw anything */
774 +    interface Action { public void run() throws Throwable; }
775 +
776 +    /**
777 +     * Runs all the given actions in parallel, failing if any fail.
778 +     * Useful for running multiple variants of tests that are
779 +     * necessarily individually slow because they must block.
780 +     */
781 +    void testInParallel(Action ... actions) {
782 +        try (PoolCloser<ExecutorService> poolCloser
783 +             = new PoolCloser<>(Executors.newCachedThreadPool())) {
784 +            ExecutorService pool = poolCloser.pool;
785 +            ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
786 +            for (final Action action : actions)
787 +                futures.add(pool.submit(new CheckedRunnable() {
788 +                    public void realRun() throws Throwable { action.run();}}));
789 +            for (Future<?> future : futures)
790 +                try {
791 +                    assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
792 +                } catch (ExecutionException ex) {
793 +                    threadUnexpectedException(ex.getCause());
794 +                } catch (Exception ex) {
795 +                    threadUnexpectedException(ex);
796 +                }
797 +        }
798 +    }
799 +
800 +    /**
801 +     * A debugging tool to print all stack traces, as jstack does.
802 +     * Uninteresting threads are filtered out.
803 +     */
804 +    static void printAllStackTraces() {
805 +        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
806 +        System.err.println("------ stacktrace dump start ------");
807 +        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
808 +            String name = info.getThreadName();
809 +            if ("Signal Dispatcher".equals(name))
810 +                continue;
811 +            if ("Reference Handler".equals(name)
812 +                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
813 +                continue;
814 +            if ("Finalizer".equals(name)
815 +                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
816 +                continue;
817 +            System.err.print(info);
818 +        }
819 +        System.err.println("------ stacktrace dump end ------");
820 +    }
821 +
822 +    /**
823 +     * Checks that thread does not terminate within the default
824 +     * millisecond delay of {@code timeoutMillis()}.
825 +     */
826 +    void assertThreadStaysAlive(Thread thread) {
827 +        assertThreadStaysAlive(thread, timeoutMillis());
828 +    }
829 +
830 +    /**
831 +     * Checks that thread does not terminate within the given millisecond delay.
832 +     */
833 +    void assertThreadStaysAlive(Thread thread, long millis) {
834 +        try {
835 +            // No need to optimize the failing case via Thread.join.
836 +            delay(millis);
837 +            assertTrue(thread.isAlive());
838 +        } catch (InterruptedException fail) {
839 +            fail("Unexpected InterruptedException");
840 +        }
841 +    }
842 +
843 +    /**
844 +     * Checks that the threads do not terminate within the default
845 +     * millisecond delay of {@code timeoutMillis()}.
846 +     */
847 +    void assertThreadsStayAlive(Thread... threads) {
848 +        assertThreadsStayAlive(timeoutMillis(), threads);
849 +    }
850 +
851 +    /**
852 +     * Checks that the threads do not terminate within the given millisecond delay.
853 +     */
854 +    void assertThreadsStayAlive(long millis, Thread... threads) {
855 +        try {
856 +            // No need to optimize the failing case via Thread.join.
857 +            delay(millis);
858 +            for (Thread thread : threads)
859 +                assertTrue(thread.isAlive());
860 +        } catch (InterruptedException fail) {
861 +            fail("Unexpected InterruptedException");
862 +        }
863 +    }
864 +
865 +    /**
866 +     * Checks that future.get times out, with the default timeout of
867 +     * {@code timeoutMillis()}.
868 +     */
869 +    void assertFutureTimesOut(Future future) {
870 +        assertFutureTimesOut(future, timeoutMillis());
871 +    }
872 +
873 +    /**
874 +     * Checks that future.get times out, with the given millisecond timeout.
875 +     */
876 +    void assertFutureTimesOut(Future future, long timeoutMillis) {
877 +        long startTime = System.nanoTime();
878 +        try {
879 +            future.get(timeoutMillis, MILLISECONDS);
880 +            shouldThrow();
881 +        } catch (TimeoutException success) {
882 +        } catch (Exception fail) {
883 +            threadUnexpectedException(fail);
884 +        } finally { future.cancel(true); }
885 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
886 +    }
887  
888      /**
889       * Fails with message "should throw exception".
# Line 495 | Line 924 | public class JSR166TestCase extends Test
924      public static final Integer m6  = new Integer(-6);
925      public static final Integer m10 = new Integer(-10);
926  
498
927      /**
928       * Runs Runnable r with a security policy that permits precisely
929       * the specified permissions.  If there is no current security
# Line 507 | Line 935 | public class JSR166TestCase extends Test
935          SecurityManager sm = System.getSecurityManager();
936          if (sm == null) {
937              r.run();
938 +        }
939 +        runWithSecurityManagerWithPermissions(r, permissions);
940 +    }
941 +
942 +    /**
943 +     * Runs Runnable r with a security policy that permits precisely
944 +     * the specified permissions.  If there is no current security
945 +     * manager, a temporary one is set for the duration of the
946 +     * Runnable.  We require that any security manager permit
947 +     * getPolicy/setPolicy.
948 +     */
949 +    public void runWithSecurityManagerWithPermissions(Runnable r,
950 +                                                      Permission... permissions) {
951 +        SecurityManager sm = System.getSecurityManager();
952 +        if (sm == null) {
953              Policy savedPolicy = Policy.getPolicy();
954              try {
955                  Policy.setPolicy(permissivePolicy());
956                  System.setSecurityManager(new SecurityManager());
957 <                runWithPermissions(r, permissions);
957 >                runWithSecurityManagerWithPermissions(r, permissions);
958              } finally {
959                  System.setSecurityManager(null);
960                  Policy.setPolicy(savedPolicy);
# Line 559 | Line 1002 | public class JSR166TestCase extends Test
1002              return perms.implies(p);
1003          }
1004          public void refresh() {}
1005 +        public String toString() {
1006 +            List<Permission> ps = new ArrayList<Permission>();
1007 +            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1008 +                ps.add(e.nextElement());
1009 +            return "AdjustablePolicy with permissions " + ps;
1010 +        }
1011      }
1012  
1013      /**
# Line 586 | Line 1035 | public class JSR166TestCase extends Test
1035       */
1036      void sleep(long millis) {
1037          try {
1038 <            Thread.sleep(millis);
1039 <        } catch (InterruptedException ie) {
1038 >            delay(millis);
1039 >        } catch (InterruptedException fail) {
1040              AssertionFailedError afe =
1041                  new AssertionFailedError("Unexpected InterruptedException");
1042 <            afe.initCause(ie);
1042 >            afe.initCause(fail);
1043              throw afe;
1044          }
1045      }
1046  
1047      /**
1048 <     * Sleeps until the timeout has elapsed, or interrupted.
600 <     * Does <em>NOT</em> throw InterruptedException.
601 <     */
602 <    void sleepTillInterrupted(long timeoutMillis) {
603 <        try {
604 <            Thread.sleep(timeoutMillis);
605 <        } catch (InterruptedException wakeup) {}
606 <    }
607 <
608 <    /**
609 <     * Waits up to the specified number of milliseconds for the given
1048 >     * Spin-waits up to the specified number of milliseconds for the given
1049       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1050       */
1051      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1052 <        long timeoutNanos = timeoutMillis * 1000L * 1000L;
614 <        long t0 = System.nanoTime();
1052 >        long startTime = System.nanoTime();
1053          for (;;) {
1054              Thread.State s = thread.getState();
1055              if (s == Thread.State.BLOCKED ||
1056                  s == Thread.State.WAITING ||
1057 <                s == Thread.State.TIMED_WAITING ||
1058 <                System.nanoTime() - t0 > timeoutNanos)
1057 >                s == Thread.State.TIMED_WAITING)
1058 >                return;
1059 >            else if (s == Thread.State.TERMINATED)
1060 >                fail("Unexpected thread termination");
1061 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1062 >                threadAssertTrue(thread.isAlive());
1063                  return;
1064 +            }
1065              Thread.yield();
1066          }
1067      }
1068  
1069      /**
1070 +     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1071 +     * state: BLOCKED, WAITING, or TIMED_WAITING.
1072 +     */
1073 +    void waitForThreadToEnterWaitState(Thread thread) {
1074 +        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1075 +    }
1076 +
1077 +    /**
1078       * Returns the number of milliseconds since time given by
1079       * startNanoTime, which must have been previously returned from a
1080 <     * call to {@link System.nanoTime()}.
1080 >     * call to {@link System#nanoTime()}.
1081       */
1082 <    long millisElapsedSince(long startNanoTime) {
1082 >    static long millisElapsedSince(long startNanoTime) {
1083          return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1084      }
1085 <    
1085 >
1086 > //     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1087 > //         long startTime = System.nanoTime();
1088 > //         try {
1089 > //             r.run();
1090 > //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1091 > //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1092 > //             throw new AssertionFailedError("did not return promptly");
1093 > //     }
1094 >
1095 > //     void assertTerminatesPromptly(Runnable r) {
1096 > //         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1097 > //     }
1098 >
1099 >    /**
1100 >     * Checks that timed f.get() returns the expected value, and does not
1101 >     * wait for the timeout to elapse before returning.
1102 >     */
1103 >    <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1104 >        long startTime = System.nanoTime();
1105 >        try {
1106 >            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1107 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
1108 >        if (millisElapsedSince(startTime) > timeoutMillis/2)
1109 >            throw new AssertionFailedError("timed get did not return promptly");
1110 >    }
1111 >
1112 >    <T> void checkTimedGet(Future<T> f, T expectedValue) {
1113 >        checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1114 >    }
1115 >
1116      /**
1117       * Returns a new started daemon Thread running the given runnable.
1118       */
# Line 650 | Line 1131 | public class JSR166TestCase extends Test
1131      void awaitTermination(Thread t, long timeoutMillis) {
1132          try {
1133              t.join(timeoutMillis);
1134 <        } catch (InterruptedException ie) {
1135 <            threadUnexpectedException(ie);
1134 >        } catch (InterruptedException fail) {
1135 >            threadUnexpectedException(fail);
1136          } finally {
1137 <            if (t.isAlive()) {
1137 >            if (t.getState() != Thread.State.TERMINATED) {
1138                  t.interrupt();
1139                  fail("Test timed out");
1140              }
1141          }
1142      }
1143  
1144 +    /**
1145 +     * Waits for LONG_DELAY_MS milliseconds for the thread to
1146 +     * terminate (using {@link Thread#join(long)}), else interrupts
1147 +     * the thread (in the hope that it may terminate later) and fails.
1148 +     */
1149 +    void awaitTermination(Thread t) {
1150 +        awaitTermination(t, LONG_DELAY_MS);
1151 +    }
1152 +
1153      // Some convenient Runnable classes
1154  
1155      public abstract class CheckedRunnable implements Runnable {
# Line 668 | Line 1158 | public class JSR166TestCase extends Test
1158          public final void run() {
1159              try {
1160                  realRun();
1161 <            } catch (Throwable t) {
1162 <                threadUnexpectedException(t);
1161 >            } catch (Throwable fail) {
1162 >                threadUnexpectedException(fail);
1163              }
1164          }
1165      }
# Line 722 | Line 1212 | public class JSR166TestCase extends Test
1212                  realRun();
1213                  threadShouldThrow("InterruptedException");
1214              } catch (InterruptedException success) {
1215 <            } catch (Throwable t) {
1216 <                threadUnexpectedException(t);
1215 >                threadAssertFalse(Thread.interrupted());
1216 >            } catch (Throwable fail) {
1217 >                threadUnexpectedException(fail);
1218              }
1219          }
1220      }
# Line 734 | Line 1225 | public class JSR166TestCase extends Test
1225          public final T call() {
1226              try {
1227                  return realCall();
1228 <            } catch (Throwable t) {
1229 <                threadUnexpectedException(t);
1228 >            } catch (Throwable fail) {
1229 >                threadUnexpectedException(fail);
1230                  return null;
1231              }
1232          }
# Line 751 | Line 1242 | public class JSR166TestCase extends Test
1242                  threadShouldThrow("InterruptedException");
1243                  return result;
1244              } catch (InterruptedException success) {
1245 <            } catch (Throwable t) {
1246 <                threadUnexpectedException(t);
1245 >                threadAssertFalse(Thread.interrupted());
1246 >            } catch (Throwable fail) {
1247 >                threadUnexpectedException(fail);
1248              }
1249              return null;
1250          }
# Line 769 | Line 1261 | public class JSR166TestCase extends Test
1261      public static final String TEST_STRING = "a test string";
1262  
1263      public static class StringTask implements Callable<String> {
1264 <        public String call() { return TEST_STRING; }
1264 >        final String value;
1265 >        public StringTask() { this(TEST_STRING); }
1266 >        public StringTask(String value) { this.value = value; }
1267 >        public String call() { return value; }
1268      }
1269  
1270      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
# Line 782 | Line 1277 | public class JSR166TestCase extends Test
1277              }};
1278      }
1279  
1280 +    public Runnable countDowner(final CountDownLatch latch) {
1281 +        return new CheckedRunnable() {
1282 +            public void realRun() throws InterruptedException {
1283 +                latch.countDown();
1284 +            }};
1285 +    }
1286 +
1287 +    public Runnable awaiter(final CountDownLatch latch) {
1288 +        return new CheckedRunnable() {
1289 +            public void realRun() throws InterruptedException {
1290 +                await(latch);
1291 +            }};
1292 +    }
1293 +
1294 +    public void await(CountDownLatch latch) {
1295 +        try {
1296 +            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1297 +        } catch (Throwable fail) {
1298 +            threadUnexpectedException(fail);
1299 +        }
1300 +    }
1301 +
1302 +    public void await(Semaphore semaphore) {
1303 +        try {
1304 +            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1305 +        } catch (Throwable fail) {
1306 +            threadUnexpectedException(fail);
1307 +        }
1308 +    }
1309 +
1310 + //     /**
1311 + //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1312 + //      */
1313 + //     public void await(AtomicBoolean flag) {
1314 + //         await(flag, LONG_DELAY_MS);
1315 + //     }
1316 +
1317 + //     /**
1318 + //      * Spin-waits up to the specified timeout until flag becomes true.
1319 + //      */
1320 + //     public void await(AtomicBoolean flag, long timeoutMillis) {
1321 + //         long startTime = System.nanoTime();
1322 + //         while (!flag.get()) {
1323 + //             if (millisElapsedSince(startTime) > timeoutMillis)
1324 + //                 throw new AssertionFailedError("timed out");
1325 + //             Thread.yield();
1326 + //         }
1327 + //     }
1328 +
1329      public static class NPETask implements Callable<String> {
1330          public String call() { throw new NullPointerException(); }
1331      }
# Line 792 | Line 1336 | public class JSR166TestCase extends Test
1336  
1337      public class ShortRunnable extends CheckedRunnable {
1338          protected void realRun() throws Throwable {
1339 <            Thread.sleep(SHORT_DELAY_MS);
1339 >            delay(SHORT_DELAY_MS);
1340          }
1341      }
1342  
1343      public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1344          protected void realRun() throws InterruptedException {
1345 <            Thread.sleep(SHORT_DELAY_MS);
1345 >            delay(SHORT_DELAY_MS);
1346          }
1347      }
1348  
1349      public class SmallRunnable extends CheckedRunnable {
1350          protected void realRun() throws Throwable {
1351 <            Thread.sleep(SMALL_DELAY_MS);
1351 >            delay(SMALL_DELAY_MS);
1352          }
1353      }
1354  
1355      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1356          protected void realRun() {
1357              try {
1358 <                Thread.sleep(SMALL_DELAY_MS);
1358 >                delay(SMALL_DELAY_MS);
1359              } catch (InterruptedException ok) {}
1360          }
1361      }
1362  
1363      public class SmallCallable extends CheckedCallable {
1364          protected Object realCall() throws InterruptedException {
1365 <            Thread.sleep(SMALL_DELAY_MS);
1365 >            delay(SMALL_DELAY_MS);
1366              return Boolean.TRUE;
1367          }
1368      }
1369  
1370      public class MediumRunnable extends CheckedRunnable {
1371          protected void realRun() throws Throwable {
1372 <            Thread.sleep(MEDIUM_DELAY_MS);
1372 >            delay(MEDIUM_DELAY_MS);
1373          }
1374      }
1375  
1376      public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1377          protected void realRun() throws InterruptedException {
1378 <            Thread.sleep(MEDIUM_DELAY_MS);
1378 >            delay(MEDIUM_DELAY_MS);
1379          }
1380      }
1381  
# Line 839 | Line 1383 | public class JSR166TestCase extends Test
1383          return new CheckedRunnable() {
1384              protected void realRun() {
1385                  try {
1386 <                    Thread.sleep(timeoutMillis);
1386 >                    delay(timeoutMillis);
1387                  } catch (InterruptedException ok) {}
1388              }};
1389      }
# Line 847 | Line 1391 | public class JSR166TestCase extends Test
1391      public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1392          protected void realRun() {
1393              try {
1394 <                Thread.sleep(MEDIUM_DELAY_MS);
1394 >                delay(MEDIUM_DELAY_MS);
1395              } catch (InterruptedException ok) {}
1396          }
1397      }
# Line 855 | Line 1399 | public class JSR166TestCase extends Test
1399      public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1400          protected void realRun() {
1401              try {
1402 <                Thread.sleep(LONG_DELAY_MS);
1402 >                delay(LONG_DELAY_MS);
1403              } catch (InterruptedException ok) {}
1404          }
1405      }
# Line 879 | Line 1423 | public class JSR166TestCase extends Test
1423                  public boolean isDone() { return done; }
1424                  public void run() {
1425                      try {
1426 <                        Thread.sleep(timeoutMillis);
1426 >                        delay(timeoutMillis);
1427                          done = true;
1428                      } catch (InterruptedException ok) {}
1429                  }
# Line 890 | Line 1434 | public class JSR166TestCase extends Test
1434          public volatile boolean done = false;
1435          public void run() {
1436              try {
1437 <                Thread.sleep(SHORT_DELAY_MS);
1437 >                delay(SHORT_DELAY_MS);
1438                  done = true;
1439              } catch (InterruptedException ok) {}
1440          }
# Line 900 | Line 1444 | public class JSR166TestCase extends Test
1444          public volatile boolean done = false;
1445          public void run() {
1446              try {
1447 <                Thread.sleep(SMALL_DELAY_MS);
1447 >                delay(SMALL_DELAY_MS);
1448                  done = true;
1449              } catch (InterruptedException ok) {}
1450          }
# Line 910 | Line 1454 | public class JSR166TestCase extends Test
1454          public volatile boolean done = false;
1455          public void run() {
1456              try {
1457 <                Thread.sleep(MEDIUM_DELAY_MS);
1457 >                delay(MEDIUM_DELAY_MS);
1458                  done = true;
1459              } catch (InterruptedException ok) {}
1460          }
# Line 920 | Line 1464 | public class JSR166TestCase extends Test
1464          public volatile boolean done = false;
1465          public void run() {
1466              try {
1467 <                Thread.sleep(LONG_DELAY_MS);
1467 >                delay(LONG_DELAY_MS);
1468                  done = true;
1469              } catch (InterruptedException ok) {}
1470          }
# Line 937 | Line 1481 | public class JSR166TestCase extends Test
1481          public volatile boolean done = false;
1482          public Object call() {
1483              try {
1484 <                Thread.sleep(SMALL_DELAY_MS);
1484 >                delay(SMALL_DELAY_MS);
1485                  done = true;
1486              } catch (InterruptedException ok) {}
1487              return Boolean.TRUE;
# Line 950 | Line 1494 | public class JSR166TestCase extends Test
1494      public abstract class CheckedRecursiveAction extends RecursiveAction {
1495          protected abstract void realCompute() throws Throwable;
1496  
1497 <        public final void compute() {
1497 >        @Override protected final void compute() {
1498              try {
1499                  realCompute();
1500 <            } catch (Throwable t) {
1501 <                threadUnexpectedException(t);
1500 >            } catch (Throwable fail) {
1501 >                threadUnexpectedException(fail);
1502              }
1503          }
1504      }
# Line 965 | Line 1509 | public class JSR166TestCase extends Test
1509      public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1510          protected abstract T realCompute() throws Throwable;
1511  
1512 <        public final T compute() {
1512 >        @Override protected final T compute() {
1513              try {
1514                  return realCompute();
1515 <            } catch (Throwable t) {
1516 <                threadUnexpectedException(t);
1515 >            } catch (Throwable fail) {
1516 >                threadUnexpectedException(fail);
1517                  return null;
1518              }
1519          }
# Line 984 | Line 1528 | public class JSR166TestCase extends Test
1528      }
1529  
1530      /**
1531 <     * A CyclicBarrier that fails with AssertionFailedErrors instead
1532 <     * of throwing checked exceptions.
1531 >     * A CyclicBarrier that uses timed await and fails with
1532 >     * AssertionFailedErrors instead of throwing checked exceptions.
1533       */
1534      public class CheckedBarrier extends CyclicBarrier {
1535          public CheckedBarrier(int parties) { super(parties); }
1536  
1537          public int await() {
1538              try {
1539 <                return super.await();
1540 <            } catch (Exception e) {
1539 >                return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1540 >            } catch (TimeoutException timedOut) {
1541 >                throw new AssertionFailedError("timed out");
1542 >            } catch (Exception fail) {
1543                  AssertionFailedError afe =
1544 <                    new AssertionFailedError("Unexpected exception: " + e);
1545 <                afe.initCause(e);
1544 >                    new AssertionFailedError("Unexpected exception: " + fail);
1545 >                afe.initCause(fail);
1546                  throw afe;
1547              }
1548          }
1549      }
1550  
1551 +    void checkEmpty(BlockingQueue q) {
1552 +        try {
1553 +            assertTrue(q.isEmpty());
1554 +            assertEquals(0, q.size());
1555 +            assertNull(q.peek());
1556 +            assertNull(q.poll());
1557 +            assertNull(q.poll(0, MILLISECONDS));
1558 +            assertEquals(q.toString(), "[]");
1559 +            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1560 +            assertFalse(q.iterator().hasNext());
1561 +            try {
1562 +                q.element();
1563 +                shouldThrow();
1564 +            } catch (NoSuchElementException success) {}
1565 +            try {
1566 +                q.iterator().next();
1567 +                shouldThrow();
1568 +            } catch (NoSuchElementException success) {}
1569 +            try {
1570 +                q.remove();
1571 +                shouldThrow();
1572 +            } catch (NoSuchElementException success) {}
1573 +        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
1574 +    }
1575 +
1576 +    void assertSerialEquals(Object x, Object y) {
1577 +        assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1578 +    }
1579 +
1580 +    void assertNotSerialEquals(Object x, Object y) {
1581 +        assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1582 +    }
1583 +
1584 +    byte[] serialBytes(Object o) {
1585 +        try {
1586 +            ByteArrayOutputStream bos = new ByteArrayOutputStream();
1587 +            ObjectOutputStream oos = new ObjectOutputStream(bos);
1588 +            oos.writeObject(o);
1589 +            oos.flush();
1590 +            oos.close();
1591 +            return bos.toByteArray();
1592 +        } catch (Throwable fail) {
1593 +            threadUnexpectedException(fail);
1594 +            return new byte[0];
1595 +        }
1596 +    }
1597 +
1598 +    @SuppressWarnings("unchecked")
1599 +    <T> T serialClone(T o) {
1600 +        try {
1601 +            ObjectInputStream ois = new ObjectInputStream
1602 +                (new ByteArrayInputStream(serialBytes(o)));
1603 +            T clone = (T) ois.readObject();
1604 +            assertSame(o.getClass(), clone.getClass());
1605 +            return clone;
1606 +        } catch (Throwable fail) {
1607 +            threadUnexpectedException(fail);
1608 +            return null;
1609 +        }
1610 +    }
1611 +
1612 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1613 +                             Runnable... throwingActions) {
1614 +        for (Runnable throwingAction : throwingActions) {
1615 +            boolean threw = false;
1616 +            try { throwingAction.run(); }
1617 +            catch (Throwable t) {
1618 +                threw = true;
1619 +                if (!expectedExceptionClass.isInstance(t)) {
1620 +                    AssertionFailedError afe =
1621 +                        new AssertionFailedError
1622 +                        ("Expected " + expectedExceptionClass.getName() +
1623 +                         ", got " + t.getClass().getName());
1624 +                    afe.initCause(t);
1625 +                    threadUnexpectedException(afe);
1626 +                }
1627 +            }
1628 +            if (!threw)
1629 +                shouldThrow(expectedExceptionClass.getName());
1630 +        }
1631 +    }
1632 +
1633 +    public void assertIteratorExhausted(Iterator<?> it) {
1634 +        try {
1635 +            it.next();
1636 +            shouldThrow();
1637 +        } catch (NoSuchElementException success) {}
1638 +        assertFalse(it.hasNext());
1639 +    }
1640   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines