8181878: javadoc should support/ignore --add-opens

Reviewed-by: ksrini
This commit is contained in:
Jonathan Gibbons 2018-01-11 15:38:57 -08:00
parent 1b558514ff
commit f811ca50b3
4 changed files with 168 additions and 1 deletions
src/jdk.javadoc/share/classes
com/sun/tools/javadoc/main
jdk/javadoc/internal/tool
test/langtools
jdk/javadoc/tool
tools/javadoc

@ -212,6 +212,13 @@ public enum ToolOption {
}
},
ADD_OPENS("--add-opens", true) {
@Override
public void process(Helper helper, String arg) throws InvalidValueException {
Option.ADD_OPENS.process(helper.getOptionHelper(), opt, arg);
}
},
// ----- doclet options -----
DOCLET("-doclet", true), // handled in setDocletInvoker

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -189,6 +189,13 @@ public enum ToolOption {
}
},
ADD_OPENS("--add-opens", HIDDEN, true) {
@Override
public void process(Helper helper, String arg) throws InvalidValueException {
Option.ADD_OPENS.process(helper.getOptionHelper(), primaryName, arg);
}
},
// ----- doclet options -----
DOCLET("-doclet", STANDARD, true), // handled in setDocletInvoker

@ -0,0 +1,76 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8181878
* @summary javadoc should support/ignore --add-opens
* @modules jdk.compiler/com.sun.tools.javac.api
* @modules jdk.compiler/com.sun.tools.javac.main
* @modules jdk.javadoc/jdk.javadoc.internal.api
* @modules jdk.javadoc/jdk.javadoc.internal.tool
* @library /tools/lib
* @build toolbox.JavacTask toolbox.JavadocTask toolbox.TestRunner toolbox.ToolBox
* @run main AddOpensTest
*/
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.nio.file.Paths;
import toolbox.JavadocTask;
import toolbox.Task;
import toolbox.TestRunner;
import toolbox.ToolBox;
public class AddOpensTest extends TestRunner {
public static void main(String... args) throws Exception {
AddOpensTest t = new AddOpensTest();
t.runTests();
}
private final ToolBox tb = new ToolBox();
private final Path src = Paths.get("src");
private final Path api = Paths.get("api");
AddOpensTest() throws Exception {
super(System.err);
init();
}
void init() throws IOException {
tb.writeJavaFiles(src, "public class C { }");
}
@Test
public void testEncoding() {
Task.Result result = new JavadocTask(tb, Task.Mode.EXEC)
.options("-d", api.toString(),
"--add-opens", "some.module")
.files(src.resolve("C.java"))
.run(Task.Expect.SUCCESS)
.writeAll();
}
}

@ -0,0 +1,77 @@
/*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8181878
* @summary javadoc should support/ignore --add-opens
* @modules jdk.compiler/com.sun.tools.javac.api
* @modules jdk.compiler/com.sun.tools.javac.main
* @modules jdk.javadoc/jdk.javadoc.internal.api
* @modules jdk.javadoc/jdk.javadoc.internal.tool
* @library /tools/lib /tools/javadoc/lib
* @build toolbox.JavacTask toolbox.JavadocTask toolbox.TestRunner toolbox.ToolBox ToyDoclet
* @run main AddOpensTest
*/
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.nio.file.Paths;
import toolbox.JavadocTask;
import toolbox.Task;
import toolbox.TestRunner;
import toolbox.ToolBox;
public class AddOpensTest extends TestRunner {
public static void main(String... args) throws Exception {
AddOpensTest t = new AddOpensTest();
t.runTests();
}
private final ToolBox tb = new ToolBox();
private final Path src = Paths.get("src");
private final Path api = Paths.get("api");
AddOpensTest() throws Exception {
super(System.err);
init();
}
void init() throws IOException {
tb.writeJavaFiles(src, "public class C { }");
}
@Test
public void testEncoding() {
Task.Result result = new JavadocTask(tb, Task.Mode.EXEC)
.options("-docletpath", System.getProperty("test.class.path"),
"-doclet", "ToyDoclet",
"--add-opens", "some.module")
.files(src.resolve("C.java"))
.run(Task.Expect.SUCCESS)
.writeAll();
}
}