equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 2013, 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. |
21 * questions. |
21 * questions. |
22 */ |
22 */ |
23 |
23 |
24 /** |
24 /** |
25 * @test |
25 * @test |
26 * @modules java.base/jdk.internal.module |
26 * @modules java.base/jdk.internal.access |
27 * java.base/jdk.internal.misc |
27 * java.base/jdk.internal.module |
28 * @run testng ModuleDescriptorTest |
28 * @run testng ModuleDescriptorTest |
29 * @summary Basic test for java.lang.module.ModuleDescriptor and its builder |
29 * @summary Basic test for java.lang.module.ModuleDescriptor and its builder |
30 */ |
30 */ |
31 |
31 |
32 import java.io.ByteArrayOutputStream; |
32 import java.io.ByteArrayOutputStream; |
47 import java.util.EnumSet; |
47 import java.util.EnumSet; |
48 import java.util.HashSet; |
48 import java.util.HashSet; |
49 import java.util.Iterator; |
49 import java.util.Iterator; |
50 import java.util.List; |
50 import java.util.List; |
51 import java.util.Objects; |
51 import java.util.Objects; |
52 import java.util.Optional; |
|
53 import java.util.Set; |
52 import java.util.Set; |
54 import java.util.stream.Collectors; |
53 import java.util.stream.Collectors; |
55 |
54 |
56 import static java.lang.module.ModuleDescriptor.Requires.Modifier.*; |
55 import static java.lang.module.ModuleDescriptor.Requires.Modifier.*; |
57 |
56 |
58 import jdk.internal.misc.JavaLangModuleAccess; |
57 import jdk.internal.access.JavaLangModuleAccess; |
59 import jdk.internal.misc.SharedSecrets; |
58 import jdk.internal.access.SharedSecrets; |
60 import jdk.internal.module.ModuleInfoWriter; |
59 import jdk.internal.module.ModuleInfoWriter; |
61 import org.testng.annotations.DataProvider; |
60 import org.testng.annotations.DataProvider; |
62 import org.testng.annotations.Test; |
61 import org.testng.annotations.Test; |
63 import static org.testng.Assert.*; |
62 import static org.testng.Assert.*; |
64 |
63 |