jdk/test/jdk/nio/zipfs/MultiReleaseJarTest.java
author redestad
Wed, 15 Mar 2017 23:09:18 +0100
changeset 44259 b60290290b9e
parent 44257 3220d2ac3cee
permissions -rw-r--r--
8176834: jdk/nio/zipfs/MultiReleaseJarTest.java test fails after JDK-8176709 Reviewed-by: mchung
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     1
/*
44257
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
     2
 * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     4
 *
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     7
 * published by the Free Software Foundation.
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     8
 *
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    13
 * accompanied this code).
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    14
 *
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    18
 *
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    21
 * questions.
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    22
 */
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    23
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    24
/*
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    25
 * @test
44257
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
    26
 * @bug 8144355 8144062 8176709
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    27
 * @summary Test aliasing additions to ZipFileSystem for multi-release jar files
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    28
 * @library /lib/testlibrary/java/util/jar
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    29
 * @build Compiler JarBuilder CreateMultiReleaseTestJars
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    30
 * @run testng MultiReleaseJarTest
40531
d1fd060ce6b7 8163126: Fix @modules in some of jdk/* tests
shurailine
parents: 38579
diff changeset
    31
 * @modules jdk.compiler
38579
477f5b3c9973 8157783: Fix module dependencies for /jdk/* tests
mli
parents: 38568
diff changeset
    32
 *          jdk.jartool
477f5b3c9973 8157783: Fix module dependencies for /jdk/* tests
mli
parents: 38568
diff changeset
    33
 *          jdk.zipfs
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    34
 */
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    35
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    36
import java.io.IOException;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    37
import java.lang.invoke.MethodHandle;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    38
import java.lang.invoke.MethodHandles;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    39
import java.lang.invoke.MethodType;
38432
892603099bb0 8144062: Move jdk.Version to java.lang.Runtime.Version
iris
parents: 36219
diff changeset
    40
import java.lang.Runtime.Version;
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    41
import java.net.URI;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    42
import java.nio.file.*;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    43
import java.util.HashMap;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    44
import java.util.Map;
44257
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
    45
import java.util.concurrent.atomic.AtomicInteger;
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    46
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    47
import org.testng.Assert;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    48
import org.testng.annotations.*;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    49
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    50
public class MultiReleaseJarTest {
38432
892603099bb0 8144062: Move jdk.Version to java.lang.Runtime.Version
iris
parents: 36219
diff changeset
    51
    final private int MAJOR_VERSION = Runtime.version().major();
36012
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
    52
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    53
    final private String userdir = System.getProperty("user.dir",".");
44257
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
    54
    final private CreateMultiReleaseTestJars creator =  new CreateMultiReleaseTestJars();
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    55
    final private Map<String,String> stringEnv = new HashMap<>();
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    56
    final private Map<String,Integer> integerEnv = new HashMap<>();
36012
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
    57
    final private Map<String,Version> versionEnv = new HashMap<>();
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    58
    final private String className = "version.Version";
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    59
    final private MethodType mt = MethodType.methodType(int.class);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    60
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    61
    private String entryName;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    62
    private URI uvuri;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    63
    private URI mruri;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    64
    private URI smruri;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    65
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    66
    @BeforeClass
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    67
    public void initialize() throws Exception {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    68
        creator.compileEntries();
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    69
        creator.buildUnversionedJar();
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    70
        creator.buildMultiReleaseJar();
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    71
        creator.buildShortMultiReleaseJar();
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    72
        String ssp = Paths.get(userdir, "unversioned.jar").toUri().toString();
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    73
        uvuri = new URI("jar", ssp , null);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    74
        ssp = Paths.get(userdir, "multi-release.jar").toUri().toString();
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    75
        mruri = new URI("jar", ssp, null);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    76
        ssp = Paths.get(userdir, "short-multi-release.jar").toUri().toString();
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    77
        smruri = new URI("jar", ssp, null);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    78
        entryName = className.replace('.', '/') + ".class";
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    79
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    80
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    81
    public void close() throws IOException {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    82
        Files.delete(Paths.get(userdir, "unversioned.jar"));
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    83
        Files.delete(Paths.get(userdir, "multi-release.jar"));
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    84
        Files.delete(Paths.get(userdir, "short-multi-release.jar"));
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    85
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    86
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    87
    @DataProvider(name="strings")
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    88
    public Object[][] createStrings() {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    89
        return new Object[][]{
36012
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
    90
                {"runtime", MAJOR_VERSION},
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    91
                {"-20", 8},
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    92
                {"0", 8},
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    93
                {"8", 8},
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    94
                {"9", 9},
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    95
                {"10", 10},
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    96
                {"11", 10},
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    97
                {"50", 10}
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    98
        };
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    99
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   100
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   101
    @DataProvider(name="integers")
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   102
    public Object[][] createIntegers() {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   103
        return new Object[][] {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   104
                {new Integer(-5), 8},
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   105
                {new Integer(0), 8},
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   106
                {new Integer(8), 8},
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   107
                {new Integer(9), 9},
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   108
                {new Integer(10), 10},
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   109
                {new Integer(11), 10},
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   110
                {new Integer(100), 10}
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   111
        };
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   112
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   113
36012
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   114
    @DataProvider(name="versions")
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   115
    public Object[][] createVersions() {
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   116
        return new Object[][] {
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   117
                {Version.parse("8"),    8},
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   118
                {Version.parse("9"),    9},
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   119
                {Version.parse("10"),  10},
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   120
                {Version.parse("11"),  10},
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   121
                {Version.parse("100"), 10}
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   122
        };
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   123
    }
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   124
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   125
    // Not the best test but all I can do since ZipFileSystem and JarFileSystem
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   126
    // are not public, so I can't use (fs instanceof ...)
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   127
    @Test
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   128
    public void testNewFileSystem() throws Exception {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   129
        Map<String,String> env = new HashMap<>();
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   130
        // no configuration, treat multi-release jar as unversioned
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   131
        try (FileSystem fs = FileSystems.newFileSystem(mruri, env)) {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   132
            Assert.assertTrue(readAndCompare(fs, 8));
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   133
        }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   134
        env.put("multi-release", "runtime");
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   135
        // a configuration and jar file is multi-release
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   136
        try (FileSystem fs = FileSystems.newFileSystem(mruri, env)) {
36012
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   137
            Assert.assertTrue(readAndCompare(fs, MAJOR_VERSION));
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   138
        }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   139
        // a configuration but jar file is unversioned
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   140
        try (FileSystem fs = FileSystems.newFileSystem(uvuri, env)) {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   141
            Assert.assertTrue(readAndCompare(fs, 8));
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   142
        }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   143
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   144
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   145
    private boolean readAndCompare(FileSystem fs, int expected) throws IOException {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   146
        Path path = fs.getPath("version/Version.java");
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   147
        String src = new String(Files.readAllBytes(path));
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   148
        return src.contains("return " + expected);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   149
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   150
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   151
    @Test(dataProvider="strings")
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   152
    public void testStrings(String value, int expected) throws Throwable {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   153
        stringEnv.put("multi-release", value);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   154
        runTest(stringEnv, expected);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   155
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   156
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   157
    @Test(dataProvider="integers")
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   158
    public void testIntegers(Integer value, int expected) throws Throwable {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   159
        integerEnv.put("multi-release", value);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   160
        runTest(integerEnv, expected);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   161
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   162
36012
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   163
    @Test(dataProvider="versions")
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   164
    public void testVersions(Version value, int expected) throws Throwable {
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   165
        versionEnv.put("multi-release", value);
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   166
        runTest(versionEnv, expected);
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   167
    }
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
   168
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   169
    @Test
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   170
    public void testShortJar() throws Throwable {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   171
        integerEnv.put("multi-release", Integer.valueOf(10));
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   172
        runTest(smruri, integerEnv, 10);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   173
        integerEnv.put("multi-release", Integer.valueOf(9));
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   174
        runTest(smruri, integerEnv, 8);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   175
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   176
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   177
    private void runTest(Map<String,?> env, int expected) throws Throwable {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   178
        runTest(mruri, env, expected);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   179
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   180
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   181
    private void runTest(URI uri, Map<String,?> env, int expected) throws Throwable {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   182
        try (FileSystem fs = FileSystems.newFileSystem(uri, env)) {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   183
            Path version = fs.getPath(entryName);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   184
            byte [] bytes = Files.readAllBytes(version);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   185
            Class<?> vcls = (new ByteArrayClassLoader(fs)).defineClass(className, bytes);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   186
            MethodHandle mh = MethodHandles.lookup().findVirtual(vcls, "getVersion", mt);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   187
            Assert.assertEquals((int)mh.invoke(vcls.newInstance()), expected);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   188
        }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   189
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   190
44257
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   191
    @Test
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   192
    public void testIsMultiReleaseJar() throws Exception {
44259
b60290290b9e 8176834: jdk/nio/zipfs/MultiReleaseJarTest.java test fails after JDK-8176709
redestad
parents: 44257
diff changeset
   193
        // Re-examine commented out tests as part of JDK-8176843
44257
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   194
        testCustomMultiReleaseValue("true", true);
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   195
        testCustomMultiReleaseValue("true\r\nOther: value", true);
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   196
        testCustomMultiReleaseValue("true\nOther: value", true);
44259
b60290290b9e 8176834: jdk/nio/zipfs/MultiReleaseJarTest.java test fails after JDK-8176709
redestad
parents: 44257
diff changeset
   197
        //testCustomMultiReleaseValue("true\rOther: value", true);
44257
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   198
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   199
        testCustomMultiReleaseValue("false", false);
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   200
        testCustomMultiReleaseValue(" true", false);
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   201
        testCustomMultiReleaseValue("true ", false);
44259
b60290290b9e 8176834: jdk/nio/zipfs/MultiReleaseJarTest.java test fails after JDK-8176709
redestad
parents: 44257
diff changeset
   202
        //testCustomMultiReleaseValue("true\n ", false);
b60290290b9e 8176834: jdk/nio/zipfs/MultiReleaseJarTest.java test fails after JDK-8176709
redestad
parents: 44257
diff changeset
   203
        //testCustomMultiReleaseValue("true\r ", false);
b60290290b9e 8176834: jdk/nio/zipfs/MultiReleaseJarTest.java test fails after JDK-8176709
redestad
parents: 44257
diff changeset
   204
        //testCustomMultiReleaseValue("true\n true", false);
b60290290b9e 8176834: jdk/nio/zipfs/MultiReleaseJarTest.java test fails after JDK-8176709
redestad
parents: 44257
diff changeset
   205
        //testCustomMultiReleaseValue("true\r\n true", false);
44257
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   206
    }
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   207
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   208
    private static final AtomicInteger JAR_COUNT = new AtomicInteger(0);
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   209
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   210
    private void testCustomMultiReleaseValue(String value, boolean expected)
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   211
            throws Exception {
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   212
        String fileName = "custom-mr" + JAR_COUNT.incrementAndGet() + ".jar";
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   213
        creator.buildCustomMultiReleaseJar(fileName, value, Map.of(),
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   214
                /*addEntries*/true);
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   215
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   216
        Map<String,String> env = Map.of("multi-release", "runtime");
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   217
        Path filePath = Paths.get(userdir, fileName);
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   218
        String ssp = filePath.toUri().toString();
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   219
        URI customJar = new URI("jar", ssp , null);
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   220
        try (FileSystem fs = FileSystems.newFileSystem(customJar, env)) {
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   221
            if (expected) {
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   222
                Assert.assertTrue(readAndCompare(fs, MAJOR_VERSION));
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   223
            } else {
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   224
                Assert.assertTrue(readAndCompare(fs, 8));
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   225
            }
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   226
        }
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   227
        Files.delete(filePath);
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   228
    }
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 40531
diff changeset
   229
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   230
    private static class ByteArrayClassLoader extends ClassLoader {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   231
        final private FileSystem fs;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   232
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   233
        ByteArrayClassLoader(FileSystem fs) {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   234
            super(null);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   235
            this.fs = fs;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   236
        }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   237
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   238
        @Override
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   239
        public Class<?> loadClass(String name) throws ClassNotFoundException {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   240
            try {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   241
                return super.loadClass(name);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   242
            } catch (ClassNotFoundException x) {}
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   243
            Path cls = fs.getPath(name.replace('.', '/') + ".class");
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   244
            try {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   245
                byte[] bytes = Files.readAllBytes(cls);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   246
                return defineClass(name, bytes);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   247
            } catch (IOException x) {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   248
                throw new ClassNotFoundException(x.getMessage());
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   249
            }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   250
        }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   251
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   252
        public Class<?> defineClass(String name, byte[] bytes) throws ClassNotFoundException {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   253
            if (bytes == null) throw new ClassNotFoundException("No bytes for " + name);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   254
            return defineClass(name, bytes, 0, bytes.length);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   255
        }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   256
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   257
}