test/tools/jar/mmrjar/Basic.java

*** 329,339 ****
          byte[] mdBytes = Files.readAllBytes(Paths.get("module-info.class"));
  
          ModuleInfoExtender mie = ModuleInfoExtender.newExtender(
              new ByteArrayInputStream(mdBytes));
  
!         mie.mainClass("foo.main");
          mie.version(Version.parse("1.0"));
  
          ByteArrayOutputStream baos = new ByteArrayOutputStream();
          mie.write(baos);
          Files.write(Paths.get("test6", "module-info.class"), baos.toByteArray());
--- 329,339 ----
          byte[] mdBytes = Files.readAllBytes(Paths.get("module-info.class"));
  
          ModuleInfoExtender mie = ModuleInfoExtender.newExtender(
              new ByteArrayInputStream(mdBytes));
  
!         mie.mainClass("p.Main");
          mie.version(Version.parse("1.0"));
  
          ByteArrayOutputStream baos = new ByteArrayOutputStream();
          mie.write(baos);
          Files.write(Paths.get("test6", "module-info.class"), baos.toByteArray());
*** 343,353 ****
          Assert.assertEquals(rc, 0);
  
  
          // different main-class
          mie = ModuleInfoExtender.newExtender(new ByteArrayInputStream(mdBytes));
!         mie.mainClass("foo.main2");
          mie.version(Version.parse("1.0"));
          baos.reset();
          mie.write(baos);
          Files.write(Paths.get("test6-v9", "module-info.class"), baos.toByteArray());
  
--- 343,353 ----
          Assert.assertEquals(rc, 0);
  
  
          // different main-class
          mie = ModuleInfoExtender.newExtender(new ByteArrayInputStream(mdBytes));
!         mie.mainClass("p.Main2");
          mie.version(Version.parse("1.0"));
          baos.reset();
          mie.write(baos);
          Files.write(Paths.get("test6-v9", "module-info.class"), baos.toByteArray());
  
*** 358,368 ****
              new String(errbytes.toByteArray()),
              "META-INF/versions/9/module-info.class"));
  
          // different version
          mie = ModuleInfoExtender.newExtender(new ByteArrayInputStream(mdBytes));
!         mie.mainClass("foo.main");
          mie.version(Version.parse("2.0"));
          baos.reset();
          mie.write(baos);
          Files.write(Paths.get("test6-v9", "module-info.class"), baos.toByteArray());
  
--- 358,368 ----
              new String(errbytes.toByteArray()),
              "META-INF/versions/9/module-info.class"));
  
          // different version
          mie = ModuleInfoExtender.newExtender(new ByteArrayInputStream(mdBytes));
!         mie.mainClass("p.Main");
          mie.version(Version.parse("2.0"));
          baos.reset();
          mie.write(baos);
          Files.write(Paths.get("test6-v9", "module-info.class"), baos.toByteArray());
  
*** 393,403 ****
                     Paths.get("test7-v9", "module-info.class"));
  
          Files.copy(Paths.get("test7-v9", "module-info.class"),
                     Paths.get("test7-v10", "module-info.class"));
  
!         int rc = jar("--create --file mmr.jar --main-class=foo.main -C test7 . --release 9 -C test7-v9 . --release 10 -C test7-v10 .");
  
  System.out.println("-----------------------");
  System.out.println( new String(errbytes.toByteArray()));
  
  
--- 393,403 ----
                     Paths.get("test7-v9", "module-info.class"));
  
          Files.copy(Paths.get("test7-v9", "module-info.class"),
                     Paths.get("test7-v10", "module-info.class"));
  
!         int rc = jar("--create --file mmr.jar --main-class=p.Main -C test7 . --release 9 -C test7-v9 . --release 10 -C test7-v10 .");
  
  System.out.println("-----------------------");
  System.out.println( new String(errbytes.toByteArray()));
  
  
*** 407,417 ****
          jar("-tf mmr.jar");
  
  System.out.println("-----------------------");
  System.out.println( new String(outbytes.toByteArray()));
  
!         Optional<String> exp = Optional.of("foo.main");
          try (ZipFile zf = new ZipFile("mmr.jar")) {
              Assert.assertTrue(zf.getEntry("module-info.class") == null);
  
              ModuleDescriptor md = ModuleDescriptor.read(
                  zf.getInputStream(zf.getEntry("META-INF/versions/9/module-info.class")));
--- 407,417 ----
          jar("-tf mmr.jar");
  
  System.out.println("-----------------------");
  System.out.println( new String(outbytes.toByteArray()));
  
!         Optional<String> exp = Optional.of("p.Main");
          try (ZipFile zf = new ZipFile("mmr.jar")) {
              Assert.assertTrue(zf.getEntry("module-info.class") == null);
  
              ModuleDescriptor md = ModuleDescriptor.read(
                  zf.getInputStream(zf.getEntry("META-INF/versions/9/module-info.class")));