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.176 by jsr166, Mon Oct 12 07:16:39 2015 UTC vs.
Revision 1.185 by jsr166, Mon Feb 22 19:36:59 2016 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 + /*
10 + * @test
11 + * @summary JSR-166 tck tests
12 + * @modules java.management
13 + * @build *
14 + * @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
15 + */
16 +
17   import static java.util.concurrent.TimeUnit.MILLISECONDS;
18   import static java.util.concurrent.TimeUnit.MINUTES;
19   import static java.util.concurrent.TimeUnit.NANOSECONDS;
# Line 53 | Line 61 | import java.util.concurrent.Semaphore;
61   import java.util.concurrent.ThreadFactory;
62   import java.util.concurrent.ThreadPoolExecutor;
63   import java.util.concurrent.TimeoutException;
64 + import java.util.concurrent.atomic.AtomicBoolean;
65   import java.util.concurrent.atomic.AtomicReference;
66   import java.util.regex.Matcher;
67   import java.util.regex.Pattern;
# Line 112 | Line 121 | import junit.framework.TestSuite;
121   * methods as there are exceptions the method can throw. Sometimes
122   * there are multiple tests per JSR166 method when the different
123   * "normal" behaviors differ significantly. And sometimes testcases
124 < * cover multiple methods when they cannot be tested in
116 < * isolation.
124 > * cover multiple methods when they cannot be tested in isolation.
125   *
126   * <li>The documentation style for testcases is to provide as javadoc
127   * a simple sentence or two describing the property that the testcase
# Line 176 | Line 184 | public class JSR166TestCase extends Test
184      private static final int suiteRuns =
185          Integer.getInteger("jsr166.suiteRuns", 1);
186  
187 +    private static float systemPropertyValue(String name, float defaultValue) {
188 +        String floatString = System.getProperty(name);
189 +        if (floatString == null)
190 +            return defaultValue;
191 +        try {
192 +            return Float.parseFloat(floatString);
193 +        } catch (NumberFormatException ex) {
194 +            throw new IllegalArgumentException(
195 +                String.format("Bad float value in system property %s=%s",
196 +                              name, floatString));
197 +        }
198 +    }
199 +
200 +    /**
201 +     * The scaling factor to apply to standard delays used in tests.
202 +     */
203 +    private static final float delayFactor =
204 +        systemPropertyValue("jsr166.delay.factor", 1.0f);
205 +    
206 +    /**
207 +     * The timeout factor as used in the jtreg test harness.
208 +     * See: http://openjdk.java.net/jtreg/tag-spec.html
209 +     */
210 +    private static final float jtregTestTimeoutFactor
211 +        = systemPropertyValue("test.timeout.factor", 1.0f);
212 +
213      public JSR166TestCase() { super(); }
214      public JSR166TestCase(String name) { super(name); }
215  
# Line 273 | Line 307 | public class JSR166TestCase extends Test
307          main(suite(), args);
308      }
309  
310 +    static class PithyResultPrinter extends junit.textui.ResultPrinter {
311 +        PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
312 +        long runTime;
313 +        public void startTest(Test test) {}
314 +        protected void printHeader(long runTime) {
315 +            this.runTime = runTime; // defer printing for later
316 +        }
317 +        protected void printFooter(TestResult result) {
318 +            if (result.wasSuccessful()) {
319 +                getWriter().println("OK (" + result.runCount() + " tests)"
320 +                    + "  Time: " + elapsedTimeAsString(runTime));
321 +            } else {
322 +                getWriter().println("Time: " + elapsedTimeAsString(runTime));
323 +                super.printFooter(result);
324 +            }
325 +        }
326 +    }
327 +
328 +    /**
329 +     * Returns a TestRunner that doesn't bother with unnecessary
330 +     * fluff, like printing a "." for each test case.
331 +     */
332 +    static junit.textui.TestRunner newPithyTestRunner() {
333 +        junit.textui.TestRunner runner = new junit.textui.TestRunner();
334 +        runner.setPrinter(new PithyResultPrinter(System.out));
335 +        return runner;
336 +    }
337 +
338      /**
339       * Runs all unit tests in the given test suite.
340       * Actual behavior influenced by jsr166.* system properties.
# Line 284 | Line 346 | public class JSR166TestCase extends Test
346              System.setSecurityManager(new SecurityManager());
347          }
348          for (int i = 0; i < suiteRuns; i++) {
349 <            TestResult result = junit.textui.TestRunner.run(suite);
349 >            TestResult result = newPithyTestRunner().doRun(suite);
350              if (!result.wasSuccessful())
351                  System.exit(1);
352              System.gc();
# Line 521 | Line 583 | public class JSR166TestCase extends Test
583      public static long LONG_DELAY_MS;
584  
585      /**
586 <     * Returns the shortest timed delay. This could
587 <     * be reimplemented to use for example a Property.
586 >     * Returns the shortest timed delay. This can be scaled up for
587 >     * slow machines using the jsr166.delay.factor system property,
588 >     * or via jtreg's -timeoutFactor:<val> flag.
589 >     * http://openjdk.java.net/jtreg/command-help.html
590       */
591      protected long getShortDelay() {
592 <        return 50;
592 >        return (long) (50 * delayFactor * jtregTestTimeoutFactor);
593      }
594  
595      /**
# Line 838 | Line 902 | public class JSR166TestCase extends Test
902          }};
903      }
904  
905 +    PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
906 +        return new PoolCleanerWithReleaser(pool, releaser(flag));
907 +    }
908 +
909 +    Runnable releaser(final AtomicBoolean flag) {
910 +        return new Runnable() { public void run() { flag.set(true); }};
911 +    }
912 +
913      /**
914       * Waits out termination of a thread pool or fails doing so.
915       */
# Line 1228 | Line 1300 | public class JSR166TestCase extends Test
1300          } finally {
1301              if (t.getState() != Thread.State.TERMINATED) {
1302                  t.interrupt();
1303 <                threadFail("Test timed out");
1303 >                threadFail("timed out waiting for thread to terminate");
1304              }
1305          }
1306      }

Diff Legend

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