21 * questions. |
21 * questions. |
22 */ |
22 */ |
23 |
23 |
24 /* |
24 /* |
25 * @test |
25 * @test |
26 * @bug 8144355 8144062 8176709 8194070 |
26 * @bug 8144355 8144062 8176709 8194070 8193802 |
27 * @summary Test aliasing additions to ZipFileSystem for multi-release jar files |
27 * @summary Test aliasing additions to ZipFileSystem for multi-release jar files |
28 * @library /lib/testlibrary/java/util/jar |
28 * @library /lib/testlibrary/java/util/jar |
29 * @build Compiler JarBuilder CreateMultiReleaseTestJars |
29 * @build Compiler JarBuilder CreateMultiReleaseTestJars |
30 * @run testng MultiReleaseJarTest |
30 * @run testng MultiReleaseJarTest |
31 * @modules jdk.compiler |
31 * @modules jdk.compiler |
202 //testCustomMultiReleaseValue("true\r ", false); |
202 //testCustomMultiReleaseValue("true\r ", false); |
203 //testCustomMultiReleaseValue("true\n true", false); |
203 //testCustomMultiReleaseValue("true\n true", false); |
204 //testCustomMultiReleaseValue("true\r\n true", false); |
204 //testCustomMultiReleaseValue("true\r\n true", false); |
205 } |
205 } |
206 |
206 |
|
207 @Test |
|
208 public void testMultiReleaseJarWithNonVersionDir() throws Exception { |
|
209 String jfname = "multi-release-non-ver.jar"; |
|
210 Path jfpath = Paths.get(jfname); |
|
211 URI uri = new URI("jar", jfpath.toUri().toString() , null); |
|
212 JarBuilder jb = new JarBuilder(jfname); |
|
213 jb.addAttribute("Multi-Release", "true"); |
|
214 jb.build(); |
|
215 Map<String,String> env = Map.of("multi-release", "runtime"); |
|
216 try (FileSystem fs = FileSystems.newFileSystem(uri, env)) { |
|
217 Assert.assertTrue(true); |
|
218 } |
|
219 Files.delete(jfpath); |
|
220 } |
|
221 |
207 private static final AtomicInteger JAR_COUNT = new AtomicInteger(0); |
222 private static final AtomicInteger JAR_COUNT = new AtomicInteger(0); |
208 |
223 |
209 private void testCustomMultiReleaseValue(String value, boolean expected) |
224 private void testCustomMultiReleaseValue(String value, boolean expected) |
210 throws Exception { |
225 throws Exception { |
211 String fileName = "custom-mr" + JAR_COUNT.incrementAndGet() + ".jar"; |
226 String fileName = "custom-mr" + JAR_COUNT.incrementAndGet() + ".jar"; |