jdk/test/java/lang/module/AutomaticModulesTest.java
author alanb
Wed, 22 Mar 2017 16:26:27 +0000
changeset 44359 c6761862ca0b
parent 43712 5dfd0950317c
child 44545 83b611b88ac8
permissions -rw-r--r--
8174823: Module system implementation refresh (3/2017) Reviewed-by: chegar, mchung, alanb Contributed-by: alan.bateman@oracle.com, mandy.chung@oracle.com, sundararajan.athijegannathan@oracle.com, peter.levart@gmail.com
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     1
/*
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
     2
 * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     4
 *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     7
 * published by the Free Software Foundation.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     8
 *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    13
 * accompanied this code).
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    14
 *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    18
 *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    21
 * questions.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    22
 */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    23
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    24
/**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    25
 * @test
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    26
 * @library /lib/testlibrary
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
    27
 * @build AutomaticModulesTest ModuleUtils JarUtils
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    28
 * @run testng AutomaticModulesTest
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    29
 * @summary Basic tests for automatic modules
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    30
 */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    31
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    32
import java.io.IOException;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    33
import java.lang.module.Configuration;
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
    34
import java.lang.module.FindException;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    35
import java.lang.module.ModuleDescriptor;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    36
import java.lang.module.ModuleDescriptor.Requires.Modifier;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    37
import java.lang.module.ModuleFinder;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    38
import java.lang.module.ModuleReference;
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
    39
import java.lang.module.ResolutionException;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    40
import java.lang.module.ResolvedModule;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    41
import java.lang.reflect.Layer;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    42
import java.lang.reflect.Module;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    43
import java.nio.file.Files;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    44
import java.nio.file.Path;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    45
import java.nio.file.Paths;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    46
import java.util.Optional;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    47
import java.util.Set;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    48
import java.util.jar.Attributes;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    49
import java.util.jar.Manifest;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    50
import java.util.stream.Collectors;
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
    51
import java.util.stream.Stream;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    52
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    53
import org.testng.annotations.DataProvider;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    54
import org.testng.annotations.Test;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    55
import static org.testng.Assert.*;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    56
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    57
@Test
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    58
public class AutomaticModulesTest {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    59
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    60
    private static final Path USER_DIR
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    61
         = Paths.get(System.getProperty("user.dir"));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    62
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    63
    @DataProvider(name = "names")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    64
    public Object[][] createNames() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    65
        return new Object[][] {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    66
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    67
            // JAR file name                module-name[/version]
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    68
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    69
            { "foo.jar",                    "foo" },
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
    70
            { "foo4j.jar",                  "foo4j", },
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
    71
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
    72
            { "foo1.jar",                   "foo" },
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
    73
            { "foo1.2.jar",                 "foo" },
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
    74
            { "foo1.2.3.jar",               "foo" },
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
    75
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
    76
            { "foo10.jar",                  "foo" },
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
    77
            { "foo10.20.jar",               "foo" },
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
    78
            { "foo10.20.30.jar",            "foo" },
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    79
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    80
            { "foo-1.jar",                  "foo/1" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    81
            { "foo-1.2.jar",                "foo/1.2" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    82
            { "foo-1.2.3.jar",              "foo/1.2.3" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    83
            { "foo-1.2.3.4.jar",            "foo/1.2.3.4" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    84
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    85
            { "foo-10.jar",                 "foo/10" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    86
            { "foo-10.20.jar",              "foo/10.20" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    87
            { "foo-10.20.30.jar",           "foo/10.20.30" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    88
            { "foo-10.20.30.40.jar",        "foo/10.20.30.40" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    89
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    90
            { "foo-bar.jar",                "foo.bar" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    91
            { "foo-bar-1.jar",              "foo.bar/1" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    92
            { "foo-bar-1.2.jar",            "foo.bar/1.2"},
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    93
            { "foo-bar-10.jar",             "foo.bar/10" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    94
            { "foo-bar-10.20.jar",          "foo.bar/10.20" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    95
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    96
            { "foo-1.2-SNAPSHOT.jar",       "foo/1.2-SNAPSHOT" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    97
            { "foo-bar-1.2-SNAPSHOT.jar",   "foo.bar/1.2-SNAPSHOT" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    98
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    99
            { "foo--bar-1.0.jar",           "foo.bar/1.0" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   100
            { "-foo-bar-1.0.jar",           "foo.bar/1.0" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   101
            { "foo-bar--1.0.jar",           "foo.bar/1.0" },
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   102
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   103
        };
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   104
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   105
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   106
    // JAR file names that do not map to a legal module name
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   107
    @DataProvider(name = "badnames")
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   108
    public Object[][] createBadNames() {
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   109
        return new Object[][]{
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   110
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   111
            { ".jar",     null },
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   112
            { "_.jar",    null }
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   113
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   114
        };
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   115
    }
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   116
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   117
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   118
     * Test mapping of JAR file names to module names
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   119
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   120
    @Test(dataProvider = "names")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   121
    public void testNames(String fn, String mid) throws IOException {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   122
        String[] s = mid.split("/");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   123
        String mn = s[0];
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   124
        String vs = (s.length == 2) ? s[1] : null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   125
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   126
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   127
        Path jf = dir.resolve(fn);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   128
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   129
        // create empty JAR file
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   130
        createDummyJarFile(jf);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   131
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   132
        // create a ModuleFinder to find modules in the directory
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   133
        ModuleFinder finder = ModuleFinder.of(dir);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   134
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   135
        // a module with the expected name should be found
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   136
        Optional<ModuleReference> mref = finder.find(mn);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   137
        assertTrue(mref.isPresent(), mn + " not found");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   138
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   139
        ModuleDescriptor descriptor = mref.get().descriptor();
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   140
        assertTrue(descriptor.isAutomatic());
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   141
        assertEquals(descriptor.name(), mn);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   142
        if (vs == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   143
            assertFalse(descriptor.version().isPresent());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   144
        } else {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   145
            assertEquals(descriptor.version().get().toString(), vs);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   146
        }
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   147
    }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   148
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   149
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   150
    /**
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   151
     * Test impossible mapping of JAR files to modules names
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   152
     */
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   153
    @Test(dataProvider = "badnames", expectedExceptions = FindException.class)
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   154
    public void testBadNames(String fn, String ignore) throws IOException {
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   155
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   156
        Path jf = dir.resolve(fn);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   157
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   158
        // create empty JAR file
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   159
        createDummyJarFile(jf);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   160
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   161
        // should throw FindException
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   162
        ModuleFinder.of(dir).findAll();
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   163
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   164
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   165
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   166
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   167
     * Test all packages are exported
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   168
     */
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   169
    public void testPackages() throws IOException {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   170
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   171
        createDummyJarFile(dir.resolve("m.jar"),
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   172
                           "p/C1.class", "p/C2.class", "q/C1.class");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   173
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   174
        ModuleFinder finder = ModuleFinder.of(dir);
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   175
        Optional<ModuleReference> mref = finder.find("m");
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   176
        assertTrue(mref.isPresent(), "m not found");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   177
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   178
        ModuleDescriptor descriptor = mref.get().descriptor();
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   179
        assertTrue(descriptor.isAutomatic());
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   180
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   181
        assertTrue(descriptor.packages().size() == 2);
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   182
        assertTrue(descriptor.packages().contains("p"));
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   183
        assertTrue(descriptor.packages().contains("q"));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   184
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   185
        assertTrue(descriptor.exports().isEmpty());
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   186
        assertTrue(descriptor.opens().isEmpty());
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   187
    }
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   188
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   189
    /**
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   190
     * Test class files in JAR file where the entry does not correspond to a
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   191
     * legal package name.
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   192
     */
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   193
    public void testBadPackage() throws IOException {
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   194
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   195
        createDummyJarFile(dir.resolve("m.jar"), "p/C1.class", "p-/C2.class");
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   196
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   197
        ModuleFinder finder = ModuleFinder.of(dir);
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   198
        Optional<ModuleReference> mref = finder.find("m");
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   199
        assertTrue(mref.isPresent(), "m not found");
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   200
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   201
        ModuleDescriptor descriptor = mref.get().descriptor();
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   202
        assertTrue(descriptor.isAutomatic());
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   203
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   204
        assertTrue(descriptor.packages().size() == 1);
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   205
        assertTrue(descriptor.packages().contains("p"));
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   206
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   207
        assertTrue(descriptor.exports().isEmpty());
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   208
        assertTrue(descriptor.opens().isEmpty());
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   209
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   210
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   211
    /**
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   212
     * Test non-class resources in a JAR file.
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   213
     */
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   214
    public void testNonClassResources() throws IOException {
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   215
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   216
        createDummyJarFile(dir.resolve("m.jar"),
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   217
                "LICENSE",
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   218
                "README",
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   219
                "WEB-INF/tags",
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   220
                "p/Type.class",
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   221
                "p/resources/m.properties");
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   222
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   223
        ModuleFinder finder = ModuleFinder.of(dir);
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   224
        Optional<ModuleReference> mref = finder.find("m");
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   225
        assertTrue(mref.isPresent(), "m not found");
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   226
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   227
        ModuleDescriptor descriptor = mref.get().descriptor();
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   228
        assertTrue(descriptor.isAutomatic());
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   229
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   230
        assertTrue(descriptor.packages().size() == 1);
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   231
        assertTrue(descriptor.packages().contains("p"));
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   232
    }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   233
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   234
    /**
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   235
     * Test .class file in unnamed package (top-level directory)
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   236
     */
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   237
    @Test(expectedExceptions = FindException.class)
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   238
    public void testClassInUnnamedPackage() throws IOException {
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   239
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   240
        createDummyJarFile(dir.resolve("m.jar"), "Mojo.class");
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   241
        ModuleFinder finder = ModuleFinder.of(dir);
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   242
        finder.findAll();
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   243
    }
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   244
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   245
    /**
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   246
     * Test JAR file with META-INF/services configuration file
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   247
     */
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   248
    public void testServicesConfiguration() throws IOException {
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   249
        String service = "p.S";
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   250
        String provider = "p.S1";
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   251
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   252
        Path tmpdir = Files.createTempDirectory(USER_DIR, "tmp");
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   253
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   254
        // provider class
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   255
        Path providerClass = tmpdir.resolve(provider.replace('.', '/') + ".class");
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   256
        Files.createDirectories(providerClass.getParent());
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   257
        Files.createFile(providerClass);
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   258
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   259
        // services configuration file
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   260
        Path services = tmpdir.resolve("META-INF").resolve("services");
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   261
        Files.createDirectories(services);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   262
        Files.write(services.resolve(service), Set.of(provider));
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   263
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   264
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   265
        JarUtils.createJarFile(dir.resolve("m.jar"), tmpdir);
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   266
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   267
        ModuleFinder finder = ModuleFinder.of(dir);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   268
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   269
        Optional<ModuleReference> mref = finder.find("m");
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   270
        assertTrue(mref.isPresent(), "m not found");
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   271
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   272
        ModuleDescriptor descriptor = mref.get().descriptor();
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   273
        assertTrue(descriptor.provides().size() == 1);
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   274
        ModuleDescriptor.Provides provides = descriptor.provides().iterator().next();
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   275
        assertEquals(provides.service(), service);
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   276
        assertTrue(provides.providers().size() == 1);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   277
        assertTrue(provides.providers().contains((provider)));
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   278
    }
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   279
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   280
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   281
    // META-INF/services files that don't map to legal service names
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   282
    @DataProvider(name = "badservices")
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   283
    public Object[][] createBadServices() {
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   284
        return new Object[][] {
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   285
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   286
                // service type         provider type
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   287
                { "-",                  "p.S1" },
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   288
                { ".S",                 "p.S1" },
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   289
        };
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   290
    }
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   291
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   292
    /**
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   293
     * Test JAR file with META-INF/services configuration file with bad
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   294
     * values or names.
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   295
     */
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   296
    @Test(dataProvider = "badservices")
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   297
    public void testBadServicesNames(String service, String provider)
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   298
        throws IOException
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   299
    {
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   300
        Path tmpdir = Files.createTempDirectory(USER_DIR, "tmp");
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   301
        Path services = tmpdir.resolve("META-INF").resolve("services");
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   302
        Files.createDirectories(services);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   303
        Files.write(services.resolve(service), Set.of(provider));
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   304
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   305
        JarUtils.createJarFile(dir.resolve("m.jar"), tmpdir);
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   306
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   307
        Optional<ModuleReference> omref = ModuleFinder.of(dir).find("m");
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   308
        assertTrue(omref.isPresent());
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   309
        ModuleDescriptor descriptor = omref.get().descriptor();
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   310
        assertTrue(descriptor.provides().isEmpty());
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   311
    }
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   312
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   313
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   314
    // META-INF/services configuration file entries that are not legal
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   315
    @DataProvider(name = "badproviders")
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   316
    public Object[][] createBadProviders() {
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   317
        return new Object[][] {
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   318
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   319
                // service type         provider type
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   320
                { "p.S",                "-" },
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   321
                { "p.S",                "p..S1" },
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   322
                { "p.S",                "S1." },
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   323
        };
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   324
    }
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   325
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   326
    /**
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   327
     * Test JAR file with META-INF/services configuration file with bad
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   328
     * values or names.
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   329
     */
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   330
    @Test(dataProvider = "badproviders", expectedExceptions = FindException.class)
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   331
    public void testBadProviderNames(String service, String provider)
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   332
        throws IOException
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   333
    {
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   334
        Path tmpdir = Files.createTempDirectory(USER_DIR, "tmp");
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   335
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   336
        // provider class
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   337
        Path providerClass = tmpdir.resolve(provider.replace('.', '/') + ".class");
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   338
        Files.createDirectories(providerClass.getParent());
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   339
        Files.createFile(providerClass);
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   340
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   341
        // services configuration file
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   342
        Path services = tmpdir.resolve("META-INF").resolve("services");
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   343
        Files.createDirectories(services);
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   344
        Files.write(services.resolve(service), Set.of(provider));
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   345
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   346
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   347
        JarUtils.createJarFile(dir.resolve("m.jar"), tmpdir);
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   348
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   349
        // should throw FindException
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   350
        ModuleFinder.of(dir).findAll();
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   351
    }
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   352
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   353
    /**
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   354
     * Test JAR file with META-INF/services configuration file listing a
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   355
     * provider that is not in the module.
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   356
     */
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   357
    @Test(expectedExceptions = FindException.class)
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   358
    public void testMissingProviderPackage() throws IOException {
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   359
        Path tmpdir = Files.createTempDirectory(USER_DIR, "tmp");
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   360
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   361
        // services configuration file
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   362
        Path services = tmpdir.resolve("META-INF").resolve("services");
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   363
        Files.createDirectories(services);
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   364
        Files.write(services.resolve("p.S"), Set.of("q.P"));
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   365
41817
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   366
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
b90ad1de93ea 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 39050
diff changeset
   367
        JarUtils.createJarFile(dir.resolve("m.jar"), tmpdir);
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   368
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   369
        // should throw FindException
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   370
        ModuleFinder.of(dir).findAll();
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   371
    }
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   372
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   373
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   374
    /**
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   375
     * Test that a JAR file with a Main-Class attribute results
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   376
     * in a module with a main class.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   377
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   378
    public void testMainClass() throws IOException {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   379
        String mainClass = "p.Main";
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   380
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   381
        Manifest man = new Manifest();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   382
        Attributes attrs = man.getMainAttributes();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   383
        attrs.put(Attributes.Name.MANIFEST_VERSION, "1.0.0");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   384
        attrs.put(Attributes.Name.MAIN_CLASS, mainClass);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   385
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   386
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   387
        String entry = mainClass.replace('.', '/') + ".class";
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   388
        createDummyJarFile(dir.resolve("m.jar"), man, entry);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   389
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   390
        ModuleFinder finder = ModuleFinder.of(dir);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   391
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   392
        Configuration parent = Layer.boot().configuration();
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   393
        Configuration cf = resolve(parent, finder, "m");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   394
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   395
        ModuleDescriptor descriptor = findDescriptor(cf, "m");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   396
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   397
        assertTrue(descriptor.mainClass().isPresent());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   398
        assertEquals(descriptor.mainClass().get(), mainClass);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   399
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   400
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   401
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   402
    // Main-Class files that do not map to a legal qualified type name
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   403
    @DataProvider(name = "badmainclass")
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   404
    public Object[][] createBadMainClass() {
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   405
        return new Object[][]{
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   406
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   407
            { "Main",        null },
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   408
            { "p..Main",     null },
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   409
            { "p-.Main",     null },
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   410
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   411
        };
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   412
    }
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   413
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   414
    /**
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   415
     * Test that a JAR file with a Main-Class attribute that is not a qualified
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   416
     * type name.
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   417
     */
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   418
    @Test(dataProvider = "badmainclass", expectedExceptions = FindException.class)
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   419
    public void testBadMainClass(String mainClass, String ignore) throws IOException {
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   420
        Manifest man = new Manifest();
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   421
        Attributes attrs = man.getMainAttributes();
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   422
        attrs.put(Attributes.Name.MANIFEST_VERSION, "1.0.0");
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   423
        attrs.put(Attributes.Name.MAIN_CLASS, mainClass);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   424
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   425
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   426
        String entry = mainClass.replace('.', '/') + ".class";
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   427
        createDummyJarFile(dir.resolve("m.jar"), man, entry);
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   428
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   429
        // should throw FindException
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   430
        ModuleFinder.of(dir).findAll();
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   431
    }
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   432
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   433
    /**
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   434
     * Test that a JAR file with a Main-Class attribute that is not in the module
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   435
     */
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   436
    @Test(expectedExceptions = FindException.class)
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   437
    public void testMissingMainClassPackage() throws IOException {
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   438
        Manifest man = new Manifest();
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   439
        Attributes attrs = man.getMainAttributes();
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   440
        attrs.put(Attributes.Name.MANIFEST_VERSION, "1.0.0");
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   441
        attrs.put(Attributes.Name.MAIN_CLASS, "p.Main");
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   442
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   443
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   444
        createDummyJarFile(dir.resolve("m.jar"), man);
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   445
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   446
        // should throw FindException
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   447
        ModuleFinder.of(dir).findAll();
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   448
    }
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   449
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   450
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   451
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   452
     * Basic test of a configuration created with automatic modules.
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   453
     *   a requires b*
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   454
     *   a requires c*
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   455
     *   b*
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   456
     *   c*
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   457
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   458
    public void testConfiguration1() throws Exception {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   459
        ModuleDescriptor descriptor1
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   460
            = ModuleDescriptor.newModule("a")
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   461
                .requires("b")
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   462
                .requires("c")
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   463
                .requires("java.base")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   464
                .build();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   465
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   466
        // b and c are automatic modules
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   467
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   468
        createDummyJarFile(dir.resolve("b.jar"), "p/T.class");
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   469
        createDummyJarFile(dir.resolve("c.jar"), "q/T.class");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   470
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   471
        // module finder locates a and the modules in the directory
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   472
        ModuleFinder finder
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   473
            = ModuleFinder.compose(ModuleUtils.finderOf(descriptor1),
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   474
                ModuleFinder.of(dir));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   475
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   476
        Configuration parent = Layer.boot().configuration();
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   477
        Configuration cf = resolve(parent, finder, "a");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   478
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   479
        assertTrue(cf.modules().size() == 3);
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   480
        assertTrue(cf.findModule("a").isPresent());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   481
        assertTrue(cf.findModule("b").isPresent());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   482
        assertTrue(cf.findModule("c").isPresent());
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   483
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   484
        ResolvedModule base = cf.findModule("java.base").get();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   485
        assertTrue(base.configuration() == Layer.boot().configuration());
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   486
        ResolvedModule a = cf.findModule("a").get();
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   487
        ResolvedModule b = cf.findModule("b").get();
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   488
        ResolvedModule c = cf.findModule("c").get();
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   489
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   490
        // b && c only require java.base
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   491
        assertTrue(b.reference().descriptor().requires().size() == 1);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   492
        assertTrue(c.reference().descriptor().requires().size() == 1);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   493
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   494
        // readability
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   495
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   496
        assertTrue(a.reads().size() == 3);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   497
        assertTrue(a.reads().contains(base));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   498
        assertTrue(a.reads().contains(b));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   499
        assertTrue(a.reads().contains(c));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   500
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   501
        assertTrue(b.reads().contains(a));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   502
        assertTrue(b.reads().contains(c));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   503
        testReadAllBootModules(cf, "b");  // b reads all modules in boot layer
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   504
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   505
        assertTrue(c.reads().contains(a));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   506
        assertTrue(c.reads().contains(b));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   507
        testReadAllBootModules(cf, "c");  // c reads all modules in boot layer
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   508
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   509
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   510
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   511
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   512
     * Basic test of a configuration created with automatic modules
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   513
     *   a requires b
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   514
     *   b requires c*
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   515
     *   c*
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   516
     *   d*
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   517
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   518
    public void testInConfiguration2() throws IOException {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   519
        ModuleDescriptor descriptor1
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   520
            = ModuleDescriptor.newModule("a")
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   521
                .requires("b")
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   522
                .requires("java.base")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   523
                .build();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   524
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   525
        ModuleDescriptor descriptor2
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   526
            = ModuleDescriptor.newModule("b")
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   527
                .requires("c")
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   528
                .requires("java.base")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   529
                .build();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   530
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   531
        // c and d are automatic modules
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   532
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   533
        createDummyJarFile(dir.resolve("c.jar"), "p/T.class");
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   534
        createDummyJarFile(dir.resolve("d.jar"), "q/T.class");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   535
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   536
        // module finder locates a and the modules in the directory
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   537
        ModuleFinder finder
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   538
            = ModuleFinder.compose(ModuleUtils.finderOf(descriptor1, descriptor2),
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   539
                                   ModuleFinder.of(dir));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   540
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   541
        Configuration parent = Layer.boot().configuration();
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   542
        Configuration cf = resolve(parent, finder, "a", "d");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   543
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   544
        assertTrue(cf.modules().size() == 4);
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   545
        assertTrue(cf.findModule("a").isPresent());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   546
        assertTrue(cf.findModule("b").isPresent());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   547
        assertTrue(cf.findModule("c").isPresent());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   548
        assertTrue(cf.findModule("d").isPresent());
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   549
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   550
        // c && d should only require java.base
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   551
        assertTrue(findDescriptor(cf, "c").requires().size() == 1);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   552
        assertTrue(findDescriptor(cf, "d").requires().size() == 1);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   553
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   554
        // readability
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   555
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   556
        ResolvedModule base = cf.findModule("java.base").get();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   557
        assertTrue(base.configuration() == Layer.boot().configuration());
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   558
        ResolvedModule a = cf.findModule("a").get();
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   559
        ResolvedModule b = cf.findModule("b").get();
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   560
        ResolvedModule c = cf.findModule("c").get();
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   561
        ResolvedModule d = cf.findModule("d").get();
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   562
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   563
        assertTrue(a.reads().size() == 2);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   564
        assertTrue(a.reads().contains(b));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   565
        assertTrue(a.reads().contains(base));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   566
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   567
        assertTrue(b.reads().size() == 3);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   568
        assertTrue(b.reads().contains(c));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   569
        assertTrue(b.reads().contains(d));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   570
        assertTrue(b.reads().contains(base));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   571
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   572
        assertTrue(c.reads().contains(a));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   573
        assertTrue(c.reads().contains(b));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   574
        assertTrue(c.reads().contains(d));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   575
        testReadAllBootModules(cf, "c");   // c reads all modules in boot layer
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   576
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   577
        assertTrue(d.reads().contains(a));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   578
        assertTrue(d.reads().contains(b));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   579
        assertTrue(d.reads().contains(c));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   580
        testReadAllBootModules(cf, "d");    // d reads all modules in boot layer
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   581
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   582
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   583
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   584
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   585
     * Basic test of a configuration created with automatic modules
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   586
     *   a requires b
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   587
     *   b requires transitive c*
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   588
     *   c*
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   589
     *   d*
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   590
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   591
    public void testInConfiguration3() throws IOException {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   592
        ModuleDescriptor descriptor1
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   593
            = ModuleDescriptor.newModule("a")
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   594
                .requires("b")
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   595
                .requires("java.base")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   596
                .build();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   597
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   598
        ModuleDescriptor descriptor2
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   599
            = ModuleDescriptor.newModule("b")
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   600
                .requires(Set.of(Modifier.TRANSITIVE), "c")
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   601
                .requires("java.base")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   602
                .build();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   603
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   604
        // c and d are automatic modules
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   605
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   606
        createDummyJarFile(dir.resolve("c.jar"), "p/T.class");
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   607
        createDummyJarFile(dir.resolve("d.jar"), "q/T.class");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   608
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   609
        // module finder locates a and the modules in the directory
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   610
        ModuleFinder finder
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   611
            = ModuleFinder.compose(ModuleUtils.finderOf(descriptor1, descriptor2),
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   612
                ModuleFinder.of(dir));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   613
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   614
        Configuration parent = Layer.boot().configuration();
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   615
        Configuration cf = resolve(parent, finder, "a", "d");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   616
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   617
        assertTrue(cf.modules().size() == 4);
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   618
        assertTrue(cf.findModule("a").isPresent());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   619
        assertTrue(cf.findModule("b").isPresent());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   620
        assertTrue(cf.findModule("c").isPresent());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   621
        assertTrue(cf.findModule("d").isPresent());
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   622
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   623
        ResolvedModule base = cf.findModule("java.base").get();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   624
        assertTrue(base.configuration() == Layer.boot().configuration());
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   625
        ResolvedModule a = cf.findModule("a").get();
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   626
        ResolvedModule b = cf.findModule("b").get();
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   627
        ResolvedModule c = cf.findModule("c").get();
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   628
        ResolvedModule d = cf.findModule("d").get();
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   629
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   630
        // c && d should only require java.base
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   631
        assertTrue(findDescriptor(cf, "c").requires().size() == 1);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   632
        assertTrue(findDescriptor(cf, "d").requires().size() == 1);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   633
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   634
        // readability
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   635
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   636
        assertTrue(a.reads().size() == 4);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   637
        assertTrue(a.reads().contains(b));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   638
        assertTrue(a.reads().contains(c));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   639
        assertTrue(a.reads().contains(d));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   640
        assertTrue(a.reads().contains(base));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   641
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   642
        assertTrue(b.reads().size() == 3);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   643
        assertTrue(b.reads().contains(c));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   644
        assertTrue(b.reads().contains(d));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   645
        assertTrue(b.reads().contains(base));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   646
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   647
        assertTrue(reads(cf, "b", "c"));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   648
        assertTrue(reads(cf, "b", "d"));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   649
        assertTrue(reads(cf, "b", "java.base"));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   650
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   651
        assertTrue(c.reads().contains(a));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   652
        assertTrue(c.reads().contains(b));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   653
        assertTrue(c.reads().contains(d));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   654
        testReadAllBootModules(cf, "c");   // c reads all modules in boot layer
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   655
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   656
        assertTrue(d.reads().contains(a));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   657
        assertTrue(d.reads().contains(b));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   658
        assertTrue(d.reads().contains(c));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   659
        testReadAllBootModules(cf, "d");    // d reads all modules in boot layer
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   660
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   661
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   662
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   663
    /**
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   664
     * Basic test of a configuration created with automatic modules
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   665
     *   a requires b* and c*
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   666
     *   b* contains p
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   667
     *   c* contains p
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   668
     */
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   669
    @Test(expectedExceptions = { ResolutionException.class })
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   670
    public void testDuplicateSuppliers1() throws IOException {
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   671
        ModuleDescriptor descriptor
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   672
            = ModuleDescriptor.newModule("a")
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   673
                .requires("b")
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   674
                .requires("c")
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   675
                .build();
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   676
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   677
        // c and d are automatic modules with the same package
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   678
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   679
        createDummyJarFile(dir.resolve("b.jar"), "p/T.class");
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   680
        createDummyJarFile(dir.resolve("c.jar"), "p/T.class");
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   681
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   682
        // module finder locates 'a' and the modules in the directory
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   683
        ModuleFinder finder
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   684
            = ModuleFinder.compose(ModuleUtils.finderOf(descriptor),
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   685
                                   ModuleFinder.of(dir));
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   686
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   687
        Configuration parent = Layer.boot().configuration();
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   688
        resolve(parent, finder, "a");
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   689
    }
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   690
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   691
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   692
    /**
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   693
     * Basic test of a configuration created with automatic modules
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   694
     *   a contains p, requires b*
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   695
     *   b* contains p
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   696
     */
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   697
    @Test(expectedExceptions = { ResolutionException.class })
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   698
    public void testDuplicateSuppliers2() throws IOException {
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   699
        ModuleDescriptor descriptor
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   700
            = ModuleDescriptor.newModule("a")
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   701
                .packages(Set.of("p"))
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   702
                .requires("b")
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   703
                .build();
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   704
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   705
        // c and d are automatic modules with the same package
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   706
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   707
        createDummyJarFile(dir.resolve("b.jar"), "p/T.class");
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   708
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   709
        // module finder locates 'a' and the modules in the directory
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   710
        ModuleFinder finder
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   711
            = ModuleFinder.compose(ModuleUtils.finderOf(descriptor),
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   712
                                   ModuleFinder.of(dir));
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   713
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   714
        Configuration parent = Layer.boot().configuration();
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   715
        resolve(parent, finder, "a");
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   716
    }
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   717
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   718
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   719
    /**
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   720
     * Basic test of Layer containing automatic modules
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   721
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   722
    public void testInLayer() throws IOException {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   723
        ModuleDescriptor descriptor
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   724
            = ModuleDescriptor.newModule("a")
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   725
                .requires("b")
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   726
                .requires("c")
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   727
                .build();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   728
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   729
        // b and c are simple JAR files
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   730
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   731
        createDummyJarFile(dir.resolve("b.jar"), "p/T.class");
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   732
        createDummyJarFile(dir.resolve("c.jar"), "q/T2.class");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   733
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   734
        // module finder locates a and the modules in the directory
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   735
        ModuleFinder finder
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   736
            = ModuleFinder.compose(ModuleUtils.finderOf(descriptor),
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   737
                ModuleFinder.of(dir));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   738
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   739
        Configuration parent = Layer.boot().configuration();
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   740
        Configuration cf = resolve(parent, finder, "a");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   741
        assertTrue(cf.modules().size() == 3);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   742
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   743
        // each module gets its own loader
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   744
        Layer layer = Layer.boot().defineModules(cf, mn -> new ClassLoader() { });
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   745
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   746
        // an unnamed module
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   747
        Module unnamed = (new ClassLoader() { }).getUnnamedModule();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   748
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   749
        Module b = layer.findModule("b").get();
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   750
        assertTrue(b.isNamed());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   751
        assertTrue(b.canRead(unnamed));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   752
        testsReadsAll(b, layer);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   753
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   754
        Module c = layer.findModule("c").get();
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   755
        assertTrue(c.isNamed());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   756
        assertTrue(b.canRead(unnamed));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   757
        testsReadsAll(c, layer);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   758
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   759
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   760
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   761
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   762
     * Test miscellaneous methods.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   763
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   764
    public void testMisc() throws IOException {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   765
        Path dir = Files.createTempDirectory(USER_DIR, "mods");
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   766
        Path m_jar = createDummyJarFile(dir.resolve("m.jar"), "p/T.class");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   767
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   768
        ModuleFinder finder = ModuleFinder.of(m_jar);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   769
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   770
        assertTrue(finder.find("m").isPresent());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   771
        ModuleDescriptor m = finder.find("m").get().descriptor();
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   772
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   773
        // test miscellaneous methods
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   774
        assertTrue(m.isAutomatic());
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   775
        assertFalse(m.modifiers().contains(ModuleDescriptor.Modifier.SYNTHETIC));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   776
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   777
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   778
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   779
    /**
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   780
     * Invokes parent.resolve to resolve the given root modules.
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   781
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   782
    static Configuration resolve(Configuration parent,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   783
                                 ModuleFinder finder,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   784
                                 String... roots) {
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 42338
diff changeset
   785
        return parent.resolve(finder, ModuleFinder.of(), Set.of(roots));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   786
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   787
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   788
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   789
     * Finds a module in the given configuration or its parents, returning
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   790
     * the module descriptor (or null if not found)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   791
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   792
    static ModuleDescriptor findDescriptor(Configuration cf, String name) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   793
        Optional<ResolvedModule> om = cf.findModule(name);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   794
        if (om.isPresent()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   795
            return om.get().reference().descriptor();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   796
        } else {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   797
            return null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   798
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   799
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   800
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   801
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   802
     * Test that a module in a configuration reads all modules in the boot
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   803
     * configuration.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   804
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   805
    static void testReadAllBootModules(Configuration cf, String mn) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   806
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   807
        Set<String> bootModules = Layer.boot().modules().stream()
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   808
                .map(Module::getName)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   809
                .collect(Collectors.toSet());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   810
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   811
        bootModules.forEach(other -> assertTrue(reads(cf, mn, other)));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   812
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   813
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   814
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   815
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   816
     * Test that the given Module reads all module in the given Layer
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   817
     * and its parent Layers.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   818
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   819
    static void testsReadsAll(Module m, Layer layer) {
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   820
        // check that m reads all modules in the layer
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   821
        layer.configuration().modules().stream()
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   822
            .map(ResolvedModule::name)
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   823
            .map(layer::findModule)
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   824
            .map(Optional::get)
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   825
            .forEach(other -> assertTrue(m.canRead(other)));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   826
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   827
        // also check parent layers
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   828
        layer.parents().forEach(l -> testsReadsAll(m, l));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   829
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   830
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   831
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   832
     * Returns {@code true} if the configuration contains module mn1
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   833
     * that reads module mn2.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   834
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   835
    static boolean reads(Configuration cf, String mn1, String mn2) {
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   836
        Optional<ResolvedModule> om = cf.findModule(mn1);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   837
        if (!om.isPresent())
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   838
            return false;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   839
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   840
        return om.get().reads().stream()
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   841
                .map(ResolvedModule::name)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   842
                .anyMatch(mn2::equals);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   843
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   844
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   845
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   846
     * Creates a JAR file, optionally with a manifest, and with the given
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   847
     * entries. The entries will be empty in the resulting JAR file.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   848
     */
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   849
    static Path createDummyJarFile(Path jarfile, Manifest man, String... entries)
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   850
        throws IOException
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   851
    {
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   852
        Path dir = Files.createTempDirectory(USER_DIR, "tmp");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   853
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   854
        for (String entry : entries) {
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   855
            Path file = dir.resolve(entry);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   856
            Path parent = file.getParent();
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   857
            if (parent != null)
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   858
                Files.createDirectories(parent);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   859
            Files.createFile(file);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   860
        }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   861
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   862
        Path[] paths = Stream.of(entries).map(Paths::get).toArray(Path[]::new);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   863
        JarUtils.createJarFile(jarfile, man, dir, paths);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   864
        return jarfile;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   865
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   866
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   867
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   868
     * Creates a JAR file and with the given entries. The entries will be empty
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   869
     * in the resulting JAR file.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   870
     */
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   871
    static Path createDummyJarFile(Path jarfile, String... entries)
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41817
diff changeset
   872
            throws IOException
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   873
    {
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 38457
diff changeset
   874
        return createDummyJarFile(jarfile, null, entries);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   875
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   876
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   877
}