8165890: [TESTBUG] Compilation issue in MultiReleaseJarTest after 8165723
authorredestad
Mon, 12 Sep 2016 20:12:26 +0200
changeset 40814 f105fad88cb6
parent 40813 dd5aa9c67561
child 40815 196b358234d8
8165890: [TESTBUG] Compilation issue in MultiReleaseJarTest after 8165723 Reviewed-by: darcy
jdk/test/lib/testlibrary/java/util/jar/CreateMultiReleaseTestJars.java
--- a/jdk/test/lib/testlibrary/java/util/jar/CreateMultiReleaseTestJars.java	Mon Sep 12 09:38:32 2016 -0700
+++ b/jdk/test/lib/testlibrary/java/util/jar/CreateMultiReleaseTestJars.java	Mon Sep 12 20:12:26 2016 +0200
@@ -90,6 +90,13 @@
     public void buildMultiReleaseJar() throws IOException {
         JarBuilder jb = customMultiReleaseJar("multi-release.jar", "true");
         addEntries(jb);
+        jb.addEntry("META-INF/versions/9/version/Version.class", version9Classes.get("version.Version"));
+        jb.build();
+    }
+
+    public void buildShortMultiReleaseJar() throws IOException {
+        JarBuilder jb = customMultiReleaseJar("short-multi-release.jar", "true");
+        addEntries(jb);
         jb.build();
     }
 
@@ -118,7 +125,6 @@
         jb.addEntry("META-INF/versions/9/README", readme9.getBytes());
         jb.addEntry("META-INF/versions/9/version/Version.java", java9.getBytes());
         jb.addEntry("META-INF/versions/9/version/PackagePrivate.java", ppjava9.getBytes());
-        jb.addEntry("META-INF/versions/9/version/Version.class", version9Classes.get("version.Version"));
         jb.addEntry("META-INF/versions/9/version/PackagePrivate.class", version9Classes.get("version.PackagePrivate"));
         jb.addEntry("META-INF/versions/10/README", readme10.getBytes());
         jb.addEntry("META-INF/versions/10/version/Version.java", java10.getBytes());