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.210 by jsr166, Mon Nov 7 01:59:17 2016 UTC vs.
Revision 1.216 by jsr166, Wed Jan 4 06:09:58 2017 UTC

# Line 8 | Line 8
8  
9   /*
10   * @test
11 < * @summary JSR-166 tck tests
11 > * @summary JSR-166 tck tests (conformance testing mode)
12 > * @build *
13   * @modules java.management
14 + * @run junit/othervm/timeout=1000 JSR166TestCase
15 + */
16 +
17 + /*
18 + * @test
19 + * @summary JSR-166 tck tests (whitebox tests allowed)
20   * @build *
21 < * @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
22 < * @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 -Djsr166.testImplementationDetails=true JSR166TestCase
23 < * @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -Djava.util.secureRandomSeed=true JSR166TestCase
21 > * @modules java.base/java.util.concurrent:open
22 > *          java.management
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 515 | Line 533 | public class JSR166TestCase extends Test
533                  "DoubleAdderTest",
534                  "ForkJoinPool8Test",
535                  "ForkJoinTask8Test",
536 +                "LinkedBlockingDeque8Test",
537 +                "LinkedBlockingQueue8Test",
538                  "LongAccumulatorTest",
539                  "LongAdderTest",
540                  "SplittableRandomTest",
# Line 547 | 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 653 | 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 1215 | 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;
# Line 1853 | Line 1873 | public class JSR166TestCase extends Test
1873      }
1874  
1875      /**
1876 +     * A version of serialClone that leaves error handling (for
1877 +     * e.g. NotSerializableException) up to the caller.
1878 +     */
1879 +    @SuppressWarnings("unchecked")
1880 +    <T> T serialClonePossiblyFailing(T o)
1881 +        throws ReflectiveOperationException, java.io.IOException {
1882 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1883 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1884 +        oos.writeObject(o);
1885 +        oos.flush();
1886 +        oos.close();
1887 +        ObjectInputStream ois = new ObjectInputStream
1888 +            (new ByteArrayInputStream(bos.toByteArray()));
1889 +        T clone = (T) ois.readObject();
1890 +        if (o == clone) assertImmutable(o);
1891 +        assertSame(o.getClass(), clone.getClass());
1892 +        return clone;
1893 +    }
1894 +
1895 +    /**
1896       * If o implements Cloneable and has a public clone method,
1897       * returns a clone of o, else null.
1898       */

Diff Legend

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