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.132 by jsr166, Mon Apr 27 06:01:31 2015 UTC vs.
Revision 1.142 by jsr166, Tue Sep 8 16:53:43 2015 UTC

# Line 15 | Line 15 | import java.io.ObjectInputStream;
15   import java.io.ObjectOutputStream;
16   import java.lang.management.ManagementFactory;
17   import java.lang.management.ThreadInfo;
18 + import java.lang.reflect.Constructor;
19   import java.lang.reflect.Method;
20 + import java.lang.reflect.Modifier;
21   import java.security.CodeSource;
22   import java.security.Permission;
23   import java.security.PermissionCollection;
# Line 35 | Line 37 | import java.util.concurrent.BlockingQueu
37   import java.util.concurrent.Callable;
38   import java.util.concurrent.CountDownLatch;
39   import java.util.concurrent.CyclicBarrier;
40 + import java.util.concurrent.ExecutionException;
41 + import java.util.concurrent.Executors;
42   import java.util.concurrent.ExecutorService;
43   import java.util.concurrent.Future;
44   import java.util.concurrent.RecursiveAction;
# Line 166 | Line 170 | public class JSR166TestCase extends Test
170      private static final int suiteRuns =
171          Integer.getInteger("jsr166.suiteRuns", 1);
172  
173 +    public JSR166TestCase() { super(); }
174 +    public JSR166TestCase(String name) { super(name); }
175 +
176      /**
177       * A filter for tests to run, matching strings of the form
178       * methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
# Line 276 | Line 283 | public class JSR166TestCase extends Test
283      public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
284      public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
285      public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
286 <    public static boolean atLeastJava9() { return JAVA_CLASS_VERSION >= 53.0; }
286 >    public static boolean atLeastJava9() {
287 >        return JAVA_CLASS_VERSION >= 53.0
288 >            // As of 2015-09, java9 still uses 52.0 class file version
289 >            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
290 >    }
291 >    public static boolean atLeastJava10() {
292 >        return JAVA_CLASS_VERSION >= 54.0
293 >            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
294 >    }
295  
296      /**
297       * Collects all JSR166 unit tests as one suite.
# Line 364 | Line 379 | public class JSR166TestCase extends Test
379                  "LongAdderTest",
380                  "SplittableRandomTest",
381                  "StampedLockTest",
382 +                "SubmissionPublisherTest",
383                  "ThreadLocalRandom8Test",
384              };
385              addNamedTestClasses(suite, java8TestClassNames);
# Line 372 | Line 388 | public class JSR166TestCase extends Test
388          // Java9+ test classes
389          if (atLeastJava9()) {
390              String[] java9TestClassNames = {
391 <                "ThreadPoolExecutor9Test",
391 >                // Currently empty, but expecting varhandle tests
392              };
393              addNamedTestClasses(suite, java9TestClassNames);
394          }
# Line 380 | Line 396 | public class JSR166TestCase extends Test
396          return suite;
397      }
398  
399 +    /** Returns list of junit-style test method names in given class. */
400 +    public static ArrayList<String> testMethodNames(Class<?> testClass) {
401 +        Method[] methods = testClass.getDeclaredMethods();
402 +        ArrayList<String> names = new ArrayList<String>(methods.length);
403 +        for (Method method : methods) {
404 +            if (method.getName().startsWith("test")
405 +                && Modifier.isPublic(method.getModifiers())
406 +                // method.getParameterCount() requires jdk8+
407 +                && method.getParameterTypes().length == 0) {
408 +                names.add(method.getName());
409 +            }
410 +        }
411 +        return names;
412 +    }
413 +
414 +    /**
415 +     * Returns junit-style testSuite for the given test class, but
416 +     * parameterized by passing extra data to each test.
417 +     */
418 +    public static <ExtraData> Test parameterizedTestSuite
419 +        (Class<? extends JSR166TestCase> testClass,
420 +         Class<ExtraData> dataClass,
421 +         ExtraData data) {
422 +        try {
423 +            TestSuite suite = new TestSuite();
424 +            Constructor c =
425 +                testClass.getDeclaredConstructor(dataClass, String.class);
426 +            for (String methodName : testMethodNames(testClass))
427 +                suite.addTest((Test) c.newInstance(data, methodName));
428 +            return suite;
429 +        } catch (Exception e) {
430 +            throw new Error(e);
431 +        }
432 +    }
433 +
434 +    /**
435 +     * Returns junit-style testSuite for the jdk8 extension of the
436 +     * given test class, but parameterized by passing extra data to
437 +     * each test.  Uses reflection to allow compilation in jdk7.
438 +     */
439 +    public static <ExtraData> Test jdk8ParameterizedTestSuite
440 +        (Class<? extends JSR166TestCase> testClass,
441 +         Class<ExtraData> dataClass,
442 +         ExtraData data) {
443 +        if (atLeastJava8()) {
444 +            String name = testClass.getName();
445 +            String name8 = name.replaceAll("Test$", "8Test");
446 +            if (name.equals(name8)) throw new Error(name);
447 +            try {
448 +                return (Test)
449 +                    Class.forName(name8)
450 +                    .getMethod("testSuite", new Class[] { dataClass })
451 +                    .invoke(null, data);
452 +            } catch (Exception e) {
453 +                throw new Error(e);
454 +            }
455 +        } else {
456 +            return new TestSuite();
457 +        }
458 +
459 +    }
460 +
461      // Delays for timing-dependent tests, in milliseconds.
462  
463      public static long SHORT_DELAY_MS;
# Line 414 | Line 492 | public class JSR166TestCase extends Test
492      }
493  
494      /**
495 <     * Returns a new Date instance representing a time delayMillis
496 <     * milliseconds in the future.
495 >     * Returns a new Date instance representing a time at least
496 >     * delayMillis milliseconds in the future.
497       */
498      Date delayedDate(long delayMillis) {
499 <        return new Date(System.currentTimeMillis() + delayMillis);
499 >        // Add 1 because currentTimeMillis is known to round into the past.
500 >        return new Date(System.currentTimeMillis() + delayMillis + 1);
501      }
502  
503      /**
# Line 486 | Line 565 | public class JSR166TestCase extends Test
565                  // give thread some time to terminate
566                  thread.join(LONG_DELAY_MS);
567                  if (!thread.isAlive()) continue;
489 –                thread.stop();
568                  throw new AssertionFailedError
569                      (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
570                                     toString(), name));
# Line 652 | Line 730 | public class JSR166TestCase extends Test
730      /**
731       * Waits out termination of a thread pool or fails doing so.
732       */
733 <    void joinPool(ExecutorService exec) {
733 >    void joinPool(ExecutorService pool) {
734          try {
735 <            exec.shutdown();
736 <            if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
737 <                fail("ExecutorService " + exec +
735 >            pool.shutdown();
736 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
737 >                fail("ExecutorService " + pool +
738                       " did not terminate in a timely manner");
739          } catch (SecurityException ok) {
740              // Allowed in case test doesn't have privs
# Line 665 | Line 743 | public class JSR166TestCase extends Test
743          }
744      }
745  
746 +    /** Like Runnable, but with the freedom to throw anything */
747 +    interface Action { public void run() throws Throwable; }
748 +
749 +    /**
750 +     * Runs all the given actions in parallel, failing if any fail.
751 +     * Useful for running multiple variants of tests that are
752 +     * necessarily individually slow because they must block.
753 +     */
754 +    void testInParallel(Action ... actions) {
755 +        ExecutorService pool = Executors.newCachedThreadPool();
756 +        try {
757 +            ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
758 +            for (final Action action : actions)
759 +                futures.add(pool.submit(new CheckedRunnable() {
760 +                    public void realRun() throws Throwable { action.run();}}));
761 +            for (Future<?> future : futures)
762 +                try {
763 +                    assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
764 +                } catch (ExecutionException ex) {
765 +                    threadUnexpectedException(ex.getCause());
766 +                } catch (Exception ex) {
767 +                    threadUnexpectedException(ex);
768 +                }
769 +        } finally {
770 +            joinPool(pool);
771 +        }
772 +    }
773 +
774      /**
775       * A debugging tool to print all stack traces, as jstack does.
776       */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines