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.141 by jsr166, Tue Sep 8 16:49:16 2015 UTC vs.
Revision 1.148 by jsr166, Mon Sep 28 08:23:49 2015 UTC

# Line 40 | Line 40 | import java.util.concurrent.CyclicBarrie
40   import java.util.concurrent.ExecutionException;
41   import java.util.concurrent.Executors;
42   import java.util.concurrent.ExecutorService;
43 + import java.util.concurrent.ForkJoinPool;
44   import java.util.concurrent.Future;
45   import java.util.concurrent.RecursiveAction;
46   import java.util.concurrent.RecursiveTask;
# Line 67 | Line 68 | import junit.framework.TestSuite;
68   *
69   * <ol>
70   *
71 < * <li> All assertions in code running in generated threads must use
71 > * <li>All assertions in code running in generated threads must use
72   * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
73   * #threadAssertEquals}, or {@link #threadAssertNull}, (not
74   * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
75   * particularly recommended) for other code to use these forms too.
76   * Only the most typically used JUnit assertion methods are defined
77 < * this way, but enough to live with.</li>
77 > * this way, but enough to live with.
78   *
79 < * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
79 > * <li>If you override {@link #setUp} or {@link #tearDown}, make sure
80   * to invoke {@code super.setUp} and {@code super.tearDown} within
81   * them. These methods are used to clear and check for thread
82 < * assertion failures.</li>
82 > * assertion failures.
83   *
84   * <li>All delays and timeouts must use one of the constants {@code
85   * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
# Line 89 | Line 90 | import junit.framework.TestSuite;
90   * is always discriminable as larger than SHORT and smaller than
91   * MEDIUM.  And so on. These constants are set to conservative values,
92   * but even so, if there is ever any doubt, they can all be increased
93 < * in one spot to rerun tests on slower platforms.</li>
93 > * in one spot to rerun tests on slower platforms.
94   *
95 < * <li> All threads generated must be joined inside each test case
95 > * <li>All threads generated must be joined inside each test case
96   * method (or {@code fail} to do so) before returning from the
97   * method. The {@code joinPool} method can be used to do this when
98 < * using Executors.</li>
98 > * using Executors.
99   *
100   * </ol>
101   *
102   * <p><b>Other notes</b>
103   * <ul>
104   *
105 < * <li> Usually, there is one testcase method per JSR166 method
105 > * <li>Usually, there is one testcase method per JSR166 method
106   * covering "normal" operation, and then as many exception-testing
107   * methods as there are exceptions the method can throw. Sometimes
108   * there are multiple tests per JSR166 method when the different
109   * "normal" behaviors differ significantly. And sometimes testcases
110   * cover multiple methods when they cannot be tested in
111 < * isolation.</li>
111 > * isolation.
112   *
113 < * <li> The documentation style for testcases is to provide as javadoc
113 > * <li>The documentation style for testcases is to provide as javadoc
114   * a simple sentence or two describing the property that the testcase
115   * method purports to test. The javadocs do not say anything about how
116 < * the property is tested. To find out, read the code.</li>
116 > * the property is tested. To find out, read the code.
117   *
118 < * <li> These tests are "conformance tests", and do not attempt to
118 > * <li>These tests are "conformance tests", and do not attempt to
119   * test throughput, latency, scalability or other performance factors
120   * (see the separate "jtreg" tests for a set intended to check these
121   * for the most central aspects of functionality.) So, most tests use
122   * the smallest sensible numbers of threads, collection sizes, etc
123 < * needed to check basic conformance.</li>
123 > * needed to check basic conformance.
124   *
125   * <li>The test classes currently do not declare inclusion in
126   * any particular package to simplify things for people integrating
127 < * them in TCK test suites.</li>
127 > * them in TCK test suites.
128   *
129 < * <li> As a convenience, the {@code main} of this class (JSR166TestCase)
130 < * runs all JSR166 unit tests.</li>
129 > * <li>As a convenience, the {@code main} of this class (JSR166TestCase)
130 > * runs all JSR166 unit tests.
131   *
132   * </ul>
133   */
# Line 185 | Line 186 | public class JSR166TestCase extends Test
186          return (regex == null) ? null : Pattern.compile(regex);
187      }
188  
189 <    protected void runTest() throws Throwable {
189 >    public void runBare() throws Throwable {
190          if (methodFilter == null
191 <            || methodFilter.matcher(toString()).find()) {
192 <            for (int i = 0; i < runsPerTest; i++) {
193 <                if (profileTests)
194 <                    runTestProfiled();
195 <                else
196 <                    super.runTest();
197 <            }
191 >            || methodFilter.matcher(toString()).find())
192 >            super.runBare();
193 >    }
194 >
195 >    protected void runTest() throws Throwable {
196 >        for (int i = 0; i < runsPerTest; i++) {
197 >            if (profileTests)
198 >                runTestProfiled();
199 >            else
200 >                super.runTest();
201          }
202      }
203  
204      protected void runTestProfiled() throws Throwable {
205 <        // Warmup run, notably to trigger all needed classloading.
206 <        super.runTest();
203 <        long t0 = System.nanoTime();
204 <        try {
205 >        for (int i = 0; i < 2; i++) {
206 >            long startTime = System.nanoTime();
207              super.runTest();
208 <        } finally {
209 <            long elapsedMillis = millisElapsedSince(t0);
210 <            if (elapsedMillis >= profileThreshold)
208 >            long elapsedMillis = millisElapsedSince(startTime);
209 >            if (elapsedMillis < profileThreshold)
210 >                break;
211 >            // Never report first run of any test; treat it as a
212 >            // warmup run, notably to trigger all needed classloading,
213 >            if (i > 0)
214                  System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
215          }
216      }
# Line 388 | Line 393 | public class JSR166TestCase extends Test
393          // Java9+ test classes
394          if (atLeastJava9()) {
395              String[] java9TestClassNames = {
396 <                // Currently empty
396 >                // Currently empty, but expecting varhandle tests
397              };
398              addNamedTestClasses(suite, java9TestClassNames);
399          }
# Line 520 | Line 525 | public class JSR166TestCase extends Test
525          setDelays();
526      }
527  
528 +    void tearDownFail(String format, Object... args) {
529 +        String msg = toString() + ": " + String.format(format, args);
530 +        System.err.println(msg);
531 +        printAllStackTraces();
532 +        throw new AssertionFailedError(msg);
533 +    }
534 +
535      /**
536       * Extra checks that get done for all test cases.
537       *
# Line 547 | Line 559 | public class JSR166TestCase extends Test
559          }
560  
561          if (Thread.interrupted())
562 <            throw new AssertionFailedError("interrupt status set in main thread");
562 >            tearDownFail("interrupt status set in main thread");
563  
564          checkForkJoinPoolThreadLeaks();
565      }
# Line 556 | Line 568 | public class JSR166TestCase extends Test
568       * Finds missing try { ... } finally { joinPool(e); }
569       */
570      void checkForkJoinPoolThreadLeaks() throws InterruptedException {
571 <        Thread[] survivors = new Thread[5];
571 >        Thread[] survivors = new Thread[7];
572          int count = Thread.enumerate(survivors);
573          for (int i = 0; i < count; i++) {
574              Thread thread = survivors[i];
# Line 564 | Line 576 | public class JSR166TestCase extends Test
576              if (name.startsWith("ForkJoinPool-")) {
577                  // give thread some time to terminate
578                  thread.join(LONG_DELAY_MS);
579 <                if (!thread.isAlive()) continue;
580 <                throw new AssertionFailedError
581 <                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
570 <                                   toString(), name));
579 >                if (thread.isAlive())
580 >                    tearDownFail("Found leaked ForkJoinPool thread thread=%s",
581 >                                 thread);
582              }
583          }
584 +
585 +        if (!ForkJoinPool.commonPool()
586 +            .awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
587 +            tearDownFail("ForkJoin common pool thread stuck");
588      }
589  
590      /**
# Line 1223 | Line 1238 | public class JSR166TestCase extends Test
1238      public static final String TEST_STRING = "a test string";
1239  
1240      public static class StringTask implements Callable<String> {
1241 <        public String call() { return TEST_STRING; }
1241 >        final String value;
1242 >        public StringTask() { this(TEST_STRING); }
1243 >        public StringTask(String value) { this.value = value; }
1244 >        public String call() { return value; }
1245      }
1246  
1247      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
# Line 1236 | Line 1254 | public class JSR166TestCase extends Test
1254              }};
1255      }
1256  
1257 +    public Runnable countDowner(final CountDownLatch latch) {
1258 +        return new CheckedRunnable() {
1259 +            public void realRun() throws InterruptedException {
1260 +                latch.countDown();
1261 +            }};
1262 +    }
1263 +
1264      public Runnable awaiter(final CountDownLatch latch) {
1265          return new CheckedRunnable() {
1266              public void realRun() throws InterruptedException {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines