test/tools/javac/modules/ResolveTest.java

*** 34,44 ****
  
  import java.nio.file.*;
  
  import toolbox.JavacTask;
  import toolbox.Task;
- import toolbox.ToolBox;
  
  public class ResolveTest extends ModuleTestBase {
      public static void main(String... args) throws Exception {
          ResolveTest t = new ResolveTest();
          t.runTests();
--- 34,43 ----
*** 81,95 ****
      }
  
      @Test
      public void testUnexportedTypeUnreadableModule(Path base) throws Exception {
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src.resolve("m1"),
!                 "module m1 { }",
                  "package p1; public class C1 { }");
!         tb.writeJavaFiles(src.resolve("m2"),
!                 "module m2 { }",
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
--- 80,94 ----
      }
  
      @Test
      public void testUnexportedTypeUnreadableModule(Path base) throws Exception {
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src.resolve("m1x"),
!                 "module m1x { }",
                  "package p1; public class C1 { }");
!         tb.writeJavaFiles(src.resolve("m2x"),
!                 "module m2x { }",
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
*** 105,119 ****
      }
  
      @Test
      public void testUnexportedTypeReadableModule(Path base) throws Exception {
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src.resolve("m1"),
!                 "module m1 { }",
                  "package p1; public class C1 { }");
!         tb.writeJavaFiles(src.resolve("m2"),
!                 "module m2 { requires m1; }",
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
--- 104,118 ----
      }
  
      @Test
      public void testUnexportedTypeReadableModule(Path base) throws Exception {
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src.resolve("m1x"),
!                 "module m1x { }",
                  "package p1; public class C1 { }");
!         tb.writeJavaFiles(src.resolve("m2x"),
!                 "module m2x { requires m1x; }",
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
*** 129,146 ****
      }
  
      @Test
      public void testQualifiedExportedTypeReadableModule(Path base) throws Exception {
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src.resolve("m1"),
!                 "module m1 { exports p1 to m3; }",
                  "package p1; public class C1 { }");
!         tb.writeJavaFiles(src.resolve("m2"),
!                 "module m2 { requires m1; }",
                  "package p2; public class C2 { p1.C1 c; }");
!         tb.writeJavaFiles(src.resolve("m3"),
!                 "module m3 { requires m1; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
                  .options("-XDrawDiagnostics", "--module-source-path", src.toString())
--- 128,145 ----
      }
  
      @Test
      public void testQualifiedExportedTypeReadableModule(Path base) throws Exception {
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src.resolve("m1x"),
!                 "module m1x { exports p1 to m3x; }",
                  "package p1; public class C1 { }");
!         tb.writeJavaFiles(src.resolve("m2x"),
!                 "module m2x { requires m1x; }",
                  "package p2; public class C2 { p1.C1 c; }");
!         tb.writeJavaFiles(src.resolve("m3x"),
!                 "module m3x { requires m1x; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
                  .options("-XDrawDiagnostics", "--module-source-path", src.toString())
*** 155,169 ****
      }
  
      @Test
      public void testExportedTypeUnreadableModule(Path base) throws Exception {
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src.resolve("m1"),
!                 "module m1 { exports p1; }",
                  "package p1; public class C1 { }");
!         tb.writeJavaFiles(src.resolve("m2"),
!                 "module m2 { }",
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
--- 154,168 ----
      }
  
      @Test
      public void testExportedTypeUnreadableModule(Path base) throws Exception {
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src.resolve("m1x"),
!                 "module m1x { exports p1; }",
                  "package p1; public class C1 { }");
!         tb.writeJavaFiles(src.resolve("m2x"),
!                 "module m2x { }",
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          String log = new JavacTask(tb)
*** 179,193 ****
      }
  
      @Test
      public void testExportedTypeReadableModule(Path base) throws Exception {
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src.resolve("m1"),
!                 "module m1 { exports p1; }",
                  "package p1; public class C1 { }");
!         tb.writeJavaFiles(src.resolve("m2"),
!                 "module m2 { requires m1; }",
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          new JavacTask(tb)
--- 178,192 ----
      }
  
      @Test
      public void testExportedTypeReadableModule(Path base) throws Exception {
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src.resolve("m1x"),
!                 "module m1x { exports p1; }",
                  "package p1; public class C1 { }");
!         tb.writeJavaFiles(src.resolve("m2x"),
!                 "module m2x { requires m1x; }",
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          new JavacTask(tb)
*** 199,213 ****
      }
  
      @Test
      public void testExportedTypeReadableModule2(Path base) throws Exception {
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src.resolve("m1"),
!                 "module m1 { exports p1 to m2; }",
                  "package p1; public class C1 { }");
!         tb.writeJavaFiles(src.resolve("m2"),
!                 "module m2 { requires m1; }",
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          new JavacTask(tb)
--- 198,212 ----
      }
  
      @Test
      public void testExportedTypeReadableModule2(Path base) throws Exception {
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src.resolve("m1x"),
!                 "module m1x { exports p1 to m2x; }",
                  "package p1; public class C1 { }");
!         tb.writeJavaFiles(src.resolve("m2x"),
!                 "module m2x { requires m1x; }",
                  "package p2; public class C2 { p1.C1 c; }");
          Path modules = base.resolve("modules");
          Files.createDirectories(modules);
  
          new JavacTask(tb)