test/tools/javac/modules/ModulePathTest.java

*** 111,121 ****
  
      @Test
      public void testExplodedModuleOnPath(Path base) throws Exception {
          Path modSrc = base.resolve("modSrc");
          tb.writeJavaFiles(modSrc,
!                 "module m1 { exports p; }",
                  "package p; public class CC { }");
          Path modClasses = base.resolve("modClasses");
          Files.createDirectories(modClasses);
  
          new JavacTask(tb, Task.Mode.CMDLINE)
--- 111,121 ----
  
      @Test
      public void testExplodedModuleOnPath(Path base) throws Exception {
          Path modSrc = base.resolve("modSrc");
          tb.writeJavaFiles(modSrc,
!                 "module m1x { exports p; }",
                  "package p; public class CC { }");
          Path modClasses = base.resolve("modClasses");
          Files.createDirectories(modClasses);
  
          new JavacTask(tb, Task.Mode.CMDLINE)
*** 124,134 ****
                  .run()
                  .writeAll();
  
          Path src = base.resolve("src");
          tb.writeJavaFiles(src,
!                 "module m { requires m1 ; }",
                  "class C { }");
          Path classes = base.resolve("classes");
          Files.createDirectories(classes);
  
          new JavacTask(tb, Task.Mode.CMDLINE)
--- 124,134 ----
                  .run()
                  .writeAll();
  
          Path src = base.resolve("src");
          tb.writeJavaFiles(src,
!                 "module m { requires m1x ; }",
                  "class C { }");
          Path classes = base.resolve("classes");
          Files.createDirectories(classes);
  
          new JavacTask(tb, Task.Mode.CMDLINE)
*** 140,154 ****
      }
  
      @Test
      public void testBadExplodedModuleOnPath(Path base) throws Exception {
          Path modClasses = base.resolve("modClasses");
!         tb.writeFile(modClasses.resolve("module-info.class"), "module m1 { }");
  
          Path src = base.resolve("src");
          tb.writeJavaFiles(src,
!                 "module m { requires m1 ; }",
                  "class C { }");
          Path classes = base.resolve("classes");
          Files.createDirectories(classes);
  
          String log = new JavacTask(tb, Task.Mode.CMDLINE)
--- 140,154 ----
      }
  
      @Test
      public void testBadExplodedModuleOnPath(Path base) throws Exception {
          Path modClasses = base.resolve("modClasses");
!         tb.writeFile(modClasses.resolve("module-info.class"), "module m1x { }");
  
          Path src = base.resolve("src");
          tb.writeJavaFiles(src,
!                 "module m { requires m1x ; }",
                  "class C { }");
          Path classes = base.resolve("classes");
          Files.createDirectories(classes);
  
          String log = new JavacTask(tb, Task.Mode.CMDLINE)
*** 199,209 ****
  
      @Test
      public void testModJarOnPath(Path base) throws Exception {
          Path jarSrc = base.resolve("jarSrc");
          tb.writeJavaFiles(jarSrc,
!                 "module m1 { exports p; }",
                  "package p; public class CC { }");
          Path jarClasses = base.resolve("jarClasses");
          Files.createDirectories(jarClasses);
  
          new JavacTask(tb, Task.Mode.CMDLINE)
--- 199,209 ----
  
      @Test
      public void testModJarOnPath(Path base) throws Exception {
          Path jarSrc = base.resolve("jarSrc");
          tb.writeJavaFiles(jarSrc,
!                 "module m1x { exports p; }",
                  "package p; public class CC { }");
          Path jarClasses = base.resolve("jarClasses");
          Files.createDirectories(jarClasses);
  
          new JavacTask(tb, Task.Mode.CMDLINE)
*** 218,228 ****
            .files("module-info.class", "p/CC.class")
            .run();
  
          Path src = base.resolve("src");
          tb.writeJavaFiles(src,
!                 "module m { requires m1 ; }",
                  "class C { }");
          Path classes = base.resolve("classes");
          Files.createDirectories(classes);
  
          new JavacTask(tb, Task.Mode.CMDLINE)
--- 218,228 ----
            .files("module-info.class", "p/CC.class")
            .run();
  
          Path src = base.resolve("src");
          tb.writeJavaFiles(src,
!                 "module m { requires m1x ; }",
                  "class C { }");
          Path classes = base.resolve("classes");
          Files.createDirectories(classes);
  
          new JavacTask(tb, Task.Mode.CMDLINE)
*** 253,263 ****
  
      @Test
      public void testJModOnPath(Path base) throws Exception {
          Path jmodSrc = base.resolve("jmodSrc");
          tb.writeJavaFiles(jmodSrc,
!                 "module m1 { exports p; }",
                  "package p; public class CC { }");
          Path jmodClasses = base.resolve("jmodClasses");
          Files.createDirectories(jmodClasses);
  
          new JavacTask(tb, Task.Mode.CMDLINE)
--- 253,263 ----
  
      @Test
      public void testJModOnPath(Path base) throws Exception {
          Path jmodSrc = base.resolve("jmodSrc");
          tb.writeJavaFiles(jmodSrc,
!                 "module m1x { exports p; }",
                  "package p; public class CC { }");
          Path jmodClasses = base.resolve("jmodClasses");
          Files.createDirectories(jmodClasses);
  
          new JavacTask(tb, Task.Mode.CMDLINE)
*** 269,279 ****
          Path jmod = base.resolve("myModule.jmod"); // deliberately not m1
          jmod(jmodClasses, jmod);
  
          Path src = base.resolve("src");
          tb.writeJavaFiles(src,
!                 "module m { requires m1 ; }",
                  "class C { }");
          Path classes = base.resolve("classes");
          Files.createDirectories(classes);
  
          new JavacTask(tb, Task.Mode.CMDLINE)
--- 269,279 ----
          Path jmod = base.resolve("myModule.jmod"); // deliberately not m1
          jmod(jmodClasses, jmod);
  
          Path src = base.resolve("src");
          tb.writeJavaFiles(src,
!                 "module m { requires m1x ; }",
                  "class C { }");
          Path classes = base.resolve("classes");
          Files.createDirectories(classes);
  
          new JavacTask(tb, Task.Mode.CMDLINE)
*** 303,316 ****
      }
  
      @Test
      public void relativePath(Path base) throws Exception {
          Path modules = base.resolve("modules");
!         new ModuleBuilder(tb, "m1").build(modules);
  
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src, "module m2 { requires m1; }", "class A { }");
  
          new JavacTask(tb, Task.Mode.CMDLINE)
                  .options("-XDrawDiagnostics",
                          "--module-path", modules + "/./../modules")
                  .files(findJavaFiles(src))
--- 303,316 ----
      }
  
      @Test
      public void relativePath(Path base) throws Exception {
          Path modules = base.resolve("modules");
!         new ModuleBuilder(tb, "m1x").build(modules);
  
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src, "module m2x { requires m1x; }", "class A { }");
  
          new JavacTask(tb, Task.Mode.CMDLINE)
                  .options("-XDrawDiagnostics",
                          "--module-path", modules + "/./../modules")
                  .files(findJavaFiles(src))
*** 319,332 ****
      }
  
      @Test
      public void duplicatePaths_1(Path base) throws Exception {
          Path modules = base.resolve("modules");
!         new ModuleBuilder(tb, "m1").build(modules);
  
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src, "module m2 { requires m1; }", "class A { }");
  
          new JavacTask(tb, Task.Mode.CMDLINE)
                  .options("-XDrawDiagnostics",
                          "--module-path", modules + "/./../modules" + PATH_SEP + modules)
                  .files(findJavaFiles(src))
--- 319,332 ----
      }
  
      @Test
      public void duplicatePaths_1(Path base) throws Exception {
          Path modules = base.resolve("modules");
!         new ModuleBuilder(tb, "m1x").build(modules);
  
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src, "module m2x { requires m1x; }", "class A { }");
  
          new JavacTask(tb, Task.Mode.CMDLINE)
                  .options("-XDrawDiagnostics",
                          "--module-path", modules + "/./../modules" + PATH_SEP + modules)
                  .files(findJavaFiles(src))
*** 335,348 ****
      }
  
      @Test
      public void duplicatePaths_2(Path base) throws Exception {
          Path modules = base.resolve("modules");
!         new ModuleBuilder(tb, "m1").build(modules);
  
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src, "module m2 { requires m1; }", "class A { }");
  
          new JavacTask(tb, Task.Mode.CMDLINE)
                  .options("-XDrawDiagnostics",
                          "--module-path", modules.toString(),
                          "--module-path", modules.toString())
--- 335,348 ----
      }
  
      @Test
      public void duplicatePaths_2(Path base) throws Exception {
          Path modules = base.resolve("modules");
!         new ModuleBuilder(tb, "m1x").build(modules);
  
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src, "module m2x { requires m1x; }", "class A { }");
  
          new JavacTask(tb, Task.Mode.CMDLINE)
                  .options("-XDrawDiagnostics",
                          "--module-path", modules.toString(),
                          "--module-path", modules.toString())
*** 352,375 ****
      }
  
      @Test
      public void oneModuleHidesAnother(Path base) throws Exception {
          Path modules = base.resolve("modules");
!         new ModuleBuilder(tb, "m1")
                  .exports("pkg1")
                  .classes("package pkg1; public class E { }")
                  .build(modules);
  
          Path deepModuleDirSrc = base.resolve("deepModuleDirSrc");
          Path deepModuleDir = modules.resolve("deepModuleDir");
!         new ModuleBuilder(tb, "m1")
                  .exports("pkg2")
                  .classes("package pkg2; public class E { }")
                  .build(deepModuleDirSrc, deepModuleDir);
  
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src, "module m2 { requires m1; }", " package p; class A { void main() { pkg2.E.class.getName(); } }");
  
          new JavacTask(tb, Task.Mode.CMDLINE)
                  .options("-XDrawDiagnostics",
                          "--module-path", deepModuleDir + PATH_SEP + modules)
                  .files(findJavaFiles(src))
--- 352,375 ----
      }
  
      @Test
      public void oneModuleHidesAnother(Path base) throws Exception {
          Path modules = base.resolve("modules");
!         new ModuleBuilder(tb, "m1x")
                  .exports("pkg1")
                  .classes("package pkg1; public class E { }")
                  .build(modules);
  
          Path deepModuleDirSrc = base.resolve("deepModuleDirSrc");
          Path deepModuleDir = modules.resolve("deepModuleDir");
!         new ModuleBuilder(tb, "m1x")
                  .exports("pkg2")
                  .classes("package pkg2; public class E { }")
                  .build(deepModuleDirSrc, deepModuleDir);
  
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src, "module m2x { requires m1x; }", " package p; class A { void main() { pkg2.E.class.getName(); } }");
  
          new JavacTask(tb, Task.Mode.CMDLINE)
                  .options("-XDrawDiagnostics",
                          "--module-path", deepModuleDir + PATH_SEP + modules)
                  .files(findJavaFiles(src))
*** 378,404 ****
      }
  
      @Test
      public void modulesInDifferentContainers(Path base) throws Exception {
          Path modules = base.resolve("modules");
!         new ModuleBuilder(tb, "m1")
                  .exports("one")
                  .classes("package one; public class A { }")
                  .build(modules);
  
!         new ModuleBuilder(tb, "m2")
!                 .requires("m1", modules)
                  .build(base.resolve("tmp"));
!         jar(base.resolve("tmp/m2"), modules.resolve("m2.jar"));
  
!         new ModuleBuilder(tb, "m3")
!                 .requires("m2", modules)
                  .build(base.resolve("tmp"));
!         jmod(base.resolve("tmp/m3"), modules.resolve("m3.jmod"));
  
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src, "module m { requires m3; requires m2; requires m1; }",
                  "package p; class A { void main() { one.A.class.getName(); } }");
  
          new JavacTask(tb, Task.Mode.CMDLINE)
                  .options("-XDrawDiagnostics",
                          "--module-path", modules.toString())
--- 378,404 ----
      }
  
      @Test
      public void modulesInDifferentContainers(Path base) throws Exception {
          Path modules = base.resolve("modules");
!         new ModuleBuilder(tb, "m1x")
                  .exports("one")
                  .classes("package one; public class A { }")
                  .build(modules);
  
!         new ModuleBuilder(tb, "m2x")
!                 .requires("m1x", modules)
                  .build(base.resolve("tmp"));
!         jar(base.resolve("tmp/m2x"), modules.resolve("m2x.jar"));
  
!         new ModuleBuilder(tb, "m3x")
!                 .requires("m2x", modules)
                  .build(base.resolve("tmp"));
!         jmod(base.resolve("tmp/m3x"), modules.resolve("m3x.jmod"));
  
          Path src = base.resolve("src");
!         tb.writeJavaFiles(src, "module m { requires m3x; requires m2x; requires m1x; }",
                  "package p; class A { void main() { one.A.class.getName(); } }");
  
          new JavacTask(tb, Task.Mode.CMDLINE)
                  .options("-XDrawDiagnostics",
                          "--module-path", modules.toString())