--- a/jdk/test/java/util/concurrent/tck/JSR166TestCase.java Mon Nov 28 23:33:25 2016 -0800
+++ b/jdk/test/java/util/concurrent/tck/JSR166TestCase.java Mon Nov 28 23:36:11 2016 -0800
@@ -68,6 +68,7 @@
import java.security.SecurityPermission;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
@@ -474,6 +475,7 @@
AbstractQueuedLongSynchronizerTest.suite(),
ArrayBlockingQueueTest.suite(),
ArrayDequeTest.suite(),
+ ArrayListTest.suite(),
AtomicBooleanTest.suite(),
AtomicIntegerArrayTest.suite(),
AtomicIntegerFieldUpdaterTest.suite(),
@@ -496,6 +498,7 @@
CopyOnWriteArrayListTest.suite(),
CopyOnWriteArraySetTest.suite(),
CountDownLatchTest.suite(),
+ CountedCompleterTest.suite(),
CyclicBarrierTest.suite(),
DelayQueueTest.suite(),
EntryTest.suite(),
@@ -524,15 +527,17 @@
TreeMapTest.suite(),
TreeSetTest.suite(),
TreeSubMapTest.suite(),
- TreeSubSetTest.suite());
+ TreeSubSetTest.suite(),
+ VectorTest.suite());
// Java8+ test classes
if (atLeastJava8()) {
String[] java8TestClassNames = {
+ "ArrayDeque8Test",
"Atomic8Test",
"CompletableFutureTest",
"ConcurrentHashMap8Test",
- "CountedCompleterTest",
+ "CountedCompleter8Test",
"DoubleAccumulatorTest",
"DoubleAdderTest",
"ForkJoinPool8Test",
@@ -1850,12 +1855,22 @@
}
}
+ void assertImmutable(final Object o) {
+ if (o instanceof Collection) {
+ assertThrows(
+ UnsupportedOperationException.class,
+ new Runnable() { public void run() {
+ ((Collection) o).add(null);}});
+ }
+ }
+
@SuppressWarnings("unchecked")
<T> T serialClone(T o) {
try {
ObjectInputStream ois = new ObjectInputStream
(new ByteArrayInputStream(serialBytes(o)));
T clone = (T) ois.readObject();
+ if (o == clone) assertImmutable(o);
assertSame(o.getClass(), clone.getClass());
return clone;
} catch (Throwable fail) {
@@ -1864,6 +1879,46 @@
}
}
+ /**
+ * A version of serialClone that leaves error handling (for
+ * e.g. NotSerializableException) up to the caller.
+ */
+ @SuppressWarnings("unchecked")
+ <T> T serialClonePossiblyFailing(T o)
+ throws ReflectiveOperationException, java.io.IOException {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(bos);
+ oos.writeObject(o);
+ oos.flush();
+ oos.close();
+ ObjectInputStream ois = new ObjectInputStream
+ (new ByteArrayInputStream(bos.toByteArray()));
+ T clone = (T) ois.readObject();
+ if (o == clone) assertImmutable(o);
+ assertSame(o.getClass(), clone.getClass());
+ return clone;
+ }
+
+ /**
+ * If o implements Cloneable and has a public clone method,
+ * returns a clone of o, else null.
+ */
+ @SuppressWarnings("unchecked")
+ <T> T cloneableClone(T o) {
+ if (!(o instanceof Cloneable)) return null;
+ final T clone;
+ try {
+ clone = (T) o.getClass().getMethod("clone").invoke(o);
+ } catch (NoSuchMethodException ok) {
+ return null;
+ } catch (ReflectiveOperationException unexpected) {
+ throw new Error(unexpected);
+ }
+ assertNotSame(o, clone); // not 100% guaranteed by spec
+ assertSame(o.getClass(), clone.getClass());
+ return clone;
+ }
+
public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
Runnable... throwingActions) {
for (Runnable throwingAction : throwingActions) {