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.70 by jsr166, Sun Nov 21 19:04:45 2010 UTC vs.
Revision 1.106 by jsr166, Mon Apr 1 20:06:26 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.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.lang.reflect.Method;
17 + import java.util.ArrayList;
18 + import java.util.Arrays;
19 + import java.util.Date;
20 + import java.util.Enumeration;
21 + import java.util.List;
22 + import java.util.NoSuchElementException;
23   import java.util.PropertyPermission;
24   import java.util.concurrent.*;
25 + import java.util.concurrent.atomic.AtomicBoolean;
26   import java.util.concurrent.atomic.AtomicReference;
27   import static java.util.concurrent.TimeUnit.MILLISECONDS;
28   import static java.util.concurrent.TimeUnit.NANOSECONDS;
# Line 61 | Line 75 | import java.security.SecurityPermission;
75   *
76   * </ol>
77   *
78 < * <p> <b>Other notes</b>
78 > * <p><b>Other notes</b>
79   * <ul>
80   *
81   * <li> Usually, there is one testcase method per JSR166 method
# Line 134 | Line 148 | public class JSR166TestCase extends Test
148      }
149  
150      /**
151 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
151 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
152 >     * Optional command line arg provides the number of iterations to
153 >     * repeat running the tests.
154       */
155      public static void main(String[] args) {
156          if (useSecurityManager) {
# Line 166 | Line 182 | public class JSR166TestCase extends Test
182          return suite;
183      }
184  
185 +    public static void addNamedTestClasses(TestSuite suite,
186 +                                           String... testClassNames) {
187 +        for (String testClassName : testClassNames) {
188 +            try {
189 +                Class<?> testClass = Class.forName(testClassName);
190 +                Method m = testClass.getDeclaredMethod("suite",
191 +                                                       new Class<?>[0]);
192 +                suite.addTest(newTestSuite((Test)m.invoke(null)));
193 +            } catch (Exception e) {
194 +                throw new Error("Missing test class", e);
195 +            }
196 +        }
197 +    }
198 +
199 +    public static final double JAVA_CLASS_VERSION;
200 +    static {
201 +        try {
202 +            JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
203 +                new java.security.PrivilegedAction<Double>() {
204 +                public Double run() {
205 +                    return Double.valueOf(System.getProperty("java.class.version"));}});
206 +        } catch (Throwable t) {
207 +            throw new Error(t);
208 +        }
209 +    }
210 +
211 +    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
212 +    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
213 +    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
214 +
215      /**
216       * Collects all JSR166 unit tests as one suite.
217       */
218      public static Test suite() {
219 <        return newTestSuite(
219 >        // Java7+ test classes
220 >        TestSuite suite = newTestSuite(
221              ForkJoinPoolTest.suite(),
222              ForkJoinTaskTest.suite(),
223              RecursiveActionTest.suite(),
# Line 235 | Line 282 | public class JSR166TestCase extends Test
282              TreeSetTest.suite(),
283              TreeSubMapTest.suite(),
284              TreeSubSetTest.suite());
285 +
286 +        // Java8+ test classes
287 +        if (atLeastJava8()) {
288 +            String[] java8TestClassNames = {
289 +                "CompletableFutureTest",
290 +                "ConcurrentHashMap8Test",
291 +                "CountedCompleterTest",
292 +                "DoubleAccumulatorTest",
293 +                "DoubleAdderTest",
294 +                "ForkJoinPool8Test",
295 +                "LongAccumulatorTest",
296 +                "LongAdderTest",
297 +                "StampedLockTest",
298 +            };
299 +            addNamedTestClasses(suite, java8TestClassNames);
300 +        }
301 +
302 +        return suite;
303      }
304  
305  
# Line 252 | Line 317 | public class JSR166TestCase extends Test
317          return 50;
318      }
319  
255
320      /**
321       * Sets delays as multiples of SHORT_DELAY.
322       */
# Line 260 | Line 324 | public class JSR166TestCase extends Test
324          SHORT_DELAY_MS = getShortDelay();
325          SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
326          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
327 <        LONG_DELAY_MS   = SHORT_DELAY_MS * 50;
327 >        LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
328 >    }
329 >
330 >    /**
331 >     * Returns a timeout in milliseconds to be used in tests that
332 >     * verify that operations block or time out.
333 >     */
334 >    long timeoutMillis() {
335 >        return SHORT_DELAY_MS / 4;
336 >    }
337 >
338 >    /**
339 >     * Returns a new Date instance representing a time delayMillis
340 >     * milliseconds in the future.
341 >     */
342 >    Date delayedDate(long delayMillis) {
343 >        return new Date(System.currentTimeMillis() + delayMillis);
344      }
345  
346      /**
# Line 284 | Line 364 | public class JSR166TestCase extends Test
364      }
365  
366      /**
367 +     * Extra checks that get done for all test cases.
368 +     *
369       * Triggers test case failure if any thread assertions have failed,
370       * by rethrowing, in the test harness thread, any exception recorded
371       * earlier by threadRecordFailure.
372 +     *
373 +     * Triggers test case failure if interrupt status is set in the main thread.
374       */
375      public void tearDown() throws Exception {
376          Throwable t = threadFailure.getAndSet(null);
# Line 304 | Line 388 | public class JSR166TestCase extends Test
388                  throw afe;
389              }
390          }
391 +
392 +        if (Thread.interrupted())
393 +            throw new AssertionFailedError("interrupt status set in main thread");
394 +
395 +        checkForkJoinPoolThreadLeaks();
396 +    }
397 +
398 +    /**
399 +     * Find missing try { ... } finally { joinPool(e); }
400 +     */
401 +    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
402 +        Thread[] survivors = new Thread[5];
403 +        int count = Thread.enumerate(survivors);
404 +        for (int i = 0; i < count; i++) {
405 +            Thread thread = survivors[i];
406 +            String name = thread.getName();
407 +            if (name.startsWith("ForkJoinPool-")) {
408 +                // give thread some time to terminate
409 +                thread.join(LONG_DELAY_MS);
410 +                if (!thread.isAlive()) continue;
411 +                thread.stop();
412 +                throw new AssertionFailedError
413 +                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
414 +                                   toString(), name));
415 +            }
416 +        }
417      }
418  
419      /**
# Line 435 | Line 545 | public class JSR166TestCase extends Test
545          else {
546              AssertionFailedError afe =
547                  new AssertionFailedError("unexpected exception: " + t);
548 <            t.initCause(t);
548 >            afe.initCause(t);
549              throw afe;
550          }
551      }
552  
553      /**
554 +     * Delays, via Thread.sleep, for the given millisecond delay, but
555 +     * if the sleep is shorter than specified, may re-sleep or yield
556 +     * until time elapses.
557 +     */
558 +    static void delay(long millis) throws InterruptedException {
559 +        long startTime = System.nanoTime();
560 +        long ns = millis * 1000 * 1000;
561 +        for (;;) {
562 +            if (millis > 0L)
563 +                Thread.sleep(millis);
564 +            else // too short to sleep
565 +                Thread.yield();
566 +            long d = ns - (System.nanoTime() - startTime);
567 +            if (d > 0L)
568 +                millis = d / (1000 * 1000);
569 +            else
570 +                break;
571 +        }
572 +    }
573 +
574 +    /**
575       * Waits out termination of a thread pool or fails doing so.
576       */
577 <    public void joinPool(ExecutorService exec) {
577 >    void joinPool(ExecutorService exec) {
578          try {
579              exec.shutdown();
580              assertTrue("ExecutorService did not terminate in a timely manner",
581 <                       exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
581 >                       exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
582          } catch (SecurityException ok) {
583              // Allowed in case test doesn't have privs
584          } catch (InterruptedException ie) {
# Line 455 | Line 586 | public class JSR166TestCase extends Test
586          }
587      }
588  
589 +    /**
590 +     * A debugging tool to print all stack traces, as jstack does.
591 +     */
592 +    static void printAllStackTraces() {
593 +        for (ThreadInfo info :
594 +                 ManagementFactory.getThreadMXBean()
595 +                 .dumpAllThreads(true, true))
596 +            System.err.print(info);
597 +    }
598 +
599 +    /**
600 +     * Checks that thread does not terminate within the default
601 +     * millisecond delay of {@code timeoutMillis()}.
602 +     */
603 +    void assertThreadStaysAlive(Thread thread) {
604 +        assertThreadStaysAlive(thread, timeoutMillis());
605 +    }
606 +
607 +    /**
608 +     * Checks that thread does not terminate within the given millisecond delay.
609 +     */
610 +    void assertThreadStaysAlive(Thread thread, long millis) {
611 +        try {
612 +            // No need to optimize the failing case via Thread.join.
613 +            delay(millis);
614 +            assertTrue(thread.isAlive());
615 +        } catch (InterruptedException ie) {
616 +            fail("Unexpected InterruptedException");
617 +        }
618 +    }
619 +
620 +    /**
621 +     * Checks that the threads do not terminate within the default
622 +     * millisecond delay of {@code timeoutMillis()}.
623 +     */
624 +    void assertThreadsStayAlive(Thread... threads) {
625 +        assertThreadsStayAlive(timeoutMillis(), threads);
626 +    }
627 +
628 +    /**
629 +     * Checks that the threads do not terminate within the given millisecond delay.
630 +     */
631 +    void assertThreadsStayAlive(long millis, Thread... threads) {
632 +        try {
633 +            // No need to optimize the failing case via Thread.join.
634 +            delay(millis);
635 +            for (Thread thread : threads)
636 +                assertTrue(thread.isAlive());
637 +        } catch (InterruptedException ie) {
638 +            fail("Unexpected InterruptedException");
639 +        }
640 +    }
641 +
642 +    /**
643 +     * Checks that future.get times out, with the default timeout of
644 +     * {@code timeoutMillis()}.
645 +     */
646 +    void assertFutureTimesOut(Future future) {
647 +        assertFutureTimesOut(future, timeoutMillis());
648 +    }
649 +
650 +    /**
651 +     * Checks that future.get times out, with the given millisecond timeout.
652 +     */
653 +    void assertFutureTimesOut(Future future, long timeoutMillis) {
654 +        long startTime = System.nanoTime();
655 +        try {
656 +            future.get(timeoutMillis, MILLISECONDS);
657 +            shouldThrow();
658 +        } catch (TimeoutException success) {
659 +        } catch (Exception e) {
660 +            threadUnexpectedException(e);
661 +        } finally { future.cancel(true); }
662 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
663 +    }
664  
665      /**
666       * Fails with message "should throw exception".
# Line 507 | Line 713 | public class JSR166TestCase extends Test
713          SecurityManager sm = System.getSecurityManager();
714          if (sm == null) {
715              r.run();
716 +        }
717 +        runWithSecurityManagerWithPermissions(r, permissions);
718 +    }
719 +
720 +    /**
721 +     * Runs Runnable r with a security policy that permits precisely
722 +     * the specified permissions.  If there is no current security
723 +     * manager, a temporary one is set for the duration of the
724 +     * Runnable.  We require that any security manager permit
725 +     * getPolicy/setPolicy.
726 +     */
727 +    public void runWithSecurityManagerWithPermissions(Runnable r,
728 +                                                      Permission... permissions) {
729 +        SecurityManager sm = System.getSecurityManager();
730 +        if (sm == null) {
731              Policy savedPolicy = Policy.getPolicy();
732              try {
733                  Policy.setPolicy(permissivePolicy());
734                  System.setSecurityManager(new SecurityManager());
735 <                runWithPermissions(r, permissions);
735 >                runWithSecurityManagerWithPermissions(r, permissions);
736              } finally {
737                  System.setSecurityManager(null);
738                  Policy.setPolicy(savedPolicy);
# Line 559 | Line 780 | public class JSR166TestCase extends Test
780              return perms.implies(p);
781          }
782          public void refresh() {}
783 +        public String toString() {
784 +            List<Permission> ps = new ArrayList<Permission>();
785 +            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
786 +                ps.add(e.nextElement());
787 +            return "AdjustablePolicy with permissions " + ps;
788 +        }
789      }
790  
791      /**
# Line 586 | Line 813 | public class JSR166TestCase extends Test
813       */
814      void sleep(long millis) {
815          try {
816 <            Thread.sleep(millis);
816 >            delay(millis);
817          } catch (InterruptedException ie) {
818              AssertionFailedError afe =
819                  new AssertionFailedError("Unexpected InterruptedException");
# Line 596 | Line 823 | public class JSR166TestCase extends Test
823      }
824  
825      /**
826 <     * 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
826 >     * Spin-waits up to the specified number of milliseconds for the given
827       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
828       */
829      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
830 <        long timeoutNanos = timeoutMillis * 1000L * 1000L;
614 <        long t0 = System.nanoTime();
830 >        long startTime = System.nanoTime();
831          for (;;) {
832              Thread.State s = thread.getState();
833              if (s == Thread.State.BLOCKED ||
# Line 620 | Line 836 | public class JSR166TestCase extends Test
836                  return;
837              else if (s == Thread.State.TERMINATED)
838                  fail("Unexpected thread termination");
839 <            else if (System.nanoTime() - t0 > timeoutNanos) {
839 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
840                  threadAssertTrue(thread.isAlive());
841                  return;
842              }
# Line 629 | Line 845 | public class JSR166TestCase extends Test
845      }
846  
847      /**
848 +     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
849 +     * state: BLOCKED, WAITING, or TIMED_WAITING.
850 +     */
851 +    void waitForThreadToEnterWaitState(Thread thread) {
852 +        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
853 +    }
854 +
855 +    /**
856       * Returns the number of milliseconds since time given by
857       * startNanoTime, which must have been previously returned from a
858       * call to {@link System.nanoTime()}.
# Line 658 | Line 882 | public class JSR166TestCase extends Test
882          } catch (InterruptedException ie) {
883              threadUnexpectedException(ie);
884          } finally {
885 <            if (t.isAlive()) {
885 >            if (t.getState() != Thread.State.TERMINATED) {
886                  t.interrupt();
887                  fail("Test timed out");
888              }
889          }
890      }
891  
892 +    /**
893 +     * Waits for LONG_DELAY_MS milliseconds for the thread to
894 +     * terminate (using {@link Thread#join(long)}), else interrupts
895 +     * the thread (in the hope that it may terminate later) and fails.
896 +     */
897 +    void awaitTermination(Thread t) {
898 +        awaitTermination(t, LONG_DELAY_MS);
899 +    }
900 +
901      // Some convenient Runnable classes
902  
903      public abstract class CheckedRunnable implements Runnable {
# Line 727 | Line 960 | public class JSR166TestCase extends Test
960                  realRun();
961                  threadShouldThrow("InterruptedException");
962              } catch (InterruptedException success) {
963 +                threadAssertFalse(Thread.interrupted());
964              } catch (Throwable t) {
965                  threadUnexpectedException(t);
966              }
# Line 756 | Line 990 | public class JSR166TestCase extends Test
990                  threadShouldThrow("InterruptedException");
991                  return result;
992              } catch (InterruptedException success) {
993 +                threadAssertFalse(Thread.interrupted());
994              } catch (Throwable t) {
995                  threadUnexpectedException(t);
996              }
# Line 787 | Line 1022 | public class JSR166TestCase extends Test
1022              }};
1023      }
1024  
1025 +    public Runnable awaiter(final CountDownLatch latch) {
1026 +        return new CheckedRunnable() {
1027 +            public void realRun() throws InterruptedException {
1028 +                await(latch);
1029 +            }};
1030 +    }
1031 +
1032 +    public void await(CountDownLatch latch) {
1033 +        try {
1034 +            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1035 +        } catch (Throwable t) {
1036 +            threadUnexpectedException(t);
1037 +        }
1038 +    }
1039 +
1040 +    public void await(Semaphore semaphore) {
1041 +        try {
1042 +            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1043 +        } catch (Throwable t) {
1044 +            threadUnexpectedException(t);
1045 +        }
1046 +    }
1047 +
1048 + //     /**
1049 + //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1050 + //      */
1051 + //     public void await(AtomicBoolean flag) {
1052 + //         await(flag, LONG_DELAY_MS);
1053 + //     }
1054 +
1055 + //     /**
1056 + //      * Spin-waits up to the specified timeout until flag becomes true.
1057 + //      */
1058 + //     public void await(AtomicBoolean flag, long timeoutMillis) {
1059 + //         long startTime = System.nanoTime();
1060 + //         while (!flag.get()) {
1061 + //             if (millisElapsedSince(startTime) > timeoutMillis)
1062 + //                 throw new AssertionFailedError("timed out");
1063 + //             Thread.yield();
1064 + //         }
1065 + //     }
1066 +
1067      public static class NPETask implements Callable<String> {
1068          public String call() { throw new NullPointerException(); }
1069      }
# Line 797 | Line 1074 | public class JSR166TestCase extends Test
1074  
1075      public class ShortRunnable extends CheckedRunnable {
1076          protected void realRun() throws Throwable {
1077 <            Thread.sleep(SHORT_DELAY_MS);
1077 >            delay(SHORT_DELAY_MS);
1078          }
1079      }
1080  
1081      public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1082          protected void realRun() throws InterruptedException {
1083 <            Thread.sleep(SHORT_DELAY_MS);
1083 >            delay(SHORT_DELAY_MS);
1084          }
1085      }
1086  
1087      public class SmallRunnable extends CheckedRunnable {
1088          protected void realRun() throws Throwable {
1089 <            Thread.sleep(SMALL_DELAY_MS);
1089 >            delay(SMALL_DELAY_MS);
1090          }
1091      }
1092  
1093      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1094          protected void realRun() {
1095              try {
1096 <                Thread.sleep(SMALL_DELAY_MS);
1096 >                delay(SMALL_DELAY_MS);
1097              } catch (InterruptedException ok) {}
1098          }
1099      }
1100  
1101      public class SmallCallable extends CheckedCallable {
1102          protected Object realCall() throws InterruptedException {
1103 <            Thread.sleep(SMALL_DELAY_MS);
1103 >            delay(SMALL_DELAY_MS);
1104              return Boolean.TRUE;
1105          }
1106      }
1107  
1108      public class MediumRunnable extends CheckedRunnable {
1109          protected void realRun() throws Throwable {
1110 <            Thread.sleep(MEDIUM_DELAY_MS);
1110 >            delay(MEDIUM_DELAY_MS);
1111          }
1112      }
1113  
1114      public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1115          protected void realRun() throws InterruptedException {
1116 <            Thread.sleep(MEDIUM_DELAY_MS);
1116 >            delay(MEDIUM_DELAY_MS);
1117          }
1118      }
1119  
# Line 844 | Line 1121 | public class JSR166TestCase extends Test
1121          return new CheckedRunnable() {
1122              protected void realRun() {
1123                  try {
1124 <                    Thread.sleep(timeoutMillis);
1124 >                    delay(timeoutMillis);
1125                  } catch (InterruptedException ok) {}
1126              }};
1127      }
# Line 852 | Line 1129 | public class JSR166TestCase extends Test
1129      public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1130          protected void realRun() {
1131              try {
1132 <                Thread.sleep(MEDIUM_DELAY_MS);
1132 >                delay(MEDIUM_DELAY_MS);
1133              } catch (InterruptedException ok) {}
1134          }
1135      }
# Line 860 | Line 1137 | public class JSR166TestCase extends Test
1137      public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1138          protected void realRun() {
1139              try {
1140 <                Thread.sleep(LONG_DELAY_MS);
1140 >                delay(LONG_DELAY_MS);
1141              } catch (InterruptedException ok) {}
1142          }
1143      }
# Line 884 | Line 1161 | public class JSR166TestCase extends Test
1161                  public boolean isDone() { return done; }
1162                  public void run() {
1163                      try {
1164 <                        Thread.sleep(timeoutMillis);
1164 >                        delay(timeoutMillis);
1165                          done = true;
1166                      } catch (InterruptedException ok) {}
1167                  }
# Line 895 | Line 1172 | public class JSR166TestCase extends Test
1172          public volatile boolean done = false;
1173          public void run() {
1174              try {
1175 <                Thread.sleep(SHORT_DELAY_MS);
1175 >                delay(SHORT_DELAY_MS);
1176                  done = true;
1177              } catch (InterruptedException ok) {}
1178          }
# Line 905 | Line 1182 | public class JSR166TestCase extends Test
1182          public volatile boolean done = false;
1183          public void run() {
1184              try {
1185 <                Thread.sleep(SMALL_DELAY_MS);
1185 >                delay(SMALL_DELAY_MS);
1186                  done = true;
1187              } catch (InterruptedException ok) {}
1188          }
# Line 915 | Line 1192 | public class JSR166TestCase extends Test
1192          public volatile boolean done = false;
1193          public void run() {
1194              try {
1195 <                Thread.sleep(MEDIUM_DELAY_MS);
1195 >                delay(MEDIUM_DELAY_MS);
1196                  done = true;
1197              } catch (InterruptedException ok) {}
1198          }
# Line 925 | Line 1202 | public class JSR166TestCase extends Test
1202          public volatile boolean done = false;
1203          public void run() {
1204              try {
1205 <                Thread.sleep(LONG_DELAY_MS);
1205 >                delay(LONG_DELAY_MS);
1206                  done = true;
1207              } catch (InterruptedException ok) {}
1208          }
# Line 942 | Line 1219 | public class JSR166TestCase extends Test
1219          public volatile boolean done = false;
1220          public Object call() {
1221              try {
1222 <                Thread.sleep(SMALL_DELAY_MS);
1222 >                delay(SMALL_DELAY_MS);
1223                  done = true;
1224              } catch (InterruptedException ok) {}
1225              return Boolean.TRUE;
# Line 989 | Line 1266 | public class JSR166TestCase extends Test
1266      }
1267  
1268      /**
1269 <     * A CyclicBarrier that fails with AssertionFailedErrors instead
1270 <     * of throwing checked exceptions.
1269 >     * A CyclicBarrier that uses timed await and fails with
1270 >     * AssertionFailedErrors instead of throwing checked exceptions.
1271       */
1272      public class CheckedBarrier extends CyclicBarrier {
1273          public CheckedBarrier(int parties) { super(parties); }
1274  
1275          public int await() {
1276              try {
1277 <                return super.await();
1277 >                return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1278 >            } catch (TimeoutException e) {
1279 >                throw new AssertionFailedError("timed out");
1280              } catch (Exception e) {
1281                  AssertionFailedError afe =
1282                      new AssertionFailedError("Unexpected exception: " + e);
# Line 1007 | Line 1286 | public class JSR166TestCase extends Test
1286          }
1287      }
1288  
1289 +    void checkEmpty(BlockingQueue q) {
1290 +        try {
1291 +            assertTrue(q.isEmpty());
1292 +            assertEquals(0, q.size());
1293 +            assertNull(q.peek());
1294 +            assertNull(q.poll());
1295 +            assertNull(q.poll(0, MILLISECONDS));
1296 +            assertEquals(q.toString(), "[]");
1297 +            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1298 +            assertFalse(q.iterator().hasNext());
1299 +            try {
1300 +                q.element();
1301 +                shouldThrow();
1302 +            } catch (NoSuchElementException success) {}
1303 +            try {
1304 +                q.iterator().next();
1305 +                shouldThrow();
1306 +            } catch (NoSuchElementException success) {}
1307 +            try {
1308 +                q.remove();
1309 +                shouldThrow();
1310 +            } catch (NoSuchElementException success) {}
1311 +        } catch (InterruptedException ie) {
1312 +            threadUnexpectedException(ie);
1313 +        }
1314 +    }
1315 +
1316 +    void assertSerialEquals(Object x, Object y) {
1317 +        assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1318 +    }
1319 +
1320 +    void assertNotSerialEquals(Object x, Object y) {
1321 +        assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1322 +    }
1323 +
1324 +    byte[] serialBytes(Object o) {
1325 +        try {
1326 +            ByteArrayOutputStream bos = new ByteArrayOutputStream();
1327 +            ObjectOutputStream oos = new ObjectOutputStream(bos);
1328 +            oos.writeObject(o);
1329 +            oos.flush();
1330 +            oos.close();
1331 +            return bos.toByteArray();
1332 +        } catch (Throwable t) {
1333 +            threadUnexpectedException(t);
1334 +            return new byte[0];
1335 +        }
1336 +    }
1337 +
1338 +    @SuppressWarnings("unchecked")
1339 +    <T> T serialClone(T o) {
1340 +        try {
1341 +            ObjectInputStream ois = new ObjectInputStream
1342 +                (new ByteArrayInputStream(serialBytes(o)));
1343 +            T clone = (T) ois.readObject();
1344 +            assertSame(o.getClass(), clone.getClass());
1345 +            return clone;
1346 +        } catch (Throwable t) {
1347 +            threadUnexpectedException(t);
1348 +            return null;
1349 +        }
1350 +    }
1351 +
1352 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1353 +                             Runnable... throwingActions) {
1354 +        for (Runnable throwingAction : throwingActions) {
1355 +            boolean threw = false;
1356 +            try { throwingAction.run(); }
1357 +            catch (Throwable t) {
1358 +                threw = true;
1359 +                if (!expectedExceptionClass.isInstance(t)) {
1360 +                    AssertionFailedError afe =
1361 +                        new AssertionFailedError
1362 +                        ("Expected " + expectedExceptionClass.getName() +
1363 +                         ", got " + t.getClass().getName());
1364 +                    afe.initCause(t);
1365 +                    threadUnexpectedException(afe);
1366 +                }
1367 +            }
1368 +            if (!threw)
1369 +                shouldThrow(expectedExceptionClass.getName());
1370 +        }
1371 +    }
1372   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines