test/jdk/jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java

@@ -21,13 +21,11 @@
   * questions.
   */
  
  import jdk.internal.misc.TerminatingThreadLocal;
  
- import java.lang.reflect.Constructor;
  import java.lang.reflect.Field;
- import java.lang.reflect.InvocationTargetException;
  import java.util.Arrays;
  import java.util.List;
  import java.util.concurrent.CopyOnWriteArrayList;
  import java.util.concurrent.Executor;
  import java.util.concurrent.Executors;

@@ -35,19 +33,22 @@
  import java.util.concurrent.atomic.AtomicReference;
  import java.util.function.Consumer;
  import java.util.function.Function;
  import java.util.stream.Stream;
  
+ import jdk.test.lib.thread.VThreadScheduler;
+ 
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Test;
  import static org.testng.Assert.*;
  
  /*
   * @test
   * @bug 8202788 8291897 8357637
   * @summary TerminatingThreadLocal unit test
   * @modules java.base/java.lang:+open java.base/jdk.internal.misc
+  * @library /test/lib
   * @requires vm.continuations
   * @run testng/othervm TestTerminatingThreadLocal
   */
  public class TestTerminatingThreadLocal {
  

@@ -137,11 +138,11 @@
          try (var pool = Executors.newSingleThreadExecutor()) {
  
              // capture carrier Thread
              carrier = pool.submit(Thread::currentThread).get();
  
-             ThreadFactory factory = virtualThreadBuilder(pool)
+             ThreadFactory factory = VThreadScheduler.virtualThreadBuilder(pool)
                      .name("ttl-test-virtual-", 0)
                      .factory();
              try (var executor = Executors.newThreadPerTaskExecutor(factory)) {
                  executor.submit(() -> ttlOps.accept(ttl)).get();
              }

@@ -200,26 +201,6 @@
              throw t;
          }
  
          assertEquals(terminatedValues, List.of(ttlValue));
      }
- 
-     /**
-      * Returns a builder to create virtual threads that use the given scheduler.
-      */
-     static Thread.Builder.OfVirtual virtualThreadBuilder(Executor scheduler) {
-         try {
-             Class<?> clazz = Class.forName("java.lang.ThreadBuilders$VirtualThreadBuilder");
-             Constructor<?> ctor = clazz.getDeclaredConstructor(Executor.class);
-             ctor.setAccessible(true);
-             return (Thread.Builder.OfVirtual) ctor.newInstance(scheduler);
-         } catch (InvocationTargetException e) {
-             Throwable cause = e.getCause();
-             if (cause instanceof RuntimeException re) {
-                 throw re;
-             }
-             throw new RuntimeException(e);
-         } catch (Exception e) {
-             throw new RuntimeException(e);
-         }
-     }
  }