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.208 by jsr166, Sat Nov 5 16:09:50 2016 UTC vs.
Revision 1.215 by jsr166, Sat Dec 10 18:11:05 2016 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 1828 | Line 1848 | public class JSR166TestCase extends Test
1848          }
1849      }
1850  
1851 <    void assertImmutable(Object o) {
1851 >    void assertImmutable(final Object o) {
1852          if (o instanceof Collection) {
1853              assertThrows(
1854                  UnsupportedOperationException.class,
# Line 1836 | Line 1856 | public class JSR166TestCase extends Test
1856                          ((Collection) o).add(null);}});
1857          }
1858      }
1859 <    
1859 >
1860      @SuppressWarnings("unchecked")
1861      <T> T serialClone(T o) {
1862          try {
# 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