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.99 by jsr166, Tue Feb 5 03:39:34 2013 UTC vs.
Revision 1.131 by jsr166, Sat Apr 25 04:55:30 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
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;
# Line 14 | Line 16 | import java.io.ObjectOutputStream;
16   import java.lang.management.ManagementFactory;
17   import java.lang.management.ThreadInfo;
18   import java.lang.reflect.Method;
19 + import java.security.CodeSource;
20 + import java.security.Permission;
21 + import java.security.PermissionCollection;
22 + import java.security.Permissions;
23 + import java.security.Policy;
24 + import java.security.ProtectionDomain;
25 + import java.security.SecurityPermission;
26   import java.util.ArrayList;
27   import java.util.Arrays;
28   import java.util.Date;
29   import java.util.Enumeration;
30 + import java.util.Iterator;
31   import java.util.List;
32   import java.util.NoSuchElementException;
33   import java.util.PropertyPermission;
34 < import java.util.concurrent.*;
35 < import java.util.concurrent.atomic.AtomicBoolean;
34 > import java.util.concurrent.BlockingQueue;
35 > import java.util.concurrent.Callable;
36 > import java.util.concurrent.CountDownLatch;
37 > import java.util.concurrent.CyclicBarrier;
38 > import java.util.concurrent.ExecutorService;
39 > import java.util.concurrent.Future;
40 > import java.util.concurrent.RecursiveAction;
41 > import java.util.concurrent.RecursiveTask;
42 > import java.util.concurrent.RejectedExecutionHandler;
43 > import java.util.concurrent.Semaphore;
44 > import java.util.concurrent.ThreadFactory;
45 > import java.util.concurrent.ThreadPoolExecutor;
46 > import java.util.concurrent.TimeoutException;
47   import java.util.concurrent.atomic.AtomicReference;
48 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
49 < import static java.util.concurrent.TimeUnit.NANOSECONDS;
50 < import java.security.CodeSource;
51 < import java.security.Permission;
52 < import java.security.PermissionCollection;
53 < import java.security.Permissions;
54 < import java.security.Policy;
34 < import java.security.ProtectionDomain;
35 < import java.security.SecurityPermission;
48 > import java.util.regex.Pattern;
49 >
50 > import junit.framework.AssertionFailedError;
51 > import junit.framework.Test;
52 > import junit.framework.TestCase;
53 > import junit.framework.TestResult;
54 > import junit.framework.TestSuite;
55  
56   /**
57   * Base class for JSR166 Junit TCK tests.  Defines some constants,
# Line 115 | Line 134 | public class JSR166TestCase extends Test
134          Boolean.getBoolean("jsr166.expensiveTests");
135  
136      /**
137 +     * If true, also run tests that are not part of the official tck
138 +     * because they test unspecified implementation details.
139 +     */
140 +    protected static final boolean testImplementationDetails =
141 +        Boolean.getBoolean("jsr166.testImplementationDetails");
142 +
143 +    /**
144       * If true, report on stdout all "slow" tests, that is, ones that
145       * take more than profileThreshold milliseconds to execute.
146       */
# Line 128 | Line 154 | public class JSR166TestCase extends Test
154      private static final long profileThreshold =
155          Long.getLong("jsr166.profileThreshold", 100);
156  
157 +    /**
158 +     * The number of repetitions per test (for tickling rare bugs).
159 +     */
160 +    private static final int runsPerTest =
161 +        Integer.getInteger("jsr166.runsPerTest", 1);
162 +
163 +    /**
164 +     * The number of repetitions of the test suite (for finding leaks?).
165 +     */
166 +    private static final int suiteRuns =
167 +        Integer.getInteger("jsr166.suiteRuns", 1);
168 +
169 +    /**
170 +     * A filter for tests to run, matching strings of the form
171 +     * methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
172 +     * Usefully combined with jsr166.runsPerTest.
173 +     */
174 +    private static final Pattern methodFilter = methodFilter();
175 +
176 +    private static Pattern methodFilter() {
177 +        String regex = System.getProperty("jsr166.methodFilter");
178 +        return (regex == null) ? null : Pattern.compile(regex);
179 +    }
180 +
181      protected void runTest() throws Throwable {
182 <        if (profileTests)
183 <            runTestProfiled();
184 <        else
185 <            super.runTest();
182 >        if (methodFilter == null
183 >            || methodFilter.matcher(toString()).find()) {
184 >            for (int i = 0; i < runsPerTest; i++) {
185 >                if (profileTests)
186 >                    runTestProfiled();
187 >                else
188 >                    super.runTest();
189 >            }
190 >        }
191      }
192  
193      protected void runTestProfiled() throws Throwable {
194 +        // Warmup run, notably to trigger all needed classloading.
195 +        super.runTest();
196          long t0 = System.nanoTime();
197          try {
198              super.runTest();
199          } finally {
200 <            long elapsedMillis =
144 <                (System.nanoTime() - t0) / (1000L * 1000L);
200 >            long elapsedMillis = millisElapsedSince(t0);
201              if (elapsedMillis >= profileThreshold)
202                  System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
203          }
# Line 149 | Line 205 | public class JSR166TestCase extends Test
205  
206      /**
207       * 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.
208       */
209      public static void main(String[] args) {
210 +        main(suite(), args);
211 +    }
212 +
213 +    /**
214 +     * Runs all unit tests in the given test suite.
215 +     * Actual behavior influenced by system properties jsr166.*
216 +     */
217 +    static void main(Test suite, String[] args) {
218          if (useSecurityManager) {
219              System.err.println("Setting a permissive security manager");
220              Policy.setPolicy(permissivePolicy());
221              System.setSecurityManager(new SecurityManager());
222          }
223 <        int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
224 <
225 <        Test s = suite();
226 <        for (int i = 0; i < iters; ++i) {
165 <            junit.textui.TestRunner.run(s);
223 >        for (int i = 0; i < suiteRuns; i++) {
224 >            TestResult result = junit.textui.TestRunner.run(suite);
225 >            if (!result.wasSuccessful())
226 >                System.exit(1);
227              System.gc();
228              System.runFinalization();
229          }
169        System.exit(0);
230      }
231  
232      public static TestSuite newTestSuite(Object... suiteOrClasses) {
# Line 197 | Line 257 | public class JSR166TestCase extends Test
257      }
258  
259      public static final double JAVA_CLASS_VERSION;
260 +    public static final String JAVA_SPECIFICATION_VERSION;
261      static {
262          try {
263              JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
264                  new java.security.PrivilegedAction<Double>() {
265                  public Double run() {
266                      return Double.valueOf(System.getProperty("java.class.version"));}});
267 +            JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
268 +                new java.security.PrivilegedAction<String>() {
269 +                public String run() {
270 +                    return System.getProperty("java.specification.version");}});
271          } catch (Throwable t) {
272              throw new Error(t);
273          }
# Line 211 | Line 276 | public class JSR166TestCase extends Test
276      public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
277      public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
278      public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
279 +    public static boolean atLeastJava9() { return JAVA_CLASS_VERSION >= 53.0; }
280  
281      /**
282       * Collects all JSR166 unit tests as one suite.
# Line 286 | Line 352 | public class JSR166TestCase extends Test
352          // Java8+ test classes
353          if (atLeastJava8()) {
354              String[] java8TestClassNames = {
355 <                "StampedLockTest",
355 >                "Atomic8Test",
356 >                "CompletableFutureTest",
357 >                "ConcurrentHashMap8Test",
358 >                "CountedCompleterTest",
359 >                "DoubleAccumulatorTest",
360 >                "DoubleAdderTest",
361                  "ForkJoinPool8Test",
362 +                "ForkJoinTask8Test",
363 +                "LongAccumulatorTest",
364 +                "LongAdderTest",
365 +                "SplittableRandomTest",
366 +                "StampedLockTest",
367 +                "ThreadLocalRandom8Test",
368              };
369              addNamedTestClasses(suite, java8TestClassNames);
370          }
371  
372 +        // Java9+ test classes
373 +        if (atLeastJava9()) {
374 +            String[] java9TestClassNames = {
375 +                "ThreadPoolExecutor9Test",
376 +            };
377 +            addNamedTestClasses(suite, java9TestClassNames);
378 +        }
379 +
380          return suite;
381      }
382  
383 +    // Delays for timing-dependent tests, in milliseconds.
384  
385      public static long SHORT_DELAY_MS;
386      public static long SMALL_DELAY_MS;
387      public static long MEDIUM_DELAY_MS;
388      public static long LONG_DELAY_MS;
389  
304
390      /**
391       * Returns the shortest timed delay. This could
392       * be reimplemented to use for example a Property.
# Line 384 | Line 469 | public class JSR166TestCase extends Test
469  
470          if (Thread.interrupted())
471              throw new AssertionFailedError("interrupt status set in main thread");
472 +
473 +        checkForkJoinPoolThreadLeaks();
474 +    }
475 +
476 +    /**
477 +     * Finds missing try { ... } finally { joinPool(e); }
478 +     */
479 +    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
480 +        Thread[] survivors = new Thread[5];
481 +        int count = Thread.enumerate(survivors);
482 +        for (int i = 0; i < count; i++) {
483 +            Thread thread = survivors[i];
484 +            String name = thread.getName();
485 +            if (name.startsWith("ForkJoinPool-")) {
486 +                // give thread some time to terminate
487 +                thread.join(LONG_DELAY_MS);
488 +                if (!thread.isAlive()) continue;
489 +                thread.stop();
490 +                throw new AssertionFailedError
491 +                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
492 +                                   toString(), name));
493 +            }
494 +        }
495      }
496  
497      /**
# Line 464 | Line 572 | public class JSR166TestCase extends Test
572      public void threadAssertEquals(Object x, Object y) {
573          try {
574              assertEquals(x, y);
575 <        } catch (AssertionFailedError t) {
576 <            threadRecordFailure(t);
577 <            throw t;
578 <        } catch (Throwable t) {
579 <            threadUnexpectedException(t);
575 >        } catch (AssertionFailedError fail) {
576 >            threadRecordFailure(fail);
577 >            throw fail;
578 >        } catch (Throwable fail) {
579 >            threadUnexpectedException(fail);
580          }
581      }
582  
# Line 480 | Line 588 | public class JSR166TestCase extends Test
588      public void threadAssertSame(Object x, Object y) {
589          try {
590              assertSame(x, y);
591 <        } catch (AssertionFailedError t) {
592 <            threadRecordFailure(t);
593 <            throw t;
591 >        } catch (AssertionFailedError fail) {
592 >            threadRecordFailure(fail);
593 >            throw fail;
594          }
595      }
596  
# Line 547 | Line 655 | public class JSR166TestCase extends Test
655      void joinPool(ExecutorService exec) {
656          try {
657              exec.shutdown();
658 <            assertTrue("ExecutorService did not terminate in a timely manner",
659 <                       exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
658 >            if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
659 >                fail("ExecutorService " + exec +
660 >                     " did not terminate in a timely manner");
661          } catch (SecurityException ok) {
662              // Allowed in case test doesn't have privs
663 <        } catch (InterruptedException ie) {
663 >        } catch (InterruptedException fail) {
664              fail("Unexpected InterruptedException");
665          }
666      }
# Line 582 | Line 691 | public class JSR166TestCase extends Test
691              // No need to optimize the failing case via Thread.join.
692              delay(millis);
693              assertTrue(thread.isAlive());
694 <        } catch (InterruptedException ie) {
694 >        } catch (InterruptedException fail) {
695              fail("Unexpected InterruptedException");
696          }
697      }
# Line 604 | Line 713 | public class JSR166TestCase extends Test
713              delay(millis);
714              for (Thread thread : threads)
715                  assertTrue(thread.isAlive());
716 <        } catch (InterruptedException ie) {
716 >        } catch (InterruptedException fail) {
717              fail("Unexpected InterruptedException");
718          }
719      }
# Line 626 | Line 735 | public class JSR166TestCase extends Test
735              future.get(timeoutMillis, MILLISECONDS);
736              shouldThrow();
737          } catch (TimeoutException success) {
738 <        } catch (Exception e) {
739 <            threadUnexpectedException(e);
738 >        } catch (Exception fail) {
739 >            threadUnexpectedException(fail);
740          } finally { future.cancel(true); }
741          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
742      }
# Line 671 | Line 780 | public class JSR166TestCase extends Test
780      public static final Integer m6  = new Integer(-6);
781      public static final Integer m10 = new Integer(-10);
782  
674
783      /**
784       * Runs Runnable r with a security policy that permits precisely
785       * the specified permissions.  If there is no current security
# Line 784 | Line 892 | public class JSR166TestCase extends Test
892      void sleep(long millis) {
893          try {
894              delay(millis);
895 <        } catch (InterruptedException ie) {
895 >        } catch (InterruptedException fail) {
896              AssertionFailedError afe =
897                  new AssertionFailedError("Unexpected InterruptedException");
898 <            afe.initCause(ie);
898 >            afe.initCause(fail);
899              throw afe;
900          }
901      }
# Line 825 | Line 933 | public class JSR166TestCase extends Test
933      /**
934       * Returns the number of milliseconds since time given by
935       * startNanoTime, which must have been previously returned from a
936 <     * call to {@link System.nanoTime()}.
936 >     * call to {@link System#nanoTime()}.
937       */
938 <    long millisElapsedSince(long startNanoTime) {
938 >    static long millisElapsedSince(long startNanoTime) {
939          return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
940      }
941  
942 + //     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
943 + //         long startTime = System.nanoTime();
944 + //         try {
945 + //             r.run();
946 + //         } catch (Throwable fail) { threadUnexpectedException(fail); }
947 + //         if (millisElapsedSince(startTime) > timeoutMillis/2)
948 + //             throw new AssertionFailedError("did not return promptly");
949 + //     }
950 +
951 + //     void assertTerminatesPromptly(Runnable r) {
952 + //         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
953 + //     }
954 +
955 +    /**
956 +     * Checks that timed f.get() returns the expected value, and does not
957 +     * wait for the timeout to elapse before returning.
958 +     */
959 +    <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
960 +        long startTime = System.nanoTime();
961 +        try {
962 +            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
963 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
964 +        if (millisElapsedSince(startTime) > timeoutMillis/2)
965 +            throw new AssertionFailedError("timed get did not return promptly");
966 +    }
967 +
968 +    <T> void checkTimedGet(Future<T> f, T expectedValue) {
969 +        checkTimedGet(f, expectedValue, LONG_DELAY_MS);
970 +    }
971 +
972      /**
973       * Returns a new started daemon Thread running the given runnable.
974       */
# Line 849 | Line 987 | public class JSR166TestCase extends Test
987      void awaitTermination(Thread t, long timeoutMillis) {
988          try {
989              t.join(timeoutMillis);
990 <        } catch (InterruptedException ie) {
991 <            threadUnexpectedException(ie);
990 >        } catch (InterruptedException fail) {
991 >            threadUnexpectedException(fail);
992          } finally {
993              if (t.getState() != Thread.State.TERMINATED) {
994                  t.interrupt();
# Line 876 | Line 1014 | public class JSR166TestCase extends Test
1014          public final void run() {
1015              try {
1016                  realRun();
1017 <            } catch (Throwable t) {
1018 <                threadUnexpectedException(t);
1017 >            } catch (Throwable fail) {
1018 >                threadUnexpectedException(fail);
1019              }
1020          }
1021      }
# Line 931 | Line 1069 | public class JSR166TestCase extends Test
1069                  threadShouldThrow("InterruptedException");
1070              } catch (InterruptedException success) {
1071                  threadAssertFalse(Thread.interrupted());
1072 <            } catch (Throwable t) {
1073 <                threadUnexpectedException(t);
1072 >            } catch (Throwable fail) {
1073 >                threadUnexpectedException(fail);
1074              }
1075          }
1076      }
# Line 943 | Line 1081 | public class JSR166TestCase extends Test
1081          public final T call() {
1082              try {
1083                  return realCall();
1084 <            } catch (Throwable t) {
1085 <                threadUnexpectedException(t);
1084 >            } catch (Throwable fail) {
1085 >                threadUnexpectedException(fail);
1086                  return null;
1087              }
1088          }
# Line 961 | Line 1099 | public class JSR166TestCase extends Test
1099                  return result;
1100              } catch (InterruptedException success) {
1101                  threadAssertFalse(Thread.interrupted());
1102 <            } catch (Throwable t) {
1103 <                threadUnexpectedException(t);
1102 >            } catch (Throwable fail) {
1103 >                threadUnexpectedException(fail);
1104              }
1105              return null;
1106          }
# Line 1002 | Line 1140 | public class JSR166TestCase extends Test
1140      public void await(CountDownLatch latch) {
1141          try {
1142              assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1143 <        } catch (Throwable t) {
1144 <            threadUnexpectedException(t);
1143 >        } catch (Throwable fail) {
1144 >            threadUnexpectedException(fail);
1145          }
1146      }
1147  
1148      public void await(Semaphore semaphore) {
1149          try {
1150              assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1151 <        } catch (Throwable t) {
1152 <            threadUnexpectedException(t);
1151 >        } catch (Throwable fail) {
1152 >            threadUnexpectedException(fail);
1153          }
1154      }
1155  
# Line 1202 | Line 1340 | public class JSR166TestCase extends Test
1340      public abstract class CheckedRecursiveAction extends RecursiveAction {
1341          protected abstract void realCompute() throws Throwable;
1342  
1343 <        public final void compute() {
1343 >        @Override protected final void compute() {
1344              try {
1345                  realCompute();
1346 <            } catch (Throwable t) {
1347 <                threadUnexpectedException(t);
1346 >            } catch (Throwable fail) {
1347 >                threadUnexpectedException(fail);
1348              }
1349          }
1350      }
# Line 1217 | Line 1355 | public class JSR166TestCase extends Test
1355      public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1356          protected abstract T realCompute() throws Throwable;
1357  
1358 <        public final T compute() {
1358 >        @Override protected final T compute() {
1359              try {
1360                  return realCompute();
1361 <            } catch (Throwable t) {
1362 <                threadUnexpectedException(t);
1361 >            } catch (Throwable fail) {
1362 >                threadUnexpectedException(fail);
1363                  return null;
1364              }
1365          }
# Line 1245 | Line 1383 | public class JSR166TestCase extends Test
1383          public int await() {
1384              try {
1385                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1386 <            } catch (TimeoutException e) {
1386 >            } catch (TimeoutException timedOut) {
1387                  throw new AssertionFailedError("timed out");
1388 <            } catch (Exception e) {
1388 >            } catch (Exception fail) {
1389                  AssertionFailedError afe =
1390 <                    new AssertionFailedError("Unexpected exception: " + e);
1391 <                afe.initCause(e);
1390 >                    new AssertionFailedError("Unexpected exception: " + fail);
1391 >                afe.initCause(fail);
1392                  throw afe;
1393              }
1394          }
# Line 1278 | Line 1416 | public class JSR166TestCase extends Test
1416                  q.remove();
1417                  shouldThrow();
1418              } catch (NoSuchElementException success) {}
1419 <        } catch (InterruptedException ie) {
1282 <            threadUnexpectedException(ie);
1283 <        }
1419 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
1420      }
1421  
1422      void assertSerialEquals(Object x, Object y) {
# Line 1299 | Line 1435 | public class JSR166TestCase extends Test
1435              oos.flush();
1436              oos.close();
1437              return bos.toByteArray();
1438 <        } catch (Throwable t) {
1439 <            threadUnexpectedException(t);
1438 >        } catch (Throwable fail) {
1439 >            threadUnexpectedException(fail);
1440              return new byte[0];
1441          }
1442      }
# Line 1313 | Line 1449 | public class JSR166TestCase extends Test
1449              T clone = (T) ois.readObject();
1450              assertSame(o.getClass(), clone.getClass());
1451              return clone;
1452 <        } catch (Throwable t) {
1453 <            threadUnexpectedException(t);
1452 >        } catch (Throwable fail) {
1453 >            threadUnexpectedException(fail);
1454              return null;
1455          }
1456      }
1457 +
1458 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1459 +                             Runnable... throwingActions) {
1460 +        for (Runnable throwingAction : throwingActions) {
1461 +            boolean threw = false;
1462 +            try { throwingAction.run(); }
1463 +            catch (Throwable t) {
1464 +                threw = true;
1465 +                if (!expectedExceptionClass.isInstance(t)) {
1466 +                    AssertionFailedError afe =
1467 +                        new AssertionFailedError
1468 +                        ("Expected " + expectedExceptionClass.getName() +
1469 +                         ", got " + t.getClass().getName());
1470 +                    afe.initCause(t);
1471 +                    threadUnexpectedException(afe);
1472 +                }
1473 +            }
1474 +            if (!threw)
1475 +                shouldThrow(expectedExceptionClass.getName());
1476 +        }
1477 +    }
1478 +
1479 +    public void assertIteratorExhausted(Iterator<?> it) {
1480 +        try {
1481 +            it.next();
1482 +            shouldThrow();
1483 +        } catch (NoSuchElementException success) {}
1484 +        assertFalse(it.hasNext());
1485 +    }
1486   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines