mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 07:14:30 +02:00
8038730: Clean up the way JavadocTester is invoked, and checks for errors
Reviewed-by: ksrini, sogoel, bpatel
This commit is contained in:
parent
756eae6492
commit
caa2209663
144 changed files with 7277 additions and 9513 deletions
|
@ -27,172 +27,49 @@
|
|||
* @summary Javascript IE load error when linked by -linkoffline
|
||||
* Window title shouldn't change when loading left frames (javascript)
|
||||
* @author dkramer
|
||||
* @library ../lib
|
||||
* @build JavadocTester
|
||||
* @run main JavascriptWinTitle
|
||||
*/
|
||||
|
||||
public class JavascriptWinTitle extends JavadocTester {
|
||||
|
||||
import com.sun.javadoc.*;
|
||||
import java.util.*;
|
||||
import java.io.*;
|
||||
|
||||
|
||||
/**
|
||||
* Runs javadoc and runs regression tests on the resulting HTML.
|
||||
* It reads each file, complete with newlines, into a string to easily
|
||||
* find strings that contain newlines.
|
||||
*/
|
||||
public class JavascriptWinTitle {
|
||||
|
||||
protected static final String NL = System.getProperty("line.separator");
|
||||
|
||||
private static final String BUGID = "4645058";
|
||||
private static final String BUGNAME = "JavascriptWinTitle";
|
||||
private static final String TMPDEST_DIR1 = "./docs1/";
|
||||
private static final String TMPDEST_DIR2 = "./docs2/";
|
||||
|
||||
// Subtest number. Needed because runResultsOnHTML is run twice,
|
||||
// and subtestNum should increment across subtest runs.
|
||||
public static int subtestNum = 0;
|
||||
public static int numSubtestsPassed = 0;
|
||||
|
||||
// Entry point
|
||||
public static void main(String[] args) {
|
||||
|
||||
// Directory that contains source files that javadoc runs on
|
||||
String srcdir = System.getProperty("test.src", ".");
|
||||
|
||||
// Test for all cases except the split index page
|
||||
runJavadoc(new String[] {"-d", TMPDEST_DIR1,
|
||||
"-doctitle", "Document Title",
|
||||
"-windowtitle", "Window Title",
|
||||
"-overview", (srcdir + "/overview.html"),
|
||||
"-linkoffline",
|
||||
"http://java.sun.com/j2se/1.4/docs/api", srcdir,
|
||||
"-sourcepath", srcdir,
|
||||
"p1", "p2"});
|
||||
runTestsOnHTML(testArray);
|
||||
|
||||
printSummary();
|
||||
public static void main(String... args) throws Exception {
|
||||
JavascriptWinTitle tester = new JavascriptWinTitle();
|
||||
tester.runTests();
|
||||
}
|
||||
|
||||
/** Run javadoc */
|
||||
public static void runJavadoc(String[] javadocArgs) {
|
||||
if (com.sun.tools.javadoc.Main.execute(javadocArgs) != 0) {
|
||||
throw new Error("Javadoc failed to execute");
|
||||
}
|
||||
}
|
||||
@Test
|
||||
void test() {
|
||||
javadoc("-d", "out",
|
||||
"-doctitle", "Document Title",
|
||||
"-windowtitle", "Window Title",
|
||||
"-overview", testSrc("overview.html"),
|
||||
"-linkoffline", "http://java.sun.com/j2se/1.4/docs/api", testSrc,
|
||||
"-sourcepath", testSrc,
|
||||
"p1", "p2");
|
||||
checkExit(Exit.OK);
|
||||
checkOutput("overview-summary.html", true,
|
||||
"<script type=\"text/javascript\">",
|
||||
"<body>");
|
||||
|
||||
/**
|
||||
* Assign value for [ stringToFind, filename ]
|
||||
* NOTE: The standard doclet uses the same separator "\n" for all OS's
|
||||
*/
|
||||
private static final String[][] testArray = {
|
||||
// Test that "onload" is not present in BODY tag:
|
||||
checkOutput("p1/package-summary.html", true, "<body>");
|
||||
checkOutput("overview-frame.html", true, "<body>");
|
||||
checkOutput("allclasses-frame.html", true, "<body>");
|
||||
checkOutput("p1/package-frame.html", true, "<body>");
|
||||
|
||||
// Test the javascript "type" attribute is present:
|
||||
{ "<script type=\"text/javascript\">",
|
||||
TMPDEST_DIR1 + "overview-summary.html" },
|
||||
|
||||
// Test onload is absent:
|
||||
{ "<body>",
|
||||
TMPDEST_DIR1 + "overview-summary.html" },
|
||||
|
||||
// Test onload is present:
|
||||
{ "<body>",
|
||||
TMPDEST_DIR1 + "/p1/package-summary.html" },
|
||||
|
||||
// Test that "onload" is not present in BODY tag:
|
||||
{ "<body>",
|
||||
TMPDEST_DIR1 + "overview-frame.html" },
|
||||
|
||||
// Test that "onload" is not present in BODY tag:
|
||||
{ "<body>",
|
||||
TMPDEST_DIR1 + "allclasses-frame.html" },
|
||||
|
||||
// Test that "onload" is not present in BODY tag:
|
||||
{ "<body>",
|
||||
TMPDEST_DIR1 + "/p1/package-frame.html" },
|
||||
|
||||
// Test that win title javascript is followed by NOSCRIPT code.
|
||||
{"<script type=\"text/javascript\"><!--\n" +
|
||||
" try {\n" +
|
||||
" if (location.href.indexOf('is-external=true') == -1) {\n" +
|
||||
" parent.document.title=\"C (Window Title)\";\n" +
|
||||
" }\n" +
|
||||
" }\n" +
|
||||
" catch(err) {\n" +
|
||||
" }\n" +
|
||||
"//-->\n" +
|
||||
"</script>",
|
||||
TMPDEST_DIR1 + "/p1/C.html"
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
public static void runTestsOnHTML(String[][] testArray) {
|
||||
|
||||
for (int i = 0; i < testArray.length; i++) {
|
||||
|
||||
subtestNum += 1;
|
||||
|
||||
// Read contents of file into a string
|
||||
String fileString = readFileToString(testArray[i][1]);
|
||||
|
||||
// Get string to find
|
||||
String stringToFind = testArray[i][0];
|
||||
|
||||
// Find string in file's contents
|
||||
if (findString(fileString, stringToFind) == -1) {
|
||||
System.out.println("\nSub-test " + (subtestNum)
|
||||
+ " for bug " + BUGID + " (" + BUGNAME + ") FAILED\n"
|
||||
+ "when searching for:\n"
|
||||
+ stringToFind);
|
||||
} else {
|
||||
numSubtestsPassed += 1;
|
||||
System.out.println("\nSub-test " + (subtestNum) + " passed:\n" + stringToFind);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void printSummary() {
|
||||
if ( numSubtestsPassed == subtestNum ) {
|
||||
System.out.println("\nAll " + numSubtestsPassed + " subtests passed");
|
||||
} else {
|
||||
throw new Error("\n" + (subtestNum - numSubtestsPassed) + " of " + (subtestNum)
|
||||
+ " subtests failed for bug " + BUGID + " (" + BUGNAME + ")\n");
|
||||
}
|
||||
}
|
||||
|
||||
// Read the file into a String
|
||||
public static String readFileToString(String filename) {
|
||||
try {
|
||||
File file = new File(filename);
|
||||
if ( !file.exists() ) {
|
||||
System.out.println("\nFILE DOES NOT EXIST: " + filename);
|
||||
}
|
||||
BufferedReader in = new BufferedReader(new FileReader(file));
|
||||
|
||||
// Create an array of characters the size of the file
|
||||
char[] allChars = new char[(int)file.length()];
|
||||
|
||||
// Read the characters into the allChars array
|
||||
in.read(allChars, 0, (int)file.length());
|
||||
in.close();
|
||||
|
||||
// Convert to a string
|
||||
String allCharsString = new String(allChars);
|
||||
|
||||
return allCharsString;
|
||||
|
||||
} catch (FileNotFoundException e) {
|
||||
System.err.println(e);
|
||||
return "";
|
||||
} catch (IOException e) {
|
||||
System.err.println(e);
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
public static int findString(String fileString, String stringToFind) {
|
||||
return fileString.replace(NL, "\n").indexOf(stringToFind);
|
||||
// Test that win title javascript is followed by NOSCRIPT code.
|
||||
checkOutput("p1/C.html", true,
|
||||
"<script type=\"text/javascript\"><!--\n"
|
||||
+ " try {\n"
|
||||
+ " if (location.href.indexOf('is-external=true') == -1) {\n"
|
||||
+ " parent.document.title=\"C (Window Title)\";\n"
|
||||
+ " }\n"
|
||||
+ " }\n"
|
||||
+ " catch(err) {\n"
|
||||
+ " }\n"
|
||||
+ "//-->\n"
|
||||
+ "</script>");
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue