test/tools/jar/multiRelease/ApiValidatorTest.java

*** 26,54 ****
   * @summary Tests for API validator.
   * @library /test/lib
   * @modules java.base/jdk.internal.misc
   *          jdk.compiler
   *          jdk.jartool
!  * @build jdk.test.lib.util.FileUtils
!  *        jdk.test.lib.Utils
   *        jdk.test.lib.Asserts
   *        jdk.test.lib.JDKToolFinder
   *        jdk.test.lib.JDKToolLauncher
   *        jdk.test.lib.Platform
   *        jdk.test.lib.process.*
   *        MRTestBase
   * @run testng/timeout=1200 ApiValidatorTest
   */
  
  import jdk.test.lib.process.OutputAnalyzer;
- import jdk.test.lib.util.FileUtils;
- import org.testng.annotations.AfterMethod;
  import org.testng.annotations.BeforeMethod;
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Test;
  
- import java.io.IOException;
  import java.lang.reflect.Method;
  import java.nio.file.Files;
  import java.nio.file.Path;
  import java.nio.file.Paths;
  import java.util.regex.Matcher;
--- 26,50 ----
   * @summary Tests for API validator.
   * @library /test/lib
   * @modules java.base/jdk.internal.misc
   *          jdk.compiler
   *          jdk.jartool
!  * @build jdk.test.lib.Utils
   *        jdk.test.lib.Asserts
   *        jdk.test.lib.JDKToolFinder
   *        jdk.test.lib.JDKToolLauncher
   *        jdk.test.lib.Platform
   *        jdk.test.lib.process.*
   *        MRTestBase
   * @run testng/timeout=1200 ApiValidatorTest
   */
  
  import jdk.test.lib.process.OutputAnalyzer;
  import org.testng.annotations.BeforeMethod;
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Test;
  
  import java.lang.reflect.Method;
  import java.nio.file.Files;
  import java.nio.file.Path;
  import java.nio.file.Paths;
  import java.util.regex.Matcher;
*** 66,81 ****
      void testInit(Method method) {
          root = Paths.get(method.getName());
          classes = root.resolve("classes");
      }
  
-     @AfterMethod
-     void testCleanup() throws IOException {
-         FileUtils.deleteFileTreeWithRetry(root);
-     }
- 
- 
      @Test(dataProvider = "signatureChange")
      public void changeMethodSignature(String sigBase, String sigV10,
                                        boolean isAcceptable) throws Throwable {
  
          String METHOD_SIG = "#SIG";
--- 62,71 ----