test/java/lang/module/MultiReleaseJarTest.java

*** 63,73 ****
  @Test
  public class MultiReleaseJarTest {
  
      private static final String MODULE_INFO = "module-info.class";
  
!     private static final int RELEASE = Runtime.version().major();
  
      // are multi-release JARs enabled?
      private static final boolean MULTI_RELEASE;
      static {
          String s = System.getProperty("jdk.util.jar.enableMultiRelease");
--- 63,73 ----
  @Test
  public class MultiReleaseJarTest {
  
      private static final String MODULE_INFO = "module-info.class";
  
!     private static final int VERSION = Runtime.version().major();
  
      // are multi-release JARs enabled?
      private static final boolean MULTI_RELEASE;
      static {
          String s = System.getProperty("jdk.util.jar.enableMultiRelease");
*** 78,97 ****
       * Basic test of a multi-release JAR.
       */
      public void testBasic() throws Exception {
          String name = "m1";
  
!         ModuleDescriptor descriptor = ModuleDescriptor.module(name)
                  .requires("java.base")
                  .build();
  
          Path jar = new JarBuilder(name)
                  .moduleInfo("module-info.class", descriptor)
                  .resource("p/Main.class")
                  .resource("p/Helper.class")
!                 .resource("META-INF/versions/9/p/Helper.class")
!                 .resource("META-INF/versions/9/p/internal/Helper9.class")
                  .build();
  
          // find the module
          ModuleFinder finder = ModuleFinder.of(jar);
          Optional<ModuleReference> omref = finder.find(name);
--- 78,97 ----
       * Basic test of a multi-release JAR.
       */
      public void testBasic() throws Exception {
          String name = "m1";
  
!         ModuleDescriptor descriptor = ModuleDescriptor.newModule(name)
                  .requires("java.base")
                  .build();
  
          Path jar = new JarBuilder(name)
                  .moduleInfo("module-info.class", descriptor)
                  .resource("p/Main.class")
                  .resource("p/Helper.class")
!                 .resource("META-INF/versions/" + VERSION + "/p/Helper.class")
!                 .resource("META-INF/versions/" + VERSION + "/p/internal/Helper.class")
                  .build();
  
          // find the module
          ModuleFinder finder = ModuleFinder.of(jar);
          Optional<ModuleReference> omref = finder.find(name);
*** 115,141 ****
       * section of the JAR.
       */
      public void testModuleInfoInVersionedSection() throws Exception {
          String name = "m1";
  
!         ModuleDescriptor descriptor1 = ModuleDescriptor.module(name)
                  .requires("java.base")
                  .build();
  
          // module descriptor for versioned section
!         ModuleDescriptor descriptor2 = ModuleDescriptor.module(name)
                  .requires("java.base")
                  .requires("jdk.unsupported")
                  .build();
  
          Path jar = new JarBuilder(name)
                  .moduleInfo(MODULE_INFO, descriptor1)
                  .resource("p/Main.class")
                  .resource("p/Helper.class")
!                 .moduleInfo("META-INF/versions/9/" + MODULE_INFO, descriptor2)
!                 .resource("META-INF/versions/9/p/Helper.class")
!                 .resource("META-INF/versions/9/p/internal/Helper9.class")
                  .build();
  
          // find the module
          ModuleFinder finder = ModuleFinder.of(jar);
          Optional<ModuleReference> omref = finder.find(name);
--- 115,141 ----
       * section of the JAR.
       */
      public void testModuleInfoInVersionedSection() throws Exception {
          String name = "m1";
  
!         ModuleDescriptor descriptor1 = ModuleDescriptor.newModule(name)
                  .requires("java.base")
                  .build();
  
          // module descriptor for versioned section
!         ModuleDescriptor descriptor2 = ModuleDescriptor.newModule(name)
                  .requires("java.base")
                  .requires("jdk.unsupported")
                  .build();
  
          Path jar = new JarBuilder(name)
                  .moduleInfo(MODULE_INFO, descriptor1)
                  .resource("p/Main.class")
                  .resource("p/Helper.class")
!                 .moduleInfo("META-INF/versions/" + VERSION + "/" + MODULE_INFO, descriptor2)
!                 .resource("META-INF/versions/" + VERSION + "/p/Helper.class")
!                 .resource("META-INF/versions/" + VERSION + "/p/internal/Helper.class")
                  .build();
  
          // find the module
          ModuleFinder finder = ModuleFinder.of(jar);
          Optional<ModuleReference> omref = finder.find(name);
*** 159,170 ****
          String name = "m";
  
          Path jar = new JarBuilder(name)
                  .resource("p/Main.class")
                  .resource("p/Helper.class")
!                 .resource("META-INF/versions/9/p/Helper.class")
!                 .resource("META-INF/versions/9/p/internal/Helper9.class")
                  .build();
  
          // find the module
          ModuleFinder finder = ModuleFinder.of(jar);
          Optional<ModuleReference> omref = finder.find(name);
--- 159,170 ----
          String name = "m";
  
          Path jar = new JarBuilder(name)
                  .resource("p/Main.class")
                  .resource("p/Helper.class")
!                 .resource("META-INF/versions/" + VERSION + "/p/Helper.class")
!                 .resource("META-INF/versions/" + VERSION + "/p/internal/Helper.class")
                  .build();
  
          // find the module
          ModuleFinder finder = ModuleFinder.of(jar);
          Optional<ModuleReference> omref = finder.find(name);
*** 186,208 ****
       * Exercise ModuleReader on a multi-release JAR
       */
      public void testModuleReader() throws Exception {
          String name = "m1";
  
!         ModuleDescriptor descriptor1 = ModuleDescriptor.module(name)
                  .requires("java.base")
                  .build();
  
          // module descriptor for versioned section
!         ModuleDescriptor descriptor2 = ModuleDescriptor.module(name)
                  .requires("java.base")
                  .requires("jdk.unsupported")
                  .build();
  
          Path jar = new JarBuilder(name)
                  .moduleInfo(MODULE_INFO, descriptor1)
!                 .moduleInfo("META-INF/versions/9/" + MODULE_INFO, descriptor2)
                  .build();
  
          // find the module
          ModuleFinder finder = ModuleFinder.of(jar);
          Optional<ModuleReference> omref = finder.find(name);
--- 186,208 ----
       * Exercise ModuleReader on a multi-release JAR
       */
      public void testModuleReader() throws Exception {
          String name = "m1";
  
!         ModuleDescriptor descriptor1 = ModuleDescriptor.newModule(name)
                  .requires("java.base")
                  .build();
  
          // module descriptor for versioned section
!         ModuleDescriptor descriptor2 = ModuleDescriptor.newModule(name)
                  .requires("java.base")
                  .requires("jdk.unsupported")
                  .build();
  
          Path jar = new JarBuilder(name)
                  .moduleInfo(MODULE_INFO, descriptor1)
!                 .moduleInfo("META-INF/versions/" + VERSION + "/" + MODULE_INFO, descriptor2)
                  .build();
  
          // find the module
          ModuleFinder finder = ModuleFinder.of(jar);
          Optional<ModuleReference> omref = finder.find(name);
*** 241,251 ****
              assertTrue(ouri.isPresent());
              URI uri = ouri.get();
  
              String expectedTail = "!/";
              if (MULTI_RELEASE)
!                 expectedTail += "META-INF/versions/" + RELEASE + "/";
              expectedTail += MODULE_INFO;
              assertTrue(uri.toString().endsWith(expectedTail));
  
              URLConnection uc = uri.toURL().openConnection();
              uc.setUseCaches(false);
--- 241,251 ----
              assertTrue(ouri.isPresent());
              URI uri = ouri.get();
  
              String expectedTail = "!/";
              if (MULTI_RELEASE)
!                 expectedTail += "META-INF/versions/" + VERSION + "/";
              expectedTail += MODULE_INFO;
              assertTrue(uri.toString().endsWith(expectedTail));
  
              URLConnection uc = uri.toURL().openConnection();
              uc.setUseCaches(false);