mirror of
https://github.com/openjdk/jdk.git
synced 2026-03-16 10:53:31 +00:00
8249899: jdk/javadoc/tool/InlineTagsWithBraces.java uses @ignore w/o bug-id
8249897: jdk/javadoc/tool/LangVers.java uses @ignore w/o bug-id 8249898: jdk/javadoc/tool/6176978/T6176978.java uses @ignore w/o bug-id Reviewed-by: hannesw
This commit is contained in:
parent
7d7bdbe135
commit
69d01b6bca
@ -1,81 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2008, 2015, 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 6176978
|
||||
* @summary current Javadoc's invocation and extension (Doclet) mechanisms are problematic
|
||||
* @modules jdk.javadoc
|
||||
* @ignore no longer applicable, should delete
|
||||
* @build T6176978
|
||||
* @run main T6176978
|
||||
*/
|
||||
|
||||
import java.io.*;
|
||||
import java.net.*;
|
||||
|
||||
public class T6176978
|
||||
{
|
||||
public static void main(String[] args) throws Exception {
|
||||
// create and use a temp dir that will not be on jtreg's
|
||||
// default class path
|
||||
File tmpDir = new File("tmp");
|
||||
tmpDir.mkdirs();
|
||||
|
||||
File testSrc = new File(System.getProperty("test.src", "."));
|
||||
String[] javac_args = {
|
||||
"-d",
|
||||
"tmp",
|
||||
new File(testSrc, "X.java").getPath()
|
||||
};
|
||||
|
||||
int rc = com.sun.tools.javac.Main.compile(javac_args);
|
||||
if (rc != 0)
|
||||
throw new Error("javac exit code: " + rc);
|
||||
|
||||
String[] jdoc_args = {
|
||||
"-doclet",
|
||||
"X",
|
||||
new File(testSrc, "T6176978.java").getPath()
|
||||
};
|
||||
|
||||
rc = jdk.javadoc.internal.tool.Main.execute(jdoc_args);
|
||||
if (rc == 0)
|
||||
throw new Error("javadoc unexpectedly succeeded");
|
||||
|
||||
|
||||
|
||||
Thread currThread = Thread.currentThread();
|
||||
ClassLoader saveClassLoader = currThread.getContextClassLoader();
|
||||
URLClassLoader urlCL = new URLClassLoader(new URL[] { tmpDir.toURL() });
|
||||
currThread.setContextClassLoader(urlCL);
|
||||
|
||||
try {
|
||||
rc = jdk.javadoc.internal.tool.Main.execute(jdoc_args);
|
||||
if (rc != 0)
|
||||
throw new Error("javadoc exit: " + rc);
|
||||
} finally {
|
||||
currThread.setContextClassLoader(saveClassLoader);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,44 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2008, 2015, 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.
|
||||
*/
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
|
||||
import jdk.javadoc.doclet.Doclet;
|
||||
import jdk.javadoc.doclet.Reporter;
|
||||
import jdk.javadoc.doclet.DocletEnvironment;
|
||||
|
||||
public class X {
|
||||
public static boolean run(DocletEnvironment root) {
|
||||
System.out.println("X.start");
|
||||
return true;
|
||||
}
|
||||
public Set<Doclet.Option> getSupportedOptions() {
|
||||
return Collections.emptySet();
|
||||
}
|
||||
|
||||
public void init(Locale locale, Reporter reporter) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
@ -1,112 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2003, 2016, 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 4965490
|
||||
* @summary Verify that matching braces can appear within inline tags.
|
||||
* @ignore API, re-evaluate @bold, @maybe causes doclint to throw up.
|
||||
* @modules jdk.javadoc
|
||||
*/
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.lang.model.SourceVersion;
|
||||
import javax.lang.model.element.TypeElement;
|
||||
|
||||
import com.sun.source.doctree.DocCommentTree;
|
||||
import com.sun.source.doctree.DocTree;
|
||||
import com.sun.source.util.DocTrees;
|
||||
import jdk.javadoc.doclet.Doclet;
|
||||
import jdk.javadoc.doclet.DocletEnvironment;
|
||||
|
||||
/**
|
||||
* This is a {@code test} comment.
|
||||
* It is {@bold {@underline only} a test}.
|
||||
* We would like some code
|
||||
* {@code for (int i : nums) { doit(i); } return; }
|
||||
* to be embedded {@maybe {even {a couple {of levels}}} deep}.
|
||||
*/
|
||||
public class InlineTagsWithBraces implements Doclet {
|
||||
|
||||
private static String[] expectedTags = {
|
||||
"Text", "@code", "Text",
|
||||
"@bold", "Text", "@code", "Text",
|
||||
"@maybe", "Text"
|
||||
};
|
||||
private static String[] expectedText = {
|
||||
"This is a ", "test", " comment.\n" +
|
||||
" It is ", "{@underline only} a test", ".\n" +
|
||||
" We would like some code\n" +
|
||||
" ", "for (int i : nums) { doit(i); } return; ", "\n" +
|
||||
" to be embedded ", "{even {a couple {of levels}}} deep", "."
|
||||
};
|
||||
|
||||
public static void main(String[] args) {
|
||||
String thisFile = "" +
|
||||
new File(System.getProperty("test.src", "."), "InlineTagsWithBraces.java");
|
||||
|
||||
String[] argarray = {
|
||||
"InlineTagsWithBraces",
|
||||
"-Xwerror",
|
||||
thisFile
|
||||
};
|
||||
if (jdk.javadoc.internal.tool.Main.execute(argarray) != 0)
|
||||
throw new Error("Javadoc encountered warnings or errors.");
|
||||
}
|
||||
|
||||
public boolean run(DocletEnvironment root) {
|
||||
DocTrees trees = root.getDocTrees();
|
||||
TypeElement cd = ElementFilter.typesIn(root.getIncludedElements()).iterator().next();
|
||||
DocCommentTree docCommentTree = trees.getDocCommentTree(cd);
|
||||
List<? extends DocTree> tags = docCommentTree.getBody();
|
||||
|
||||
for (int i = 0; i < tags.size(); i++) {
|
||||
System.out.println(tags.get(0).getKind());
|
||||
// if (!tags[i].name().equals(expectedTags[i]) ||
|
||||
// !tags[i].text().equals(expectedText[i])) {
|
||||
// throw new Error("Tag \"" + tags[i] + "\" not as expected");
|
||||
// }
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return "Test";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<Option> getSupportedOptions() {
|
||||
return Collections.emptySet();
|
||||
}
|
||||
|
||||
@Override
|
||||
public SourceVersion getSupportedSourceVersion() {
|
||||
return SourceVersion.latest();
|
||||
}
|
||||
}
|
||||
@ -1,96 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2003, 2015, 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 4909767
|
||||
* @summary Verify that omitting Doclet.languageVersion() hides 1.5 language
|
||||
* features from the doclet.
|
||||
* @ignore API, re-evaluate, unsure of this test.
|
||||
* @modules jdk.javadoc
|
||||
*/
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.lang.model.SourceVersion;
|
||||
|
||||
import jdk.javadoc.doclet.Doclet;
|
||||
import jdk.javadoc.doclet.DocletEnvironment;
|
||||
|
||||
public class LangVers implements Doclet {
|
||||
|
||||
public static void main(String[] args) {
|
||||
String thisFile = "" +
|
||||
new java.io.File(System.getProperty("test.src", "."),
|
||||
"LangVers.java");
|
||||
|
||||
String[] toolargs = {
|
||||
"-doclet", "LangVers",
|
||||
"-docletpath", System.getProperty("test.classes", "."),
|
||||
};
|
||||
if (jdk.javadoc.internal.tool.Main.execute(toolargs) != 0)
|
||||
throw new Error("Javadoc encountered warnings or errors.");
|
||||
}
|
||||
|
||||
public boolean run(DocletEnvironment root) {
|
||||
ClassDoc fishdoc = root.classNamed("LangVers.Fish");
|
||||
System.out.println(fishdoc);
|
||||
if (fishdoc.isEnum()) {
|
||||
throw new Error("Enums are not hidden.");
|
||||
}
|
||||
|
||||
for (MethodDoc meth : fishdoc.methods()) {
|
||||
System.out.println(meth);
|
||||
if (meth.flatSignature().indexOf('<') >= 0) {
|
||||
throw new Error("Type parameters are not hidden.");
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public enum Fish {
|
||||
One, Two, Red, Blue;
|
||||
|
||||
public void enroll(List<? super Fish> school) {
|
||||
school.add(this);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return "Test";
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<Option> getSupportedOptions() {
|
||||
return Collections.emptySet();
|
||||
}
|
||||
|
||||
@Override
|
||||
public SourceVersion getSupportedSourceVersion() {
|
||||
return SourceVersion.latest();
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user