jdk/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java

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

*** 21,56 ****
   * questions.
   */
  
  import java.io.File;
  import java.io.IOException;
- import java.lang.module.ModuleDescriptor;
  import java.nio.file.Files;
  import java.nio.file.Path;
  import java.nio.file.Paths;
  import java.util.Arrays;
  import java.util.Set;
  import java.util.spi.ToolProvider;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  
! import jdk.testlibrary.FileUtils;
  
  import static jdk.testlibrary.ProcessTools.*;
  
  import org.testng.annotations.BeforeTest;
  import org.testng.annotations.Test;
  import static org.testng.Assert.*;
  
  /**
   * @test
   * @bug 8142968 8173381 8174740
!  * @library /lib/testlibrary
   * @modules jdk.compiler jdk.jlink
   * @modules java.base/jdk.internal.module
   * @modules java.base/jdk.internal.org.objectweb.asm
!  * @build ModuleTargetHelper UserModuleTest CompilerUtils jdk.testlibrary.FileUtils jdk.testlibrary.ProcessTools
   * @run testng UserModuleTest
   */
  
  public class UserModuleTest {
      private static final String JAVA_HOME = System.getProperty("java.home");
--- 21,55 ----
   * questions.
   */
  
  import java.io.File;
  import java.io.IOException;
  import java.nio.file.Files;
  import java.nio.file.Path;
  import java.nio.file.Paths;
  import java.util.Arrays;
  import java.util.Set;
  import java.util.spi.ToolProvider;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  
! import jdk.test.lib.util.FileUtils;
  
  import static jdk.testlibrary.ProcessTools.*;
  
  import org.testng.annotations.BeforeTest;
  import org.testng.annotations.Test;
  import static org.testng.Assert.*;
  
  /**
   * @test
   * @bug 8142968 8173381 8174740
!  * @library /lib/testlibrary /test/lib
   * @modules jdk.compiler jdk.jlink
   * @modules java.base/jdk.internal.module
   * @modules java.base/jdk.internal.org.objectweb.asm
!  * @build ModuleTargetHelper UserModuleTest CompilerUtils jdk.testlibrary.ProcessTools
   * @run testng UserModuleTest
   */
  
  public class UserModuleTest {
      private static final String JAVA_HOME = System.getProperty("java.home");