equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. |
7 * published by the Free Software Foundation. |
22 */ |
22 */ |
23 |
23 |
24 /** |
24 /** |
25 * @test |
25 * @test |
26 * @library /test/lib |
26 * @library /test/lib |
27 * @modules java.base/jdk.internal.misc |
27 * @modules java.base/jdk.internal.access |
28 * @build BasicLayerTest |
28 * @build BasicLayerTest |
29 * jdk.test.lib.util.ModuleUtils |
29 * jdk.test.lib.util.ModuleUtils |
30 * @compile layertest/Test.java |
30 * @compile layertest/Test.java |
31 * @run testng BasicLayerTest |
31 * @run testng BasicLayerTest |
32 * @summary Basic tests for java.lang.ModuleLayer |
32 * @summary Basic tests for java.lang.ModuleLayer |
36 import java.lang.module.ModuleDescriptor; |
36 import java.lang.module.ModuleDescriptor; |
37 import java.lang.module.ModuleDescriptor.Requires; |
37 import java.lang.module.ModuleDescriptor.Requires; |
38 import java.lang.module.ModuleFinder; |
38 import java.lang.module.ModuleFinder; |
39 import java.util.HashMap; |
39 import java.util.HashMap; |
40 import java.util.Map; |
40 import java.util.Map; |
41 import java.util.Optional; |
|
42 import java.util.Set; |
41 import java.util.Set; |
43 import java.util.stream.Collectors; |
42 import java.util.stream.Collectors; |
44 |
43 |
45 import jdk.test.lib.util.ModuleUtils; |
44 import jdk.test.lib.util.ModuleUtils; |
46 |
45 |
47 import jdk.internal.misc.SharedSecrets; |
46 import jdk.internal.access.SharedSecrets; |
48 |
47 |
49 import org.testng.annotations.DataProvider; |
48 import org.testng.annotations.DataProvider; |
50 import org.testng.annotations.Test; |
49 import org.testng.annotations.Test; |
51 import static org.testng.Assert.*; |
50 import static org.testng.Assert.*; |
52 |
51 |