archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8007490: NPE from DocumentationTool.run

Browse source 
Reviewed-by: darcy
This commit is contained in:
Jonathan Gibbons 2013-02-04 15:30:10 -08:00
parent a4a897ce52
commit 4d8014cefa
2 changed files with 51 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
langtools/src/share/classes/com/sun/tools/javadoc/api/JavadocTool.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -139,8 +139,8 @@ public class JavadocTool implements DocumentationTool {
@Override @Override
public int run(InputStream in, OutputStream out, OutputStream err, String... arguments) { public int run(InputStream in, OutputStream out, OutputStream err, String... arguments) {
PrintWriter err_pw = new PrintWriter(err, true); PrintWriter err_pw = new PrintWriter(err == null ? System.err : err, true);
PrintWriter out_pw = new PrintWriter(out); PrintWriter out_pw = new PrintWriter(out == null ? System.out : out);
try { try {
String standardDocletName = "com.sun.tools.doclets.standard.Standard"; String standardDocletName = "com.sun.tools.doclets.standard.Standard";
return com.sun.tools.javadoc.Main.execute( return com.sun.tools.javadoc.Main.execute(

52
langtools/test/tools/javadoc/api/basic/RunTest.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 6493690 * @bug 6493690 8007490
* @summary javadoc should have a javax.tools.Tool service provider * @summary javadoc should have a javax.tools.Tool service provider
* @build APITest * @build APITest
* @run main RunTest * @run main RunTest
@ -31,6 +31,7 @@
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.PrintStream;
import javax.tools.DocumentationTool; import javax.tools.DocumentationTool;
import javax.tools.ToolProvider; import javax.tools.ToolProvider;
@ -46,7 +47,7 @@ public class RunTest extends APITest {
* Verify that run method can be invoked. * Verify that run method can be invoked.
*/ */
@Test @Test
public void testRun() throws Exception { public void testRunOK() throws Exception {
File testSrc = new File(System.getProperty("test.src")); File testSrc = new File(System.getProperty("test.src"));
File srcFile = new File(testSrc, "pkg/C.java"); File srcFile = new File(testSrc, "pkg/C.java");
File outDir = getOutDir(); File outDir = getOutDir();
@ -77,7 +78,7 @@ public class RunTest extends APITest {
* Verify that run method can be invoked. * Verify that run method can be invoked.
*/ */
@Test @Test
public void testRun2() throws Exception { public void testRunFail() throws Exception {
File outDir = getOutDir(); File outDir = getOutDir();
String badfile = "badfile.java"; String badfile = "badfile.java";
String[] args = { "-d", outDir.getPath(), badfile }; String[] args = { "-d", outDir.getPath(), badfile };
@ -100,5 +101,48 @@ public class RunTest extends APITest {
} }
} }
/**
* Verify that null args are accepted.
*/
@Test
public void testNullArgs() throws Exception {
File testSrc = new File(System.getProperty("test.src"));
File srcFile = new File(testSrc, "pkg/C.java");
File outDir = getOutDir();
String[] args = { "-d", outDir.getPath(), srcFile.getPath() };
ByteArrayOutputStream stdout = new ByteArrayOutputStream();
PrintStream prevStdout = System.out;
System.setOut(new PrintStream(stdout));
ByteArrayOutputStream stderr = new ByteArrayOutputStream();
PrintStream prevStderr = System.err;
System.setErr(new PrintStream(stderr));
int rc ;
try {
DocumentationTool tool = ToolProvider.getSystemDocumentationTool();
rc = tool.run(null, null, null, args);
} finally {
System.setOut(prevStdout);
System.setErr(prevStderr);
}
System.err.println("stdout >>" + stdout.toString() + "<<");
System.err.println("stderr >>" + stderr.toString() + "<<");
if (rc == 0) {
System.err.println("call succeeded");
checkFiles(outDir, standardExpectFiles);
String out = stdout.toString();
for (String f: standardExpectFiles) {
String f1 = f.replace('/', File.separatorChar);
if (f1.endsWith(".html") && !out.contains(f1))
error("expected string not found: " + f1);
}
} else {
error("call failed");
}
}
} }