test/tools/wsgen/MultiReleaseJarTest.java

rev 17315 : 8181335: remove packageless CompilerUtils
Reviewed-by: duke

*** 23,44 ****
  
  /*
   * @test
   * @summary Test Multi-Release jar support in wsgen tool
   * @library /test/lib
-  * @library /lib/testlibrary
   * @modules jdk.compiler java.xml.ws
   * @build jdk.test.lib.JDKToolFinder jdk.test.lib.JDKToolLauncher
   *        jdk.test.lib.process.OutputAnalyzer
   *        jdk.test.lib.process.ProcessTools
   *        jdk.test.lib.Utils
!  *        CompilerUtils MultiReleaseJarTest
   * @run testng MultiReleaseJarTest
   */
  
  import jdk.test.lib.JDKToolLauncher;
  import jdk.test.lib.Utils;
  import jdk.test.lib.process.OutputAnalyzer;
  import jdk.test.lib.process.ProcessTools;
  import org.testng.annotations.BeforeClass;
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Test;
--- 23,44 ----
  
  /*
   * @test
   * @summary Test Multi-Release jar support in wsgen tool
   * @library /test/lib
   * @modules jdk.compiler java.xml.ws
   * @build jdk.test.lib.JDKToolFinder jdk.test.lib.JDKToolLauncher
   *        jdk.test.lib.process.OutputAnalyzer
   *        jdk.test.lib.process.ProcessTools
   *        jdk.test.lib.Utils
!  *        jdk.test.lib.compiler.CompilerUtils MultiReleaseJarTest
   * @run testng MultiReleaseJarTest
   */
  
  import jdk.test.lib.JDKToolLauncher;
  import jdk.test.lib.Utils;
+ import jdk.test.lib.compiler.CompilerUtils;
  import jdk.test.lib.process.OutputAnalyzer;
  import jdk.test.lib.process.ProcessTools;
  import org.testng.annotations.BeforeClass;
  import org.testng.annotations.DataProvider;
  import org.testng.annotations.Test;
*** 116,120 ****
--- 116,121 ----
              assertTrue(CompilerUtils.compile(source, classes,
                      "--add-modules", "java.xml.ws"));
          }
      }
  }
+