test/tools/javac/file/MultiReleaseJar/MultiReleaseJarTest.java

*** 84,112 ****
  
      private final ToolBox tb = new ToolBox();
  
      @BeforeClass
      public void setup() throws Exception {
!         tb.createDirectories("classes", "classes/META-INF/versions/9");
          new JavacTask(tb)
                  .outdir("classes")
                  .sources(info1)
                  .run();
          new JavacTask(tb)
!                 .outdir("classes/META-INF/versions/9")
                  .sources(info2)
                  .run();
          // This is a bogus multi-release jar file since the two Info classes
          // do not have the same public interface
          new JarTask(tb, "multi-release.jar")
                  .manifest(manifest)
                  .baseDir("classes")
!                 .files("Info.class", "META-INF/versions/9/Info.class")
                  .run();
          tb.deleteFiles(
!                 "classes/META-INF/versions/9/Info.class",
!                 "classes/META-INF/versions/9",
                  "classes/META-INF/versions",
                  "classes/META-INF",
                  "classes/Info.class"
          );
      }
--- 84,112 ----
  
      private final ToolBox tb = new ToolBox();
  
      @BeforeClass
      public void setup() throws Exception {
!         tb.createDirectories("classes", "classes/META-INF/versions/10");
          new JavacTask(tb)
                  .outdir("classes")
                  .sources(info1)
                  .run();
          new JavacTask(tb)
!                 .outdir("classes/META-INF/versions/10")
                  .sources(info2)
                  .run();
          // This is a bogus multi-release jar file since the two Info classes
          // do not have the same public interface
          new JarTask(tb, "multi-release.jar")
                  .manifest(manifest)
                  .baseDir("classes")
!                 .files("Info.class", "META-INF/versions/10/Info.class")
                  .run();
          tb.deleteFiles(
!                 "classes/META-INF/versions/10/Info.class",
!                 "classes/META-INF/versions/10",
                  "classes/META-INF/versions",
                  "classes/META-INF",
                  "classes/Info.class"
          );
      }
*** 147,162 ****
          result.writeAll();
          tb.deleteFiles("Main.java");
      }
  
      @Test(dataProvider="modes")
!     // javac -d classes --release 9 -cp multi-release.jar Main.java -> fails
!     public void main1Release9(Task.Mode mode) throws Exception {
          tb.writeFile("Main.java", main1);
          Task.Result result = new JavacTask(tb, mode)
                  .outdir("classes")
!                 .options("--release", "9")
                  .classpath("multi-release.jar")
                  .files("Main.java")
                  .run(Task.Expect.FAIL, 1);
          result.writeAll();
          tb.deleteFiles("Main.java");
--- 147,162 ----
          result.writeAll();
          tb.deleteFiles("Main.java");
      }
  
      @Test(dataProvider="modes")
!     // javac -d classes --release 10 -cp multi-release.jar Main.java -> fails
!     public void main1Release10(Task.Mode mode) throws Exception {
          tb.writeFile("Main.java", main1);
          Task.Result result = new JavacTask(tb, mode)
                  .outdir("classes")
!                 .options("--release", "10")
                  .classpath("multi-release.jar")
                  .files("Main.java")
                  .run(Task.Expect.FAIL, 1);
          result.writeAll();
          tb.deleteFiles("Main.java");
*** 189,204 ****
          result.writeAll();
          tb.deleteFiles("Main.java");
      }
  
      @Test(dataProvider="modes")
!     // javac -d classes --release 9 -cp multi-release.jar Main.java -> succeeds
!     public void main2Release9(Task.Mode mode) throws Exception {
          tb.writeFile("Main.java", main2);
          Task.Result result = new JavacTask(tb, mode)
                  .outdir("classes")
!                 .options("--release", "9")
                  .classpath("multi-release.jar")
                  .files("Main.java")
                  .run();
          result.writeAll();
          tb.deleteFiles("Main.java");
--- 189,204 ----
          result.writeAll();
          tb.deleteFiles("Main.java");
      }
  
      @Test(dataProvider="modes")
!     // javac -d classes --release 10 -cp multi-release.jar Main.java -> succeeds
!     public void main2Release10(Task.Mode mode) throws Exception {
          tb.writeFile("Main.java", main2);
          Task.Result result = new JavacTask(tb, mode)
                  .outdir("classes")
!                 .options("--release", "10")
                  .classpath("multi-release.jar")
                  .files("Main.java")
                  .run();
          result.writeAll();
          tb.deleteFiles("Main.java");