jdk/test/tools/jar/modularJar/Basic.java

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

*** 23,44 ****
  
  import java.io.*;
  import java.lang.module.ModuleDescriptor;
  import java.lang.reflect.Method;
  import java.nio.file.*;
- import java.nio.file.attribute.BasicFileAttributes;
  import java.util.*;
  import java.util.function.Consumer;
  import java.util.jar.JarEntry;
  import java.util.jar.JarFile;
  import java.util.jar.JarInputStream;
  import java.util.jar.Manifest;
  import java.util.regex.Pattern;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  
! import jdk.testlibrary.FileUtils;
  import jdk.testlibrary.JDKToolFinder;
  import org.testng.annotations.BeforeTest;
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Test;
  
--- 23,43 ----
  
  import java.io.*;
  import java.lang.module.ModuleDescriptor;
  import java.lang.reflect.Method;
  import java.nio.file.*;
  import java.util.*;
  import java.util.function.Consumer;
  import java.util.jar.JarEntry;
  import java.util.jar.JarFile;
  import java.util.jar.JarInputStream;
  import java.util.jar.Manifest;
  import java.util.regex.Pattern;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  
! import jdk.test.lib.util.FileUtils;
  import jdk.testlibrary.JDKToolFinder;
  import org.testng.annotations.BeforeTest;
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Test;
  
*** 46,59 ****
  import static java.lang.System.out;
  
  /*
   * @test
   * @bug 8167328 8171830 8165640 8174248 8176772
!  * @library /lib/testlibrary
   * @modules jdk.compiler
   *          jdk.jartool
!  * @build jdk.testlibrary.FileUtils jdk.testlibrary.JDKToolFinder
   * @compile Basic.java
   * @run testng Basic
   * @summary Tests for plain Modular jars & Multi-Release Modular jars
   */
  
--- 45,58 ----
  import static java.lang.System.out;
  
  /*
   * @test
   * @bug 8167328 8171830 8165640 8174248 8176772
!  * @library /lib/testlibrary /test/lib
   * @modules jdk.compiler
   *          jdk.jartool
!  * @build jdk.testlibrary.JDKToolFinder
   * @compile Basic.java
   * @run testng Basic
   * @summary Tests for plain Modular jars & Multi-Release Modular jars
   */