8210022: remove jdk.testlibrary.ProcessThread, TestThread and XRun

Reviewed-by: sspitsyn, jcbeyler

test/jdk/com/sun/tools/attach/BasicTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,8 @@ import java.net.Socket;
 import java.util.List;
 import java.util.Properties;
 
+import jdk.test.lib.thread.ProcessThread;
 import jdk.testlibrary.OutputAnalyzer;
-import jdk.testlibrary.ProcessThread;
 import jdk.testlibrary.ProcessTools;
 
 import com.sun.tools.attach.AgentInitializationException;
@@ -45,6 +45,7 @@ import com.sun.tools.attach.VirtualMachineDescriptor;
  * a number of basic attach tests.
  *
  * @library /lib/testlibrary
+ * @library /test/lib
  * @modules java.instrument
  *          jdk.attach
  *          jdk.jartool/sun.tools.jar

test/jdk/com/sun/tools/attach/PermissionTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,9 +24,9 @@
 import com.sun.tools.attach.VirtualMachine;
 import com.sun.tools.attach.AttachNotSupportedException;
 import java.io.File;
+import jdk.test.lib.thread.ProcessThread;
 import jdk.testlibrary.OutputAnalyzer;
 import jdk.testlibrary.ProcessTools;
-import jdk.testlibrary.ProcessThread;
 
 /*
  * @test
@@ -35,6 +35,7 @@ import jdk.testlibrary.ProcessThread;
  * API - this checks that a SecurityException is thrown as expected.
  *
  * @library /lib/testlibrary
+ * @library /test/lib
  * @modules jdk.attach
  *          jdk.jartool/sun.tools.jar
  *

test/jdk/com/sun/tools/attach/ProviderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,6 +35,7 @@ import com.sun.tools.attach.spi.AttachProvider;
  * and detach to/from the running Application.
  *
  * @library /lib/testlibrary
+ * @library /test/lib
  * @modules jdk.attach
  *          jdk.jartool/sun.tools.jar
  *

test/jdk/com/sun/tools/attach/RunnerUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,9 +26,9 @@ import java.io.File;
 import java.nio.file.Files;
 import java.util.Arrays;
 
+import jdk.test.lib.thread.ProcessThread;
 import jdk.testlibrary.ProcessTools;
 import jdk.testlibrary.Utils;
-import jdk.testlibrary.ProcessThread;
 
 /*
  * Utility functions for test runners.

test/jdk/com/sun/tools/attach/StartManagementAgent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@ import javax.management.remote.JMXServiceURL;
 import javax.management.remote.JMXConnector;
 import javax.management.remote.JMXConnectorFactory;
 
-import jdk.testlibrary.ProcessThread;
+import jdk.test.lib.thread.ProcessThread;
 import jdk.testlibrary.Utils;
 
 /*
@@ -41,6 +41,7 @@ import jdk.testlibrary.Utils;
  * @summary Test for VirtualMachine.startManagementAgent and VirtualMachine.startLocalManagementAgent
  *
  * @library /lib/testlibrary
+ * @library /test/lib
  * @modules java.management
  *          jdk.attach
  *          jdk.jartool/sun.tools.jar

test/jdk/com/sun/tools/attach/TempDirTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,9 +29,9 @@ import java.util.Properties;
 import java.util.List;
 import java.io.File;
 
+import jdk.test.lib.thread.ProcessThread;
 import jdk.testlibrary.OutputAnalyzer;
 import jdk.testlibrary.ProcessTools;
-import jdk.testlibrary.ProcessThread;
 
 /*
  * @test
@@ -39,6 +39,7 @@ import jdk.testlibrary.ProcessThread;
  * @summary Test to make sure attach and jvmstat works correctly when java.io.tmpdir is set
  *
  * @library /lib/testlibrary
+ * @library /test/lib
  * @modules jdk.attach
  *          jdk.jartool/sun.tools.jar
  *

test/jdk/lib/testlibrary/jdk/testlibrary/TestThread.java

@@ -1,204 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.testlibrary;
-
-import java.util.concurrent.TimeoutException;
-
-/**
- * Thread which catches exceptions thrown during the execution
- * and stores them for later analysis.
- *
- * <pre>
- * {@code
- * TestThread thread = new TestThread(new XRun() {
- *      public void run() {
- *      // do something
- *      }
- * });
- * thread.start();
- * // do something
- * Throwable uncaught = thread.getUncaught();
- * }
- * </pre>
- */
-public class TestThread extends Thread {
-
-    private final Runnable runnable;
-    private volatile Throwable uncaught;
-
-    /**
-     * Returns {@link Runnable} the thread has been created with.
-     *
-     * @return The object whose {@code run} method is called
-     */
-    public Runnable getRunnable() {
-        return runnable;
-    }
-
-    /**
-     * Creates a new {@code TestThread} object.
-     *
-     * @param target The object whose {@code run} method is called
-     * @param name The thread name
-     */
-    public TestThread(Runnable target, String name) {
-        super(target, name);
-        this.runnable = target;
-    }
-
-    /**
-     * Creates a new {@code TestThread} object.
-     *
-     * @param target The object whose {@code run} method is called
-     */
-    public TestThread(Runnable target) {
-        super(target);
-        this.runnable = target;
-    }
-
-    /**
-     * Creates a new {@code TestThread} object.
-     *
-     * @param group The thread group
-     * @param target The object whose {@code run} method is called
-     * @param name The thread name
-     * @param stackSize Stack size
-     */
-    public TestThread(ThreadGroup group, Runnable target, String name,
-            long stackSize) {
-        super(group, target, name, stackSize);
-        this.runnable = target;
-    }
-
-    /**
-     * Creates a new {@code TestThread} object.
-     *
-     * @param group The thread group
-     * @param target The object whose {@code run} method is called
-     * @param name The thread name
-     */
-    public TestThread(ThreadGroup group, Runnable target, String name) {
-        super(group, target, name);
-        this.runnable = target;
-    }
-
-    /**
-     * Creates a new {@code TestThread} object.
-     *
-     * @param group The thread group
-     * @param target The object whose {@code run} method is called
-     */
-    public TestThread(ThreadGroup group, Runnable target) {
-        super(group, target);
-        this.runnable = target;
-    }
-
-    /**
-     * The thread executor.
-     */
-    @Override
-    public void run() {
-        try {
-            super.run();
-        } catch (Throwable t) {
-            uncaught = t;
-        }
-    }
-
-    /**
-     * Returns exception caught during the execution.
-     *
-     * @return {@link Throwable}
-     */
-    public Throwable getUncaught() {
-        return uncaught;
-    }
-
-    /**
-     * Waits for {@link TestThread} to die
-     * and throws exception caught during the execution.
-     *
-     * @throws InterruptedException
-     * @throws Throwable
-     */
-    public void joinAndThrow() throws InterruptedException, Throwable {
-        join();
-        if (uncaught != null) {
-            throw uncaught;
-        }
-    }
-
-    /**
-     * Waits during {@code timeout} for {@link TestThread} to die
-     * and throws exception caught during the execution.
-     *
-     * @param timeout The time to wait in milliseconds
-     * @throws InterruptedException
-     * @throws Throwable
-     */
-    public void joinAndThrow(long timeout) throws InterruptedException,
-            Throwable {
-        join(timeout);
-        if (isAlive()) {
-            throw new TimeoutException();
-        }
-        if (uncaught != null) {
-            throw uncaught;
-        }
-    }
-
-    /**
-     * Waits for {@link TestThread} to die
-     * and returns exception caught during the execution.
-     *
-     * @return Exception caught during the execution
-     * @throws InterruptedException
-     */
-    public Throwable joinAndReturn() throws InterruptedException {
-        join();
-        if (uncaught != null) {
-            return uncaught;
-        }
-        return null;
-    }
-
-    /**
-     * Waits during {@code timeout} for {@link TestThread} to die
-     * and returns exception caught during the execution.
-     *
-     * @param timeout The time to wait in milliseconds
-     * @return Exception caught during the execution
-     * @throws InterruptedException
-     */
-    public Throwable joinAndReturn(long timeout) throws InterruptedException {
-        join(timeout);
-        if (isAlive()) {
-            return new TimeoutException();
-        }
-        if (uncaught != null) {
-            return uncaught;
-        }
-        return null;
-    }
-}

test/jdk/lib/testlibrary/jdk/testlibrary/XRun.java

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.testlibrary;
-
-/**
- * This type serves no other purpose than to simply allow automatically running
- * something in a thread, and have all exceptions propagated to
- * RuntimeExceptions, which are thrown up to thread, which in turn should
- * probably be a {@link TestThread} to they are stored.
- */
-public abstract class XRun implements Runnable {
-
-    /**
-     * Invokes {@code xrun()} and throws all exceptions caught in it
-     * up to the thread.
-     */
-    public final void run() {
-        try {
-            xrun();
-        } catch (Error e) {
-            throw e;
-        } catch (RuntimeException e) {
-            throw e;
-        } catch (Throwable e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * Override this method to implement what to run in the thread.
-     *
-     * @throws Throwable
-     */
-    protected abstract void xrun() throws Throwable;
-}

test/jdk/sun/management/jmxremote/bootstrap/JMXInterfaceBindingTest.java

@@ -29,7 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import jdk.testlibrary.ProcessThread;
+import jdk.test.lib.thread.ProcessThread;
 import jdk.testlibrary.ProcessTools;
 
 /**
@@ -49,6 +49,7 @@ import jdk.testlibrary.ProcessTools;
  *          interfaces to bind to (using plain sockets and SSL sockets).
  *
  * @library /lib/testlibrary
+ * @library /test/lib
  * @modules java.management.rmi
  *
  * @build jdk.testlibrary.* JMXAgentInterfaceBinding

test/jdk/sun/tools/jstatd/JstatdTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,10 +28,10 @@ import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
 import java.util.Arrays;
 
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.thread.ProcessThread;
 import static jdk.testlibrary.Asserts.*;
 import jdk.testlibrary.JDKToolLauncher;
-import jdk.testlibrary.OutputAnalyzer;
-import jdk.testlibrary.ProcessThread;
 import jdk.testlibrary.Utils;
 import jdk.testlibrary.ProcessTools;
 

test/jdk/sun/tools/jstatd/TestJstatdDefaults.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @key intermittent
  *
  * @library /lib/testlibrary
+ * @library /test/lib
  *
  * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
  * @run main/timeout=60 TestJstatdDefaults

test/jdk/sun/tools/jstatd/TestJstatdExternalRegistry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @key intermittent
  *
  * @library /lib/testlibrary
+ * @library /test/lib
  *
  * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
  * @run main/timeout=60 TestJstatdExternalRegistry

test/jdk/sun/tools/jstatd/TestJstatdPort.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @key intermittent
  *
  * @library /lib/testlibrary
+ * @library /test/lib
  *
  * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
  * @run main/timeout=60 TestJstatdPort

test/jdk/sun/tools/jstatd/TestJstatdPortAndServer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @key intermittent
  *
  * @library /lib/testlibrary
+ * @library /test/lib
  *
  * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
  * @run main/timeout=60 TestJstatdPortAndServer

test/jdk/sun/tools/jstatd/TestJstatdServer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
  * @key intermittent
  *
  * @library /lib/testlibrary
+ * @library /test/lib
  *
  * @build jdk.testlibrary.* JstatdTest JstatGCUtilParser
  * @run main/timeout=60 TestJstatdServer

test/jdk/sun/tools/jstatd/TestJstatdUsage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@ import jdk.testlibrary.ProcessTools;
  * @test
  * @bug 4990825
  * @library /lib/testlibrary
+ * @library /test/lib
  * @modules java.management
  * @build jdk.testlibrary.*
  * @run main TestJstatdUsage

test/lib/jdk/test/lib/thread/ProcessThread.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,7 +21,10 @@
  * questions.
  */
 
-package jdk.testlibrary;
+package jdk.test.lib.thread;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
 
 import java.io.PrintWriter;