test/java/lang/reflect/Proxy/ProxyTest.java

*** 24,34 ****
  import java.nio.file.Path;
  import java.nio.file.Paths;
  import java.util.Arrays;
  import java.util.List;
  
! import static jdk.testlibrary.ProcessTools.executeTestJava;
  
  import org.testng.annotations.BeforeTest;
  import org.testng.annotations.Test;
  import static org.testng.Assert.*;
  
--- 24,34 ----
  import java.nio.file.Path;
  import java.nio.file.Paths;
  import java.util.Arrays;
  import java.util.List;
  
! import static jdk.testlibrary.ProcessTools.executeModularTest;
  
  import org.testng.annotations.BeforeTest;
  import org.testng.annotations.Test;
  import static org.testng.Assert.*;
  
*** 68,82 ****
      /**
       * Run the modular test
       */
      @Test
      public void runTest() throws Exception {
!         int exitValue = executeTestJava("-cp", CPATH_DIR.toString(),
!                                         "-mp", MODS_DIR.toString(),
!                                         "-m", "test/jdk.test.Main")
!                             .outputTo(System.out)
!                             .errorTo(System.out)
!                             .getExitValue();
  
          assertTrue(exitValue == 0);
      }
  }
--- 68,78 ----
      /**
       * Run the modular test
       */
      @Test
      public void runTest() throws Exception {
!         int exitValue = executeModularTest("test", "jdk.test.Main",
!             null, Arrays.asList(CPATH_DIR), Arrays.asList(MODS_DIR), null).getExitValue();
  
          assertTrue(exitValue == 0);
      }
  }