jdk/test/jdk/modules/incubator/ImageModules.java

rev 17249 : 8180887: move FileUtils to top level testlibrary
Reviewed-by: duke

*** 23,33 ****
  
  /*
   * @test
   * @bug 8170859
   * @summary Basic test for incubator modules in jmods and images
!  * @library /lib/testlibrary
   * @key intermittent
   * @modules jdk.compiler jdk.jartool jdk.jlink
   * @build CompilerUtils
   * @run testng/othervm ImageModules
   */
--- 23,33 ----
  
  /*
   * @test
   * @bug 8170859
   * @summary Basic test for incubator modules in jmods and images
!  * @library /lib/testlibrary /test/lib
   * @key intermittent
   * @modules jdk.compiler jdk.jartool jdk.jlink
   * @build CompilerUtils
   * @run testng/othervm ImageModules
   */
*** 37,54 ****
  import java.io.IOException;
  import java.io.PrintStream;
  import java.nio.file.Files;
  import java.nio.file.Path;
  import java.nio.file.Paths;
- import java.util.ArrayList;
  import java.util.List;
  import java.util.function.Consumer;
  import java.util.spi.ToolProvider;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  
! import jdk.testlibrary.FileUtils;
  import org.testng.annotations.BeforeTest;
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Test;
  
  import static java.nio.charset.StandardCharsets.UTF_8;
--- 37,53 ----
  import java.io.IOException;
  import java.io.PrintStream;
  import java.nio.file.Files;
  import java.nio.file.Path;
  import java.nio.file.Paths;
  import java.util.List;
  import java.util.function.Consumer;
  import java.util.spi.ToolProvider;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  
! import jdk.test.lib.util.FileUtils;
  import org.testng.annotations.BeforeTest;
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Test;
  
  import static java.nio.charset.StandardCharsets.UTF_8;