41 |
|
import java.security.SecurityPermission; |
42 |
|
import java.util.ArrayList; |
43 |
|
import java.util.Arrays; |
44 |
+ |
import java.util.Collections; |
45 |
|
import java.util.Date; |
46 |
|
import java.util.Enumeration; |
47 |
|
import java.util.Iterator; |
63 |
|
import java.util.concurrent.Semaphore; |
64 |
|
import java.util.concurrent.SynchronousQueue; |
65 |
|
import java.util.concurrent.ThreadFactory; |
66 |
+ |
import java.util.concurrent.ThreadLocalRandom; |
67 |
|
import java.util.concurrent.ThreadPoolExecutor; |
68 |
|
import java.util.concurrent.TimeoutException; |
69 |
|
import java.util.concurrent.atomic.AtomicBoolean; |
447 |
|
AbstractQueuedLongSynchronizerTest.suite(), |
448 |
|
ArrayBlockingQueueTest.suite(), |
449 |
|
ArrayDequeTest.suite(), |
450 |
+ |
ArrayListTest.suite(), |
451 |
|
AtomicBooleanTest.suite(), |
452 |
|
AtomicIntegerArrayTest.suite(), |
453 |
|
AtomicIntegerFieldUpdaterTest.suite(), |
470 |
|
CopyOnWriteArrayListTest.suite(), |
471 |
|
CopyOnWriteArraySetTest.suite(), |
472 |
|
CountDownLatchTest.suite(), |
473 |
+ |
CountedCompleterTest.suite(), |
474 |
|
CyclicBarrierTest.suite(), |
475 |
|
DelayQueueTest.suite(), |
476 |
|
EntryTest.suite(), |
499 |
|
TreeMapTest.suite(), |
500 |
|
TreeSetTest.suite(), |
501 |
|
TreeSubMapTest.suite(), |
502 |
< |
TreeSubSetTest.suite()); |
502 |
> |
TreeSubSetTest.suite(), |
503 |
> |
VectorTest.suite()); |
504 |
|
|
505 |
|
// Java8+ test classes |
506 |
|
if (atLeastJava8()) { |
507 |
|
String[] java8TestClassNames = { |
508 |
+ |
"ArrayDeque8Test", |
509 |
|
"Atomic8Test", |
510 |
|
"CompletableFutureTest", |
511 |
|
"ConcurrentHashMap8Test", |
512 |
< |
"CountedCompleterTest", |
512 |
> |
"CountedCompleter8Test", |
513 |
|
"DoubleAccumulatorTest", |
514 |
|
"DoubleAdderTest", |
515 |
|
"ForkJoinPool8Test", |
1009 |
|
ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean(); |
1010 |
|
System.err.println("------ stacktrace dump start ------"); |
1011 |
|
for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) { |
1012 |
< |
String name = info.getThreadName(); |
1012 |
> |
final String name = info.getThreadName(); |
1013 |
> |
String lockName; |
1014 |
|
if ("Signal Dispatcher".equals(name)) |
1015 |
|
continue; |
1016 |
|
if ("Reference Handler".equals(name) |
1017 |
< |
&& info.getLockName().startsWith("java.lang.ref.Reference$Lock")) |
1017 |
> |
&& (lockName = info.getLockName()) != null |
1018 |
> |
&& lockName.startsWith("java.lang.ref.Reference$Lock")) |
1019 |
|
continue; |
1020 |
|
if ("Finalizer".equals(name) |
1021 |
< |
&& info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock")) |
1021 |
> |
&& (lockName = info.getLockName()) != null |
1022 |
> |
&& lockName.startsWith("java.lang.ref.ReferenceQueue$Lock")) |
1023 |
|
continue; |
1024 |
|
if ("checkForWedgedTest".equals(name)) |
1025 |
|
continue; |
1244 |
|
* Sleeps until the given time has elapsed. |
1245 |
|
* Throws AssertionFailedError if interrupted. |
1246 |
|
*/ |
1247 |
< |
void sleep(long millis) { |
1247 |
> |
static void sleep(long millis) { |
1248 |
|
try { |
1249 |
|
delay(millis); |
1250 |
|
} catch (InterruptedException fail) { |
1260 |
|
* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING. |
1261 |
|
*/ |
1262 |
|
void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) { |
1263 |
< |
long startTime = System.nanoTime(); |
1263 |
> |
long startTime = 0L; |
1264 |
|
for (;;) { |
1265 |
|
Thread.State s = thread.getState(); |
1266 |
|
if (s == Thread.State.BLOCKED || |
1269 |
|
return; |
1270 |
|
else if (s == Thread.State.TERMINATED) |
1271 |
|
fail("Unexpected thread termination"); |
1272 |
+ |
else if (startTime == 0L) |
1273 |
+ |
startTime = System.nanoTime(); |
1274 |
|
else if (millisElapsedSince(startTime) > timeoutMillis) { |
1275 |
|
threadAssertTrue(thread.isAlive()); |
1276 |
|
return; |
1763 |
|
* A CyclicBarrier that uses timed await and fails with |
1764 |
|
* AssertionFailedErrors instead of throwing checked exceptions. |
1765 |
|
*/ |
1766 |
< |
public class CheckedBarrier extends CyclicBarrier { |
1766 |
> |
public static class CheckedBarrier extends CyclicBarrier { |
1767 |
|
public CheckedBarrier(int parties) { super(parties); } |
1768 |
|
|
1769 |
|
public int await() { |
1884 |
|
1000L, MILLISECONDS, |
1885 |
|
new SynchronousQueue<Runnable>()); |
1886 |
|
|
1887 |
+ |
static <T> void shuffle(T[] array) { |
1888 |
+ |
Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current()); |
1889 |
+ |
} |
1890 |
|
} |