test/jdk/jdk/nio/zipfs/MultiReleaseJarTest.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 21,31 ****
   * questions.
   */
  
  /*
   * @test
!  * @bug 8144355 8144062 8176709
   * @summary Test aliasing additions to ZipFileSystem for multi-release jar files
   * @library /lib/testlibrary/java/util/jar
   * @build Compiler JarBuilder CreateMultiReleaseTestJars
   * @run testng MultiReleaseJarTest
   * @modules jdk.compiler
--- 21,31 ----
   * questions.
   */
  
  /*
   * @test
!  * @bug 8144355 8144062 8176709 8194070
   * @summary Test aliasing additions to ZipFileSystem for multi-release jar files
   * @library /lib/testlibrary/java/util/jar
   * @build Compiler JarBuilder CreateMultiReleaseTestJars
   * @run testng MultiReleaseJarTest
   * @modules jdk.compiler
*** 90,126 ****
                  {"runtime", MAJOR_VERSION},
                  {"-20", 8},
                  {"0", 8},
                  {"8", 8},
                  {"9", 9},
!                 {"10", 10},
!                 {"11", 10},
!                 {"50", 10}
          };
      }
  
      @DataProvider(name="integers")
      public Object[][] createIntegers() {
          return new Object[][] {
                  {new Integer(-5), 8},
                  {new Integer(0), 8},
                  {new Integer(8), 8},
                  {new Integer(9), 9},
!                 {new Integer(10), 10},
!                 {new Integer(11), 10},
!                 {new Integer(100), 10}
          };
      }
  
      @DataProvider(name="versions")
      public Object[][] createVersions() {
          return new Object[][] {
                  {Version.parse("8"),    8},
                  {Version.parse("9"),    9},
!                 {Version.parse("10"),  10},
!                 {Version.parse("11"),  10},
!                 {Version.parse("100"), 10}
          };
      }
  
      // Not the best test but all I can do since ZipFileSystem and JarFileSystem
      // are not public, so I can't use (fs instanceof ...)
--- 90,125 ----
                  {"runtime", MAJOR_VERSION},
                  {"-20", 8},
                  {"0", 8},
                  {"8", 8},
                  {"9", 9},
!                 {Integer.toString(MAJOR_VERSION), MAJOR_VERSION},
!                 {Integer.toString(MAJOR_VERSION+1), MAJOR_VERSION},
!                 {"50", MAJOR_VERSION}
          };
      }
  
      @DataProvider(name="integers")
      public Object[][] createIntegers() {
          return new Object[][] {
                  {new Integer(-5), 8},
                  {new Integer(0), 8},
                  {new Integer(8), 8},
                  {new Integer(9), 9},
!                 {new Integer(MAJOR_VERSION), MAJOR_VERSION},
!                 {new Integer(MAJOR_VERSION + 1), MAJOR_VERSION},
!                 {new Integer(100), MAJOR_VERSION}
          };
      }
  
      @DataProvider(name="versions")
      public Object[][] createVersions() {
          return new Object[][] {
                  {Version.parse("8"),    8},
                  {Version.parse("9"),    9},
!                 {Version.parse("11"),  MAJOR_VERSION},
!                 {Version.parse("100"), MAJOR_VERSION}
          };
      }
  
      // Not the best test but all I can do since ZipFileSystem and JarFileSystem
      // are not public, so I can't use (fs instanceof ...)
*** 166,177 ****
          runTest(versionEnv, expected);
      }
  
      @Test
      public void testShortJar() throws Throwable {
!         integerEnv.put("multi-release", Integer.valueOf(10));
!         runTest(smruri, integerEnv, 10);
          integerEnv.put("multi-release", Integer.valueOf(9));
          runTest(smruri, integerEnv, 8);
      }
  
      private void runTest(Map<String,?> env, int expected) throws Throwable {
--- 165,176 ----
          runTest(versionEnv, expected);
      }
  
      @Test
      public void testShortJar() throws Throwable {
!         integerEnv.put("multi-release", Integer.valueOf(MAJOR_VERSION));
!         runTest(smruri, integerEnv, MAJOR_VERSION);
          integerEnv.put("multi-release", Integer.valueOf(9));
          runTest(smruri, integerEnv, 8);
      }
  
      private void runTest(Map<String,?> env, int expected) throws Throwable {