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.213 by jsr166, Fri Dec 9 06:58:57 2016 UTC vs.
Revision 1.216 by jsr166, Wed Jan 4 06:09:58 2017 UTC

# Line 20 | Line 20
20   * @build *
21   * @modules java.base/java.util.concurrent:open
22   *          java.management
23 < * @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
24 < * @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 JSR166TestCase
23 > * @run junit/othervm/timeout=1000
24 > *      -Djsr166.testImplementationDetails=true
25 > *      JSR166TestCase
26 > * @run junit/othervm/timeout=1000
27 > *      -Djsr166.testImplementationDetails=true
28 > *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=0
29 > *      JSR166TestCase
30 > * @run junit/othervm/timeout=1000
31 > *      -Djsr166.testImplementationDetails=true
32 > *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
33 > *      -Djava.util.secureRandomSeed=true
34 > *      JSR166TestCase
35   */
36  
37   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 523 | Line 533 | public class JSR166TestCase extends Test
533                  "DoubleAdderTest",
534                  "ForkJoinPool8Test",
535                  "ForkJoinTask8Test",
536 +                "LinkedBlockingDeque8Test",
537 +                "LinkedBlockingQueue8Test",
538                  "LongAccumulatorTest",
539                  "LongAdderTest",
540                  "SplittableRandomTest",
# Line 555 | Line 567 | public class JSR166TestCase extends Test
567      /** Returns list of junit-style test method names in given class. */
568      public static ArrayList<String> testMethodNames(Class<?> testClass) {
569          Method[] methods = testClass.getDeclaredMethods();
570 <        ArrayList<String> names = new ArrayList<String>(methods.length);
570 >        ArrayList<String> names = new ArrayList<>(methods.length);
571          for (Method method : methods) {
572              if (method.getName().startsWith("test")
573                  && Modifier.isPublic(method.getModifiers())
# Line 661 | Line 673 | public class JSR166TestCase extends Test
673       * The first exception encountered if any threadAssertXXX method fails.
674       */
675      private final AtomicReference<Throwable> threadFailure
676 <        = new AtomicReference<Throwable>(null);
676 >        = new AtomicReference<>(null);
677  
678      /**
679       * Records an exception so that it can be rethrown later in the test
# Line 1223 | Line 1235 | public class JSR166TestCase extends Test
1235          }
1236          public void refresh() {}
1237          public String toString() {
1238 <            List<Permission> ps = new ArrayList<Permission>();
1238 >            List<Permission> ps = new ArrayList<>();
1239              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1240                  ps.add(e.nextElement());
1241              return "AdjustablePolicy with permissions " + ps;

Diff Legend

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