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.48 by jsr166, Tue Dec 1 22:51:44 2009 UTC vs.
Revision 1.96 by jsr166, Mon Jan 21 19:51:46 2013 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.*;
10 > import java.io.ByteArrayInputStream;
11 > import java.io.ByteArrayOutputStream;
12 > import java.io.ObjectInputStream;
13 > import java.io.ObjectOutputStream;
14 > import java.lang.management.ManagementFactory;
15 > import java.lang.management.ThreadInfo;
16 > import java.util.ArrayList;
17 > import java.util.Arrays;
18 > import java.util.Date;
19 > import java.util.Enumeration;
20 > import java.util.List;
21 > import java.util.NoSuchElementException;
22 > import java.util.PropertyPermission;
23   import java.util.concurrent.*;
24 + import java.util.concurrent.atomic.AtomicBoolean;
25 + import java.util.concurrent.atomic.AtomicReference;
26   import static java.util.concurrent.TimeUnit.MILLISECONDS;
27 < import java.io.*;
28 < import java.security.*;
27 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
28 > import java.security.CodeSource;
29 > import java.security.Permission;
30 > import java.security.PermissionCollection;
31 > import java.security.Permissions;
32 > import java.security.Policy;
33 > import java.security.ProtectionDomain;
34 > import java.security.SecurityPermission;
35  
36   /**
37   * Base class for JSR166 Junit TCK tests.  Defines some constants,
# Line 26 | Line 46 | import java.security.*;
46   * <li> All assertions in code running in generated threads must use
47   * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
48   * #threadAssertEquals}, or {@link #threadAssertNull}, (not
49 < * <tt>fail</tt>, <tt>assertTrue</tt>, etc.) It is OK (but not
49 > * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
50   * particularly recommended) for other code to use these forms too.
51   * Only the most typically used JUnit assertion methods are defined
52   * this way, but enough to live with.</li>
53   *
54   * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
55 < * to invoke <tt>super.setUp</tt> and <tt>super.tearDown</tt> within
55 > * to invoke {@code super.setUp} and {@code super.tearDown} within
56   * them. These methods are used to clear and check for thread
57   * assertion failures.</li>
58   *
59 < * <li>All delays and timeouts must use one of the constants <tt>
60 < * SHORT_DELAY_MS</tt>, <tt> SMALL_DELAY_MS</tt>, <tt> MEDIUM_DELAY_MS</tt>,
61 < * <tt> LONG_DELAY_MS</tt>. The idea here is that a SHORT is always
59 > * <li>All delays and timeouts must use one of the constants {@code
60 > * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
61 > * {@code LONG_DELAY_MS}. The idea here is that a SHORT is always
62   * discriminable from zero time, and always allows enough time for the
63   * small amounts of computation (creating a thread, calling a few
64   * methods, etc) needed to reach a timeout point. Similarly, a SMALL
# Line 48 | Line 68 | import java.security.*;
68   * in one spot to rerun tests on slower platforms.</li>
69   *
70   * <li> All threads generated must be joined inside each test case
71 < * method (or <tt>fail</tt> to do so) before returning from the
72 < * method. The <tt> joinPool</tt> method can be used to do this when
71 > * method (or {@code fail} to do so) before returning from the
72 > * method. The {@code joinPool} method can be used to do this when
73   * using Executors.</li>
74   *
75   * </ol>
76   *
77 < * <p> <b>Other notes</b>
77 > * <p><b>Other notes</b>
78   * <ul>
79   *
80   * <li> Usually, there is one testcase method per JSR166 method
# Line 81 | Line 101 | import java.security.*;
101   * any particular package to simplify things for people integrating
102   * them in TCK test suites.</li>
103   *
104 < * <li> As a convenience, the <tt>main</tt> of this class (JSR166TestCase)
104 > * <li> As a convenience, the {@code main} of this class (JSR166TestCase)
105   * runs all JSR166 unit tests.</li>
106   *
107   * </ul>
108   */
109   public class JSR166TestCase extends TestCase {
110 +    private static final boolean useSecurityManager =
111 +        Boolean.getBoolean("jsr166.useSecurityManager");
112 +
113 +    protected static final boolean expensiveTests =
114 +        Boolean.getBoolean("jsr166.expensiveTests");
115 +
116 +    /**
117 +     * If true, report on stdout all "slow" tests, that is, ones that
118 +     * take more than profileThreshold milliseconds to execute.
119 +     */
120 +    private static final boolean profileTests =
121 +        Boolean.getBoolean("jsr166.profileTests");
122 +
123 +    /**
124 +     * The number of milliseconds that tests are permitted for
125 +     * execution without being reported, when profileTests is set.
126 +     */
127 +    private static final long profileThreshold =
128 +        Long.getLong("jsr166.profileThreshold", 100);
129 +
130 +    protected void runTest() throws Throwable {
131 +        if (profileTests)
132 +            runTestProfiled();
133 +        else
134 +            super.runTest();
135 +    }
136 +
137 +    protected void runTestProfiled() throws Throwable {
138 +        long t0 = System.nanoTime();
139 +        try {
140 +            super.runTest();
141 +        } finally {
142 +            long elapsedMillis =
143 +                (System.nanoTime() - t0) / (1000L * 1000L);
144 +            if (elapsedMillis >= profileThreshold)
145 +                System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
146 +        }
147 +    }
148 +
149      /**
150 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
150 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
151 >     * Optional command line arg provides the number of iterations to
152 >     * repeat running the tests.
153       */
154      public static void main(String[] args) {
155 <        int iters = 1;
156 <        if (args.length > 0)
157 <            iters = Integer.parseInt(args[0]);
155 >        if (useSecurityManager) {
156 >            System.err.println("Setting a permissive security manager");
157 >            Policy.setPolicy(permissivePolicy());
158 >            System.setSecurityManager(new SecurityManager());
159 >        }
160 >        int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
161 >
162          Test s = suite();
163          for (int i = 0; i < iters; ++i) {
164              junit.textui.TestRunner.run(s);
# Line 103 | Line 168 | public class JSR166TestCase extends Test
168          System.exit(0);
169      }
170  
171 +    public static TestSuite newTestSuite(Object... suiteOrClasses) {
172 +        TestSuite suite = new TestSuite();
173 +        for (Object suiteOrClass : suiteOrClasses) {
174 +            if (suiteOrClass instanceof TestSuite)
175 +                suite.addTest((TestSuite) suiteOrClass);
176 +            else if (suiteOrClass instanceof Class)
177 +                suite.addTest(new TestSuite((Class<?>) suiteOrClass));
178 +            else
179 +                throw new ClassCastException("not a test suite or class");
180 +        }
181 +        return suite;
182 +    }
183 +
184      /**
185 <     * Collects all JSR166 unit tests as one suite
185 >     * Collects all JSR166 unit tests as one suite.
186       */
187      public static Test suite() {
188 <        TestSuite suite = new TestSuite("JSR166 Unit Tests");
189 <
190 <        suite.addTest(new TestSuite(ForkJoinPoolTest.class));
191 <        suite.addTest(new TestSuite(ForkJoinTaskTest.class));
192 <        suite.addTest(new TestSuite(RecursiveActionTest.class));
193 <        suite.addTest(new TestSuite(RecursiveTaskTest.class));
194 <        suite.addTest(new TestSuite(LinkedTransferQueueTest.class));
195 <        suite.addTest(new TestSuite(PhaserTest.class));
196 <        suite.addTest(new TestSuite(ThreadLocalRandomTest.class));
197 <        suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
198 <        suite.addTest(new TestSuite(AbstractQueueTest.class));
199 <        suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
200 <        suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class));
201 <        suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
202 <        suite.addTest(new TestSuite(ArrayDequeTest.class));
203 <        suite.addTest(new TestSuite(AtomicBooleanTest.class));
204 <        suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
205 <        suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
206 <        suite.addTest(new TestSuite(AtomicIntegerTest.class));
207 <        suite.addTest(new TestSuite(AtomicLongArrayTest.class));
208 <        suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
209 <        suite.addTest(new TestSuite(AtomicLongTest.class));
210 <        suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
211 <        suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
212 <        suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
213 <        suite.addTest(new TestSuite(AtomicReferenceTest.class));
214 <        suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
215 <        suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
216 <        suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
217 <        suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
218 <        suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
219 <        suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
220 <        suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
221 <        suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
222 <        suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
223 <        suite.addTest(new TestSuite(CountDownLatchTest.class));
224 <        suite.addTest(new TestSuite(CyclicBarrierTest.class));
225 <        suite.addTest(new TestSuite(DelayQueueTest.class));
226 <        suite.addTest(new TestSuite(EntryTest.class));
227 <        suite.addTest(new TestSuite(ExchangerTest.class));
228 <        suite.addTest(new TestSuite(ExecutorsTest.class));
229 <        suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
230 <        suite.addTest(new TestSuite(FutureTaskTest.class));
231 <        suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
232 <        suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
233 <        suite.addTest(new TestSuite(LinkedListTest.class));
234 <        suite.addTest(new TestSuite(LockSupportTest.class));
235 <        suite.addTest(new TestSuite(PriorityBlockingQueueTest.class));
236 <        suite.addTest(new TestSuite(PriorityQueueTest.class));
237 <        suite.addTest(new TestSuite(ReentrantLockTest.class));
238 <        suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
239 <        suite.addTest(new TestSuite(ScheduledExecutorTest.class));
240 <        suite.addTest(new TestSuite(ScheduledExecutorSubclassTest.class));
241 <        suite.addTest(new TestSuite(SemaphoreTest.class));
242 <        suite.addTest(new TestSuite(SynchronousQueueTest.class));
243 <        suite.addTest(new TestSuite(SystemTest.class));
244 <        suite.addTest(new TestSuite(ThreadLocalTest.class));
245 <        suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
246 <        suite.addTest(new TestSuite(ThreadPoolExecutorSubclassTest.class));
247 <        suite.addTest(new TestSuite(ThreadTest.class));
248 <        suite.addTest(new TestSuite(TimeUnitTest.class));
249 <        suite.addTest(new TestSuite(TreeMapTest.class));
250 <        suite.addTest(new TestSuite(TreeSetTest.class));
251 <        suite.addTest(new TestSuite(TreeSubMapTest.class));
252 <        suite.addTest(new TestSuite(TreeSubSetTest.class));
175 <
176 <        return suite;
188 >        return newTestSuite(
189 >            ForkJoinPoolTest.suite(),
190 >            ForkJoinTaskTest.suite(),
191 >            RecursiveActionTest.suite(),
192 >            RecursiveTaskTest.suite(),
193 >            LinkedTransferQueueTest.suite(),
194 >            PhaserTest.suite(),
195 >            ThreadLocalRandomTest.suite(),
196 >            AbstractExecutorServiceTest.suite(),
197 >            AbstractQueueTest.suite(),
198 >            AbstractQueuedSynchronizerTest.suite(),
199 >            AbstractQueuedLongSynchronizerTest.suite(),
200 >            ArrayBlockingQueueTest.suite(),
201 >            ArrayDequeTest.suite(),
202 >            AtomicBooleanTest.suite(),
203 >            AtomicIntegerArrayTest.suite(),
204 >            AtomicIntegerFieldUpdaterTest.suite(),
205 >            AtomicIntegerTest.suite(),
206 >            AtomicLongArrayTest.suite(),
207 >            AtomicLongFieldUpdaterTest.suite(),
208 >            AtomicLongTest.suite(),
209 >            AtomicMarkableReferenceTest.suite(),
210 >            AtomicReferenceArrayTest.suite(),
211 >            AtomicReferenceFieldUpdaterTest.suite(),
212 >            AtomicReferenceTest.suite(),
213 >            AtomicStampedReferenceTest.suite(),
214 >            ConcurrentHashMapTest.suite(),
215 >            ConcurrentLinkedDequeTest.suite(),
216 >            ConcurrentLinkedQueueTest.suite(),
217 >            ConcurrentSkipListMapTest.suite(),
218 >            ConcurrentSkipListSubMapTest.suite(),
219 >            ConcurrentSkipListSetTest.suite(),
220 >            ConcurrentSkipListSubSetTest.suite(),
221 >            CopyOnWriteArrayListTest.suite(),
222 >            CopyOnWriteArraySetTest.suite(),
223 >            CountDownLatchTest.suite(),
224 >            CyclicBarrierTest.suite(),
225 >            DelayQueueTest.suite(),
226 >            EntryTest.suite(),
227 >            ExchangerTest.suite(),
228 >            ExecutorsTest.suite(),
229 >            ExecutorCompletionServiceTest.suite(),
230 >            FutureTaskTest.suite(),
231 >            LinkedBlockingDequeTest.suite(),
232 >            LinkedBlockingQueueTest.suite(),
233 >            LinkedListTest.suite(),
234 >            LockSupportTest.suite(),
235 >            PriorityBlockingQueueTest.suite(),
236 >            PriorityQueueTest.suite(),
237 >            ReentrantLockTest.suite(),
238 >            ReentrantReadWriteLockTest.suite(),
239 >            ScheduledExecutorTest.suite(),
240 >            ScheduledExecutorSubclassTest.suite(),
241 >            SemaphoreTest.suite(),
242 >            SynchronousQueueTest.suite(),
243 >            SystemTest.suite(),
244 >            ThreadLocalTest.suite(),
245 >            ThreadPoolExecutorTest.suite(),
246 >            ThreadPoolExecutorSubclassTest.suite(),
247 >            ThreadTest.suite(),
248 >            TimeUnitTest.suite(),
249 >            TreeMapTest.suite(),
250 >            TreeSetTest.suite(),
251 >            TreeSubMapTest.suite(),
252 >            TreeSubSetTest.suite());
253      }
254  
255  
# Line 191 | Line 267 | public class JSR166TestCase extends Test
267          return 50;
268      }
269  
194
270      /**
271       * Sets delays as multiples of SHORT_DELAY.
272       */
273      protected void setDelays() {
274          SHORT_DELAY_MS = getShortDelay();
275 <        SMALL_DELAY_MS = SHORT_DELAY_MS * 5;
275 >        SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
276          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
277 <        LONG_DELAY_MS = SHORT_DELAY_MS * 50;
277 >        LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
278      }
279  
280      /**
281 <     * Flag set true if any threadAssert methods fail
281 >     * Returns a timeout in milliseconds to be used in tests that
282 >     * verify that operations block or time out.
283       */
284 <    volatile boolean threadFailed;
284 >    long timeoutMillis() {
285 >        return SHORT_DELAY_MS / 4;
286 >    }
287  
288      /**
289 <     * Initializes test to indicate that no thread assertions have failed
289 >     * Returns a new Date instance representing a time delayMillis
290 >     * milliseconds in the future.
291       */
292 +    Date delayedDate(long delayMillis) {
293 +        return new Date(System.currentTimeMillis() + delayMillis);
294 +    }
295 +
296 +    /**
297 +     * The first exception encountered if any threadAssertXXX method fails.
298 +     */
299 +    private final AtomicReference<Throwable> threadFailure
300 +        = new AtomicReference<Throwable>(null);
301 +
302 +    /**
303 +     * Records an exception so that it can be rethrown later in the test
304 +     * harness thread, triggering a test case failure.  Only the first
305 +     * failure is recorded; subsequent calls to this method from within
306 +     * the same test have no effect.
307 +     */
308 +    public void threadRecordFailure(Throwable t) {
309 +        threadFailure.compareAndSet(null, t);
310 +    }
311 +
312      public void setUp() {
313          setDelays();
215        threadFailed = false;
314      }
315  
316      /**
317 <     * Triggers test case failure if any thread assertions have failed
318 <     */
319 <    public void tearDown() {
320 <        assertFalse(threadFailed);
317 >     * Extra checks that get done for all test cases.
318 >     *
319 >     * Triggers test case failure if any thread assertions have failed,
320 >     * by rethrowing, in the test harness thread, any exception recorded
321 >     * earlier by threadRecordFailure.
322 >     *
323 >     * Triggers test case failure if interrupt status is set in the main thread.
324 >     */
325 >    public void tearDown() throws Exception {
326 >        Throwable t = threadFailure.getAndSet(null);
327 >        if (t != null) {
328 >            if (t instanceof Error)
329 >                throw (Error) t;
330 >            else if (t instanceof RuntimeException)
331 >                throw (RuntimeException) t;
332 >            else if (t instanceof Exception)
333 >                throw (Exception) t;
334 >            else {
335 >                AssertionFailedError afe =
336 >                    new AssertionFailedError(t.toString());
337 >                afe.initCause(t);
338 >                throw afe;
339 >            }
340 >        }
341 >
342 >        if (Thread.interrupted())
343 >            throw new AssertionFailedError("interrupt status set in main thread");
344      }
345  
346      /**
347 <     * Fail, also setting status to indicate current testcase should fail
347 >     * Just like fail(reason), but additionally recording (using
348 >     * threadRecordFailure) any AssertionFailedError thrown, so that
349 >     * the current testcase will fail.
350       */
351      public void threadFail(String reason) {
352 <        threadFailed = true;
353 <        fail(reason);
352 >        try {
353 >            fail(reason);
354 >        } catch (AssertionFailedError t) {
355 >            threadRecordFailure(t);
356 >            fail(reason);
357 >        }
358      }
359  
360      /**
361 <     * If expression not true, set status to indicate current testcase
362 <     * should fail
361 >     * Just like assertTrue(b), but additionally recording (using
362 >     * threadRecordFailure) any AssertionFailedError thrown, so that
363 >     * the current testcase will fail.
364       */
365      public void threadAssertTrue(boolean b) {
366 <        if (!b) {
239 <            threadFailed = true;
366 >        try {
367              assertTrue(b);
368 +        } catch (AssertionFailedError t) {
369 +            threadRecordFailure(t);
370 +            throw t;
371          }
372      }
373  
374      /**
375 <     * If expression not false, set status to indicate current testcase
376 <     * should fail
375 >     * Just like assertFalse(b), but additionally recording (using
376 >     * threadRecordFailure) any AssertionFailedError thrown, so that
377 >     * the current testcase will fail.
378       */
379      public void threadAssertFalse(boolean b) {
380 <        if (b) {
250 <            threadFailed = true;
380 >        try {
381              assertFalse(b);
382 +        } catch (AssertionFailedError t) {
383 +            threadRecordFailure(t);
384 +            throw t;
385          }
386      }
387  
388      /**
389 <     * If argument not null, set status to indicate current testcase
390 <     * should fail
389 >     * Just like assertNull(x), but additionally recording (using
390 >     * threadRecordFailure) any AssertionFailedError thrown, so that
391 >     * the current testcase will fail.
392       */
393      public void threadAssertNull(Object x) {
394 <        if (x != null) {
261 <            threadFailed = true;
394 >        try {
395              assertNull(x);
396 +        } catch (AssertionFailedError t) {
397 +            threadRecordFailure(t);
398 +            throw t;
399          }
400      }
401  
402      /**
403 <     * If arguments not equal, set status to indicate current testcase
404 <     * should fail
403 >     * Just like assertEquals(x, y), but additionally recording (using
404 >     * threadRecordFailure) any AssertionFailedError thrown, so that
405 >     * the current testcase will fail.
406       */
407      public void threadAssertEquals(long x, long y) {
408 <        if (x != y) {
272 <            threadFailed = true;
408 >        try {
409              assertEquals(x, y);
410 +        } catch (AssertionFailedError t) {
411 +            threadRecordFailure(t);
412 +            throw t;
413          }
414      }
415  
416      /**
417 <     * If arguments not equal, set status to indicate current testcase
418 <     * should fail
417 >     * Just like assertEquals(x, y), but additionally recording (using
418 >     * threadRecordFailure) any AssertionFailedError thrown, so that
419 >     * the current testcase will fail.
420       */
421      public void threadAssertEquals(Object x, Object y) {
422 <        if (x != y && (x == null || !x.equals(y))) {
283 <            threadFailed = true;
422 >        try {
423              assertEquals(x, y);
424 +        } catch (AssertionFailedError t) {
425 +            threadRecordFailure(t);
426 +            throw t;
427 +        } catch (Throwable t) {
428 +            threadUnexpectedException(t);
429          }
430      }
431  
432      /**
433 <     * threadFail with message "should throw exception"
433 >     * Just like assertSame(x, y), but additionally recording (using
434 >     * threadRecordFailure) any AssertionFailedError thrown, so that
435 >     * the current testcase will fail.
436 >     */
437 >    public void threadAssertSame(Object x, Object y) {
438 >        try {
439 >            assertSame(x, y);
440 >        } catch (AssertionFailedError t) {
441 >            threadRecordFailure(t);
442 >            throw t;
443 >        }
444 >    }
445 >
446 >    /**
447 >     * Calls threadFail with message "should throw exception".
448       */
449      public void threadShouldThrow() {
450 <        threadFailed = true;
293 <        fail("should throw exception");
450 >        threadFail("should throw exception");
451      }
452  
453      /**
454 <     * threadFail with message "should throw" + exceptionName
454 >     * Calls threadFail with message "should throw" + exceptionName.
455       */
456      public void threadShouldThrow(String exceptionName) {
457 <        threadFailed = true;
301 <        fail("should throw " + exceptionName);
457 >        threadFail("should throw " + exceptionName);
458      }
459  
460      /**
461 <     * threadFail with message "Unexpected exception"
461 >     * Records the given exception using {@link #threadRecordFailure},
462 >     * then rethrows the exception, wrapping it in an
463 >     * AssertionFailedError if necessary.
464       */
465 <    public void threadUnexpectedException() {
466 <        threadFailed = true;
467 <        fail("Unexpected exception");
465 >    public void threadUnexpectedException(Throwable t) {
466 >        threadRecordFailure(t);
467 >        t.printStackTrace();
468 >        if (t instanceof RuntimeException)
469 >            throw (RuntimeException) t;
470 >        else if (t instanceof Error)
471 >            throw (Error) t;
472 >        else {
473 >            AssertionFailedError afe =
474 >                new AssertionFailedError("unexpected exception: " + t);
475 >            afe.initCause(t);
476 >            throw afe;
477 >        }
478      }
479  
480      /**
481 <     * threadFail with message "Unexpected exception", with argument
481 >     * Delays, via Thread.sleep, for the given millisecond delay, but
482 >     * if the sleep is shorter than specified, may re-sleep or yield
483 >     * until time elapses.
484       */
485 <    public void threadUnexpectedException(Throwable ex) {
486 <        threadFailed = true;
487 <        ex.printStackTrace();
488 <        fail("Unexpected exception: " + ex);
485 >    static void delay(long millis) throws InterruptedException {
486 >        long startTime = System.nanoTime();
487 >        long ns = millis * 1000 * 1000;
488 >        for (;;) {
489 >            if (millis > 0L)
490 >                Thread.sleep(millis);
491 >            else // too short to sleep
492 >                Thread.yield();
493 >            long d = ns - (System.nanoTime() - startTime);
494 >            if (d > 0L)
495 >                millis = d / (1000 * 1000);
496 >            else
497 >                break;
498 >        }
499      }
500  
501      /**
502 <     * Wait out termination of a thread pool or fail doing so
502 >     * Waits out termination of a thread pool or fails doing so.
503       */
504 <    public void joinPool(ExecutorService exec) {
504 >    void joinPool(ExecutorService exec) {
505          try {
506              exec.shutdown();
507 <            assertTrue(exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
507 >            assertTrue("ExecutorService did not terminate in a timely manner",
508 >                       exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
509          } catch (SecurityException ok) {
510              // Allowed in case test doesn't have privs
511          } catch (InterruptedException ie) {
# Line 332 | Line 513 | public class JSR166TestCase extends Test
513          }
514      }
515  
516 +    /**
517 +     * A debugging tool to print all stack traces, as jstack does.
518 +     */
519 +    static void printAllStackTraces() {
520 +        for (ThreadInfo info :
521 +                 ManagementFactory.getThreadMXBean()
522 +                 .dumpAllThreads(true, true))
523 +            System.err.print(info);
524 +    }
525  
526      /**
527 <     * fail with message "should throw exception"
527 >     * Checks that thread does not terminate within the default
528 >     * millisecond delay of {@code timeoutMillis()}.
529       */
530 <    public void shouldThrow() {
531 <        fail("Should throw exception");
530 >    void assertThreadStaysAlive(Thread thread) {
531 >        assertThreadStaysAlive(thread, timeoutMillis());
532      }
533  
534      /**
535 <     * fail with message "should throw " + exceptionName
535 >     * Checks that thread does not terminate within the given millisecond delay.
536       */
537 <    public void shouldThrow(String exceptionName) {
538 <        fail("Should throw " + exceptionName);
537 >    void assertThreadStaysAlive(Thread thread, long millis) {
538 >        try {
539 >            // No need to optimize the failing case via Thread.join.
540 >            delay(millis);
541 >            assertTrue(thread.isAlive());
542 >        } catch (InterruptedException ie) {
543 >            fail("Unexpected InterruptedException");
544 >        }
545      }
546  
547      /**
548 <     * fail with message "Unexpected exception"
548 >     * Checks that the threads do not terminate within the default
549 >     * millisecond delay of {@code timeoutMillis()}.
550       */
551 <    public void unexpectedException() {
552 <        fail("Unexpected exception");
551 >    void assertThreadsStayAlive(Thread... threads) {
552 >        assertThreadsStayAlive(timeoutMillis(), threads);
553      }
554  
555      /**
556 <     * fail with message "Unexpected exception", with argument
556 >     * Checks that the threads do not terminate within the given millisecond delay.
557       */
558 <    public void unexpectedException(Throwable ex) {
559 <        ex.printStackTrace();
560 <        fail("Unexpected exception: " + ex);
558 >    void assertThreadsStayAlive(long millis, Thread... threads) {
559 >        try {
560 >            // No need to optimize the failing case via Thread.join.
561 >            delay(millis);
562 >            for (Thread thread : threads)
563 >                assertTrue(thread.isAlive());
564 >        } catch (InterruptedException ie) {
565 >            fail("Unexpected InterruptedException");
566 >        }
567 >    }
568 >
569 >    /**
570 >     * Checks that future.get times out, with the default timeout of
571 >     * {@code timeoutMillis()}.
572 >     */
573 >    void assertFutureTimesOut(Future future) {
574 >        assertFutureTimesOut(future, timeoutMillis());
575 >    }
576 >
577 >    /**
578 >     * Checks that future.get times out, with the given millisecond timeout.
579 >     */
580 >    void assertFutureTimesOut(Future future, long timeoutMillis) {
581 >        long startTime = System.nanoTime();
582 >        try {
583 >            future.get(timeoutMillis, MILLISECONDS);
584 >            shouldThrow();
585 >        } catch (TimeoutException success) {
586 >        } catch (Exception e) {
587 >            threadUnexpectedException(e);
588 >        } finally { future.cancel(true); }
589 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
590 >    }
591 >
592 >    /**
593 >     * Fails with message "should throw exception".
594 >     */
595 >    public void shouldThrow() {
596 >        fail("Should throw exception");
597      }
598  
599 +    /**
600 +     * Fails with message "should throw " + exceptionName.
601 +     */
602 +    public void shouldThrow(String exceptionName) {
603 +        fail("Should throw " + exceptionName);
604 +    }
605  
606      /**
607       * The number of elements to place in collections, arrays, etc.
# Line 390 | Line 630 | public class JSR166TestCase extends Test
630  
631  
632      /**
633 +     * Runs Runnable r with a security policy that permits precisely
634 +     * the specified permissions.  If there is no current security
635 +     * manager, the runnable is run twice, both with and without a
636 +     * security manager.  We require that any security manager permit
637 +     * getPolicy/setPolicy.
638 +     */
639 +    public void runWithPermissions(Runnable r, Permission... permissions) {
640 +        SecurityManager sm = System.getSecurityManager();
641 +        if (sm == null) {
642 +            r.run();
643 +        }
644 +        runWithSecurityManagerWithPermissions(r, permissions);
645 +    }
646 +
647 +    /**
648 +     * Runs Runnable r with a security policy that permits precisely
649 +     * the specified permissions.  If there is no current security
650 +     * manager, a temporary one is set for the duration of the
651 +     * Runnable.  We require that any security manager permit
652 +     * getPolicy/setPolicy.
653 +     */
654 +    public void runWithSecurityManagerWithPermissions(Runnable r,
655 +                                                      Permission... permissions) {
656 +        SecurityManager sm = System.getSecurityManager();
657 +        if (sm == null) {
658 +            Policy savedPolicy = Policy.getPolicy();
659 +            try {
660 +                Policy.setPolicy(permissivePolicy());
661 +                System.setSecurityManager(new SecurityManager());
662 +                runWithSecurityManagerWithPermissions(r, permissions);
663 +            } finally {
664 +                System.setSecurityManager(null);
665 +                Policy.setPolicy(savedPolicy);
666 +            }
667 +        } else {
668 +            Policy savedPolicy = Policy.getPolicy();
669 +            AdjustablePolicy policy = new AdjustablePolicy(permissions);
670 +            Policy.setPolicy(policy);
671 +
672 +            try {
673 +                r.run();
674 +            } finally {
675 +                policy.addPermission(new SecurityPermission("setPolicy"));
676 +                Policy.setPolicy(savedPolicy);
677 +            }
678 +        }
679 +    }
680 +
681 +    /**
682 +     * Runs a runnable without any permissions.
683 +     */
684 +    public void runWithoutPermissions(Runnable r) {
685 +        runWithPermissions(r);
686 +    }
687 +
688 +    /**
689       * A security policy where new permissions can be dynamically added
690       * or all cleared.
691       */
692      public static class AdjustablePolicy extends java.security.Policy {
693          Permissions perms = new Permissions();
694 <        AdjustablePolicy() { }
694 >        AdjustablePolicy(Permission... permissions) {
695 >            for (Permission permission : permissions)
696 >                perms.add(permission);
697 >        }
698          void addPermission(Permission perm) { perms.add(perm); }
699          void clearPermissions() { perms = new Permissions(); }
700          public PermissionCollection getPermissions(CodeSource cs) {
# Line 408 | Line 707 | public class JSR166TestCase extends Test
707              return perms.implies(p);
708          }
709          public void refresh() {}
710 +        public String toString() {
711 +            List<Permission> ps = new ArrayList<Permission>();
712 +            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
713 +                ps.add(e.nextElement());
714 +            return "AdjustablePolicy with permissions " + ps;
715 +        }
716      }
717  
718      /**
719 <     * Sleep until the timeout has elapsed, or interrupted.
415 <     * Does <em>NOT</em> throw InterruptedException.
719 >     * Returns a policy containing all the permissions we ever need.
720       */
721 <    void sleepTillInterrupted(long timeoutMillis) {
721 >    public static Policy permissivePolicy() {
722 >        return new AdjustablePolicy
723 >            // Permissions j.u.c. needs directly
724 >            (new RuntimePermission("modifyThread"),
725 >             new RuntimePermission("getClassLoader"),
726 >             new RuntimePermission("setContextClassLoader"),
727 >             // Permissions needed to change permissions!
728 >             new SecurityPermission("getPolicy"),
729 >             new SecurityPermission("setPolicy"),
730 >             new RuntimePermission("setSecurityManager"),
731 >             // Permissions needed by the junit test harness
732 >             new RuntimePermission("accessDeclaredMembers"),
733 >             new PropertyPermission("*", "read"),
734 >             new java.io.FilePermission("<<ALL FILES>>", "read"));
735 >    }
736 >
737 >    /**
738 >     * Sleeps until the given time has elapsed.
739 >     * Throws AssertionFailedError if interrupted.
740 >     */
741 >    void sleep(long millis) {
742          try {
743 <            Thread.sleep(timeoutMillis);
744 <        } catch (InterruptedException wakeup) {}
743 >            delay(millis);
744 >        } catch (InterruptedException ie) {
745 >            AssertionFailedError afe =
746 >                new AssertionFailedError("Unexpected InterruptedException");
747 >            afe.initCause(ie);
748 >            throw afe;
749 >        }
750 >    }
751 >
752 >    /**
753 >     * Spin-waits up to the specified number of milliseconds for the given
754 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
755 >     */
756 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
757 >        long startTime = System.nanoTime();
758 >        for (;;) {
759 >            Thread.State s = thread.getState();
760 >            if (s == Thread.State.BLOCKED ||
761 >                s == Thread.State.WAITING ||
762 >                s == Thread.State.TIMED_WAITING)
763 >                return;
764 >            else if (s == Thread.State.TERMINATED)
765 >                fail("Unexpected thread termination");
766 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
767 >                threadAssertTrue(thread.isAlive());
768 >                return;
769 >            }
770 >            Thread.yield();
771 >        }
772      }
773  
774      /**
775 <     * Returns a new started Thread running the given runnable.
775 >     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
776 >     * state: BLOCKED, WAITING, or TIMED_WAITING.
777 >     */
778 >    void waitForThreadToEnterWaitState(Thread thread) {
779 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
780 >    }
781 >
782 >    /**
783 >     * Returns the number of milliseconds since time given by
784 >     * startNanoTime, which must have been previously returned from a
785 >     * call to {@link System.nanoTime()}.
786 >     */
787 >    long millisElapsedSince(long startNanoTime) {
788 >        return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
789 >    }
790 >
791 >    /**
792 >     * Returns a new started daemon Thread running the given runnable.
793       */
794      Thread newStartedThread(Runnable runnable) {
795          Thread t = new Thread(runnable);
796 +        t.setDaemon(true);
797          t.start();
798          return t;
799      }
800  
801 +    /**
802 +     * Waits for the specified time (in milliseconds) for the thread
803 +     * to terminate (using {@link Thread#join(long)}), else interrupts
804 +     * the thread (in the hope that it may terminate later) and fails.
805 +     */
806 +    void awaitTermination(Thread t, long timeoutMillis) {
807 +        try {
808 +            t.join(timeoutMillis);
809 +        } catch (InterruptedException ie) {
810 +            threadUnexpectedException(ie);
811 +        } finally {
812 +            if (t.getState() != Thread.State.TERMINATED) {
813 +                t.interrupt();
814 +                fail("Test timed out");
815 +            }
816 +        }
817 +    }
818 +
819 +    /**
820 +     * Waits for LONG_DELAY_MS milliseconds for the thread to
821 +     * terminate (using {@link Thread#join(long)}), else interrupts
822 +     * the thread (in the hope that it may terminate later) and fails.
823 +     */
824 +    void awaitTermination(Thread t) {
825 +        awaitTermination(t, LONG_DELAY_MS);
826 +    }
827 +
828      // Some convenient Runnable classes
829  
830      public abstract class CheckedRunnable implements Runnable {
# Line 491 | Line 887 | public class JSR166TestCase extends Test
887                  realRun();
888                  threadShouldThrow("InterruptedException");
889              } catch (InterruptedException success) {
890 +                threadAssertFalse(Thread.interrupted());
891              } catch (Throwable t) {
892                  threadUnexpectedException(t);
893              }
# Line 505 | Line 902 | public class JSR166TestCase extends Test
902                  return realCall();
903              } catch (Throwable t) {
904                  threadUnexpectedException(t);
905 +                return null;
906              }
509            return null;
907          }
908      }
909  
910 <    public abstract class CheckedInterruptedCallable<T> implements Callable<T> {
910 >    public abstract class CheckedInterruptedCallable<T>
911 >        implements Callable<T> {
912          protected abstract T realCall() throws Throwable;
913  
914          public final T call() {
# Line 519 | Line 917 | public class JSR166TestCase extends Test
917                  threadShouldThrow("InterruptedException");
918                  return result;
919              } catch (InterruptedException success) {
920 +                threadAssertFalse(Thread.interrupted());
921              } catch (Throwable t) {
922                  threadUnexpectedException(t);
923              }
# Line 542 | Line 941 | public class JSR166TestCase extends Test
941  
942      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
943          return new CheckedCallable<String>() {
944 <            public String realCall() {
944 >            protected String realCall() {
945                  try {
946                      latch.await();
947                  } catch (InterruptedException quittingTime) {}
# Line 550 | Line 949 | public class JSR166TestCase extends Test
949              }};
950      }
951  
952 +    public Runnable awaiter(final CountDownLatch latch) {
953 +        return new CheckedRunnable() {
954 +            public void realRun() throws InterruptedException {
955 +                await(latch);
956 +            }};
957 +    }
958 +
959 +    public void await(CountDownLatch latch) {
960 +        try {
961 +            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
962 +        } catch (Throwable t) {
963 +            threadUnexpectedException(t);
964 +        }
965 +    }
966 +
967 +    public void await(Semaphore semaphore) {
968 +        try {
969 +            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
970 +        } catch (Throwable t) {
971 +            threadUnexpectedException(t);
972 +        }
973 +    }
974 +
975 + //     /**
976 + //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
977 + //      */
978 + //     public void await(AtomicBoolean flag) {
979 + //         await(flag, LONG_DELAY_MS);
980 + //     }
981 +
982 + //     /**
983 + //      * Spin-waits up to the specified timeout until flag becomes true.
984 + //      */
985 + //     public void await(AtomicBoolean flag, long timeoutMillis) {
986 + //         long startTime = System.nanoTime();
987 + //         while (!flag.get()) {
988 + //             if (millisElapsedSince(startTime) > timeoutMillis)
989 + //                 throw new AssertionFailedError("timed out");
990 + //             Thread.yield();
991 + //         }
992 + //     }
993 +
994      public static class NPETask implements Callable<String> {
995          public String call() { throw new NullPointerException(); }
996      }
# Line 560 | Line 1001 | public class JSR166TestCase extends Test
1001  
1002      public class ShortRunnable extends CheckedRunnable {
1003          protected void realRun() throws Throwable {
1004 <            Thread.sleep(SHORT_DELAY_MS);
1004 >            delay(SHORT_DELAY_MS);
1005          }
1006      }
1007  
1008      public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1009          protected void realRun() throws InterruptedException {
1010 <            Thread.sleep(SHORT_DELAY_MS);
1010 >            delay(SHORT_DELAY_MS);
1011          }
1012      }
1013  
1014      public class SmallRunnable extends CheckedRunnable {
1015          protected void realRun() throws Throwable {
1016 <            Thread.sleep(SMALL_DELAY_MS);
1016 >            delay(SMALL_DELAY_MS);
1017          }
1018      }
1019  
1020      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1021          protected void realRun() {
1022              try {
1023 <                Thread.sleep(SMALL_DELAY_MS);
1023 >                delay(SMALL_DELAY_MS);
1024              } catch (InterruptedException ok) {}
1025          }
1026      }
1027  
1028      public class SmallCallable extends CheckedCallable {
1029          protected Object realCall() throws InterruptedException {
1030 <            Thread.sleep(SMALL_DELAY_MS);
1030 >            delay(SMALL_DELAY_MS);
1031              return Boolean.TRUE;
1032          }
1033      }
1034  
594    public class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
595        protected void realRun() throws InterruptedException {
596            Thread.sleep(SMALL_DELAY_MS);
597        }
598    }
599
1035      public class MediumRunnable extends CheckedRunnable {
1036          protected void realRun() throws Throwable {
1037 <            Thread.sleep(MEDIUM_DELAY_MS);
1037 >            delay(MEDIUM_DELAY_MS);
1038          }
1039      }
1040  
1041      public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1042          protected void realRun() throws InterruptedException {
1043 <            Thread.sleep(MEDIUM_DELAY_MS);
1043 >            delay(MEDIUM_DELAY_MS);
1044          }
1045      }
1046  
1047 +    public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1048 +        return new CheckedRunnable() {
1049 +            protected void realRun() {
1050 +                try {
1051 +                    delay(timeoutMillis);
1052 +                } catch (InterruptedException ok) {}
1053 +            }};
1054 +    }
1055 +
1056      public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1057          protected void realRun() {
1058              try {
1059 <                Thread.sleep(MEDIUM_DELAY_MS);
1059 >                delay(MEDIUM_DELAY_MS);
1060              } catch (InterruptedException ok) {}
1061          }
1062      }
# Line 620 | Line 1064 | public class JSR166TestCase extends Test
1064      public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1065          protected void realRun() {
1066              try {
1067 <                Thread.sleep(LONG_DELAY_MS);
1067 >                delay(LONG_DELAY_MS);
1068              } catch (InterruptedException ok) {}
1069          }
1070      }
# Line 634 | Line 1078 | public class JSR166TestCase extends Test
1078          }
1079      }
1080  
1081 +    public interface TrackedRunnable extends Runnable {
1082 +        boolean isDone();
1083 +    }
1084 +
1085 +    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1086 +        return new TrackedRunnable() {
1087 +                private volatile boolean done = false;
1088 +                public boolean isDone() { return done; }
1089 +                public void run() {
1090 +                    try {
1091 +                        delay(timeoutMillis);
1092 +                        done = true;
1093 +                    } catch (InterruptedException ok) {}
1094 +                }
1095 +            };
1096 +    }
1097 +
1098      public static class TrackedShortRunnable implements Runnable {
1099          public volatile boolean done = false;
1100          public void run() {
1101              try {
1102 <                Thread.sleep(SMALL_DELAY_MS);
1102 >                delay(SHORT_DELAY_MS);
1103 >                done = true;
1104 >            } catch (InterruptedException ok) {}
1105 >        }
1106 >    }
1107 >
1108 >    public static class TrackedSmallRunnable implements Runnable {
1109 >        public volatile boolean done = false;
1110 >        public void run() {
1111 >            try {
1112 >                delay(SMALL_DELAY_MS);
1113                  done = true;
1114              } catch (InterruptedException ok) {}
1115          }
# Line 648 | Line 1119 | public class JSR166TestCase extends Test
1119          public volatile boolean done = false;
1120          public void run() {
1121              try {
1122 <                Thread.sleep(MEDIUM_DELAY_MS);
1122 >                delay(MEDIUM_DELAY_MS);
1123                  done = true;
1124              } catch (InterruptedException ok) {}
1125          }
# Line 658 | Line 1129 | public class JSR166TestCase extends Test
1129          public volatile boolean done = false;
1130          public void run() {
1131              try {
1132 <                Thread.sleep(LONG_DELAY_MS);
1132 >                delay(LONG_DELAY_MS);
1133                  done = true;
1134              } catch (InterruptedException ok) {}
1135          }
# Line 675 | Line 1146 | public class JSR166TestCase extends Test
1146          public volatile boolean done = false;
1147          public Object call() {
1148              try {
1149 <                Thread.sleep(SMALL_DELAY_MS);
1149 >                delay(SMALL_DELAY_MS);
1150                  done = true;
1151              } catch (InterruptedException ok) {}
1152              return Boolean.TRUE;
1153          }
1154      }
1155  
1156 +    /**
1157 +     * Analog of CheckedRunnable for RecursiveAction
1158 +     */
1159 +    public abstract class CheckedRecursiveAction extends RecursiveAction {
1160 +        protected abstract void realCompute() throws Throwable;
1161 +
1162 +        public final void compute() {
1163 +            try {
1164 +                realCompute();
1165 +            } catch (Throwable t) {
1166 +                threadUnexpectedException(t);
1167 +            }
1168 +        }
1169 +    }
1170 +
1171 +    /**
1172 +     * Analog of CheckedCallable for RecursiveTask
1173 +     */
1174 +    public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1175 +        protected abstract T realCompute() throws Throwable;
1176 +
1177 +        public final T compute() {
1178 +            try {
1179 +                return realCompute();
1180 +            } catch (Throwable t) {
1181 +                threadUnexpectedException(t);
1182 +                return null;
1183 +            }
1184 +        }
1185 +    }
1186  
1187      /**
1188       * For use as RejectedExecutionHandler in constructors
# Line 691 | Line 1192 | public class JSR166TestCase extends Test
1192                                        ThreadPoolExecutor executor) {}
1193      }
1194  
1195 +    /**
1196 +     * A CyclicBarrier that uses timed await and fails with
1197 +     * AssertionFailedErrors instead of throwing checked exceptions.
1198 +     */
1199 +    public class CheckedBarrier extends CyclicBarrier {
1200 +        public CheckedBarrier(int parties) { super(parties); }
1201 +
1202 +        public int await() {
1203 +            try {
1204 +                return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1205 +            } catch (TimeoutException e) {
1206 +                throw new AssertionFailedError("timed out");
1207 +            } catch (Exception e) {
1208 +                AssertionFailedError afe =
1209 +                    new AssertionFailedError("Unexpected exception: " + e);
1210 +                afe.initCause(e);
1211 +                throw afe;
1212 +            }
1213 +        }
1214 +    }
1215 +
1216 +    void checkEmpty(BlockingQueue q) {
1217 +        try {
1218 +            assertTrue(q.isEmpty());
1219 +            assertEquals(0, q.size());
1220 +            assertNull(q.peek());
1221 +            assertNull(q.poll());
1222 +            assertNull(q.poll(0, MILLISECONDS));
1223 +            assertEquals(q.toString(), "[]");
1224 +            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1225 +            assertFalse(q.iterator().hasNext());
1226 +            try {
1227 +                q.element();
1228 +                shouldThrow();
1229 +            } catch (NoSuchElementException success) {}
1230 +            try {
1231 +                q.iterator().next();
1232 +                shouldThrow();
1233 +            } catch (NoSuchElementException success) {}
1234 +            try {
1235 +                q.remove();
1236 +                shouldThrow();
1237 +            } catch (NoSuchElementException success) {}
1238 +        } catch (InterruptedException ie) {
1239 +            threadUnexpectedException(ie);
1240 +        }
1241 +    }
1242 +
1243 +    void assertSerialEquals(Object x, Object y) {
1244 +        assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1245 +    }
1246 +
1247 +    void assertNotSerialEquals(Object x, Object y) {
1248 +        assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1249 +    }
1250 +
1251 +    byte[] serialBytes(Object o) {
1252 +        try {
1253 +            ByteArrayOutputStream bos = new ByteArrayOutputStream();
1254 +            ObjectOutputStream oos = new ObjectOutputStream(bos);
1255 +            oos.writeObject(o);
1256 +            oos.flush();
1257 +            oos.close();
1258 +            return bos.toByteArray();
1259 +        } catch (Throwable t) {
1260 +            threadUnexpectedException(t);
1261 +            return new byte[0];
1262 +        }
1263 +    }
1264 +
1265 +    @SuppressWarnings("unchecked")
1266 +    <T> T serialClone(T o) {
1267 +        try {
1268 +            ObjectInputStream ois = new ObjectInputStream
1269 +                (new ByteArrayInputStream(serialBytes(o)));
1270 +            T clone = (T) ois.readObject();
1271 +            assertSame(o.getClass(), clone.getClass());
1272 +            return clone;
1273 +        } catch (Throwable t) {
1274 +            threadUnexpectedException(t);
1275 +            return null;
1276 +        }
1277 +    }
1278   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines