infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-11 05:59:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

8040903: Clean up use of BUG_ID in javadoc tests

Browse Source 
Reviewed-by: ksrini
This commit is contained in:
Jonathan Gibbons 2014-04-22 17:57:40 -07:00
parent 187dbd343c
commit 3acf463dc4
133 changed files with 1298 additions and 3431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
langtools/test/com/sun/javadoc/5093723/T5093723.java
View File

@ -33,10 +33,8 @@
public class T5093723 extends JavadocTester {
private static final String BUG_ID = "5093723";
private static final String[] ARGS = new String[] {
"-d", BUG_ID + ".out", "-Xdoclint:none",
"-d", OUTPUT_DIR + ".out", "-Xdoclint:none",
SRC_DIR + "/DocumentedClass.java",
SRC_DIR + "/UndocumentedClass.java"
};
@ -46,12 +44,4 @@ public class T5093723 extends JavadocTester {
if (tester.runJavadoc(ARGS) != 0)
throw new AssertionError("non-zero return code from javadoc");
}
public String getBugId() {
return BUG_ID;
}
public String getBugName() {
return getClass().getName();
}
}

25
langtools/test/com/sun/javadoc/AccessSummary/AccessSummary.java
View File

@ -34,30 +34,27 @@
public class AccessSummary extends JavadocTester {
private static final String BUG_ID = "4637604-4775148";
private static final String OUTPUT_DIR1 = "docs1-" + BUG_ID + "/";
/**
* Assign value for [ fileToSearch, stringToFind ]
*/
private static final String[][] TESTARRAY1 = {
// Test that the summary attribute appears
{ OUTPUT_DIR1 + "overview-summary.html",
{ "overview-summary.html",
"summary=\"Packages table, listing packages, and an explanation\"" },
// Test that the summary attribute appears
{ OUTPUT_DIR1 + "p1/C1.html",
{ "p1/C1.html",
"summary=\"Constructor Summary table, listing constructors, and an explanation\"" },
// Test that the summary attribute appears
{ OUTPUT_DIR1 + "constant-values.html",
{ "constant-values.html",
"summary=\"Constant Field Values table, listing constant fields, and values\"" }
};
// First test with -header only
private static final String[] JAVADOC_ARGS = new String[] {
"-d", OUTPUT_DIR1,
"-d", OUTPUT_DIR,
"-sourcepath", SRC_DIR,
"p1", "p2"};
@ -70,18 +67,4 @@ public class AccessSummary extends JavadocTester {
tester.run(JAVADOC_ARGS, TESTARRAY1, new String[][] {});
tester.printSummary(); // Necessary for string search
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

48
langtools/test/com/sun/javadoc/MetaTag/MetaTag.java
View File

@ -39,8 +39,6 @@ import java.util.Date;
public class MetaTag extends JavadocTester {
//Test information.
private static final String BUG_ID = "4034096-4764726-6235799";
private static final String OUTPUT_DIR = "docs-" + BUG_ID;
private static final SimpleDateFormat m_dateFormat = new SimpleDateFormat("yyyy-MM-dd");
//Javadoc arguments.
@ -63,62 +61,62 @@ public class MetaTag extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{ OUTPUT_DIR + "/p1/C1.html",
{ "p1/C1.html",
"<meta name=\"keywords\" content=\"p1.C1 class\">" },
{ OUTPUT_DIR + "/p1/C1.html",
{ "p1/C1.html",
"<meta name=\"keywords\" content=\"field1\">" },
{ OUTPUT_DIR + "/p1/C1.html",
{ "p1/C1.html",
"<meta name=\"keywords\" content=\"field2\">" },
{ OUTPUT_DIR + "/p1/C1.html",
{ "p1/C1.html",
"<meta name=\"keywords\" content=\"method1()\">" },
{ OUTPUT_DIR + "/p1/C1.html",
{ "p1/C1.html",
"<meta name=\"keywords\" content=\"method2()\">" },
{ OUTPUT_DIR + "/p1/package-summary.html",
{ "p1/package-summary.html",
"<meta name=\"keywords\" content=\"p1 package\">" },
{ OUTPUT_DIR + "/overview-summary.html",
{ "overview-summary.html",
"<meta name=\"keywords\" content=\"Overview, Sample Packages\">" },
//NOTE: Hopefully, this regression test is not run at midnight. If the output
//was generated yesterday and this test is run today, the test will fail.
{OUTPUT_DIR + "/overview-summary.html",
{ "overview-summary.html",
"<meta name=\"date\" "
+ "content=\"" + m_dateFormat.format(new Date()) + "\">"},
};
private static final String[][] NEGATED_TEST2 = {
//No keywords when -keywords is not used.
{ OUTPUT_DIR + "-2/p1/C1.html",
{ "p1/C1.html",
"<META NAME=\"keywords\" CONTENT=\"p1.C1 class\">" },
{ OUTPUT_DIR + "-2/p1/C1.html",
{ "p1/C1.html",
"<META NAME=\"keywords\" CONTENT=\"field1\">" },
{ OUTPUT_DIR + "-2/p1/C1.html",
{ "p1/C1.html",
"<META NAME=\"keywords\" CONTENT=\"field2\">" },
{ OUTPUT_DIR + "-2/p1/C1.html",
{ "p1/C1.html",
"<META NAME=\"keywords\" CONTENT=\"method1()\">" },
{ OUTPUT_DIR + "-2/p1/C1.html",
{ "p1/C1.html",
"<META NAME=\"keywords\" CONTENT=\"method2()\">" },
{ OUTPUT_DIR + "-2/p1/package-summary.html",
{ "p1/package-summary.html",
"<META NAME=\"keywords\" CONTENT=\"p1 package\">" },
{ OUTPUT_DIR + "-2/overview-summary.html",
{ "overview-summary.html",
"<META NAME=\"keywords\" CONTENT=\"Overview Summary, Sample Packages\">" },
//The date metatag should not show up when -notimestamp is used.
//NOTE: Hopefully, this regression test is not run at midnight. If the output
//was generated yesterday and this test is run today, the test will fail.
{OUTPUT_DIR + "-2/overview-summary.html",
{ "overview-summary.html",
"<META NAME=\"date\" "
+ "CONTENT=\"" + m_dateFormat.format(new Date()) + "\">"},
};
@ -133,18 +131,4 @@ public class MetaTag extends JavadocTester {
tester.run(ARGS_NO_TIMESTAMP_NO_KEYWORDS, NO_TEST, NEGATED_TEST2);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

31
langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java
View File

@ -37,12 +37,9 @@
public class PackagesHeader extends JavadocTester {
//Test information.
private static final String BUG_ID = "4766385";
private static final String OUTPUT_DIR = "docs-" + BUG_ID;
private static final String OUTPUT_DIR1 = "docs1-" + BUG_ID + "/";
private static final String OUTPUT_DIR2 = "docs2-" + BUG_ID + "/";
private static final String OUTPUT_DIR3 = "docs3-" + BUG_ID + "/";
private static final String OUTPUT_DIR1 = OUTPUT_DIR + "-1/";
private static final String OUTPUT_DIR2 = OUTPUT_DIR + "-2/";
private static final String OUTPUT_DIR3 = OUTPUT_DIR + "-3/";
/**
* Assign value for [ fileToSearch, stringToFind ]
@ -50,7 +47,7 @@ public class PackagesHeader extends JavadocTester {
private static final String[][] TESTARRAY1 = {
// Test that the -header shows up in the packages frame
{ OUTPUT_DIR1 + "overview-frame.html",
{ "overview-frame.html",
"Main Frame Header" }
};
@ -59,7 +56,7 @@ public class PackagesHeader extends JavadocTester {
// Test that the -packagesheader string shows
// up in the packages frame
{ OUTPUT_DIR2 + "overview-frame.html",
{ "overview-frame.html",
"Packages Frame Header" }
};
@ -67,10 +64,10 @@ public class PackagesHeader extends JavadocTester {
// Test that the both headers show up and are different
{ OUTPUT_DIR3 + "overview-frame.html",
{ "overview-frame.html",
"Packages Frame Header" },
{ OUTPUT_DIR3 + "overview-summary.html",
{ "overview-summary.html",
"Main Frame Header" }
};
@ -110,18 +107,4 @@ public class PackagesHeader extends JavadocTester {
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

11
langtools/test/com/sun/javadoc/T6735320/T6735320.java
View File

@ -31,20 +31,11 @@
*/
public class T6735320 extends JavadocTester {
private static final String BUG_ID = "6735320";
private static final String[] ARGS = new String[]{
"-d", BUG_ID + ".out",
"-d", OUTPUT_DIR + ".out",
SRC_DIR + "/SerialFieldTest.java"
};
public String getBugId() {
return BUG_ID;
}
public String getBugName() {
return getClass().getName();
}
public static void main(String... args) {
T6735320 tester = new T6735320();
if (tester.runJavadoc(ARGS) == 0) {

18
langtools/test/com/sun/javadoc/_template/Template.java
View File

@ -33,10 +33,6 @@
public class Template extends JavadocTester {
//Test information.
private static final String BUG_ID = "<BUG ID>";
private static final String OUTPUT_DIR = "docs-" + BUG_ID;
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR
@ -55,18 +51,4 @@ public class Template extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

22
langtools/test/com/sun/javadoc/_template/TemplateComplete.java
View File

@ -33,10 +33,6 @@
public class TemplateComplete extends JavadocTester {
//Test information.
private static final String BUG_ID = "<BUG ID>";
private static final String OUTPUT_DIR = "docs-" + BUG_ID;
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR
@ -51,6 +47,8 @@ public class TemplateComplete extends JavadocTester {
//Input for file diff test.
private static final String DIFFDIR1 = null;
private static final String DIFFDIR2 = null;
private static final String[][] FILES_TO_DIFF = {};
/**
@ -61,21 +59,7 @@ public class TemplateComplete extends JavadocTester {
TemplateComplete tester = new TemplateComplete();
int actualExitCode = tester.run(ARGS, TEST, NEGATED_TEST);
tester.checkExitCode(EXPECTED_EXIT_CODE, actualExitCode);
tester.runDiffs(FILES_TO_DIFF, false);
tester.runDiffs(DIFFDIR1, DIFFDIR2, FILES_TO_DIFF, false);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java
View File

@ -33,9 +33,8 @@
*/
public class TestConstantValuesDriver extends JavadocTester {
private static final String BUG_ID = "4504730-4526070-5077317";
private static final String[] ARGS = new String[] {
"-d", BUG_ID, SRC_DIR + "/TestConstantValues.java",
"-d", OUTPUT_DIR, SRC_DIR + "/TestConstantValues.java",
SRC_DIR + "/TestConstantValues2.java",
SRC_DIR + "/A.java"
};
@ -47,30 +46,16 @@ public class TestConstantValuesDriver extends JavadocTester {
public static void main(String[] args) {
String[][] tests = new String[5][2];
for (int i = 0; i < tests.length-1; i++) {
tests[i][0] = BUG_ID + "/constant-values.html";
tests[i][0] = "constant-values.html";
tests[i][1] = "TEST"+(i+1)+"PASSES";
}
tests[tests.length-1][0] = BUG_ID + "/constant-values.html";
tests[tests.length-1][0] = "constant-values.html";
tests[tests.length-1][1] = "<code>\"&lt;Hello World&gt;\"</code>";
TestConstantValuesDriver tester = new TestConstantValuesDriver();
tester.run(ARGS, tests, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
/**
* @throws java.io.IOException Test 1 passes
* @throws java.io.IOException Test 2 passes

19
langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java
View File

@ -33,9 +33,8 @@
*/
public class TestDupThrowsTags extends JavadocTester {
private static final String BUG_ID = "4525364";
private static final String[] ARGS = new String[] {
"-d", BUG_ID, SRC_DIR + "/TestDupThrowsTags.java"
"-d", OUTPUT_DIR, SRC_DIR + "/TestDupThrowsTags.java"
};
/**
@ -45,7 +44,7 @@ public class TestDupThrowsTags extends JavadocTester {
public static void main(String[] args) {
String[][] tests = new String[4][2];
for (int i = 0; i < tests.length; i++) {
tests[i][0] = BUG_ID + "/TestDupThrowsTags.html";
tests[i][0] = "TestDupThrowsTags.html";
tests[i][1] = "Test "+(i+1)+" passes";
}
TestDupThrowsTags tester = new TestDupThrowsTags();
@ -53,20 +52,6 @@ public class TestDupThrowsTags extends JavadocTester {
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
/**
* @throws java.io.IOException Test 1 passes
* @throws java.io.IOException Test 2 passes

206
langtools/test/com/sun/javadoc/lib/JavadocTester.java
View File

@ -21,8 +21,6 @@
* questions.
*/
import com.sun.javadoc.*;
import java.util.*;
import java.io.*;
@ -56,6 +54,7 @@ public abstract class JavadocTester {
protected static final String SRC_DIR = System.getProperty("test.src", ".");
protected static final String JAVA_VERSION = System.getProperty("java.version");
protected static final String OUTPUT_DIR = "out";
protected static final String[][] NO_TEST = new String[][] {};
protected static final String[] NO_FILE_TEST = new String[] {};
@ -105,10 +104,15 @@ public abstract class JavadocTester {
public StringWriter warnings;
/**
* The buffer of warning output..
* The buffer of warning output.
*/
public StringBuffer standardOut;
/**
* The output directory.
*/
private File outputDir;
/**
* The current subtest number.
*/
@ -130,18 +134,6 @@ public abstract class JavadocTester {
public JavadocTester() {
}
/**
* Return the bug id.
* @return the bug id
*/
public abstract String getBugId();
/**
* Return the name of the bug.
* @return the name of the bug
*/
public abstract String getBugName();
/**
* Execute the tests.
*
@ -206,6 +198,13 @@ public abstract class JavadocTester {
+ javadocRunNum + ")...");
}
initOutputBuffers();
outputDir = new File(".");
for (int i = 0; i < args.length - 2; i++) {
if (args[i].equals("-d")) {
outputDir = new File(args[++i]);
break;
}
}
ByteArrayOutputStream stdout = new ByteArrayOutputStream();
PrintStream prevOut = System.out;
@ -216,7 +215,7 @@ public abstract class JavadocTester {
System.setErr(new PrintStream(stderr));
int returnCode = com.sun.tools.javadoc.Main.execute(
getBugName(),
"javadoc",
new PrintWriter(errors, true),
new PrintWriter(warnings, true),
new PrintWriter(notices, true),
@ -258,60 +257,53 @@ public abstract class JavadocTester {
* Run array of tests on the generated files.
* This method accepts a fileTestArray for testing if a file is generated
* and a negatedFileTestArray for testing if a file is not found.
* The files are relative to the most recent output directory specified
* with -d.
*
* @param testArray the array of file tests
* @param negatedTestArray the array of negated file tests
* @param fileTestArray the array of file tests
* @param negatedFileTestArray the array of negated file tests
*/
public void runTestsOnFile(String[] fileTestArray, String[] negatedFileTestArray) {
runTestsOnFile(fileTestArray, false);
runTestsOnFile(negatedFileTestArray, true);
runTestsOnFile(outputDir, fileTestArray, false);
runTestsOnFile(outputDir, negatedFileTestArray, true);
}
/**
* Run the array of tests on the resulting HTML.
* The files are relative to the most recent output directory specified
* with -d.
*
* @param testArray the array of tests
* @param isNegated true if test is negated; false otherwise
*/
private void runTestsOnHTML(String[][] testArray , boolean isNegated) {
for (int i = 0; i < testArray.length; i++) {
for (String[] test : testArray) {
numTestsRun++;
System.out.print("Running subtest #" + numTestsRun + "... ");
// Get string to find
String stringToFind = testArray[i][1];
String stringToFind = test[1];
// Read contents of file into a string
String fileString;
try {
fileString = readFileToString(testArray[i][0]);
fileString = readFileToString(outputDir, test[0]);
} catch (Error e) {
if (isNegated) {
System.out.println( "FAILED" + "\n"
+ "for bug " + getBugId()
+ " (" + getBugName() + ") "
+ "due to "
+ e + "\n");
continue;
System.out.println( "FAILED, due to " + e + "\n");
continue;
}
throw e;
}
// Find string in file's contents
boolean isFound = findString(fileString, stringToFind);
if ((isNegated && !isFound) || (!isNegated && isFound) ) {
if ((isNegated && !isFound) || (!isNegated && isFound)) {
numTestsPassed += 1;
System.out.println( "Passed" + "\n"
+ (isNegated ? "not found:" : "found:") + "\n"
+ stringToFind + " in " + testArray[i][0] + "\n");
System.out.println("Passed" + "\n"
+ (isNegated ? "not found:" : "found:") + "\n"
+ stringToFind + " in " + test[0] + "\n");
} else {
System.out.println( "FAILED" + "\n"
+ "for bug " + getBugId()
+ " (" + getBugName() + ")" + "\n"
+ "when searching for:" + "\n"
+ stringToFind
+ " in " + testArray[i][0] + "\n");
System.out.println("FAILED, when searching for:" + "\n"
+ stringToFind
+ " in " + test[0] + "\n");
}
}
}
@ -322,21 +314,15 @@ public abstract class JavadocTester {
* @param testArray the array of file tests
* @param isNegated true if test is negated; false otherwise
*/
private void runTestsOnFile(String[] testArray, boolean isNegated) {
String fileName;
String failedString;
String passedString;
for (int i = 0; i < testArray.length; i++) {
private void runTestsOnFile(File baseDir, String[] testArray, boolean isNegated) {
for (String fileName : testArray) {
numTestsRun++;
fileName = testArray[i];
failedString = "FAILED" + "\n"
+ "for bug " + getBugId() + " (" + getBugName() + ") "
+ "file (" + fileName + ") found" + "\n";
passedString = "Passed" + "\n" +
"file (" + fileName + ") not found" + "\n";
String failedString = "FAILED: file (" + fileName + ") found" + "\n";
String passedString = "Passed" + "\n" +
"file (" + fileName + ") not found" + "\n";
System.out.print("Running subtest #" + numTestsRun + "... ");
try {
File file = new File(fileName);
File file = new File(baseDir, fileName);
if ((file.exists() && !isNegated) || (!file.exists() && isNegated)) {
numTestsPassed += 1;
System.out.println(passedString);
@ -352,27 +338,33 @@ public abstract class JavadocTester {
/**
* Iterate through the list of given file pairs and diff each file.
*
* @param filePairs the pairs of files to diff.
* @throws an Error is thrown if any differences are found between
* @param baseDir1 the directory containing the first set of files
* @param baseDir2 the directory containing the second set of files
* @param files the set of files to be compared
* @throws Error if any differences are found between
* file pairs.
*/
public void runDiffs(String[][] filePairs) throws Error {
runDiffs(filePairs, true);
public void runDiffs(String baseDir1, String baseDir2, String[] files) throws Error {
runDiffs(baseDir1, baseDir2, files, true);
}
/**
* Iterate through the list of given file pairs and diff each file.
*
* @param filePairs the pairs of files to diff.
* @param throwErrorIFNoMatch flag to indicate whether or not to throw
* @param baseDir1 the directory containing the first set of files
* @param baseDir2 the directory containing the second set of files
* @param files the set of files to be compared
* @param throwErrorIfNoMatch flag to indicate whether or not to throw
* an error if the files do not match.
*
* @throws an Error is thrown if any differences are found between
* file pairs and throwErrorIFNoMatch is true.
* @throws Error if any differences are found between
* file pairs and throwErrorIfNoMatch is true.
*/
public void runDiffs(String[][] filePairs, boolean throwErrorIfNoMatch) throws Error {
for (int i = 0; i < filePairs.length; i++) {
diff(filePairs[i][0], filePairs[i][1], throwErrorIfNoMatch);
public void runDiffs(String baseDir1, String baseDir2, String[] files, boolean throwErrorIfNoMatch) throws Error {
File bd1 = new File(baseDir1);
File bd2 = new File(baseDir2);
for (String file : files) {
diff(bd1, bd2, file, throwErrorIfNoMatch);
}
}
@ -392,8 +384,7 @@ public abstract class JavadocTester {
actualExitCode);
numTestsPassed++;
} else {
System.out.println( "FAILED" + "\n" + "for bug " + getBugId()
+ " (" + getBugName() + ")" + "\n" + "Expected return code " +
System.out.println( "FAILED: expected return code " +
expectedExitCode + " but got " + actualExitCode);
}
}
@ -410,8 +401,7 @@ public abstract class JavadocTester {
// Test failed
throw new Error("\n" + (numTestsRun - numTestsPassed)
+ " of " + (numTestsRun)
+ " subtests failed for bug " + getBugId()
+ " (" + getBugName() + ")" + "\n");
+ " subtests failed\n");
}
}
@ -432,28 +422,39 @@ public abstract class JavadocTester {
* @return the file in string format
*/
public String readFileToString(String fileName) throws Error {
if (fileName.equals(ERROR_OUTPUT)) {
return getErrorOutput();
} else if (fileName.equals(NOTICE_OUTPUT)) {
return getNoticeOutput();
} else if (fileName.equals(WARNING_OUTPUT)) {
return getWarningOutput();
} else if (fileName.equals(STANDARD_OUTPUT)) {
return getStandardOutput();
return readFileToString(outputDir, fileName);
}
/**
* Read the file and return it as a string.
*
* @param baseDir the directory in which to locate the file
* @param fileName the name of the file to read
* @return the file in string format
*/
private String readFileToString(File baseDir, String fileName) throws Error {
switch (fileName) {
case ERROR_OUTPUT:
return getErrorOutput();
case NOTICE_OUTPUT:
return getNoticeOutput();
case WARNING_OUTPUT:
return getWarningOutput();
case STANDARD_OUTPUT:
return getStandardOutput();
}
try {
File file = new File(fileName);
File file = new File(baseDir, fileName);
if ( !file.exists() ) {
System.out.println("\n" + "FILE 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();
char[] allChars;
try (BufferedReader in = new BufferedReader(new FileReader(file))) {
// Create an array of characters the size of the file
allChars = new char[(int)file.length()];
// Read the characters into the allChars array
in.read(allChars, 0, (int)file.length());
}
// Convert to a string
String allCharsString = new String(allChars);
@ -470,22 +471,24 @@ public abstract class JavadocTester {
/**
* Compare the two given files.
*
* @param file1 the first file to compare.
* @param file2 the second file to compare.
* @param baseDir1 the directory in which to locate the first file
* @param baseDir2 the directory in which to locate the second file
* @param file the file to compare in the two base directories
* @param throwErrorIFNoMatch flag to indicate whether or not to throw
* an error if the files do not match.
* @return true if the files are the same and false otherwise.
*/
public boolean diff(String file1, String file2, boolean throwErrorIFNoMatch) throws Error {
String file1Contents = readFileToString(file1);
String file2Contents = readFileToString(file2);
private boolean diff(File baseDir1, File baseDir2, String file,
boolean throwErrorIFNoMatch) throws Error {
String file1Contents = readFileToString(baseDir1, file);
String file2Contents = readFileToString(baseDir2, file);
numTestsRun++;
if (file1Contents.trim().compareTo(file2Contents.trim()) == 0) {
System.out.println("Diff successful: " + file1 + ", " + file2);
System.out.println("Diff successful: " + new File(baseDir1, file) + ", " + new File(baseDir2, file));
numTestsPassed++;
return true;
} else if (throwErrorIFNoMatch) {
throw new Error("Diff failed: " + file1 + ", " + file2);
throw new Error("Diff failed: " + new File(baseDir1, file) + ", " + new File(baseDir2, file));
} else {
return false;
}
@ -559,12 +562,12 @@ public abstract class JavadocTester {
destDirObj.mkdir();
}
String[] files = targetDirObj.list();
for (int i = 0; i < files.length; i++) {
File srcFile = new File(targetDirObj, files[i]);
File destFile = new File(destDirObj, files[i]);
for (String file : files) {
File srcFile = new File(targetDirObj, file);
File destFile = new File(destDirObj, file);
if (srcFile.isFile()) {
System.out.println("Copying " + srcFile + " to " + destFile);
copyFile(destFile, srcFile);
copyFile(destFile, srcFile);
} else if(srcFile.isDirectory()) {
copyDir(srcFile.getAbsolutePath(), destDirObj.getAbsolutePath());
}
@ -577,13 +580,15 @@ public abstract class JavadocTester {
/**
* Copy source file to destination file.
*
* @param destfile the destination file
* @param srcfile the source file
* @throws SecurityException
* @throws IOException
*/
public static void copyFile(File destfile, File srcfile)
throws IOException {
byte[] bytearr = new byte[512];
int len = 0;
int len;
FileInputStream input = new FileInputStream(srcfile);
File destDir = destfile.getParentFile();
destDir.mkdirs();
@ -592,8 +597,7 @@ public abstract class JavadocTester {
while ((len = input.read(bytearr)) != -1) {
output.write(bytearr, 0, len);
}
} catch (FileNotFoundException exc) {
} catch (SecurityException exc) {
} catch (FileNotFoundException | SecurityException exc) {
} finally {
input.close();
output.close();

17
langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java
View File

@ -34,9 +34,8 @@
public class TestAbsLinkPath extends JavadocTester {
private static final String BUG_ID = "4640745";
private static final String[][] TEST = {
{"tmp/pkg1/C1.html", "C2.html"}};
{ "pkg1/C1.html", "C2.html"}};
private static final String[] ARGS1 =
new String[] {
@ -56,18 +55,4 @@ public class TestAbsLinkPath extends JavadocTester {
tester.run(ARGS2, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

37
langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java
View File

@ -35,18 +35,17 @@
public class TestAbstractMethod extends JavadocTester {
//Test information.
private static final String BUG_ID = "8004891";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg/A.html",
{ "pkg/A.html",
"<td class=\"colFirst\"><code>default void</code></td>"},
{BUG_ID + "/pkg/A.html",
{ "pkg/A.html",
"<caption><span id=\"t0\" class=\"activeTableTab\"><span>" +
"All Methods</span><span class=\"tabEnd\">&nbsp;</span></span>" +
"<span id=\"t2\" class=\"tableTab\"><span>" +
@ -57,7 +56,7 @@ public class TestAbstractMethod extends JavadocTester {
"</span><span id=\"t5\" class=\"tableTab\"><span>" +
"<a href=\"javascript:show(16);\">Default Methods</a></span>" +
"<span class=\"tabEnd\">&nbsp;</span></span></caption>"},
{BUG_ID + "/pkg/B.html",
{ "pkg/B.html",
"<caption><span id=\"t0\" class=\"activeTableTab\"><span>" +
"All Methods</span><span class=\"tabEnd\">&nbsp;</span></span>" +
"<span id=\"t2\" class=\"tableTab\"><span>" +
@ -68,9 +67,9 @@ public class TestAbstractMethod extends JavadocTester {
"<span id=\"t4\" class=\"tableTab\"><span>" +
"<a href=\"javascript:show(8);\">Concrete Methods</a></span>" +
"<span class=\"tabEnd\">&nbsp;</span></span></caption>"},
{BUG_ID + "/pkg/B.html",
{ "pkg/B.html",
"<td class=\"colFirst\"><code>abstract void</code></td>"},
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<caption><span id=\"t0\" class=\"activeTableTab\"><span>" +
"All Methods</span><span class=\"tabEnd\">&nbsp;</span></span>" +
"<span id=\"t2\" class=\"tableTab\"><span>" +
@ -79,18 +78,18 @@ public class TestAbstractMethod extends JavadocTester {
"<span id=\"t5\" class=\"tableTab\"><span>" +
"<a href=\"javascript:show(16);\">Default Methods</a></span>" +
"<span class=\"tabEnd\">&nbsp;</span></span></caption>"},
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<td class=\"colFirst\"><code>default void</code></td>"}
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/pkg/A.html",
{ "pkg/A.html",
"<td class=\"colFirst\"><code>abstract void</code></td>"},
{BUG_ID + "/pkg/B.html",
{ "pkg/B.html",
"<span><a href=\"javascript:show(16);\">Default Methods</a></span>" +
"<span class=\"tabEnd\">&nbsp;</span>"},
{BUG_ID + "/pkg/B.html",
{ "pkg/B.html",
"<td class=\"colFirst\"><code>default void</code></td>"},
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<span><a href=\"javascript:show(4);\">Abstract Methods</a></span>" +
"<span class=\"tabEnd\">&nbsp;</span>"}
};
@ -104,18 +103,4 @@ public class TestAbstractMethod extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

139
langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java
View File

@ -33,41 +33,40 @@
public class TestAnchorNames extends JavadocTester {
private static final String BUG_ID = "8025633";
//Input for string search tests.
private static final String[][] TEST = {
//Test some section markers and links to these markers
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"skip.navbar.top\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"nested.class.summary\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"#nested.class.summary\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"method.summary\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"#method.summary\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"field.detail\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"#field.detail\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"constructor.detail\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"#constructor.detail\">"
},
@ -75,170 +74,170 @@ public class TestAnchorNames extends JavadocTester {
//The marker for this appears in the serialized-form.html which we will
//test below
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../serialized-form.html#pkg1.RegClass\">"
},
//Test some fields
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"Z:Z_\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#Z:Z_\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"Z:Z_:D\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#Z:Z_:D\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"Z:Z:D_\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#Z:Z:D_\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"Z:Z:Dfield\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#Z:Z:Dfield\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"fieldInCla:D:D\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#fieldInCla:D:D\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"S_:D:D:D:D:DINT\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#S_:D:D:D:D:DINT\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"method:D:D\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#method:D:D\">"
},
{BUG_ID + "/pkg1/DeprMemClass.html",
{ "pkg1/DeprMemClass.html",
"<a name=\"Z:Z_field_In_Class\">"
},
{BUG_ID + "/pkg1/DeprMemClass.html",
{ "pkg1/DeprMemClass.html",
"<a href=\"../pkg1/DeprMemClass.html#Z:Z_field_In_Class\">"
},
//Test constructor
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"RegClass-java.lang.String-int-\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#RegClass-java.lang.String-int-\">"
},
//Test some methods
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"Z:Z_methodInClass-java.lang.String-\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#Z:Z_methodInClass-java.lang.String-\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"method--\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#method--\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"foo-java.util.Map-\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#foo-java.util.Map-\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"methodInCla:Ds-java.lang.String:A-\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#methodInCla:Ds-java.lang.String:A-\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"Z:Z_methodInClas:D-java.lang.String-int-\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#Z:Z_methodInClas:D-java.lang.String-int-\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"methodD-pkg1.RegClass.:DA-\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#methodD-pkg1.RegClass.:DA-\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a name=\"methodD-pkg1.RegClass.D:A-\">"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#methodD-pkg1.RegClass.D:A-\">"
},
{BUG_ID + "/pkg1/DeprMemClass.html",
{ "pkg1/DeprMemClass.html",
"<a name=\"Z:Z:Dmethod_In_Class--\">"
},
{BUG_ID + "/pkg1/DeprMemClass.html",
{ "pkg1/DeprMemClass.html",
"<a href=\"../pkg1/DeprMemClass.html#Z:Z:Dmethod_In_Class--\">"
},
//Test enum
{BUG_ID + "/pkg1/RegClass.Te$t_Enum.html",
{ "pkg1/RegClass.Te$t_Enum.html",
"<a name=\"Z:Z:DFLD2\">"
},
{BUG_ID + "/pkg1/RegClass.Te$t_Enum.html",
{ "pkg1/RegClass.Te$t_Enum.html",
"<a href=\"../pkg1/RegClass.Te$t_Enum.html#Z:Z:DFLD2\">"
},
//Test nested class
{BUG_ID + "/pkg1/RegClass._NestedClas$.html",
{ "pkg1/RegClass._NestedClas$.html",
"<a name=\"Z:Z_NestedClas:D--\">"
},
{BUG_ID + "/pkg1/RegClass._NestedClas$.html",
{ "pkg1/RegClass._NestedClas$.html",
"<a href=\"../pkg1/RegClass._NestedClas$.html#Z:Z_NestedClas:D--\">"
},
//Test class use page
{BUG_ID + "/pkg1/class-use/DeprMemClass.html",
{ "pkg1/class-use/DeprMemClass.html",
"<a href=\"../../pkg1/RegClass.html#d____mc\">"
},
//Test deprecated list page
{BUG_ID + "/deprecated-list.html",
{ "deprecated-list.html",
"<a href=\"pkg1/DeprMemClass.html#Z:Z_field_In_Class\">"
},
{BUG_ID + "/deprecated-list.html",
{ "deprecated-list.html",
"<a href=\"pkg1/DeprMemClass.html#Z:Z:Dmethod_In_Class--\">"
},
//Test constant values page
{BUG_ID + "/constant-values.html",
{ "constant-values.html",
"<a href=\"pkg1/RegClass.html#S_:D:D:D:D:DINT\">"
},
//Test serialized form page
//This is the marker for the link that appears in the pkg1.RegClass.html page
{BUG_ID + "/serialized-form.html",
{ "serialized-form.html",
"<a name=\"pkg1.RegClass\">"
},
//Test member name index page
{BUG_ID + "/index-all.html",
{ "index-all.html",
"<a name=\"I:Z:Z:D\">"
},
{BUG_ID + "/index-all.html",
{ "index-all.html",
"<a href=\"#I:Z:Z:D\">$"
},
{BUG_ID + "/index-all.html",
{ "index-all.html",
"<a href=\"#I:Z:Z_\">_"
}
};
@ -246,22 +245,22 @@ public class TestAnchorNames extends JavadocTester {
private static final String[][] NEGATED_TEST = {
//The marker name conversion should only affect HTML anchors. It should not
//affect the lables.
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
" Z:Z_"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
" Z:Z:Dfield"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
" Z:Z_field_In_Class"
},
{BUG_ID + "/pkg1/RegClass.html",
{ "pkg1/RegClass.html",
" S_:D:D:D:D:DINT"
},
};
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-use", "pkg1"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-use", "pkg1"
};
/**
@ -273,18 +272,4 @@ public class TestAnchorNames extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java
View File

@ -35,17 +35,14 @@
public class TestAnnotationOptional extends JavadocTester {
//Test information.
private static final String BUG_ID = "NO_BUG_ID_YET";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg/AnnotationOptional.html",
{ "pkg/AnnotationOptional.html",
"<a name=\"annotation.type.element.detail\">"
}
};
@ -58,18 +55,4 @@ public class TestAnnotationOptional extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

39
langtools/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java
View File

@ -34,47 +34,44 @@
public class TestAnnotationTypes extends JavadocTester {
//Test information.
private static final String BUG_ID = "4973609-8015249";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg/AnnotationTypeField.html",
{ "pkg/AnnotationTypeField.html",
"<li>Summary:&nbsp;</li>\n" +
"<li><a href=\"#annotation.type." +
"field.summary\">Field</a>&nbsp;|&nbsp;</li>"},
{BUG_ID + "/pkg/AnnotationTypeField.html",
{ "pkg/AnnotationTypeField.html",
"<li>Detail:&nbsp;</li>\n" +
"<li><a href=\"#annotation.type." +
"field.detail\">Field</a>&nbsp;|&nbsp;</li>"},
{BUG_ID + "/pkg/AnnotationTypeField.html",
{ "pkg/AnnotationTypeField.html",
"<!-- =========== ANNOTATION TYPE FIELD SUMMARY =========== -->"},
{BUG_ID + "/pkg/AnnotationTypeField.html",
{ "pkg/AnnotationTypeField.html",
"<h3>Field Summary</h3>"},
{BUG_ID + "/pkg/AnnotationTypeField.html",
{ "pkg/AnnotationTypeField.html",
"<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../" +
"pkg/AnnotationTypeField.html#DEFAULT_NAME\">DEFAULT_NAME</a></span>" +
"</code>&nbsp;</td>"},
{BUG_ID + "/pkg/AnnotationTypeField.html",
{ "pkg/AnnotationTypeField.html",
"<!-- ============ ANNOTATION TYPE FIELD DETAIL =========== -->"},
{BUG_ID + "/pkg/AnnotationTypeField.html",
{ "pkg/AnnotationTypeField.html",
"<h4>DEFAULT_NAME</h4>\n" +
"<pre>public static final&nbsp;java." +
"lang.String&nbsp;DEFAULT_NAME</pre>"},
{BUG_ID + "/pkg/AnnotationType.html",
{ "pkg/AnnotationType.html",
"<li>Summary:&nbsp;</li>\n" +
"<li>Field&nbsp;|&nbsp;</li>"},
{BUG_ID + "/pkg/AnnotationType.html",
{ "pkg/AnnotationType.html",
"<li>Detail:&nbsp;</li>\n" +
"<li>Field&nbsp;|&nbsp;</li>"},
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/pkg/AnnotationType.html",
{ "pkg/AnnotationType.html",
"<HR>\n\n" +
"<P>\n\n" +
"<P>" +
@ -90,18 +87,4 @@ public class TestAnnotationTypes extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

19
langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java
View File

@ -35,12 +35,11 @@
public class TestBackSlashInLink extends JavadocTester {
private static final String BUG_ID = "4511110";
private static final String[][] TEST = {
{BUG_ID + "/C.html", "src-html/C.html#line.7"}};
{ "C.html", "src-html/C.html#line.7"}};
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"-linksource", SRC_DIR + "/C.java"};
/**
@ -52,18 +51,4 @@ public class TestBackSlashInLink extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

20
langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java
View File

@ -35,10 +35,6 @@
public class TestBadPackageFileInJar extends JavadocTester {
protected static final String FS = System.getProperty("file.separator");
private static final String BUG_ID = "4691095";
private static final String[][] TEST =
new String[][] {
{ERROR_OUTPUT,
@ -47,7 +43,7 @@ public class TestBadPackageFileInJar extends JavadocTester {
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-classpath",
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-classpath",
SRC_DIR + "/badPackageFileInJar.jar", "pkg"};
@ -60,18 +56,4 @@ public class TestBadPackageFileInJar extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

19
langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java
View File

@ -35,12 +35,9 @@
public class TestBadSourceFile extends JavadocTester {
//Test information.
private static final String BUG_ID = "4835749";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-Xdoclint:none", "-d", BUG_ID, SRC_DIR + "/C2.java"
"-Xdoclint:none", "-d", OUTPUT_DIR, SRC_DIR + "/C2.java"
};
/**
@ -53,18 +50,4 @@ public class TestBadSourceFile extends JavadocTester {
tester.checkExitCode(0, exitCode);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

15
langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java
View File

@ -35,7 +35,6 @@
public class TestBaseClass extends JavadocTester {
private static final String BUG_ID = "4197513";
private static final String[] ARGS =
new String[] {
"-sourcepath", SRC_DIR,
@ -52,18 +51,4 @@ public class TestBaseClass extends JavadocTester {
throw new Error("Javadoc failed to execute.");
}
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

19
langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java
View File

@ -37,13 +37,12 @@
public class TestBreakIterator extends JavadocTester {
private static final String BUG_ID = "4165985";
private static final String[][] TEST = {
{BUG_ID + "/pkg/BreakIteratorTest.html",
{ "pkg/BreakIteratorTest.html",
"The class is empty (i.e. it has no members)."}};
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"-breakiterator", "pkg"};
/**
@ -55,18 +54,4 @@ public class TestBreakIterator extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java
View File

@ -37,17 +37,14 @@ import java.util.*;
public class TestCRLineSeparator extends JavadocTester {
//Test information.
private static final String BUG_ID = "4979486-8014636";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", ".", "pkg"
"-d", OUTPUT_DIR, "-sourcepath", ".", "pkg"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg/MyClass.html", "Line 1\n" +
{ "pkg/MyClass.html", "Line 1\n" +
" Line 2"}
};
@ -63,20 +60,6 @@ public class TestCRLineSeparator extends JavadocTester {
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
// recursively copy files from fromDir to toDir, replacing newlines
// with \r
static void initFiles(File fromDir, File toDir, String f) throws IOException {

27
langtools/test/com/sun/javadoc/testCharset/TestCharset.java
View File

@ -34,25 +34,22 @@
public class TestCharset extends JavadocTester {
//Test information.
private static final String BUG_ID = "7052170";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-charset", "UTF-8", "-sourcepath", SRC_DIR, "pkg"
"-d", OUTPUT_DIR, "-charset", "UTF-8", "-sourcepath", SRC_DIR, "pkg"
};
private static final String[][] TEST = {
{BUG_ID + "/index.html",
{ "index.html",
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">"},
{BUG_ID + "/pkg/Foo.html",
{ "pkg/Foo.html",
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">"}
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/index.html",
{ "index.html",
"<meta http-equiv=\"Content-Type\" content=\"text/html\" charset=\"UTF-8\">"},
{BUG_ID + "/pkg/Foo.html",
{ "pkg/Foo.html",
"<meta http-equiv=\"Content-Type\" content=\"text/html\" charset=\"UTF-8\">"}
};
@ -65,18 +62,4 @@ public class TestCharset extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

27
langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java
View File

@ -34,20 +34,19 @@
public class TestClassCrossReferences extends JavadocTester {
private static final String BUG_ID = "4652655-4857717";
private static final String[][] TEST = {
{BUG_ID + "/C.html",
{ "C.html",
"<a href=\"http://java.sun.com/j2se/1.4/docs/api/java/math/package-summary.html?is-external=true\"><code>Link to math package</code></a>"},
{BUG_ID + "/C.html",
{ "C.html",
"<a href=\"http://java.sun.com/j2se/1.4/docs/api/javax/swing/text/AbstractDocument.AttributeContext.html?is-external=true\" " +
"title=\"class or interface in javax.swing.text\"><code>Link to AttributeContext innerclass</code></a>"},
{BUG_ID + "/C.html",
{ "C.html",
"<a href=\"http://java.sun.com/j2se/1.4/docs/api/java/math/BigDecimal.html?is-external=true\" " +
"title=\"class or interface in java.math\"><code>Link to external class BigDecimal</code></a>"},
{BUG_ID + "/C.html",
{ "C.html",
"<a href=\"http://java.sun.com/j2se/1.4/docs/api/java/math/BigInteger.html?is-external=true#gcd-java.math.BigInteger-\" " +
"title=\"class or interface in java.math\"><code>Link to external member gcd</code></a>"},
{BUG_ID + "/C.html",
{ "C.html",
"<dl>\n" +
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>\n" +
@ -55,7 +54,7 @@ public class TestClassCrossReferences extends JavadocTester {
};
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"-linkoffline", "http://java.sun.com/j2se/1.4/docs/api/",
SRC_DIR, SRC_DIR + "/C.java"};
@ -68,18 +67,4 @@ public class TestClassCrossReferences extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

27
langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java
View File

@ -37,22 +37,19 @@
public class TestClassTree extends JavadocTester {
//Test information.
private static final String BUG_ID = "4632553-4973607";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg/package-tree.html",
{ "pkg/package-tree.html",
"<ul>\n" +
"<li type=\"circle\">pkg.<a href=\"../pkg/ParentClass.html\" " +
"title=\"class in pkg\"><span class=\"typeNameLink\">ParentClass</span></a>"},
{BUG_ID + "/pkg/package-tree.html",
{ "pkg/package-tree.html",
"<h2 title=\"Annotation Type Hierarchy\">Annotation Type Hierarchy</h2>\n" +
"<ul>\n" +
"<li type=\"circle\">pkg.<a href=\"../pkg/AnnotationType.html\" " +
@ -60,7 +57,7 @@ public class TestClassTree extends JavadocTester {
"(implements java.lang.annotation.Annotation)</li>\n" +
"</ul>"},
{BUG_ID + "/pkg/package-tree.html",
{ "pkg/package-tree.html",
"<h2 title=\"Enum Hierarchy\">Enum Hierarchy</h2>\n" +
"<ul>\n" +
"<li type=\"circle\">java.lang.Object\n" +
@ -78,7 +75,7 @@ public class TestClassTree extends JavadocTester {
},
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/pkg/package-tree.html",
{ "pkg/package-tree.html",
"<li type=\"circle\">class pkg.<a href=\"../pkg/ParentClass.html\" " +
"title=\"class in pkg\"><span class=\"typeNameLink\">ParentClass</span></a></li>"}
};
@ -92,18 +89,4 @@ public class TestClassTree extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

29
langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java
View File

@ -52,15 +52,14 @@ public class TestCmndLineClass extends JavadocTester {
SRC_DIR + "/pkg2/C3.java",
SRC_DIR + "/pkg2/C4.java"
};
private static final String[][] FILES_TO_DIFF = {
{OUTPUT_DIR1 + "/C5.html", OUTPUT_DIR2 + "/C5.html"},
{OUTPUT_DIR2 + "/pkg1/C1.html", OUTPUT_DIR2 + "/pkg1/C1.html"},
{OUTPUT_DIR1 + "/pkg1/C2.html", OUTPUT_DIR2 + "/pkg1/C2.html"},
{OUTPUT_DIR1 + "/pkg2/C3.html", OUTPUT_DIR2 + "/pkg2/C3.html"},
{OUTPUT_DIR1 + "/pkg2/C4.html", OUTPUT_DIR2 + "/pkg2/C4.html"}
private static final String[] FILES_TO_DIFF = {
"C5.html",
"pkg1/C1.html",
"pkg1/C2.html",
"pkg2/C3.html",
"pkg2/C4.html"
};
private static final String BUG_ID = "4506980";
/**
* The entry point of the test.
@ -70,20 +69,6 @@ public class TestCmndLineClass extends JavadocTester {
TestCmndLineClass tester = new TestCmndLineClass();
tester.run(ARGS1, NO_TEST, NO_TEST);
tester.run(ARGS2, NO_TEST, NO_TEST);
tester.runDiffs(FILES_TO_DIFF);
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
tester.runDiffs(OUTPUT_DIR1, OUTPUT_DIR2, FILES_TO_DIFF);
}
}

18
langtools/test/com/sun/javadoc/testCompletionFailure/TestCompletionFailure.java
View File

@ -33,8 +33,6 @@
public class TestCompletionFailure extends JavadocTester {
private static final String BUG_ID = "8027977";
//Input for string search tests.
private static final String[][] NEGATED_TEST = {
{ERROR_OUTPUT, "TestCompletionFailure: error - " +
@ -44,7 +42,7 @@ public class TestCompletionFailure extends JavadocTester {
};
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1"
};
/**
@ -56,18 +54,4 @@ public class TestCompletionFailure extends JavadocTester {
tester.run(ARGS, NO_TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

17
langtools/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java
View File

@ -35,13 +35,12 @@
public class TestConstantValuesPage extends JavadocTester {
private static final String BUG_ID = "4681599";
private static final String[][] NEGATED_TEST = {
{NOTICE_OUTPUT, "constant-values.html..."}
};
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "foo"};
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "foo"};
/**
* The entry point of the test.
@ -52,18 +51,4 @@ public class TestConstantValuesPage extends JavadocTester {
tester.run(ARGS, NO_TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java
View File

@ -35,17 +35,14 @@
public class TestConstructorIndent extends JavadocTester {
//Test information.
private static final String BUG_ID = "4904037";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + "/C.java"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, SRC_DIR + "/C.java"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/C.html", "<div class=\"block\">" +
{ "C.html", "<div class=\"block\">" +
"This is just a simple constructor.</div>\n" +
"<dl>\n" +
"<dt><span class=\"paramLabel\">Parameters:</span></dt>\n" +
@ -63,18 +60,4 @@ public class TestConstructorIndent extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

62
langtools/test/com/sun/javadoc/testConstructors/TestConstructors.java
View File

@ -33,11 +33,9 @@
public class TestConstructors extends JavadocTester {
private static final String BUG_ID = "8025524";
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg1/Outer.html",
{ "pkg1/Outer.html",
"<dt><span class=\"seeLabel\">See Also:</span></dt>\n" +
"<dd><a href=\"../pkg1/Outer.Inner.html#Inner--\"><code>Inner()</code></a>, \n" +
"<a href=\"../pkg1/Outer.Inner.html#Inner-int-\"><code>Inner(int)</code></a>, \n" +
@ -46,79 +44,79 @@ public class TestConstructors extends JavadocTester {
"<a href=\"../pkg1/Outer.html#Outer--\"><code>Outer()</code></a>, \n" +
"<a href=\"../pkg1/Outer.html#Outer-int-\"><code>Outer(int)</code></a>"
},
{BUG_ID + "/pkg1/Outer.html",
{ "pkg1/Outer.html",
"Link: <a href=\"../pkg1/Outer.Inner.html#Inner--\"><code>Inner()</code></a>, " +
"<a href=\"../pkg1/Outer.html#Outer-int-\"><code>Outer(int)</code></a>, " +
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\"><code>" +
"NestedInner(int)</code></a>"
},
{BUG_ID + "/pkg1/Outer.html",
{ "pkg1/Outer.html",
"<a href=\"../pkg1/Outer.html#Outer--\">Outer</a></span>()"
},
{BUG_ID + "/pkg1/Outer.html",
{ "pkg1/Outer.html",
"<a name=\"Outer--\">"
},
{BUG_ID + "/pkg1/Outer.html",
{ "pkg1/Outer.html",
"<a href=\"../pkg1/Outer.html#Outer-int-\">Outer</a></span>(int&nbsp;i)"
},
{BUG_ID + "/pkg1/Outer.html",
{ "pkg1/Outer.html",
"<a name=\"Outer-int-\">"
},
{BUG_ID + "/pkg1/Outer.Inner.html",
{ "pkg1/Outer.Inner.html",
"<a href=\"../pkg1/Outer.Inner.html#Inner--\">Inner</a></span>()"
},
{BUG_ID + "/pkg1/Outer.Inner.html",
{ "pkg1/Outer.Inner.html",
"<a name=\"Inner--\">"
},
{BUG_ID + "/pkg1/Outer.Inner.html",
{ "pkg1/Outer.Inner.html",
"<a href=\"../pkg1/Outer.Inner.html#Inner-int-\">Inner</a></span>(int&nbsp;i)"
},
{BUG_ID + "/pkg1/Outer.Inner.html",
{ "pkg1/Outer.Inner.html",
"<a name=\"Inner-int-\">"
},
{BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
{ "pkg1/Outer.Inner.NestedInner.html",
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner--\">NestedInner</a></span>()"
},
{BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
{ "pkg1/Outer.Inner.NestedInner.html",
"<a name=\"NestedInner--\">"
},
{BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
{ "pkg1/Outer.Inner.NestedInner.html",
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\">NestedInner</a></span>(int&nbsp;i)"
},
{BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
{ "pkg1/Outer.Inner.NestedInner.html",
"<a name=\"NestedInner-int-\">"
}
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/pkg1/Outer.Inner.html",
{ "pkg1/Outer.Inner.html",
"Outer.Inner--"
},
{BUG_ID + "/pkg1/Outer.Inner.html",
{ "pkg1/Outer.Inner.html",
"Outer.Inner-int-"
},
{BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
{ "pkg1/Outer.Inner.NestedInner.html",
"Outer.Inner.NestedInner--"
},
{BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
{ "pkg1/Outer.Inner.NestedInner.html",
"Outer.Inner.NestedInner-int-"
},
{BUG_ID + "/pkg1/Outer.html",
{ "pkg1/Outer.html",
"<a href=\"../pkg1/Outer.Inner.html#Outer.Inner--\"><code>Outer.Inner()</code></a>"
},
{BUG_ID + "/pkg1/Outer.html",
{ "pkg1/Outer.html",
"<a href=\"../pkg1/Outer.Inner.html#Outer.Inner-int-\"><code>Outer.Inner(int)</code></a>"
},
{BUG_ID + "/pkg1/Outer.html",
{ "pkg1/Outer.html",
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#Outer.Inner.NestedInner--\"><code>Outer.Inner.NestedInner()</code></a>"
},
{BUG_ID + "/pkg1/Outer.html",
{ "pkg1/Outer.html",
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#Outer.Inner.NestedInner-int-\"><code>Outer.Inner.NestedInner(int)</code></a>"
}
};
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1"
};
/**
@ -130,18 +128,4 @@ public class TestConstructors extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

25
langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java
View File

@ -33,28 +33,25 @@
public class TestCustomTag extends JavadocTester {
//Test information.
private static final String BUG_ID = "8006248";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-Xdoclint:none", "-d", BUG_ID, "-tagletpath", SRC_DIR,
"-Xdoclint:none", "-d", OUTPUT_DIR, "-tagletpath", SRC_DIR,
"-taglet", "taglets.CustomTag", "-sourcepath",
SRC_DIR, SRC_DIR + "/TagTestClass.java"
};
private static final String[] ARGS1 = new String[] {
"-d", BUG_ID + "-1", "-tagletpath",
"-d", OUTPUT_DIR + "-1", "-tagletpath",
SRC_DIR, "-taglet", "taglets.CustomTag",
"-sourcepath", SRC_DIR, SRC_DIR + "/TagTestClass.java"
};
private static final String[] ARGS2 = new String[] {
"-Xdoclint:none", "-d", BUG_ID + "-2", "-sourcepath",
"-Xdoclint:none", "-d", OUTPUT_DIR + "-2", "-sourcepath",
SRC_DIR, SRC_DIR + "/TagTestClass.java"
};
private static final String[] ARGS3 = new String[] {
"-d", BUG_ID + "-3", "-sourcepath",
"-d", OUTPUT_DIR + "-3", "-sourcepath",
SRC_DIR, SRC_DIR + "/TagTestClass.java"
};
@ -94,18 +91,4 @@ public class TestCustomTag extends JavadocTester {
tester.run(ARGS3, TEST3, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

23
langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java
View File

@ -33,19 +33,16 @@
public class TestDeprecatedDocs extends JavadocTester {
//Test information.
private static final String BUG_ID = "4927552";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
};
private static final String TARGET_FILE =
BUG_ID + "/deprecated-list.html";
"deprecated-list.html";
private static final String TARGET_FILE2 =
BUG_ID + "/pkg/DeprecatedClassByAnnotation.html";
"pkg/DeprecatedClassByAnnotation.html";
//Input for string search tests.
private static final String[][] TEST = {
@ -101,18 +98,4 @@ public class TestDeprecatedDocs extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java
View File

@ -38,12 +38,9 @@
public class TestDocEncoding extends JavadocTester {
//Test information.
private static final String BUG_ID = "8000743";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID,
"-d", OUTPUT_DIR,
"-docencoding", "Cp930",
"-sourcepath", SRC_DIR,
"-notimestamp",
@ -51,7 +48,7 @@ public class TestDocEncoding extends JavadocTester {
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/stylesheet.css",
{ "stylesheet.css",
"body {\n" +
" background-color:#ffffff;"}
};
@ -65,19 +62,5 @@ public class TestDocEncoding extends JavadocTester {
tester.run(ARGS, NO_TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

19
langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java
View File

@ -35,12 +35,9 @@
public class TestDocErrorReporter extends JavadocTester {
//Test information.
private static final String BUG_ID = "4927928";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-encoding", "xyz",
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-encoding", "xyz",
SRC_DIR + "/TestDocErrorReporter.java"
};
@ -57,18 +54,4 @@ public class TestDocErrorReporter extends JavadocTester {
tester.checkExitCode(EXPECTED_EXIT_CODE, actualExitCode);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

38
langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java
View File

@ -39,24 +39,18 @@ import java.io.File;
public class TestDocFileDir extends JavadocTester {
private static final String BUG_ID = "4258405-4973606";
private static final String[][] TEST1 = {
{BUG_ID + "-1/pkg/doc-files/testfile.txt",
{ "pkg/doc-files/testfile.txt",
"This doc file did not get trashed."}
};
private static final String[] FILE_TEST2 = {
BUG_ID + "-2/pkg/doc-files/subdir-used1" +
"/testfile.txt",
BUG_ID + "-2/pkg/doc-files/subdir-used2" +
"/testfile.txt"
"pkg/doc-files/subdir-used1/testfile.txt",
"pkg/doc-files/subdir-used2/testfile.txt"
};
private static final String[] FILE_NEGATED_TEST2 = {
BUG_ID + "-2/pkg/doc-files/subdir-excluded1" +
"/testfile.txt",
BUG_ID + "-2/pkg/doc-files/subdir-excluded2" +
"/testfile.txt"
"pkg/doc-files/subdir-excluded1/testfile.txt",
"pkg/doc-files/subdir-excluded2/testfile.txt"
};
private static final String[][] TEST0 = {
@ -67,15 +61,15 @@ public class TestDocFileDir extends JavadocTester {
//Output dir = Input Dir
private static final String[] ARGS1 =
new String[] {
"-d", BUG_ID + "-1",
"-d", OUTPUT_DIR + "-1",
"-sourcepath",
"blah" + File.pathSeparator + BUG_ID + "-1" +
"blah" + File.pathSeparator + OUTPUT_DIR + "-1" +
File.pathSeparator + "blah", "pkg"};
//Exercising -docfilessubdirs and -excludedocfilessubdir
private static final String[] ARGS2 =
new String[] {
"-d", BUG_ID + "-2",
"-d", OUTPUT_DIR + "-2",
"-sourcepath", SRC_DIR,
"-docfilessubdirs",
"-excludedocfilessubdir", "subdir-excluded1:subdir-excluded2",
@ -94,23 +88,9 @@ public class TestDocFileDir extends JavadocTester {
TestDocFileDir tester = new TestDocFileDir();
copyDir(SRC_DIR + "/pkg", ".");
tester.run(ARGS0, TEST0, NO_TEST);
copyDir(SRC_DIR + "/pkg", BUG_ID + "-1");
copyDir(SRC_DIR + "/pkg", OUTPUT_DIR + "-1");
tester.run(ARGS1, TEST1, NO_TEST);
tester.run(ARGS2, NO_TEST, NO_TEST, FILE_TEST2, FILE_NEGATED_TEST2);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

17
langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java
View File

@ -33,9 +33,8 @@
public class TestDocFiles extends JavadocTester {
private static final String BUG_ID = "8008949";
private static final String[][] TEST = {
{"tmp/pkg/doc-files/test.txt", "test file"}};
{ "pkg/doc-files/test.txt", "test file"}};
private static final String[] ARGS =
new String[] {
@ -50,18 +49,4 @@ public class TestDocFiles extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

27
langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java
View File

@ -36,24 +36,23 @@
public class TestDocRootInlineTag extends JavadocTester {
private static final String BUG_ID = "4369014-4851991";
private static final String[][] TEST = {
{BUG_ID + "/TestDocRootTag.html",
{ "TestDocRootTag.html",
"<a href=\"http://www.java.sun.com/j2se/1.4/docs/api/java/io/File.html?is-external=true\" " +
"title=\"class or interface in java.io\"><code>File</code></a>"},
{BUG_ID + "/TestDocRootTag.html",
{ "TestDocRootTag.html",
"<a href=\"./glossary.html\">glossary</a>"},
{BUG_ID + "/TestDocRootTag.html",
{ "TestDocRootTag.html",
"<a href=\"http://www.java.sun.com/j2se/1.4/docs/api/java/io/File.html?is-external=true\" " +
"title=\"class or interface in java.io\"><code>Second File Link</code></a>"},
{BUG_ID + "/TestDocRootTag.html", "The value of @docRoot is \"./\""},
{BUG_ID + "/index-all.html", "My package page is " +
{ "TestDocRootTag.html", "The value of @docRoot is \"./\""},
{ "index-all.html", "My package page is " +
"<a href=\"./pkg/package-summary.html\">here</a>"}
};
private static final String[] ARGS =
new String[] {
"-bottom", "The value of @docRoot is \"{@docRoot}\"",
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"-linkoffline", "http://www.java.sun.com/j2se/1.4/docs/api",
SRC_DIR, SRC_DIR + "/TestDocRootTag.java", "pkg"
};
@ -67,18 +66,4 @@ public class TestDocRootInlineTag extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

59
langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java
View File

@ -32,92 +32,91 @@
*/
public class TestDocRootLink extends JavadocTester {
private static final String BUG_ID = "6553182";
private static final String[][] TEST1 = {
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"Refer <a href=\"../../technotes/guides/index.html\">Here</a>"
},
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"This <a href=\"../pkg2/C2.html\">Here</a> should not be replaced\n" +
" with an absolute link."
},
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"Testing <a href=\"../technotes/guides/index.html\">Link 1</a> and\n" +
" <a href=\"../pkg2/C2.html\">Link 2</a>."
},
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg1/package-summary.html",
"<a href=\"../../technotes/guides/index.html\">\n" +
" Test document 1</a>"
},
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg1/package-summary.html",
"<a href=\"../pkg2/C2.html\">\n" +
" Another Test document 1</a>"
},
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg1/package-summary.html",
"<a href=\"../technotes/guides/index.html\">\n" +
" Another Test document 2.</a>"
}
};
private static final String[][] NEGATED_TEST1 = {
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
},
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">"
},
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg1/package-summary.html",
"<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
},
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg1/package-summary.html",
"<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">"
}
};
private static final String[][] TEST2 = {
{BUG_ID + "-1/pkg2/C2.html",
{ "pkg2/C2.html",
"Refer <a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">Here</a>"
},
{BUG_ID + "-1/pkg2/C2.html",
{ "pkg2/C2.html",
"This <a href=\"../pkg1/C1.html\">Here</a> should not be replaced\n" +
" with an absolute link."
},
{BUG_ID + "-1/pkg2/C2.html",
{ "pkg2/C2.html",
"Testing <a href=\"../technotes/guides/index.html\">Link 1</a> and\n" +
" <a href=\"../pkg1/C1.html\">Link 2</a>."
},
{BUG_ID + "-1/pkg2/package-summary.html",
{ "pkg2/package-summary.html",
"<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">\n" +
" Test document 1</a>"
},
{BUG_ID + "-1/pkg2/package-summary.html",
{ "pkg2/package-summary.html",
"<a href=\"../pkg1/C1.html\">\n" +
" Another Test document 1</a>"
},
{BUG_ID + "-1/pkg2/package-summary.html",
{ "pkg2/package-summary.html",
"<a href=\"../technotes/guides/index.html\">\n" +
" Another Test document 2.</a>"
}
};
private static final String[][] NEGATED_TEST2 = {
{BUG_ID + "-1/pkg2/C2.html",
{ "pkg2/C2.html",
"<a href=\"../../technotes/guides/index.html\">"
},
{BUG_ID + "-1/pkg2/C2.html",
{ "pkg2/C2.html",
"<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">"
},
{BUG_ID + "-1/pkg2/package-summary.html",
{ "pkg2/package-summary.html",
"<a href=\"../../technotes/guides/index.html\">"
},
{BUG_ID + "-1/pkg2/package-summary.html",
{ "pkg2/package-summary.html",
"<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">"
}
};
private static final String[] ARGS1 =
new String[]{
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1", "pkg2"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1", "pkg2"
};
private static final String[] ARGS2 =
new String[]{
"-d", BUG_ID + "-1", "-Xdocrootparent",
"-d", OUTPUT_DIR + "-1", "-Xdocrootparent",
"http://download.oracle.com/javase/7/docs", "-sourcepath",
SRC_DIR, "pkg1", "pkg2"
};
@ -132,18 +131,4 @@ public class TestDocRootLink extends JavadocTester {
tester.run(ARGS2, TEST2, NEGATED_TEST2);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

17
langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java
View File

@ -35,9 +35,8 @@
public class TestDupParamWarn extends JavadocTester {
private static final String BUG_ID = "4745855";
private static final String[] ARGS =
new String[] {"-d", BUG_ID, "-sourcepath",
new String[] {"-d", OUTPUT_DIR, "-sourcepath",
SRC_DIR + "/", "pkg"};
private static final String[][] NEGATED_TEST =
new String[][] {{WARNING_OUTPUT,
@ -52,18 +51,4 @@ public class TestDupParamWarn extends JavadocTester {
tester.run(ARGS, NO_TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java
View File

@ -35,14 +35,13 @@
public class TestEmptyClass extends JavadocTester {
private static final String OUTPUT_DIR = "tmp";
private static final String[][] NEGATED_TEST = {
//The overview tree should not link to classes that were not documented
{OUTPUT_DIR + "/overview-tree.html", "<A HREF=\"TestEmptyClass.html\">"},
{ "overview-tree.html", "<A HREF=\"TestEmptyClass.html\">"},
//The index page should not link to classes that were not documented
{OUTPUT_DIR + "/index-all.html", "<A HREF=\"TestEmptyClass.html\">"},
{ "index-all.html", "<A HREF=\"TestEmptyClass.html\">"},
};
private static final String[] ARGS =
new String[] {
@ -50,8 +49,6 @@ public class TestEmptyClass extends JavadocTester {
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR + "/src",
SRC_DIR + "/src/Empty.java"
};
private static final String BUG_ID =
"4483401 4483407 4483409 4483413 4494343";
/**
* The entry point of the test.
@ -65,18 +62,4 @@ public class TestEmptyClass extends JavadocTester {
throw new Error("Error found while executing Javadoc");
}
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java
View File

@ -34,17 +34,14 @@
public class TestEnclosingClass extends JavadocTester {
//Test information.
private static final String BUG_ID = "5008230";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg/MyClass.MyInterface.html", "Enclosing class:"}
{ "pkg/MyClass.MyInterface.html", "Enclosing class:"}
};
/**
@ -56,18 +53,4 @@ public class TestEnclosingClass extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

19
langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java
View File

@ -35,15 +35,14 @@
public class TestEncoding extends JavadocTester {
private static final String BUG_ID = "4661481";
//If ??? is found in the output, the source file was not read with the correct encoding setting.
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/EncodeTest.html", "??"}
{ "EncodeTest.html", "??"}
};
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"-encoding", "iso-8859-1", SRC_DIR + "/EncodeTest.java"
};
@ -56,18 +55,4 @@ public class TestEncoding extends JavadocTester {
tester.run(ARGS, NO_TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java
View File

@ -35,15 +35,14 @@
public class TestExternalOverridenMethod extends JavadocTester {
private static final String BUG_ID = "4857717";
private static final String[][] TEST = {
{BUG_ID + "/pkg/XReader.html",
{ "pkg/XReader.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/FilterReader.html?is-external=true#read--\" " +
"title=\"class or interface in java.io\">read</a></code>&nbsp;in class&nbsp;<code>" +
"<a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/FilterReader.html?is-external=true\" " +
"title=\"class or interface in java.io\">FilterReader</a></code></dd>"},
{BUG_ID + "/pkg/XReader.html",
{ "pkg/XReader.html",
"<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n" +
"<dd><code><a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/DataInput.html?is-external=true#readInt--\" " +
"title=\"class or interface in java.io\">readInt</a></code>&nbsp;in interface&nbsp;<code>" +
@ -52,7 +51,7 @@ public class TestExternalOverridenMethod extends JavadocTester {
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"-linkoffline", "http://java.sun.com/j2se/1.4.1/docs/api", SRC_DIR,
"pkg"
};
@ -66,18 +65,4 @@ public class TestExternalOverridenMethod extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java
View File

@ -32,8 +32,6 @@
public class TestGeneratedBy extends JavadocTester {
private static final String OUTPUT_DIR = "tmp";
private static final String[] FILES = {
"pkg/MyClass.html",
"pkg/package-summary.html",
@ -65,7 +63,6 @@ public class TestGeneratedBy extends JavadocTester {
"pkg"
};
private static final String BUG_ID = "8000418-8024288";
private static String[][] getTests(boolean timestamp) {
String version = System.getProperty("java.version");
@ -74,7 +71,7 @@ public class TestGeneratedBy extends JavadocTester {
String genBy = "Generated by javadoc";
if (timestamp) genBy += " (" + version + ") on ";
tests[i] = new String[] {
OUTPUT_DIR + "/" + FILES[i], genBy
FILES[i], genBy
};
}
return tests;
@ -84,7 +81,7 @@ public class TestGeneratedBy extends JavadocTester {
String[][] tests = new String[FILES.length][];
for (int i = 0; i < FILES.length; i++) {
tests[i] = new String[] {
OUTPUT_DIR + "/" + FILES[i],
FILES[i],
(timestamp
? "Generated by javadoc (version"
: "Generated by javadoc ("),
@ -107,19 +104,5 @@ public class TestGeneratedBy extends JavadocTester {
throw new Error("Error found while executing Javadoc");
}
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java
View File

@ -35,12 +35,9 @@
public class TestGroupOption extends JavadocTester {
//Test information.
private static final String BUG_ID = "4924383";
//Javadoc arguments.
private static final String[] ARGS1 = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"-group", "Package One", "pkg1",
"-group", "Package Two", "pkg2",
"-group", "Package Three", "pkg3",
@ -48,7 +45,7 @@ public class TestGroupOption extends JavadocTester {
};
private static final String[] ARGS2 = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"-group", "Package One", "pkg1",
"-group", "Package One", "pkg2",
"-group", "Package One", "pkg3",
@ -75,18 +72,4 @@ public class TestGroupOption extends JavadocTester {
tester.run(ARGS2, TEST2, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

45
langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java
View File

@ -34,19 +34,16 @@
public class TestHeadings extends JavadocTester {
//Test information.
private static final String BUG_ID = "4905786-6259611";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-use", "-header", "Test Files",
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-use", "-header", "Test Files",
"pkg1", "pkg2"
};
//Input for string search tests.
private static final String[][] TEST = {
//Package summary
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg1/package-summary.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Class</th>\n" +
"<th class=\"colLast\" scope=\"col\"" +
@ -54,31 +51,31 @@ public class TestHeadings extends JavadocTester {
},
// Class documentation
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Field and Description</th>"
},
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"<h3>Methods inherited from class&nbsp;java.lang.Object</h3>"
},
// Class use documentation
{BUG_ID + "/pkg1/class-use/C1.html",
{ "pkg1/class-use/C1.html",
"<th class=\"colFirst\" scope=\"col\">Package</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>"
},
{BUG_ID + "/pkg1/class-use/C1.html",
{ "pkg1/class-use/C1.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Field and Description</th>"
},
// Deprecated
{BUG_ID + "/deprecated-list.html",
{ "deprecated-list.html",
"<th class=\"colOne\" scope=\"col\">Method and Description</th>"
},
// Constant values
{BUG_ID + "/constant-values.html",
{ "constant-values.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Modifier and Type</th>\n" +
"<th scope=\"col\">Constant Field</th>\n" +
@ -86,27 +83,27 @@ public class TestHeadings extends JavadocTester {
},
// Serialized Form
{BUG_ID + "/serialized-form.html",
{ "serialized-form.html",
"<h2 title=\"Package\">Package&nbsp;pkg1</h2>"
},
{BUG_ID + "/serialized-form.html",
{ "serialized-form.html",
"<h3>Class <a href=\"pkg1/C1.html\" title=\"class in pkg1\">" +
"pkg1.C1</a> extends java.lang.Object implements Serializable</h3>"
},
{BUG_ID + "/serialized-form.html",
{ "serialized-form.html",
"<h3>Serialized Fields</h3>"
},
// Overview Frame
{BUG_ID + "/overview-frame.html",
{ "overview-frame.html",
"<h1 title=\"Test Files\" class=\"bar\">Test Files</h1>"
},
{BUG_ID + "/overview-frame.html",
{ "overview-frame.html",
"<title>Overview List</title>"
},
// Overview Summary
{BUG_ID + "/overview-summary.html",
{ "overview-summary.html",
"<title>Overview</title>"
}
};
@ -120,18 +117,4 @@ public class TestHeadings extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java
View File

@ -33,17 +33,14 @@
public class TestHelpFile extends JavadocTester {
//Test information.
private static final String BUG_ID = "7132631";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
SRC_DIR + "/TestHelpFile.java"
};
private static final String[][] TEST = {
{BUG_ID + "/help-doc.html",
{ "help-doc.html",
"<a href=\"constant-values.html\">Constant Field Values</a>"
},
};
@ -57,18 +54,4 @@ public class TestHelpFile extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

23
langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java
View File

@ -34,17 +34,14 @@
public class TestHelpOption extends JavadocTester {
//Test information.
private static final String BUG_ID = "4934778-4777599-6553182";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-help",
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-help",
SRC_DIR + "/TestHelpOption.java"
};
private static final String[] ARGS2 = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
SRC_DIR + "/TestHelpOption.java"
};
@ -88,7 +85,7 @@ public class TestHelpOption extends JavadocTester {
};
private static final String[][] TEST2 = {
{BUG_ID + "/TestHelpOption.html",
{ "TestHelpOption.html",
"<li><a href=\"help-doc.html\">Help</a></li>"
},
};
@ -107,18 +104,4 @@ public class TestHelpOption extends JavadocTester {
tester.run(ARGS2, TEST2, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

19
langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java
View File

@ -35,17 +35,16 @@
public class TestHiddenMembers extends JavadocTester {
private static final String BUG_ID = "4492178";
//We should not inherit any members from BaseClass because they are all overriden and hidden
//(declared as private).
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/pkg/SubClass.html",
{ "pkg/SubClass.html",
"inherited from class pkg.<A HREF=\"../pkg/BaseClass.html\">BaseClass</A>"}
};
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"pkg"
};
@ -58,18 +57,4 @@ public class TestHiddenMembers extends JavadocTester {
tester.run(ARGS, NO_TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

35
langtools/test/com/sun/javadoc/testHref/TestHref.java
View File

@ -33,54 +33,51 @@
public class TestHref extends JavadocTester {
//Test information.
private static final String BUG_ID = "4663254";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-linkoffline",
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-linkoffline",
"http://java.sun.com/j2se/1.4/docs/api/", SRC_DIR, "pkg"
};
//Input for string search tests.
private static final String[][] TEST = {
//External link.
{BUG_ID + "/pkg/C1.html",
{ "pkg/C1.html",
"href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true#wait-long-int-\""
},
//Member summary table link.
{BUG_ID + "/pkg/C1.html",
{ "pkg/C1.html",
"href=\"../pkg/C1.html#method-int-int-java.util.ArrayList-\""
},
//Anchor test.
{BUG_ID + "/pkg/C1.html",
{ "pkg/C1.html",
"<a name=\"method-int-int-java.util.ArrayList-\">\n" +
"<!-- -->\n" +
"</a>"
},
//Backward compatibility anchor test.
{BUG_ID + "/pkg/C1.html",
{ "pkg/C1.html",
"<a name=\"method-int-int-java.util.ArrayList-\">\n" +
"<!-- -->\n" +
"</a>"
},
//{@link} test.
{BUG_ID + "/pkg/C2.html",
{ "pkg/C2.html",
"Link: <a href=\"../pkg/C1.html#method-int-int-java.util.ArrayList-\">"
},
//@see test.
{BUG_ID + "/pkg/C2.html",
{ "pkg/C2.html",
"See Also:</span></dt>\n" +
"<dd><a href=\"../pkg/C1.html#method-int-int-java.util.ArrayList-\">"
},
//Header does not link to the page itself.
{BUG_ID + "/pkg/C4.html",
{ "pkg/C4.html",
"Class C4&lt;E extends C4&lt;E&gt;&gt;</h2>"
},
//Signature does not link to the page itself.
{BUG_ID + "/pkg/C4.html",
{ "pkg/C4.html",
"public abstract class <span class=\"typeNameLabel\">C4&lt;E extends C4&lt;E&gt;&gt;</span>"
},
};
@ -98,18 +95,4 @@ public class TestHref extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

18
langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java
View File

@ -35,10 +35,9 @@
public class TestHrefInDocComment extends JavadocTester {
private static final String BUG_ID = "4638015";
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"};
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"};
/**
* The entry point of the test.
@ -49,20 +48,5 @@ public class TestHrefInDocComment extends JavadocTester {
if (tester.run(ARGS, NO_TEST, NO_TEST) != 0) {
throw new Error("Javadoc failed to execute properly with given source.");
}
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java
View File

@ -35,17 +35,14 @@
public class TestHtmlComments extends JavadocTester {
//Test information.
private static final String BUG_ID = "4904038";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + "/C.java"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, SRC_DIR + "/C.java"
};
//Input for string search tests.
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/C.html",
{ "C.html",
"<!-- ============ FIELD DETAIL =========== -->"}
};
@ -58,18 +55,4 @@ public class TestHtmlComments extends JavadocTester {
tester.run(ARGS, NO_TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

118
langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
View File

@ -35,18 +35,16 @@
public class TestHtmlDefinitionListTag extends JavadocTester {
private static final String BUG_ID = "6786690-6820360";
// Test common to all runs of javadoc. The class signature should print
// properly enclosed definition list tags and the Annotation Type
// Optional Element should print properly nested definition list tags
// for default value.
private static final String[][] TEST_ALL = {
{BUG_ID + "/pkg1/C1.html", "<pre>public class " +
{ "pkg1/C1.html", "<pre>public class " +
"<span class=\"typeNameLabel\">C1</span>\n" +
"extends java.lang.Object\n" +
"implements java.io.Serializable</pre>"},
{BUG_ID + "/pkg1/C4.html", "<dl>\n" +
{ "pkg1/C4.html", "<dl>\n" +
"<dt>Default:</dt>\n" +
"<dd>true</dd>\n" +
"</dl>"}};
@ -55,11 +53,11 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
// serialized form should have properly nested definition list tags
// enclosing comments, tags and deprecated information.
private static final String[][] TEST_CMNT_DEPR = {
{BUG_ID + "/pkg1/package-summary.html", "<dl>\n" +
{ "pkg1/package-summary.html", "<dl>\n" +
"<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n" +
"<dd>JDK1.0</dd>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C1.html", "<dl>\n" +
{ "pkg1/C1.html", "<dl>\n" +
"<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n" +
"<dd>JDK1.0</dd>\n" +
"<dt><span class=\"seeLabel\">See Also:</span></dt>\n" +
@ -68,7 +66,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"<a href=\"../serialized-form.html#pkg1.C1\">" +
"Serialized Form</a></dd>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C1.html", "<dl>\n" +
{ "pkg1/C1.html", "<dl>\n" +
"<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n" +
"<dd>1.4</dd>\n" +
"<dt><span class=\"seeLabel\">See Also:</span></dt>\n" +
@ -76,7 +74,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"<a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>setUndecorated(boolean)</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C1.html", "<dl>\n" +
{ "pkg1/C1.html", "<dl>\n" +
"<dt><span class=\"paramLabel\">Parameters:</span></dt>\n" +
"<dd><code>title" +
"</code> - the title</dd>\n" +
@ -89,7 +87,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"device</dd>\n" +
"<dd><code>HeadlessException</code></dd>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C1.html", "<dl>\n" +
{ "pkg1/C1.html", "<dl>\n" +
"<dt><span class=\"paramLabel\">Parameters:</span></dt>\n" +
"<dd><code>undecorated" +
"</code> - <code>true</code> if no decorations are\n" +
@ -104,7 +102,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"<a href=\"../pkg1/C1.html#readObject--\"><code>readObject()" +
"</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C1.html", "<dl>\n" +
{ "pkg1/C1.html", "<dl>\n" +
"<dt><span class=\"throwsLabel\">Throws:</span></dt>\n" +
"<dd><code>java.io.IOException</code></dd>\n" +
"<dt><span class=\"seeLabel\">See Also:" +
@ -112,7 +110,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>setUndecorated(boolean)</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C2.html", "<dl>\n" +
{ "pkg1/C2.html", "<dl>\n" +
"<dt><span class=\"paramLabel\">Parameters:" +
"</span></dt>\n" +
"<dd><code>set</code> - boolean</dd>\n" +
@ -120,7 +118,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"Since:</span></dt>\n" +
"<dd>1.4</dd>\n" +
"</dl>"},
{BUG_ID + "/serialized-form.html", "<dl>\n" +
{ "serialized-form.html", "<dl>\n" +
"<dt><span class=\"throwsLabel\">Throws:</span>" +
"</dt>\n" +
"<dd><code>" +
@ -130,7 +128,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>C1.setUndecorated(boolean)</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/serialized-form.html",
{ "serialized-form.html",
"<span class=\"deprecatedLabel\">Deprecated.</span>" +
"&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by\n" +
" <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
@ -146,7 +144,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>C1.setUndecorated(boolean)</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/serialized-form.html",
{ "serialized-form.html",
"<span class=\"deprecatedLabel\">Deprecated.</span>" +
"&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by\n" +
" <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
@ -159,7 +157,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"IOException</code></code></dd>\n" +
"<dd><code>java.io.IOException</code></dd>\n" +
"</dl>"},
{BUG_ID + "/serialized-form.html",
{ "serialized-form.html",
"<span class=\"deprecatedLabel\">Deprecated.</span>" +
"&nbsp;</div>\n" +
"<div class=\"block\">The name for this class.</div>"}};
@ -170,11 +168,11 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
// should display properly nested definition list tags for comments, tags
// and deprecated information.
private static final String[][] TEST_NODEPR = {
{BUG_ID + "/pkg1/package-summary.html", "<dl>\n" +
{ "pkg1/package-summary.html", "<dl>\n" +
"<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n" +
"<dd>JDK1.0</dd>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C1.html", "<dl>\n" +
{ "pkg1/C1.html", "<dl>\n" +
"<dt><span class=\"simpleTagLabel\">Since:</span>" +
"</dt>\n" +
"<dd>JDK1.0</dd>\n" +
@ -185,7 +183,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"<a href=\"../serialized-form.html#pkg1.C1\">" +
"Serialized Form</a></dd>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C1.html", "<dl>\n" +
{ "pkg1/C1.html", "<dl>\n" +
"<dt><span class=\"paramLabel\">Parameters:" +
"</span></dt>\n" +
"<dd><code>title</code> - the title</dd>\n" +
@ -200,7 +198,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"<dd><code>" +
"HeadlessException</code></dd>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C1.html", "<dl>\n" +
{ "pkg1/C1.html", "<dl>\n" +
"<dt><span class=\"paramLabel\">Parameters:" +
"</span></dt>\n" +
"<dd><code>undecorated</code> - <code>true</code>" +
@ -214,7 +212,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"<dd><a href=\"../pkg1/C1.html#readObject--\">" +
"<code>readObject()</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C1.html", "<dl>\n" +
{ "pkg1/C1.html", "<dl>\n" +
"<dt><span class=\"throwsLabel\">Throws:</span>" +
"</dt>\n" +
"<dd><code>java.io.IOException</code></dd>\n" +
@ -223,7 +221,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>setUndecorated(boolean)</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/serialized-form.html", "<dl>\n" +
{ "serialized-form.html", "<dl>\n" +
"<dt><span class=\"throwsLabel\">Throws:</span>" +
"</dt>\n" +
"<dd><code>" +
@ -233,7 +231,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>C1.setUndecorated(boolean)</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/serialized-form.html",
{ "serialized-form.html",
"<span class=\"deprecatedLabel\">Deprecated.</span>" +
"&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by\n" +
" <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
@ -249,7 +247,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>C1.setUndecorated(boolean)</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/serialized-form.html",
{ "serialized-form.html",
"<span class=\"deprecatedLabel\">Deprecated.</span>" +
"&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by\n" +
" <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
@ -262,7 +260,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"IOException</code></code></dd>\n" +
"<dd><code>java.io.IOException</code></dd>\n" +
"</dl>"},
{BUG_ID + "/serialized-form.html",
{ "serialized-form.html",
"<span class=\"deprecatedLabel\">Deprecated.</span>" +
"&nbsp;</div>\n" +
"<div class=\"block\">" +
@ -271,25 +269,25 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
// Test with -nocomment and -nodeprecated options. The ClassDocs whould
// not display definition lists for any member details.
private static final String[][] TEST_NOCMNT_NODEPR = {
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"<pre>public&nbsp;void&nbsp;readObject()\n" +
" throws java.io.IOException</pre>\n" +
"</li>"},
{BUG_ID + "/pkg1/C2.html", "<pre>public&nbsp;C2()</pre>\n" +
{ "pkg1/C2.html", "<pre>public&nbsp;C2()</pre>\n" +
"</li>"},
{BUG_ID + "/pkg1/C1.ModalExclusionType.html", "<pre>public " +
{ "pkg1/C1.ModalExclusionType.html", "<pre>public " +
"static final&nbsp;<a href=\"../pkg1/C1.ModalExclusionType.html\" " +
"title=\"enum in pkg1\">C1.ModalExclusionType</a> " +
"APPLICATION_EXCLUDE</pre>\n" +
"</li>"},
{BUG_ID + "/serialized-form.html", "<pre>boolean " +
{ "serialized-form.html", "<pre>boolean " +
"undecorated</pre>\n" +
"<div class=\"block\"><span class=\"deprecatedLabel\">" +
"Deprecated.</span>&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by\n" +
" <a href=\"pkg1/C1.html#setUndecorated-boolean-\"><code>" +
"setUndecorated(boolean)</code></a>.</span></div>\n" +
"</li>"},
{BUG_ID + "/serialized-form.html", "<span class=\"deprecatedLabel\">" +
{ "serialized-form.html", "<span class=\"deprecatedLabel\">" +
"Deprecated.</span>&nbsp;<span class=\"deprecationComment\">As of JDK version" +
" 1.5, replaced by\n" +
" <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
@ -299,54 +297,54 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
// Test for valid HTML generation which should not comprise of empty
// definition list tags.
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/pkg1/package-summary.html", "<dl></dl>"},
{BUG_ID + "/pkg1/package-summary.html", "<dl>\n" +
{ "pkg1/package-summary.html", "<dl></dl>"},
{ "pkg1/package-summary.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C1.html", "<dl></dl>"},
{BUG_ID + "/pkg1/C1.html", "<dl>\n" +
{ "pkg1/C1.html", "<dl></dl>"},
{ "pkg1/C1.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C1.ModalExclusionType.html", "<dl></dl>"},
{BUG_ID + "/pkg1/C1.ModalExclusionType.html", "<dl>\n" +
{ "pkg1/C1.ModalExclusionType.html", "<dl></dl>"},
{ "pkg1/C1.ModalExclusionType.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C2.html", "<dl></dl>"},
{BUG_ID + "/pkg1/C2.html", "<dl>\n" +
{ "pkg1/C2.html", "<dl></dl>"},
{ "pkg1/C2.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C2.ModalType.html", "<dl></dl>"},
{BUG_ID + "/pkg1/C2.ModalType.html", "<dl>\n" +
{ "pkg1/C2.ModalType.html", "<dl></dl>"},
{ "pkg1/C2.ModalType.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C3.html", "<dl></dl>"},
{BUG_ID + "/pkg1/C3.html", "<dl>\n" +
{ "pkg1/C3.html", "<dl></dl>"},
{ "pkg1/C3.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C4.html", "<dl></dl>"},
{BUG_ID + "/pkg1/C4.html", "<dl>\n" +
{ "pkg1/C4.html", "<dl></dl>"},
{ "pkg1/C4.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C5.html", "<dl></dl>"},
{BUG_ID + "/pkg1/C5.html", "<dl>\n" +
{ "pkg1/C5.html", "<dl></dl>"},
{ "pkg1/C5.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/overview-tree.html", "<dl></dl>"},
{BUG_ID + "/overview-tree.html", "<dl>\n" +
{ "overview-tree.html", "<dl></dl>"},
{ "overview-tree.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/serialized-form.html", "<dl></dl>"},
{BUG_ID + "/serialized-form.html", "<dl>\n" +
{ "serialized-form.html", "<dl></dl>"},
{ "serialized-form.html", "<dl>\n" +
"</dl>"}};
private static final String[] ARGS1 =
new String[] {
"-Xdoclint:none", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"};
"-Xdoclint:none", "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1"};
private static final String[] ARGS2 =
new String[] {
"-Xdoclint:none", "-d", BUG_ID, "-nocomment", "-sourcepath",
"-Xdoclint:none", "-d", OUTPUT_DIR, "-nocomment", "-sourcepath",
SRC_DIR, "pkg1"};
private static final String[] ARGS3 =
new String[] {
"-Xdoclint:none", "-d", BUG_ID, "-nodeprecated", "-sourcepath",
"-Xdoclint:none", "-d", OUTPUT_DIR, "-nodeprecated", "-sourcepath",
SRC_DIR, "pkg1"};
private static final String[] ARGS4 =
new String[] {
"-Xdoclint:none", "-d", BUG_ID, "-nocomment", "-nodeprecated",
"-Xdoclint:none", "-d", OUTPUT_DIR, "-nocomment", "-nodeprecated",
"-sourcepath", SRC_DIR, "pkg1"};
/**
@ -365,18 +363,4 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
tester.run(ARGS4, TEST_NOCMNT_NODEPR, TEST_CMNT_DEPR);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

33
langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java
View File

@ -36,28 +36,27 @@
public class TestHtmlStrongTag extends JavadocTester {
private static final String BUG_ID = "6786028";
private static final String[][] TEST1 = {
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"<span class=\"seeLabel\">See Also:</span>"}};
private static final String[][] NEGATED_TEST1 = {
{BUG_ID + "/pkg1/C1.html", "<STRONG>Method Summary</STRONG>"},
{BUG_ID + "/pkg1/C1.html", "<B>"},
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg1/C1.html", "<STRONG>Method Summary</STRONG>"},
{ "pkg1/C1.html", "<B>"},
{ "pkg1/package-summary.html",
"<STRONG>Class Summary</STRONG>"}};
private static final String[][] TEST2 = {
{BUG_ID + "/pkg2/C2.html", "<B>Comments:</B>"}};
{ "pkg2/C2.html", "<B>Comments:</B>"}};
private static final String[][] NEGATED_TEST2 = {
{BUG_ID + "/pkg2/C2.html", "<STRONG>Method Summary</STRONG>"},
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg2/C2.html", "<STRONG>Method Summary</STRONG>"},
{ "pkg1/package-summary.html",
"<STRONG>Class Summary</STRONG>"}};
private static final String[] ARGS1 =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"};
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1"};
private static final String[] ARGS2 =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg2"};
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg2"};
/**
* The entry point of the test.
@ -69,18 +68,4 @@ public class TestHtmlStrongTag extends JavadocTester {
tester.run(ARGS2, TEST2, NEGATED_TEST2);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

36
langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java
View File

@ -33,47 +33,45 @@
public class TestHtmlTableStyles extends JavadocTester {
private static final String BUG_ID = "8008164";
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg1/TestTable.html",
{ "pkg1/TestTable.html",
"<table border cellpadding=3 cellspacing=1>"
},
{BUG_ID + "/pkg1/TestTable.html",
{ "pkg1/TestTable.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Field Summary table, listing fields, " +
"and an explanation\">"
},
{BUG_ID + "/pkg1/TestTable.html",
{ "pkg1/TestTable.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Constructor Summary table, listing " +
"constructors, and an explanation\">"
},
{BUG_ID + "/pkg1/TestTable.html",
{ "pkg1/TestTable.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Method Summary table, listing methods, " +
"and an explanation\">"
},
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg1/package-summary.html",
"<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Class Summary table, listing classes, " +
"and an explanation\">"
},
{BUG_ID + "/pkg1/class-use/TestTable.html",
{ "pkg1/class-use/TestTable.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Use table, listing fields, and an explanation\">"
},
{BUG_ID + "/overview-summary.html",
{ "overview-summary.html",
"<table class=\"overviewSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Packages table, listing packages, and an explanation\">"
},
{BUG_ID + "/deprecated-list.html",
{ "deprecated-list.html",
"<table class=\"deprecatedSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Deprecated Methods table, listing " +
"deprecated methods, and an explanation\">"
},
{BUG_ID + "/constant-values.html",
{ "constant-values.html",
"<table class=\"constantsSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Constant Field Values table, listing " +
"constant fields, and values\">"
@ -81,7 +79,7 @@ public class TestHtmlTableStyles extends JavadocTester {
};
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2"
};
/**
@ -93,18 +91,4 @@ public class TestHtmlTableStyles extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

173
langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java
View File

@ -34,12 +34,9 @@
public class TestHtmlTableTags extends JavadocTester {
//Test information.
private static final String BUG_ID = "6786688";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-use", "pkg1", "pkg2"
};
//Input for string tests for HTML table tags.
@ -49,127 +46,127 @@ public class TestHtmlTableTags extends JavadocTester {
*/
//Package summary
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg1/package-summary.html",
"<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\"" +
" cellspacing=\"0\" summary=\"Class Summary table, " +
"listing classes, and an explanation\">"
},
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg1/package-summary.html",
"<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\"" +
" cellspacing=\"0\" summary=\"Interface Summary table, " +
"listing interfaces, and an explanation\">"
},
{BUG_ID + "/pkg2/package-summary.html",
{ "pkg2/package-summary.html",
"<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\"" +
" cellspacing=\"0\" summary=\"Enum Summary table, " +
"listing enums, and an explanation\">"
},
{BUG_ID + "/pkg2/package-summary.html",
{ "pkg2/package-summary.html",
"<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\"" +
" cellspacing=\"0\" summary=\"Annotation Types Summary table, " +
"listing annotation types, and an explanation\">"
},
// Class documentation
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Field Summary table, listing fields, " +
"and an explanation\">"
},
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Method Summary table, listing methods, " +
"and an explanation\">"
},
{BUG_ID + "/pkg2/C2.html",
{ "pkg2/C2.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Nested Class Summary table, listing " +
"nested classes, and an explanation\">"
},
{BUG_ID + "/pkg2/C2.html",
{ "pkg2/C2.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Constructor Summary table, listing " +
"constructors, and an explanation\">"
},
{BUG_ID + "/pkg2/C2.ModalExclusionType.html",
{ "pkg2/C2.ModalExclusionType.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Enum Constant Summary table, listing " +
"enum constants, and an explanation\">"
},
{BUG_ID + "/pkg2/C3.html",
{ "pkg2/C3.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Required Element Summary table, " +
"listing required elements, and an explanation\">"
},
{BUG_ID + "/pkg2/C4.html",
{ "pkg2/C4.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Optional Element Summary table, " +
"listing optional elements, and an explanation\">"
},
// Class use documentation
{BUG_ID + "/pkg1/class-use/I1.html",
{ "pkg1/class-use/I1.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing packages, and an explanation\">"
},
{BUG_ID + "/pkg1/class-use/C1.html",
{ "pkg1/class-use/C1.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing fields, and an explanation\">"
},
{BUG_ID + "/pkg1/class-use/C1.html",
{ "pkg1/class-use/C1.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing methods, and an explanation\">"
},
{BUG_ID + "/pkg2/class-use/C2.html",
{ "pkg2/class-use/C2.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing fields, and an explanation\">"
},
{BUG_ID + "/pkg2/class-use/C2.html",
{ "pkg2/class-use/C2.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing methods, and an explanation\">"
},
{BUG_ID + "/pkg2/class-use/C2.ModalExclusionType.html",
{ "pkg2/class-use/C2.ModalExclusionType.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing packages, and an explanation\">"
},
{BUG_ID + "/pkg2/class-use/C2.ModalExclusionType.html",
{ "pkg2/class-use/C2.ModalExclusionType.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing methods, and an explanation\">"
},
// Package use documentation
{BUG_ID + "/pkg1/package-use.html",
{ "pkg1/package-use.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing packages, and an explanation\">"
},
{BUG_ID + "/pkg1/package-use.html",
{ "pkg1/package-use.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing classes, and an explanation\">"
},
{BUG_ID + "/pkg2/package-use.html",
{ "pkg2/package-use.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing packages, and an explanation\">"
},
{BUG_ID + "/pkg2/package-use.html",
{ "pkg2/package-use.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing classes, and an explanation\">"
},
// Deprecated
{BUG_ID + "/deprecated-list.html",
{ "deprecated-list.html",
"<table class=\"deprecatedSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" " +
"summary=\"Deprecated Fields table, listing deprecated fields, " +
"and an explanation\">"
},
{BUG_ID + "/deprecated-list.html",
{ "deprecated-list.html",
"<table class=\"deprecatedSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" " +
"summary=\"Deprecated Methods table, listing deprecated methods, " +
"and an explanation\">"
},
// Constant values
{BUG_ID + "/constant-values.html",
{ "constant-values.html",
"<table class=\"constantsSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" " +
"summary=\"Constant Field Values table, listing " +
"constant fields, and values\">"
},
// Overview Summary
{BUG_ID + "/overview-summary.html",
{ "overview-summary.html",
"<table class=\"overviewSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Packages table, " +
"listing packages, and an explanation\">"
@ -180,27 +177,27 @@ public class TestHtmlTableTags extends JavadocTester {
*/
//Package summary
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg1/package-summary.html",
"<caption><span>Class Summary</span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg1/package-summary.html",
"<caption><span>Interface Summary</span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/package-summary.html",
{ "pkg2/package-summary.html",
"<caption><span>Enum Summary</span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/package-summary.html",
{ "pkg2/package-summary.html",
"<caption><span>Annotation Types Summary</span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
// Class documentation
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"<caption><span>Fields</span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"<caption><span id=\"t0\" class=\"activeTableTab\"><span>All " +
"Methods</span><span class=\"tabEnd\">&nbsp;</span></span>" +
"<span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:show(2);\">" +
@ -211,94 +208,94 @@ public class TestHtmlTableTags extends JavadocTester {
"Deprecated Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>" +
"</caption>"
},
{BUG_ID + "/pkg2/C2.html",
{ "pkg2/C2.html",
"<caption><span>Nested Classes</span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/C2.html",
{ "pkg2/C2.html",
"<caption><span>Constructors</span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/C2.ModalExclusionType.html",
{ "pkg2/C2.ModalExclusionType.html",
"<caption><span>Enum Constants</span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/C3.html",
{ "pkg2/C3.html",
"<caption><span>Required Elements</span><span class=\"tabEnd\">&nbsp;" +
"</span></caption>"
},
{BUG_ID + "/pkg2/C4.html",
{ "pkg2/C4.html",
"<caption><span>Optional Elements</span><span class=\"tabEnd\">&nbsp;" +
"</span></caption>"
},
// Class use documentation
{BUG_ID + "/pkg1/class-use/I1.html",
{ "pkg1/class-use/I1.html",
"<caption><span>Packages that use <a href=\"../../pkg1/I1.html\" " +
"title=\"interface in pkg1\">I1</a></span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg1/class-use/C1.html",
{ "pkg1/class-use/C1.html",
"<caption><span>Fields in <a href=\"../../pkg2/package-summary.html\">" +
"pkg2</a> declared as <a href=\"../../pkg1/C1.html\" " +
"title=\"class in pkg1\">C1</a></span><span class=\"tabEnd\">&nbsp;" +
"</span></caption>"
},
{BUG_ID + "/pkg1/class-use/C1.html",
{ "pkg1/class-use/C1.html",
"<caption><span>Methods in <a href=\"../../pkg2/package-summary.html\">" +
"pkg2</a> that return <a href=\"../../pkg1/C1.html\" " +
"title=\"class in pkg1\">C1</a></span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/C2.html",
{ "pkg2/class-use/C2.html",
"<caption><span>Fields in <a href=\"../../pkg1/package-summary.html\">" +
"pkg1</a> declared as <a href=\"../../pkg2/C2.html\" " +
"title=\"class in pkg2\">C2</a></span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/C2.html",
{ "pkg2/class-use/C2.html",
"<caption><span>Methods in <a href=\"../../pkg1/package-summary.html\">" +
"pkg1</a> that return <a href=\"../../pkg2/C2.html\" " +
"title=\"class in pkg2\">C2</a></span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/C2.ModalExclusionType.html",
{ "pkg2/class-use/C2.ModalExclusionType.html",
"<caption><span>Methods in <a href=\"../../pkg2/package-summary.html\">" +
"pkg2</a> that return <a href=\"../../pkg2/C2.ModalExclusionType.html\" " +
"title=\"enum in pkg2\">C2.ModalExclusionType</a></span>" +
"<span class=\"tabEnd\">&nbsp;</span></caption>"
},
// Package use documentation
{BUG_ID + "/pkg1/package-use.html",
{ "pkg1/package-use.html",
"<caption><span>Packages that use <a href=\"../pkg1/package-summary.html\">" +
"pkg1</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg1/package-use.html",
{ "pkg1/package-use.html",
"<caption><span>Classes in <a href=\"../pkg1/package-summary.html\">" +
"pkg1</a> used by <a href=\"../pkg1/package-summary.html\">pkg1</a>" +
"</span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/package-use.html",
{ "pkg2/package-use.html",
"<caption><span>Packages that use <a href=\"../pkg2/package-summary.html\">" +
"pkg2</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/package-use.html",
{ "pkg2/package-use.html",
"<caption><span>Classes in <a href=\"../pkg2/package-summary.html\">" +
"pkg2</a> used by <a href=\"../pkg1/package-summary.html\">pkg1</a>" +
"</span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
// Deprecated
{BUG_ID + "/deprecated-list.html",
{ "deprecated-list.html",
"<caption><span>Deprecated Fields</span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + "/deprecated-list.html",
{ "deprecated-list.html",
"<caption><span>Deprecated Methods</span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
// Constant values
{BUG_ID + "/constant-values.html",
{ "constant-values.html",
"<caption><span>pkg1.<a href=\"pkg1/C1.html\" title=\"class in pkg1\">" +
"C1</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
// Overview Summary
{BUG_ID + "/overview-summary.html",
{ "overview-summary.html",
"<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
@ -307,110 +304,110 @@ public class TestHtmlTableTags extends JavadocTester {
*/
//Package summary
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg1/package-summary.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Class</th>\n" +
"<th class=\"colLast\" scope=\"col\"" +
">Description</th>"
},
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg1/package-summary.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Interface</th>\n" +
"<th class=\"colLast\" scope=\"col\"" +
">Description</th>"
},
{BUG_ID + "/pkg2/package-summary.html",
{ "pkg2/package-summary.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Enum</th>\n" +
"<th class=\"colLast\" scope=\"col\"" +
">Description</th>"
},
{BUG_ID + "/pkg2/package-summary.html",
{ "pkg2/package-summary.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Annotation Type</th>\n" +
"<th class=\"colLast\"" +
" scope=\"col\">Description</th>"
},
// Class documentation
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Field and Description</th>"
},
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Method and Description</th>"
},
{BUG_ID + "/pkg2/C2.html",
{ "pkg2/C2.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Class and Description</th>"
},
{BUG_ID + "/pkg2/C2.html",
{ "pkg2/C2.html",
"<th class=\"colOne\" scope=\"col\">Constructor and Description</th>"
},
{BUG_ID + "/pkg2/C2.ModalExclusionType.html",
{ "pkg2/C2.ModalExclusionType.html",
"<th class=\"colOne\" scope=\"col\">Enum Constant and Description</th>"
},
{BUG_ID + "/pkg2/C3.html",
{ "pkg2/C3.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Required Element and Description</th>"
},
{BUG_ID + "/pkg2/C4.html",
{ "pkg2/C4.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Optional Element and Description</th>"
},
// Class use documentation
{BUG_ID + "/pkg1/class-use/I1.html",
{ "pkg1/class-use/I1.html",
"<th class=\"colFirst\" scope=\"col\">Package</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>"
},
{BUG_ID + "/pkg1/class-use/C1.html",
{ "pkg1/class-use/C1.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Field and Description</th>"
},
{BUG_ID + "/pkg1/class-use/C1.html",
{ "pkg1/class-use/C1.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Method and Description</th>"
},
{BUG_ID + "/pkg2/class-use/C2.html",
{ "pkg2/class-use/C2.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Field and Description</th>"
},
{BUG_ID + "/pkg2/class-use/C2.html",
{ "pkg2/class-use/C2.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Method and Description</th>"
},
{BUG_ID + "/pkg2/class-use/C2.ModalExclusionType.html",
{ "pkg2/class-use/C2.ModalExclusionType.html",
"<th class=\"colFirst\" scope=\"col\">Package</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>"
},
{BUG_ID + "/pkg2/class-use/C2.ModalExclusionType.html",
{ "pkg2/class-use/C2.ModalExclusionType.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Method and Description</th>"
},
// Package use documentation
{BUG_ID + "/pkg1/package-use.html",
{ "pkg1/package-use.html",
"<th class=\"colFirst\" scope=\"col\">Package</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>"
},
{BUG_ID + "/pkg1/package-use.html",
{ "pkg1/package-use.html",
"<th class=\"colOne\" scope=\"col\">Class and Description</th>"
},
{BUG_ID + "/pkg2/package-use.html",
{ "pkg2/package-use.html",
"<th class=\"colFirst\" scope=\"col\">Package</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>"
},
{BUG_ID + "/pkg2/package-use.html",
{ "pkg2/package-use.html",
"<th class=\"colOne\" scope=\"col\">Class and Description</th>"
},
// Deprecated
{BUG_ID + "/deprecated-list.html",
{ "deprecated-list.html",
"<th class=\"colOne\" scope=\"col\">Field and Description</th>"
},
{BUG_ID + "/deprecated-list.html",
{ "deprecated-list.html",
"<th class=\"colOne\" scope=\"col\">Method and Description</th>"
},
// Constant values
{BUG_ID + "/constant-values.html",
{ "constant-values.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Modifier and Type</th>\n" +
"<th" +
@ -418,7 +415,7 @@ public class TestHtmlTableTags extends JavadocTester {
"<th class=\"colLast\" scope=\"col\">Value</th>"
},
// Overview Summary
{BUG_ID + "/overview-summary.html",
{ "overview-summary.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Package</th>\n" +
"<th class=\"colLast\" scope=\"col\"" +
@ -435,18 +432,4 @@ public class TestHtmlTableTags extends JavadocTester {
tester.run(ARGS, TABLE_TAGS_TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

39
langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java
View File

@ -38,34 +38,33 @@ import java.util.Locale;
public class TestHtmlTag extends JavadocTester {
private static final String BUG_ID = "6786682";
private static final String[][] TEST1 = {
{BUG_ID + "/pkg1/C1.html",
{ "pkg1/C1.html",
"<html lang=\"" + Locale.getDefault().getLanguage() + "\">"},
{BUG_ID + "/pkg1/package-summary.html",
{ "pkg1/package-summary.html",
"<html lang=\"" + Locale.getDefault().getLanguage() + "\">"}};
private static final String[][] NEGATED_TEST1 = {
{BUG_ID + "/pkg1/C1.html", "<html>"}};
{ "pkg1/C1.html", "<html>"}};
private static final String[][] TEST2 = {
{BUG_ID + "/pkg2/C2.html", "<html lang=\"ja\">"},
{BUG_ID + "/pkg2/package-summary.html", "<html lang=\"ja\">"}};
{ "pkg2/C2.html", "<html lang=\"ja\">"},
{ "pkg2/package-summary.html", "<html lang=\"ja\">"}};
private static final String[][] NEGATED_TEST2 = {
{BUG_ID + "/pkg2/C2.html", "<html>"}};
{ "pkg2/C2.html", "<html>"}};
private static final String[][] TEST3 = {
{BUG_ID + "/pkg1/C1.html", "<html lang=\"en\">"},
{BUG_ID + "/pkg1/package-summary.html", "<html lang=\"en\">"}};
{ "pkg1/C1.html", "<html lang=\"en\">"},
{ "pkg1/package-summary.html", "<html lang=\"en\">"}};
private static final String[][] NEGATED_TEST3 = {
{BUG_ID + "/pkg1/C1.html", "<html>"}};
{ "pkg1/C1.html", "<html>"}};
private static final String[] ARGS1 =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"};
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1"};
private static final String[] ARGS2 =
new String[] {
"-locale", "ja", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg2"};
"-locale", "ja", "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg2"};
private static final String[] ARGS3 =
new String[] {
"-locale", "en_US", "-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"};
"-locale", "en_US", "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1"};
/**
* The entry point of the test.
@ -78,18 +77,4 @@ public class TestHtmlTag extends JavadocTester {
tester.run(ARGS3, TEST3, NEGATED_TEST3);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

25
langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java
View File

@ -32,22 +32,19 @@
public class TestIndentation extends JavadocTester {
//Test information.
private static final String BUG_ID = "8011288";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "p"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "p"
};
//Input for string search tests.
private static final String[][] TEST = {
{ BUG_ID + "/p/Indent.html",
{ "p/Indent.html",
"<pre>public&nbsp;&lt;T&gt;&nbsp;void&nbsp;m(T&nbsp;t1," },
{ BUG_ID + "/p/Indent.html",
{ "p/Indent.html",
"\n" +
" T&nbsp;t2)" },
{ BUG_ID + "/p/Indent.html",
{ "p/Indent.html",
"\n" +
" throws java.lang.Exception" }
};
@ -61,18 +58,4 @@ public class TestIndentation extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

33
langtools/test/com/sun/javadoc/testIndex/TestIndex.java
View File

@ -36,40 +36,37 @@
public class TestIndex extends JavadocTester {
//Test information.
private static final String BUG_ID = "4852280-4517115-4973608-4994589";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", SRC_DIR + "/NoPackage.java"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg", SRC_DIR + "/NoPackage.java"
};
//Input for string search tests.
private static final String[][] TEST = {
//Make sure the horizontal scroll bar does not appear in class frame.
{BUG_ID + "/index.html",
{ "index.html",
"<frame src=\"overview-summary.html\" name=\"classFrame\" title=\"" +
"Package, class and interface descriptions\" scrolling=\"yes\">"},
//Test index-all.html
{BUG_ID + "/index-all.html",
{ "index-all.html",
"<a href=\"pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">C</span></a>" +
" - Class in <a href=\"pkg/package-summary.html\">pkg</a>"},
{BUG_ID + "/index-all.html",
{ "index-all.html",
"<a href=\"pkg/Interface.html\" title=\"interface in pkg\">" +
"<span class=\"typeNameLink\">Interface</span></a> - Interface in " +
"<a href=\"pkg/package-summary.html\">pkg</a>"},
{BUG_ID + "/index-all.html",
{ "index-all.html",
"<a href=\"pkg/AnnotationType.html\" title=\"annotation in pkg\">" +
"<span class=\"typeNameLink\">AnnotationType</span></a> - Annotation Type in " +
"<a href=\"pkg/package-summary.html\">pkg</a>"},
{BUG_ID + "/index-all.html",
{ "index-all.html",
"<a href=\"pkg/Coin.html\" title=\"enum in pkg\">" +
"<span class=\"typeNameLink\">Coin</span></a> - Enum in " +
"<a href=\"pkg/package-summary.html\">pkg</a>"},
{BUG_ID + "/index-all.html",
{ "index-all.html",
"Class in <a href=\"package-summary.html\">&lt;Unnamed&gt;</a>"},
{BUG_ID + "/index-all.html",
{ "index-all.html",
"<dl>\n" +
"<dt><span class=\"memberNameLink\"><a href=\"pkg/C.html#Java\">" +
"Java</a></span> - Static variable in class pkg.<a href=\"pkg/C.html\" " +
@ -91,18 +88,4 @@ public class TestIndex extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java
View File

@ -34,19 +34,18 @@
public class TestInlineLinkLabel extends JavadocTester {
private static final String BUG_ID = "4524136";
private static final String[][] TEST = {
//Search for the label to the package link.
{BUG_ID + "/pkg/C1.html" ,
{ "pkg/C1.html" ,
"<a href=\"../pkg/package-summary.html\"><code>Here is a link to a package</code></a>"},
//Search for the label to the class link
{BUG_ID + "/pkg/C1.html" ,
{ "pkg/C1.html" ,
"<a href=\"../pkg/C2.html\" title=\"class in pkg\"><code>Here is a link to a class</code></a>"}
};
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"};
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"};
/**
* The entry point of the test.
@ -57,18 +56,4 @@ public class TestInlineLinkLabel extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

39
langtools/test/com/sun/javadoc/testInterface/TestInterface.java
View File

@ -37,24 +37,21 @@
public class TestInterface extends JavadocTester {
//Test information.
private static final String BUG_ID = "4682448-4947464-5029946";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg/Interface.html",
{ "pkg/Interface.html",
"<pre>int&nbsp;method()</pre>"},
{BUG_ID + "/pkg/Interface.html",
{ "pkg/Interface.html",
"<pre>static final&nbsp;int field</pre>"},
// Make sure known implementing class list is correct and omits type parameters.
{BUG_ID + "/pkg/Interface.html",
{ "pkg/Interface.html",
"<dl>\n" +
"<dt>All Known Implementing Classes:</dt>\n" +
"<dd><a href=\"../pkg/Child.html\" title=\"class in pkg\">Child" +
@ -63,7 +60,7 @@ public class TestInterface extends JavadocTester {
"</dl>"},
// Make sure "All Implemented Interfaces": has substituted type parameters
{BUG_ID + "/pkg/Child.html",
{ "pkg/Child.html",
"<dl>\n" +
"<dt>All Implemented Interfaces:</dt>\n" +
"<dd><a href=\"../pkg/Interface.html\" title=\"interface in pkg\">" +
@ -71,7 +68,7 @@ public class TestInterface extends JavadocTester {
"</dl>"
},
//Make sure Class Tree has substituted type parameters.
{BUG_ID + "/pkg/Child.html",
{ "pkg/Child.html",
"<ul class=\"inheritance\">\n" +
"<li>java.lang.Object</li>\n" +
"<li>\n" +
@ -88,7 +85,7 @@ public class TestInterface extends JavadocTester {
"</ul>"
},
//Make sure "Direct Know Subclasses" omits type parameters
{BUG_ID + "/pkg/Parent.html",
{ "pkg/Parent.html",
"<dl>\n" +
"<dt>Direct Known Subclasses:</dt>\n" +
"<dd><a href=\"../pkg/Child.html\" title=\"class in pkg\">Child" +
@ -96,7 +93,7 @@ public class TestInterface extends JavadocTester {
"</dl>"
},
//Make sure "Specified By" has substituted type parameters.
{BUG_ID + "/pkg/Child.html",
{ "pkg/Child.html",
"<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n" +
"<dd><code><a href=\"../pkg/Interface.html#method--\">method</a>" +
"</code>&nbsp;in interface&nbsp;<code>" +
@ -105,7 +102,7 @@ public class TestInterface extends JavadocTester {
"T</a>&gt;</code></dd>"
},
//Make sure "Overrides" has substituted type parameters.
{BUG_ID + "/pkg/Child.html",
{ "pkg/Child.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg/Parent.html#method--\">method</a>" +
"</code>&nbsp;in class&nbsp;<code><a href=\"../pkg/Parent.html\" " +
@ -114,9 +111,9 @@ public class TestInterface extends JavadocTester {
},
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/pkg/Interface.html",
{ "pkg/Interface.html",
"public int&nbsp;method()"},
{BUG_ID + "/pkg/Interface.html",
{ "pkg/Interface.html",
"public static final&nbsp;int field"},
};
@ -129,18 +126,4 @@ public class TestInterface extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

44
langtools/test/com/sun/javadoc/testJavaFX/TestJavaFX.java
View File

@ -33,58 +33,56 @@
public class TestJavaFX extends JavadocTester {
private static final String BUG_ID = "7112427";
private static final String[][] TEST =
new String[][] {
{"./" + BUG_ID + "/C.html",
{ "C.html",
"<dt><span class=\"seeLabel\">See Also:</span></dt>\n" +
"<dd><a href=\"C.html#getRate--\"><code>getRate()</code></a>, \n" +
"<a href=\"C.html#setRate-double-\"><code>setRate(double)</code></a></dd>"},
{"./" + BUG_ID + "/C.html",
{ "C.html",
"<pre>public final&nbsp;void&nbsp;setRate(double&nbsp;value)</pre>\n" +
"<div class=\"block\">Sets the value of the property rate.</div>\n" +
"<dl>\n" +
"<dt><span class=\"simpleTagLabel\">Property description:</span></dt>" },
{"./" + BUG_ID + "/C.html",
{ "C.html",
"<pre>public final&nbsp;double&nbsp;getRate()</pre>\n" +
"<div class=\"block\">Gets the value of the property rate.</div>\n" +
"<dl>\n" +
"<dt><span class=\"simpleTagLabel\">Property description:</span></dt>" },
{"./" + BUG_ID + "/C.html",
{ "C.html",
"<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"C.html#rateProperty\">rate</a></span></code>\n" +
"<div class=\"block\">Defines the direction/speed at which the <code>Timeline</code> is expected to"},
{"./" + BUG_ID + "/C.html",
{ "C.html",
"<span class=\"simpleTagLabel\">Default value:</span>"},
{"./" + BUG_ID + "/C.html",
{ "C.html",
"<span class=\"simpleTagLabel\">Since:</span></dt>\n" +
"<dd>JavaFX 8.0</dd>" },
{"./" + BUG_ID + "/C.html",
{ "C.html",
"<p>Sets the value of the property <code>Property</code>"},
{"./" + BUG_ID + "/C.html",
{ "C.html",
"<p>Gets the value of the property <code>Property</code>"},
{"./" + BUG_ID + "/C.html",
{ "C.html",
"<span class=\"simpleTagLabel\">Property description:</span>"},
{"./" + BUG_ID + "/C.html",
{ "C.html",
"<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"C.html#setTestMethodProperty--\">setTestMethodProperty</a></span>()</code>&nbsp;</td>" },
{"./" + BUG_ID + "/C.html",
{ "C.html",
"<h4>isPaused</h4>\n" +
"<pre>public final&nbsp;double&nbsp;isPaused()</pre>\n" +
"<div class=\"block\">Gets the value of the property paused.</div>" },
{"./" + BUG_ID + "/D.html",
{ "D.html",
"<h3>Properties inherited from class&nbsp;<a href=\"C.html\" title=\"class in &lt;Unnamed&gt;\">C</a></h3>\n" +
"<code><a href=\"C.html#pausedProperty\">paused</a>, <a href=\"C.html#rateProperty\">rate</a></code></li>" },
};
private static final String[][] NO_TEST =
new String[][] {
{"./" + BUG_ID + "/C.html",
{ "C.html",
"A()"},
};
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-javafx",
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-javafx",
SRC_DIR + "/C.java", SRC_DIR + "/D.java"
};
@ -97,18 +95,4 @@ public class TestJavaFX extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

27
langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java
View File

@ -34,22 +34,19 @@
public class TestJavascript extends JavadocTester {
//Test information.
private static final String BUG_ID = "4665566-4855876-8012375";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", SRC_DIR +
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg", SRC_DIR +
"/TestJavascript.java"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<a href=\"../index.html?pkg/C.html\" target=\"_top\">Frames</a>"},
{BUG_ID + "/TestJavascript.html",
{ "TestJavascript.html",
"<a href=\"index.html?TestJavascript.html\" target=\"_top\">Frames</a>"},
{BUG_ID + "/index.html",
{ "index.html",
"<script type=\"text/javascript\">\n" +
" targetPage = \"\" + window.location.search;\n" +
" if (targetPage != \"\" && targetPage != \"undefined\")\n" +
@ -104,7 +101,7 @@ public class TestJavascript extends JavadocTester {
"</script>"},
//Make sure title javascript only runs if is-external is not true
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
" try {\n" +
" if (location.href.indexOf('is-external=true') == -1) {\n" +
" parent.document.title=\"C\";\n" +
@ -123,18 +120,4 @@ public class TestJavascript extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

43
langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java
View File

@ -40,25 +40,22 @@
public class TestLambdaFeature extends JavadocTester {
//Test information.
private static final String BUG_ID = "8004893-8022738";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "pkg1"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg", "pkg1"
};
private static final String[] ARGS_1 = new String[] {
"-d", BUG_ID + "-2", "-sourcepath", SRC_DIR, "-source", "1.7", "pkg1"
"-d", OUTPUT_DIR + "-2", "-sourcepath", SRC_DIR, "-source", "1.7", "pkg1"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg/A.html",
{ "pkg/A.html",
"<td class=\"colFirst\"><code>default void</code></td>"},
{BUG_ID + "/pkg/A.html",
{ "pkg/A.html",
"<pre>default&nbsp;void&nbsp;defaultMethod()</pre>"},
{BUG_ID + "/pkg/A.html",
{ "pkg/A.html",
"<caption><span id=\"t0\" class=\"activeTableTab\"><span>" +
"All Methods</span><span class=\"tabEnd\">&nbsp;</span></span>" +
"<span id=\"t2\" class=\"tableTab\"><span>" +
@ -69,14 +66,14 @@ public class TestLambdaFeature extends JavadocTester {
"</span><span id=\"t5\" class=\"tableTab\"><span>" +
"<a href=\"javascript:show(16);\">Default Methods</a></span>" +
"<span class=\"tabEnd\">&nbsp;</span></span></caption>"},
{BUG_ID + "/pkg/A.html",
{ "pkg/A.html",
"<dl>\n" +
"<dt>Functional Interface:</dt>\n" +
"<dd>This is a functional interface and can therefore be used as " +
"the assignment target for a lambda expression or method " +
"reference.</dd>\n" +
"</dl>"},
{BUG_ID + "/pkg1/FuncInf.html",
{ "pkg1/FuncInf.html",
"<dl>\n" +
"<dt>Functional Interface:</dt>\n" +
"<dd>This is a functional interface and can therefore be used as " +
@ -85,25 +82,25 @@ public class TestLambdaFeature extends JavadocTester {
"</dl>"}
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/pkg/A.html",
{ "pkg/A.html",
"<td class=\"colFirst\"><code>default default void</code></td>"},
{BUG_ID + "/pkg/A.html",
{ "pkg/A.html",
"<pre>default&nbsp;default&nbsp;void&nbsp;defaultMethod()</pre>"},
{BUG_ID + "/pkg/B.html",
{ "pkg/B.html",
"<td class=\"colFirst\"><code>default void</code></td>"},
{BUG_ID + "/pkg1/NotAFuncInf.html",
{ "pkg1/NotAFuncInf.html",
"<dl>\n" +
"<dt>Functional Interface:</dt>\n" +
"<dd>This is a functional interface and can therefore be used as " +
"the assignment target for a lambda expression or method " +
"reference.</dd>\n" +
"</dl>"},
{BUG_ID + "/pkg/B.html",
{ "pkg/B.html",
"<dl>\n" +
"<dt>Functional Interface:</dt>"}
};
private static final String[][] NEGATED_TEST_1 = {
{BUG_ID + "-2/pkg1/FuncInf.html",
{ "pkg1/FuncInf.html",
"<dl>\n" +
"<dt>Functional Interface:</dt>"}
};
@ -118,18 +115,4 @@ public class TestLambdaFeature extends JavadocTester {
tester.run(ARGS_1, NO_TEST, NEGATED_TEST_1);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

19
langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java
View File

@ -37,9 +37,8 @@
public class LeadingSpaces extends JavadocTester {
private static final String BUG_ID = "4232882-8014636";
private static final String[][] TEST = {
{BUG_ID + "/LeadingSpaces.html",
{ "LeadingSpaces.html",
" 1\n" +
" 2\n" +
" 3\n" +
@ -50,7 +49,7 @@ public class LeadingSpaces extends JavadocTester {
};
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
SRC_DIR + "/LeadingSpaces.java"};
/**
@ -63,20 +62,6 @@ public class LeadingSpaces extends JavadocTester {
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
/**
This leading spaces in the &lt;pre&gt; block below should be
preserved.

24
langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java
View File

@ -34,19 +34,17 @@
public class TestLegacyTaglet extends JavadocTester {
private static final String BUG_ID = "4638723-8015882";
private static final String[] ARGS =
new String[] {"-d", BUG_ID, "-sourcepath", SRC_DIR,
new String[] {"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"-tagletpath", SRC_DIR, "-taglet", "ToDoTaglet", "-taglet", "Check",
"-taglet", "UnderlineTaglet", SRC_DIR + "/C.java"};
private static final String[][] TEST = new String[][] {
{BUG_ID + "/C.html", "This is an <u>underline</u>"},
{BUG_ID + "/C.html",
{ "C.html", "This is an <u>underline</u>"},
{ "C.html",
"<DT><B>To Do:</B><DD><table cellpadding=2 cellspacing=0><tr>" +
"<td bgcolor=\"yellow\">Finish this class.</td></tr></table></DD>"},
{BUG_ID + "/C.html",
{ "C.html",
"<DT><B>To Do:</B><DD><table cellpadding=2 cellspacing=0><tr>" +
"<td bgcolor=\"yellow\">Tag in Method.</td></tr></table></DD>"}
};
@ -63,18 +61,4 @@ public class TestLegacyTaglet extends JavadocTester {
}
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

20
langtools/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java
View File

@ -34,11 +34,9 @@
public class TestBadLinkOption extends JavadocTester {
private static final String BUG_ID = "4720957";
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-link", BUG_ID, "pkg"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"-link", OUTPUT_DIR, "pkg"
};
private static final String[][] TEST = {
@ -58,18 +56,4 @@ public class TestBadLinkOption extends JavadocTester {
tester.run(ARGS, TEST, NEG_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

40
langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java
View File

@ -36,33 +36,31 @@ import java.io.File;
public class TestLinkOption extends JavadocTester {
private static final String BUG_ID = "4720957-5020118-8038976";
//Generate the documentation using -linkoffline and a URL as the first parameter.
private static final String[] ARGS1 = new String[] {
"-d", BUG_ID + "-1", "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR + "-1", "-sourcepath", SRC_DIR,
"-linkoffline", "http://java.sun.com/j2se/1.4/docs/api/",
SRC_DIR, "-package", "pkg", "java.lang"
};
private static final String[][] TEST1 = {
{BUG_ID + "-1/pkg/C.html",
{ "pkg/C.html",
"<a href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/String.html?is-external=true\" " +
"title=\"class or interface in java.lang\"><code>Link to String Class</code></a>"
},
//Make sure the parameters are indented properly when the -link option is used.
{BUG_ID + "-1/pkg/C.html",
{ "pkg/C.html",
"(int&nbsp;p1,\n" +
" int&nbsp;p2,\n" +
" int&nbsp;p3)"
},
{BUG_ID + "-1/pkg/C.html",
{ "pkg/C.html",
"(int&nbsp;p1,\n" +
" int&nbsp;p2,\n" +
" <a href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true\" title=\"class or interface in java.lang\">" +
"Object</a>&nbsp;p3)"
},
{BUG_ID + "-1/java/lang/StringBuilderChild.html",
{ "java/lang/StringBuilderChild.html",
"<pre>public abstract class <span class=\"typeNameLabel\">StringBuilderChild</span>\n" +
"extends <a href=\"http://java.sun.com/j2se/1.4/docs/api/java/lang/Object.html?is-external=true\" " +
"title=\"class or interface in java.lang\">Object</a></pre>"
@ -74,14 +72,14 @@ public class TestLinkOption extends JavadocTester {
//Generate the documentation using -linkoffline and a relative path as the first parameter.
//We will try linking to the docs generated in test 1 with a relative path.
private static final String[] ARGS2 = new String[] {
"-d", BUG_ID + "-2", "-sourcepath", SRC_DIR,
"-linkoffline", "../" + BUG_ID + "-1",
BUG_ID + "-1", "-package", "pkg2"
"-d", OUTPUT_DIR + "-2", "-sourcepath", SRC_DIR,
"-linkoffline", "../" + OUTPUT_DIR + "-1",
OUTPUT_DIR + "-1", "-package", "pkg2"
};
private static final String[][] TEST2 = {
{BUG_ID + "-2/pkg2/C2.html",
"This is a link to <a href=\"../../" + BUG_ID +
{ "pkg2/C2.html",
"This is a link to <a href=\"../../" + OUTPUT_DIR +
"-1/pkg/C.html?is-external=true\" " +
"title=\"class or interface in pkg\"><code>Class C</code></a>."
}
@ -92,8 +90,8 @@ public class TestLinkOption extends JavadocTester {
* that the command executes with no errors or related warnings.
*/
static String[] createArguments(boolean withTrailingSlash) {
String packagePath = new File(BUG_ID + "-1").getAbsolutePath();
String outputDirName = BUG_ID;
String packagePath = new File(OUTPUT_DIR + "-1").getAbsolutePath();
String outputDirName = OUTPUT_DIR;
if (withTrailingSlash) {
// add the trailing slash, if it is not present!
if (!packagePath.endsWith(FS)) {
@ -131,18 +129,4 @@ public class TestLinkOption extends JavadocTester {
}
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

17
langtools/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java
View File

@ -35,7 +35,6 @@
public class TestNewLineInLink extends JavadocTester {
private static final String BUG_ID = "4739870";
private static final String[][] NEGATED_TEST =
new String[][] {
{ERROR_OUTPUT,
@ -43,7 +42,7 @@ public class TestNewLineInLink extends JavadocTester {
};
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"-linkoffline", "http://www.java.sun.com/j2se/1.4/docs/api",
SRC_DIR, "testNewLineInLink"};
@ -56,18 +55,4 @@ public class TestNewLineInLink extends JavadocTester {
tester.run(ARGS, new String[][] {}, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

25
langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java
View File

@ -35,18 +35,15 @@
public class TestLinkTaglet extends JavadocTester {
//Test information.
private static final String BUG_ID = "4732864-6280605-7064544-8014636";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", SRC_DIR +
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg", SRC_DIR +
"/checkPkg/B.java"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"Qualified Link: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n" +
" Unqualified Link1: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n" +
" Unqualified Link2: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>\n" +
@ -54,12 +51,12 @@ public class TestLinkTaglet extends JavadocTester {
" Unqualified Link: <a href=\"../pkg/C.html#method-pkg.C.InnerC-pkg.C.InnerC2-\"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>\n" +
" Unqualified Link: <a href=\"../pkg/C.html#method-pkg.C.InnerC-pkg.C.InnerC2-\"><code>method(InnerC, InnerC2)</code></a>.<br/>"
},
{BUG_ID + "/pkg/C.InnerC.html",
{ "pkg/C.InnerC.html",
"Link to member in outer class: <a href=\"../pkg/C.html#MEMBER\"><code>C.MEMBER</code></a> <br/>\n" +
" Link to member in inner class: <a href=\"../pkg/C.InnerC2.html#MEMBER2\"><code>C.InnerC2.MEMBER2</code></a> <br/>\n" +
" Link to another inner class: <a href=\"../pkg/C.InnerC2.html\" title=\"class in pkg\"><code>C.InnerC2</code></a>"
},
{BUG_ID + "/pkg/C.InnerC2.html",
{ "pkg/C.InnerC2.html",
"<dl>\n" +
"<dt>Enclosing class:</dt>\n" +
"<dd><a href=\"../pkg/C.html\" title=\"class in pkg\">C</a></dd>\n" +
@ -79,18 +76,4 @@ public class TestLinkTaglet extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java
View File

@ -35,14 +35,13 @@
public class TestLinkToSerialForm extends JavadocTester {
private static final String BUG_ID = "4521661";
private static final String[][] TEST = {
{BUG_ID + "/serialized-form.html", "<a name=\"pkg.C\">"},
{BUG_ID + "/pkg/C.html", "<a href=\"../serialized-form.html#pkg.C\">"}
{ "serialized-form.html", "<a name=\"pkg.C\">"},
{ "pkg/C.html", "<a href=\"../serialized-form.html#pkg.C\">"}
};
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"};
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"};
/**
* The entry point of the test.
@ -53,18 +52,4 @@ public class TestLinkToSerialForm extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

36
langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java
View File

@ -32,10 +32,6 @@
public class TestLiteralCodeInPre extends JavadocTester {
//Test information.
private static final String BUG_ID = "8002387-8014636";
private static final String OUTPUT_DIR = BUG_ID;
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-Xdoclint:none", "pkg"
@ -43,25 +39,25 @@ public class TestLiteralCodeInPre extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{ BUG_ID + "/pkg/Test.html",
{ "pkg/Test.html",
"no_pre()</pre>\n" +
"<div class=\"block\">abc<code>def</code>ghi</div>" },
{ BUG_ID + "/pkg/Test.html",
{ "pkg/Test.html",
"no_pre_extra_whitespace()</pre>\n" +
"<div class=\"block\">abc<code>def </code>ghi</div>" },
{ BUG_ID + "/pkg/Test.html",
{ "pkg/Test.html",
"in_pre()</pre>\n" +
"<div class=\"block\"><pre> abc<code> def </code>ghi</pre></div>" },
{ BUG_ID + "/pkg/Test.html",
{ "pkg/Test.html",
"pre_after_text()</pre>\n" +
"<div class=\"block\">xyz <pre> abc<code> def </code>ghi</pre></div>" },
{ BUG_ID + "/pkg/Test.html",
{ "pkg/Test.html",
"after_pre()</pre>\n" +
"<div class=\"block\">xyz <pre> pqr </pre> abc<code>def </code>ghi</div>" },
{ BUG_ID + "/pkg/Test.html",
{ "pkg/Test.html",
"back_in_pre()</pre>\n" +
"<div class=\"block\">xyz <pre> pqr </pre> mno <pre> abc<code> def </code>ghi</pre></div>" },
{ BUG_ID + "/pkg/Test.html",
{ "pkg/Test.html",
"typical_usage_code()</pre>\n" +
"<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n" +
" Example: <pre><code>\n" +
@ -70,7 +66,7 @@ public class TestLiteralCodeInPre extends JavadocTester {
" line 3 }\n" +
" </code></pre>\n" +
" and so it goes.</div>" },
{ BUG_ID + "/pkg/Test.html",
{ "pkg/Test.html",
"typical_usage_literal()</pre>\n" +
"<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n" +
" Example: <pre>\n" +
@ -79,7 +75,7 @@ public class TestLiteralCodeInPre extends JavadocTester {
" line 3 }\n" +
" </pre>\n" +
" and so it goes.</div>" },
{ BUG_ID + "/pkg/Test.html",
{ "pkg/Test.html",
"recommended_usage_literal()</pre>\n" +
"<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n" +
" Example: <pre>\n" +
@ -98,18 +94,4 @@ public class TestLiteralCodeInPre extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

42
langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java
View File

@ -35,43 +35,41 @@
public class TestMemberInheritence extends JavadocTester {
private static final String BUG_ID = "4638588-4635809-6256068-6270645";
private static final String[][] TEST = {
//Public field should be inherited
{BUG_ID + "/pkg/SubClass.html",
{ "pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.html#pubField\">"},
//Public method should be inherited
{BUG_ID + "/pkg/SubClass.html",
{ "pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.html#pubMethod--\">"},
//Public inner class should be inherited.
{BUG_ID + "/pkg/SubClass.html",
{ "pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.pubInnerClass.html\" title=\"class in pkg\">"},
//Protected field should be inherited
{BUG_ID + "/pkg/SubClass.html",
{ "pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.html#proField\">"},
//Protected method should be inherited
{BUG_ID + "/pkg/SubClass.html",
{ "pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.html#proMethod--\">"},
//Protected inner class should be inherited.
{BUG_ID + "/pkg/SubClass.html",
{ "pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.proInnerClass.html\" title=\"class in pkg\">"},
// New labels as of 1.5.0
{BUG_ID + "/pkg/SubClass.html",
{ "pkg/SubClass.html",
"Nested classes/interfaces inherited from class&nbsp;pkg." +
"<a href=\"../pkg/BaseClass.html\" title=\"class in pkg\">BaseClass</a>"},
{BUG_ID + "/pkg/SubClass.html",
{ "pkg/SubClass.html",
"Nested classes/interfaces inherited from interface&nbsp;pkg." +
"<a href=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">BaseInterface</a>"},
// Test overriding/implementing methods with generic parameters.
{BUG_ID + "/pkg/BaseClass.html",
{ "pkg/BaseClass.html",
"<dl>\n" +
"<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n" +
"<dd><code><a href=\"../pkg/BaseInterface.html#getAnnotation-java.lang.Class-\">" +
@ -81,22 +79,22 @@ public class TestMemberInheritence extends JavadocTester {
"</dl>"},
// Test diamond inheritence member summary (6256068)
{BUG_ID + "/diamond/Z.html",
{ "diamond/Z.html",
"<code><a href=\"../diamond/A.html#aMethod--\">aMethod</a></code>"},
// Test that doc is inherited from closed parent (6270645)
{BUG_ID + "/inheritDist/C.html",
{ "inheritDist/C.html",
"<div class=\"block\">m1-B</div>"},
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/pkg/SubClass.html",
{ "pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.html#staticMethod--\">staticMethod</a></code>"},
};
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "diamond",
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg", "diamond",
"inheritDist"};
/**
@ -108,18 +106,4 @@ public class TestMemberInheritence extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

25
langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java
View File

@ -36,30 +36,27 @@
public class TestMemberSummary extends JavadocTester {
//Test information.
private static final String BUG_ID = "4951228-6290760";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg","pkg2"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg","pkg2"
};
//Input for string search tests.
private static final String[][] TEST = {
// Check return type in member summary.
{BUG_ID + "/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"<code><a href=\"../pkg/PublicChild.html\" title=\"class in pkg\">PublicChild</a></code></td>\n" +
"<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../pkg/PublicChild.html#returnTypeTest--\">" +
"returnTypeTest</a></span>()</code>"
},
// Check return type in member detail.
{BUG_ID + "/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"<pre>public&nbsp;<a href=\"../pkg/PublicChild.html\" title=\"class in pkg\">" +
"PublicChild</a>&nbsp;returnTypeTest()</pre>"
},
// Legacy anchor dimensions (6290760)
{BUG_ID + "/pkg2/A.html",
{ "pkg2/A.html",
"<a name=\"f-java.lang.Object:A-\">\n" +
"<!-- -->\n" +
"</a><a name=\"f-T:A-\">\n" +
@ -77,18 +74,4 @@ public class TestMemberSummary extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

39
langtools/test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java
View File

@ -33,20 +33,17 @@
public class TestMethodTypes extends JavadocTester {
//Test information.
private static final String BUG_ID = "8002304";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1"
};
private static final String[][] TEST = {
{BUG_ID + "/pkg1/A.html",
{ "pkg1/A.html",
"var methods = {"
},
{BUG_ID + "/pkg1/A.html",
{ "pkg1/A.html",
"<caption><span id=\"t0\" class=\"activeTableTab\"><span>All " +
"Methods</span><span class=\"tabEnd\">&nbsp;</span></span>" +
"<span id=\"t1\" class=\"tableTab\"><span><a href=\"javascript:show(1);\">" +
@ -60,11 +57,11 @@ public class TestMethodTypes extends JavadocTester {
"</caption>"
},
{BUG_ID + "/pkg1/A.html",
{ "pkg1/A.html",
"<tr id=\"i0\" class=\"altColor\">"
},
{BUG_ID + "/pkg1/B.html",
{ "pkg1/B.html",
"<caption><span id=\"t0\" class=\"activeTableTab\"><span>All " +
"Methods</span><span class=\"tabEnd\">&nbsp;</span></span>" +
"<span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:show(2);\">" +
@ -74,11 +71,11 @@ public class TestMethodTypes extends JavadocTester {
"</caption>"
},
{BUG_ID + "/pkg1/D.html",
{ "pkg1/D.html",
"var methods = {"
},
{BUG_ID + "/pkg1/D.html",
{ "pkg1/D.html",
"<caption><span id=\"t0\" class=\"activeTableTab\"><span>All " +
"Methods</span><span class=\"tabEnd\">&nbsp;</span></span>" +
"<span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:show(2);\">" +
@ -92,22 +89,22 @@ public class TestMethodTypes extends JavadocTester {
"</caption>"
},
{BUG_ID + "/pkg1/D.html",
{ "pkg1/D.html",
"<tr id=\"i0\" class=\"altColor\">"
},
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/pkg1/A.html",
{ "pkg1/A.html",
"<caption><span>Methods</span><span class=\"tabEnd\">&nbsp;</span>" +
"</caption>"
},
{BUG_ID + "/pkg1/B.html",
{ "pkg1/B.html",
"<caption><span>Methods</span><span class=\"tabEnd\">&nbsp;</span>" +
"</caption>"
},
{BUG_ID + "/pkg1/D.html",
{ "pkg1/D.html",
"<caption><span>Methods</span><span class=\"tabEnd\">&nbsp;</span>" +
"</caption>"
},
@ -122,18 +119,4 @@ public class TestMethodTypes extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

15
langtools/test/com/sun/javadoc/testModifier/TestModifier.java
View File

@ -35,7 +35,6 @@
public class TestModifier extends JavadocTester {
private static final String BUG_ID = "4210388";
private static final String[] ARGS =
new String[] {
"-sourcepath", SRC_DIR,
@ -52,18 +51,4 @@ public class TestModifier extends JavadocTester {
throw new Error("Javadoc error occured during execution.");
}
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

37
langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java
View File

@ -34,32 +34,29 @@
public class TestNavigation extends JavadocTester {
//Test information.
private static final String BUG_ID = "4131628-4664607";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg/A.html", "<li>Prev&nbsp;Class</li>"},
{BUG_ID + "/pkg/A.html",
{ "pkg/A.html", "<li>Prev&nbsp;Class</li>"},
{ "pkg/A.html",
"<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">Next&nbsp;Class</span></a>"},
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<a href=\"../pkg/A.html\" title=\"annotation in pkg\"><span class=\"typeNameLink\">Prev&nbsp;Class</span></a>"},
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"typeNameLink\">Next&nbsp;Class</span></a>"},
{BUG_ID + "/pkg/E.html",
{ "pkg/E.html",
"<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">Prev&nbsp;Class</span></a>"},
{BUG_ID + "/pkg/E.html",
{ "pkg/E.html",
"<a href=\"../pkg/I.html\" title=\"interface in pkg\"><span class=\"typeNameLink\">Next&nbsp;Class</span></a>"},
{BUG_ID + "/pkg/I.html",
{ "pkg/I.html",
"<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"typeNameLink\">Prev&nbsp;Class</span></a>"},
{BUG_ID + "/pkg/I.html", "<li>Next&nbsp;Class</li>"},
{ "pkg/I.html", "<li>Next&nbsp;Class</li>"},
// Test for 4664607
{BUG_ID + "/pkg/I.html",
{ "pkg/I.html",
"<div class=\"skipNav\"><a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a></div>\n" +
"<a name=\"navbar.top.firstrow\">\n" +
"<!-- -->\n" +
@ -75,18 +72,4 @@ public class TestNavigation extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java
View File

@ -33,18 +33,15 @@
public class TestNestedGenerics extends JavadocTester {
//Test information.
private static final String BUG_ID = "6758050";
//Javadoc arguments.
private static final String[] ARGS = new String[]{
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"pkg"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg/NestedGenerics.html",
{ "pkg/NestedGenerics.html",
"<div class=\"block\">Contains <a " +
"href=\"../pkg/NestedGenerics.html#foo-java.util.Map-\"><code>foo" +
"(java.util.Map&lt;A, java.util.Map&lt;A, A&gt;&gt;)</code></a></div>"
@ -60,18 +57,4 @@ public class TestNestedGenerics extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

25
langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java
View File

@ -54,32 +54,31 @@ public class TestNestedInlineTag extends JavadocTester {
*/
public void method(){}
private static final String BUG_ID = "no-bug-id";
private static final String[][] TEST = {
//Test nested inline tag in class description.
{BUG_ID + "/TestNestedInlineTag.html",
{ "TestNestedInlineTag.html",
"This should be green, underlined and bold (Class): <u><b><font color=\"green\">My test</font></b></u>"
},
//Test nested inline tag in field description.
{BUG_ID + "/TestNestedInlineTag.html",
{ "TestNestedInlineTag.html",
"This should be green, underlined and bold (Field): <u><b><font color=\"green\">My test</font></b></u>"
},
//Test nested inline tag in constructor description.
{BUG_ID + "/TestNestedInlineTag.html",
{ "TestNestedInlineTag.html",
"This should be green, underlined and bold (Constructor): <u><b><font color=\"green\">My test</font></b></u>"
},
//Test nested inline tag in method description.
{BUG_ID + "/TestNestedInlineTag.html",
{ "TestNestedInlineTag.html",
"This should be green, underlined and bold (Method): <u><b><font color=\"green\">My test</font></b></u>"
}
};
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"-taglet", "testtaglets.UnderlineTaglet",
"-taglet", "testtaglets.BoldTaglet",
"-taglet", "testtaglets.GreenTaglet",
@ -95,18 +94,4 @@ public class TestNestedInlineTag extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

236
langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java
View File

@ -35,13 +35,9 @@
public class TestNewLanguageFeatures extends JavadocTester {
//Test information.
private static final String BUG_ID =
"4789689-4905985-4927164-4827184-4993906";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-Xdoclint:none", "-d", BUG_ID, "-use", "-sourcepath", SRC_DIR,
"-Xdoclint:none", "-d", OUTPUT_DIR, "-use", "-sourcepath", SRC_DIR,
"pkg", "pkg1", "pkg2"
};
@ -52,43 +48,43 @@ public class TestNewLanguageFeatures extends JavadocTester {
// ENUM TESTING
//=================================
//Make sure enum header is correct.
{BUG_ID + "/pkg/Coin.html", "Enum Coin</h2>"},
{ "pkg/Coin.html", "Enum Coin</h2>"},
//Make sure enum signature is correct.
{BUG_ID + "/pkg/Coin.html", "<pre>public enum " +
{ "pkg/Coin.html", "<pre>public enum " +
"<span class=\"typeNameLabel\">Coin</span>\n" +
"extends java.lang.Enum&lt;<a href=\"../pkg/Coin.html\" " +
"title=\"enum in pkg\">Coin</a>&gt;</pre>"
},
//Check for enum constant section
{BUG_ID + "/pkg/Coin.html", "<caption><span>Enum Constants" +
{ "pkg/Coin.html", "<caption><span>Enum Constants" +
"</span><span class=\"tabEnd\">&nbsp;</span></caption>"},
//Detail for enum constant
{BUG_ID + "/pkg/Coin.html",
{ "pkg/Coin.html",
"<span class=\"memberNameLink\"><a href=\"../pkg/Coin.html#Dime\">Dime</a></span>"},
//Automatically insert documentation for values() and valueOf().
{BUG_ID + "/pkg/Coin.html",
{ "pkg/Coin.html",
"Returns an array containing the constants of this enum type,"},
{BUG_ID + "/pkg/Coin.html",
{ "pkg/Coin.html",
"Returns the enum constant of this type with the specified name"},
{BUG_ID + "/pkg/Coin.html", "for (Coin c : Coin.values())"},
{BUG_ID + "/pkg/Coin.html",
{ "pkg/Coin.html", "for (Coin c : Coin.values())"},
{ "pkg/Coin.html",
"Overloaded valueOf() method has correct documentation."},
{BUG_ID + "/pkg/Coin.html",
{ "pkg/Coin.html",
"Overloaded values method has correct documentation."},
//=================================
// TYPE PARAMETER TESTING
//=================================
//Make sure the header is correct.
{BUG_ID + "/pkg/TypeParameters.html",
{ "pkg/TypeParameters.html",
"Class TypeParameters&lt;E&gt;</h2>"},
//Check class type parameters section.
{BUG_ID + "/pkg/TypeParameters.html",
{ "pkg/TypeParameters.html",
"<dt><span class=\"paramLabel\">Type Parameters:</span></dt>\n" +
"<dd><code>E</code> - " +
"the type parameter for this class."},
//Type parameters in @see/@link
{BUG_ID + "/pkg/TypeParameters.html",
{ "pkg/TypeParameters.html",
"<dl>\n" +
"<dt><span class=\"seeLabel\">See Also:</span></dt>\n" +
"<dd>" +
@ -96,28 +92,28 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<code>TypeParameters</code></a></dd>\n" +
"</dl>"},
//Method that uses class type parameter.
{BUG_ID + "/pkg/TypeParameters.html",
{ "pkg/TypeParameters.html",
"(<a href=\"../pkg/TypeParameters.html\" title=\"type " +
"parameter in TypeParameters\">E</a>&nbsp;param)"},
//Method type parameter section.
{BUG_ID + "/pkg/TypeParameters.html",
{ "pkg/TypeParameters.html",
"<span class=\"paramLabel\">Type Parameters:</span></dt>\n" +
"<dd><code>T</code> - This is the first " +
"type parameter.</dd>\n" +
"<dd><code>V</code> - This is the second type " +
"parameter."},
//Signature of method with type parameters
{BUG_ID + "/pkg/TypeParameters.html",
{ "pkg/TypeParameters.html",
"public&nbsp;&lt;T extends java.util.List,V&gt;&nbsp;" +
"java.lang.String[]&nbsp;methodThatHasTypeParameters"},
//Wildcard testing.
{BUG_ID + "/pkg/Wildcards.html",
{ "pkg/Wildcards.html",
"<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
"TypeParameters</a>&lt;? super java.lang.String&gt;&nbsp;a"},
{BUG_ID + "/pkg/Wildcards.html",
{ "pkg/Wildcards.html",
"<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
"TypeParameters</a>&lt;? extends java.lang.StringBuffer&gt;&nbsp;b"},
{BUG_ID + "/pkg/Wildcards.html",
{ "pkg/Wildcards.html",
"<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
"TypeParameters</a>&nbsp;c"},
//Bad type parameter warnings.
@ -127,7 +123,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"\"<BadMethodTypeParam>\" is not a type parameter name."},
//Signature of subclass that has type parameters.
{BUG_ID + "/pkg/TypeParameterSubClass.html",
{ "pkg/TypeParameterSubClass.html",
"<pre>public class <span class=\"typeNameLabel\">TypeParameterSubClass&lt;T extends " +
"java.lang.String&gt;</span>\n" +
"extends " +
@ -136,20 +132,20 @@ public class TestNewLanguageFeatures extends JavadocTester {
//Interface generic parameter substitution
//Signature of subclass that has type parameters.
{BUG_ID + "/pkg/TypeParameters.html",
{ "pkg/TypeParameters.html",
"<dl>\n" +
"<dt>All Implemented Interfaces:</dt>\n" +
"<dd><a href=\"../pkg/SubInterface.html\" title=\"interface in pkg\">" +
"SubInterface</a>&lt;E&gt;, <a href=\"../pkg/SuperInterface.html\" " +
"title=\"interface in pkg\">SuperInterface</a>&lt;E&gt;</dd>\n" +
"</dl>"},
{BUG_ID + "/pkg/SuperInterface.html",
{ "pkg/SuperInterface.html",
"<dl>\n" +
"<dt>All Known Subinterfaces:</dt>\n" +
"<dd><a href=\"../pkg/SubInterface.html\" title=\"interface in pkg\">" +
"SubInterface</a>&lt;V&gt;</dd>\n" +
"</dl>"},
{BUG_ID + "/pkg/SubInterface.html",
{ "pkg/SubInterface.html",
"<dl>\n" +
"<dt>All Superinterfaces:</dt>\n" +
"<dd><a href=\"../pkg/SuperInterface.html\" title=\"interface in pkg\">" +
@ -159,10 +155,10 @@ public class TestNewLanguageFeatures extends JavadocTester {
//=================================
// VAR ARG TESTING
//=================================
{BUG_ID + "/pkg/VarArgs.html", "(int...&nbsp;i)"},
{BUG_ID + "/pkg/VarArgs.html", "(int[][]...&nbsp;i)"},
{BUG_ID + "/pkg/VarArgs.html", "-int:A...-"},
{BUG_ID + "/pkg/VarArgs.html",
{ "pkg/VarArgs.html", "(int...&nbsp;i)"},
{ "pkg/VarArgs.html", "(int[][]...&nbsp;i)"},
{ "pkg/VarArgs.html", "-int:A...-"},
{ "pkg/VarArgs.html",
"<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
"TypeParameters</a>...&nbsp;t"},
@ -170,7 +166,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
// ANNOTATION TYPE TESTING
//=================================
//Make sure the summary links are correct.
{BUG_ID + "/pkg/AnnotationType.html",
{ "pkg/AnnotationType.html",
"<li>Summary:&nbsp;</li>\n" +
"<li>Field&nbsp;|&nbsp;</li>\n" +
"<li><a href=\"#annotation.type.required.element.summary\">" +
@ -178,26 +174,26 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<li>" +
"<a href=\"#annotation.type.optional.element.summary\">Optional</a></li>"},
//Make sure the detail links are correct.
{BUG_ID + "/pkg/AnnotationType.html",
{ "pkg/AnnotationType.html",
"<li>Detail:&nbsp;</li>\n" +
"<li>Field&nbsp;|&nbsp;</li>\n" +
"<li><a href=\"#annotation.type.element.detail\">Element</a></li>"},
//Make sure the heading is correct.
{BUG_ID + "/pkg/AnnotationType.html",
{ "pkg/AnnotationType.html",
"Annotation Type AnnotationType</h2>"},
//Make sure the signature is correct.
{BUG_ID + "/pkg/AnnotationType.html",
{ "pkg/AnnotationType.html",
"public @interface <span class=\"memberNameLabel\">AnnotationType</span>"},
//Make sure member summary headings are correct.
{BUG_ID + "/pkg/AnnotationType.html",
{ "pkg/AnnotationType.html",
"<h3>Required Element Summary</h3>"},
{BUG_ID + "/pkg/AnnotationType.html",
{ "pkg/AnnotationType.html",
"<h3>Optional Element Summary</h3>"},
//Make sure element detail heading is correct
{BUG_ID + "/pkg/AnnotationType.html",
{ "pkg/AnnotationType.html",
"Element Detail"},
//Make sure default annotation type value is printed when necessary.
{BUG_ID + "/pkg/AnnotationType.html",
{ "pkg/AnnotationType.html",
"<dl>\n" +
"<dt>Default:</dt>\n" +
"<dd>\"unknown\"</dd>\n" +
@ -208,12 +204,12 @@ public class TestNewLanguageFeatures extends JavadocTester {
//=================================
//PACKAGE
{BUG_ID + "/pkg/package-summary.html",
{ "pkg/package-summary.html",
"<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>=\"Package Annotation\",\n" +
" <a href=\"../pkg/AnnotationType.html#required--\">required</a>=1994)"},
//CLASS
{BUG_ID + "/pkg/AnnotationTypeUsage.html",
{ "pkg/AnnotationTypeUsage.html",
"<pre><a href=\"../pkg/AnnotationType.html\" " +
"title=\"annotation in pkg\">@AnnotationType</a>(" +
"<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>" +
@ -225,7 +221,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"extends java.lang.Object</pre>"},
//FIELD
{BUG_ID + "/pkg/AnnotationTypeUsage.html",
{ "pkg/AnnotationTypeUsage.html",
"<pre><a href=\"../pkg/AnnotationType.html\" " +
"title=\"annotation in pkg\">@AnnotationType</a>(" +
"<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>" +
@ -235,7 +231,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"public&nbsp;int field</pre>"},
//CONSTRUCTOR
{BUG_ID + "/pkg/AnnotationTypeUsage.html",
{ "pkg/AnnotationTypeUsage.html",
"<pre><a href=\"../pkg/AnnotationType.html\" " +
"title=\"annotation in pkg\">@AnnotationType</a>(" +
"<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>" +
@ -245,7 +241,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"public&nbsp;AnnotationTypeUsage()</pre>"},
//METHOD
{BUG_ID + "/pkg/AnnotationTypeUsage.html",
{ "pkg/AnnotationTypeUsage.html",
"<pre><a href=\"../pkg/AnnotationType.html\" " +
"title=\"annotation in pkg\">@AnnotationType</a>(" +
"<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>" +
@ -255,7 +251,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"public&nbsp;void&nbsp;method()</pre>"},
//METHOD PARAMS
{BUG_ID + "/pkg/AnnotationTypeUsage.html",
{ "pkg/AnnotationTypeUsage.html",
"<pre>public&nbsp;void&nbsp;methodWithParams(" +
"<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">" +
"@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">" +
@ -265,7 +261,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
" int&nbsp;undocmented)</pre>"},
//CONSTRUCTOR PARAMS
{BUG_ID + "/pkg/AnnotationTypeUsage.html",
{ "pkg/AnnotationTypeUsage.html",
"<pre>public&nbsp;AnnotationTypeUsage(<a " +
"href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">" +
"@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">" +
@ -279,59 +275,59 @@ public class TestNewLanguageFeatures extends JavadocTester {
//=================================
//Integer
{BUG_ID + "/pkg1/B.html",
{ "pkg1/B.html",
"<a href=\"../pkg1/A.html#d--\">d</a>=3.14,"},
//Double
{BUG_ID + "/pkg1/B.html",
{ "pkg1/B.html",
"<a href=\"../pkg1/A.html#d--\">d</a>=3.14,"},
//Boolean
{BUG_ID + "/pkg1/B.html",
{ "pkg1/B.html",
"<a href=\"../pkg1/A.html#b--\">b</a>=true,"},
//String
{BUG_ID + "/pkg1/B.html",
{ "pkg1/B.html",
"<a href=\"../pkg1/A.html#s--\">s</a>=\"sigh\","},
//Class
{BUG_ID + "/pkg1/B.html",
{ "pkg1/B.html",
"<a href=\"../pkg1/A.html#c--\">c</a>=<a href=\"../pkg2/Foo.html\" title=\"class in pkg2\">Foo.class</a>,"},
//Bounded Class
{BUG_ID + "/pkg1/B.html",
{ "pkg1/B.html",
"<a href=\"../pkg1/A.html#w--\">w</a>=<a href=\"../pkg/TypeParameterSubClass.html\" title=\"class in pkg\">TypeParameterSubClass.class</a>,"},
//Enum
{BUG_ID + "/pkg1/B.html",
{ "pkg1/B.html",
"<a href=\"../pkg1/A.html#e--\">e</a>=<a href=\"../pkg/Coin.html#Penny\">Penny</a>,"},
//Annotation Type
{BUG_ID + "/pkg1/B.html",
{ "pkg1/B.html",
"<a href=\"../pkg1/A.html#a--\">a</a>=<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>=\"foo\",<a href=\"../pkg/AnnotationType.html#required--\">required</a>=1994),"},
//String Array
{BUG_ID + "/pkg1/B.html",
{ "pkg1/B.html",
"<a href=\"../pkg1/A.html#sa--\">sa</a>={\"up\",\"down\"},"},
//Primitive
{BUG_ID + "/pkg1/B.html",
{ "pkg1/B.html",
"<a href=\"../pkg1/A.html#primitiveClassTest--\">primitiveClassTest</a>=boolean.class,"},
//XXX: Add array test case after this if fixed:
//5020899: Incorrect internal representation of class-valued annotation elements
//Make sure that annotations are surrounded by <pre> and </pre>
{BUG_ID + "/pkg1/B.html",
{ "pkg1/B.html",
"<pre><a href=\"../pkg1/A.html\" title=\"annotation in pkg1\">@A</a>"},
{BUG_ID + "/pkg1/B.html",
{ "pkg1/B.html",
"public interface <span class=\"typeNameLabel\">B</span></pre>"},
//==============================================================
// Handle multiple bounds.
//==============================================================
{BUG_ID + "/pkg/MultiTypeParameters.html",
{ "pkg/MultiTypeParameters.html",
"public&nbsp;&lt;T extends java.lang.Number &amp; java.lang.Runnable&gt;&nbsp;T&nbsp;foo(T&nbsp;t)"},
//==============================================================
@ -339,79 +335,79 @@ public class TestNewLanguageFeatures extends JavadocTester {
//==============================================================
//ClassUseTest1: <T extends Foo & Foo2>
{BUG_ID + "/pkg2/class-use/Foo.html",
{ "pkg2/class-use/Foo.html",
"<caption><span>Classes in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> with type parameters of " +
"type <a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">" +
"Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/Foo.html",
{ "pkg2/class-use/Foo.html",
"<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest1.html\" " +
"title=\"class in pkg2\">ClassUseTest1</a>&lt;T extends " +
"<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo" +
"</a> &amp; <a href=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">" +
"Foo2</a>&gt;</span></code>&nbsp;</td>"
},
{BUG_ID + "/pkg2/class-use/Foo.html",
{ "pkg2/class-use/Foo.html",
"<caption><span>Methods in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> with type parameters of " +
"type <a href=\"../../pkg2/Foo.html\" title=\"class in " +
"pkg2\">Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/Foo.html",
{ "pkg2/class-use/Foo.html",
"<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest1." +
"</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/" +
"ClassUseTest1.html#method-T-\">method</a></span>" +
"(T&nbsp;t)</code>&nbsp;</td>"
},
{BUG_ID + "/pkg2/class-use/Foo.html",
{ "pkg2/class-use/Foo.html",
"<caption><span>Fields in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> with type parameters of " +
"type <a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">" +
"Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/Foo.html",
{ "pkg2/class-use/Foo.html",
"td class=\"colFirst\"><code><a href=\"../../pkg2/" +
"ParamTest.html\" title=\"class in pkg2\">ParamTest</a>" +
"&lt;<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\"" +
">Foo</a>&gt;</code></td>"
},
{BUG_ID + "/pkg2/class-use/ParamTest.html",
{ "pkg2/class-use/ParamTest.html",
"<caption><span>Fields in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> declared as <a href=\"../" +
"../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest" +
"</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/ParamTest.html",
{ "pkg2/class-use/ParamTest.html",
"<td class=\"colFirst\"><code><a href=\"../../pkg2/" +
"ParamTest.html\" title=\"class in pkg2\">ParamTest</a>&lt;<a " +
"href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo</a" +
">&gt;</code></td>"
},
{BUG_ID + "/pkg2/class-use/Foo2.html",
{ "pkg2/class-use/Foo2.html",
"<caption><span>Classes in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> with type parameters of " +
"type <a href=\"../../pkg2/Foo2.html\" title=\"interface " +
"in pkg2\">Foo2</a></span><span class=\"tabEnd\">&nbsp;" +
"</span></caption>"
},
{BUG_ID + "/pkg2/class-use/Foo2.html",
{ "pkg2/class-use/Foo2.html",
"<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest1.html\" " +
"title=\"class in pkg2\">ClassUseTest1</a>&lt;T extends " +
"<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">Foo" +
"</a> &amp; <a href=\"../../pkg2/Foo2.html\" title=\"interface in pkg2\">" +
"Foo2</a>&gt;</span></code>&nbsp;</td>"
},
{BUG_ID + "/pkg2/class-use/Foo2.html",
{ "pkg2/class-use/Foo2.html",
"<caption><span>Methods in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> with type parameters of " +
"type <a href=\"../../pkg2/Foo2.html\" title=\"interface " +
"in pkg2\">Foo2</a></span><span class=\"tabEnd\">&nbsp;" +
"</span></caption>"
},
{BUG_ID + "/pkg2/class-use/Foo2.html",
{ "pkg2/class-use/Foo2.html",
"<td class=\"colLast\"><span class=\"typeNameLabel\">" +
"ClassUseTest1.</span><code><span class=\"memberNameLink\"><a href=\"../../" +
"pkg2/ClassUseTest1.html#method-T-\">method</a></span>" +
@ -419,53 +415,53 @@ public class TestNewLanguageFeatures extends JavadocTester {
},
//ClassUseTest2: <T extends ParamTest<Foo3>>
{BUG_ID + "/pkg2/class-use/ParamTest.html",
{ "pkg2/class-use/ParamTest.html",
"<caption><span>Classes in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> with type parameters of " +
"type <a href=\"../../pkg2/ParamTest.html\" title=\"class " +
"in pkg2\">ParamTest</a></span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/ParamTest.html",
{ "pkg2/class-use/ParamTest.html",
"<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest2.html\" " +
"title=\"class in pkg2\">ClassUseTest2</a>&lt;T extends " +
"<a href=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">" +
"ParamTest</a>&lt;<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">" +
"Foo3</a>&gt;&gt;</span></code>&nbsp;</td>"
},
{BUG_ID + "/pkg2/class-use/ParamTest.html",
{ "pkg2/class-use/ParamTest.html",
"<caption><span>Methods in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> with type parameters of " +
"type <a href=\"../../pkg2/ParamTest.html\" title=\"class " +
"in pkg2\">ParamTest</a></span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/ParamTest.html",
{ "pkg2/class-use/ParamTest.html",
"<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest2." +
"</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/" +
"ClassUseTest2.html#method-T-\">method</a></span>" +
"(T&nbsp;t)</code>&nbsp;</td>"
},
{BUG_ID + "/pkg2/class-use/ParamTest.html",
{ "pkg2/class-use/ParamTest.html",
"<caption><span>Fields in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> declared as <a href=\"../" +
"../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest" +
"</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/ParamTest.html",
{ "pkg2/class-use/ParamTest.html",
"<td class=\"colFirst\"><code><a href=\"../../pkg2/" +
"ParamTest.html\" title=\"class in pkg2\">ParamTest</a>" +
"&lt;<a href=\"../../pkg2/Foo.html\" title=\"class in pkg2\">" +
"Foo</a>&gt;</code></td>"
},
{BUG_ID + "/pkg2/class-use/ParamTest.html",
{ "pkg2/class-use/ParamTest.html",
"<caption><span>Methods in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> with type parameters of " +
"type <a href=\"../../pkg2/ParamTest.html\" title=\"class " +
"in pkg2\">ParamTest</a></span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/ParamTest.html",
{ "pkg2/class-use/ParamTest.html",
"<td class=\"colFirst\"><code>&lt;T extends <a href=\"../" +
"../pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest" +
"</a>&lt;<a href=\"../../pkg2/Foo3.html\" title=\"class in " +
@ -475,40 +471,40 @@ public class TestNewLanguageFeatures extends JavadocTester {
"pkg2\">Foo3</a>&gt;</code></td>"
},
{BUG_ID + "/pkg2/class-use/Foo3.html",
{ "pkg2/class-use/Foo3.html",
"<caption><span>Classes in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> with type parameters of " +
"type <a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">" +
"Foo3</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/Foo3.html",
{ "pkg2/class-use/Foo3.html",
"<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest2.html\" " +
"title=\"class in pkg2\">ClassUseTest2</a>&lt;T extends " +
"<a href=\"../../pkg2/ParamTest.html\" title=\"class in pkg2\">" +
"ParamTest</a>&lt;<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">" +
"Foo3</a>&gt;&gt;</span></code>&nbsp;</td>"
},
{BUG_ID + "/pkg2/class-use/Foo3.html",
{ "pkg2/class-use/Foo3.html",
"<caption><span>Methods in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> with type parameters of " +
"type <a href=\"../../pkg2/Foo3.html\" title=\"class in " +
"pkg2\">Foo3</a></span><span class=\"tabEnd\">&nbsp;" +
"</span></caption>"
},
{BUG_ID + "/pkg2/class-use/Foo3.html",
{ "pkg2/class-use/Foo3.html",
"<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest2." +
"</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/" +
"ClassUseTest2.html#method-T-\">method</a></span>" +
"(T&nbsp;t)</code>&nbsp;</td>"
},
{BUG_ID + "/pkg2/class-use/Foo3.html",
{ "pkg2/class-use/Foo3.html",
"<caption><span>Methods in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> that return types with " +
"arguments of type <a href=\"../../pkg2/Foo3.html\" title" +
"=\"class in pkg2\">Foo3</a></span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/Foo3.html",
{ "pkg2/class-use/Foo3.html",
"<td class=\"colFirst\"><code>&lt;T extends <a href=\"../../" +
"pkg2/ParamTest.html\" title=\"class in pkg2\">ParamTest</a>&lt;" +
"<a href=\"../../pkg2/Foo3.html\" title=\"class in pkg2\">Foo3" +
@ -518,14 +514,14 @@ public class TestNewLanguageFeatures extends JavadocTester {
},
//ClassUseTest3: <T extends ParamTest2<List<? extends Foo4>>>
{BUG_ID + "/pkg2/class-use/ParamTest2.html",
{ "pkg2/class-use/ParamTest2.html",
"<caption><span>Classes in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> with type parameters of " +
"type <a href=\"../../pkg2/ParamTest2.html\" title=\"class " +
"in pkg2\">ParamTest2</a></span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/ParamTest2.html",
{ "pkg2/class-use/ParamTest2.html",
"<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3.html\" " +
"title=\"class in pkg2\">ClassUseTest3</a>&lt;T extends " +
"<a href=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
@ -533,19 +529,19 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<a href=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" +
"Foo4</a>&gt;&gt;&gt;</span></code>&nbsp;</td>"
},
{BUG_ID + "/pkg2/class-use/ParamTest2.html",
{ "pkg2/class-use/ParamTest2.html",
"<caption><span>Methods in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> with type parameters of " +
"type <a href=\"../../pkg2/ParamTest2.html\" title=\"class " +
"in pkg2\">ParamTest2</a></span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/ParamTest2.html",
{ "pkg2/class-use/ParamTest2.html",
"<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest3" +
".</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3." +
"html#method-T-\">method</a></span>(T&nbsp;t)</code>&nbsp;</td>"
},
{BUG_ID + "/pkg2/class-use/ParamTest2.html",
{ "pkg2/class-use/ParamTest2.html",
"<td class=\"colFirst\"><code>&lt;T extends <a href=\"../" +
"../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
"ParamTest2</a>&lt;java.util.List&lt;? extends <a href=\".." +
@ -556,14 +552,14 @@ public class TestNewLanguageFeatures extends JavadocTester {
"class in pkg2\">Foo4</a>&gt;&gt;</code></td>"
},
{BUG_ID + "/pkg2/class-use/Foo4.html",
{ "pkg2/class-use/Foo4.html",
"<caption><span>Classes in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> with type parameters of " +
"type <a href=\"../../pkg2/Foo4.html\" title=\"class in " +
"pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;" +
"</span></caption>"
},
{BUG_ID + "/pkg2/class-use/Foo4.html",
{ "pkg2/class-use/Foo4.html",
"<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3.html\" " +
"title=\"class in pkg2\">ClassUseTest3</a>&lt;T extends " +
"<a href=\"../../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
@ -571,26 +567,26 @@ public class TestNewLanguageFeatures extends JavadocTester {
"<a href=\"../../pkg2/Foo4.html\" title=\"class in pkg2\">" +
"Foo4</a>&gt;&gt;&gt;</span></code>&nbsp;</td>"
},
{BUG_ID + "/pkg2/class-use/Foo4.html",
{ "pkg2/class-use/Foo4.html",
"<caption><span>Methods in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> with type parameters of " +
"type <a href=\"../../pkg2/Foo4.html\" title=\"class in " +
"pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/Foo4.html",
{ "pkg2/class-use/Foo4.html",
"<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest3." +
"</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3." +
"html#method-T-\">method</a></span>(T&nbsp;t)</code>" +
"&nbsp;</td>"
},
{BUG_ID + "/pkg2/class-use/Foo4.html",
{ "pkg2/class-use/Foo4.html",
"<caption><span>Methods in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> that return types with " +
"arguments of type <a href=\"../../pkg2/Foo4.html\" " +
"title=\"class in pkg2\">Foo4</a></span><span class=\"" +
"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg2/class-use/Foo4.html",
{ "pkg2/class-use/Foo4.html",
"<td class=\"colFirst\"><code>&lt;T extends <a href=\"../" +
"../pkg2/ParamTest2.html\" title=\"class in pkg2\">" +
"ParamTest2</a>&lt;java.util.List&lt;? extends <a href=\".." +
@ -602,7 +598,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
},
//Type parameters in constructor and method args
{BUG_ID + "/pkg2/class-use/Foo4.html",
{ "pkg2/class-use/Foo4.html",
"<caption><span>Method parameters in <a href=\"../../pkg2/" +
"package-summary.html\">pkg2</a> with type arguments of " +
"type <a href=\"../../pkg2/Foo4.html\" title=\"class in " +
@ -623,7 +619,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"</tr>\n" +
"</tbody>"
},
{BUG_ID + "/pkg2/class-use/Foo4.html",
{ "pkg2/class-use/Foo4.html",
"<caption><span>Constructor parameters in <a href=\"../../" +
"pkg2/package-summary.html\">pkg2</a> with type arguments " +
"of type <a href=\"../../pkg2/Foo4.html\" title=\"class in " +
@ -634,14 +630,14 @@ public class TestNewLanguageFeatures extends JavadocTester {
//=================================
// Annotatation Type Usage
//=================================
{BUG_ID + "/pkg/class-use/AnnotationType.html",
{ "pkg/class-use/AnnotationType.html",
"<caption><span>Packages with annotations of type <a href=\"" +
"../../pkg/AnnotationType.html\" title=\"annotation in pkg\">" +
"AnnotationType</a></span><span class=\"tabEnd\">&nbsp;" +
"</span></caption>"
},
{BUG_ID + "/pkg/class-use/AnnotationType.html",
{ "pkg/class-use/AnnotationType.html",
"<caption><span>Classes in <a href=\"../../pkg/" +
"package-summary.html\">pkg</a> with annotations of type " +
"<a href=\"../../pkg/AnnotationType.html\" title=\"" +
@ -649,7 +645,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + "/pkg/class-use/AnnotationType.html",
{ "pkg/class-use/AnnotationType.html",
"<caption><span>Fields in <a href=\"../../pkg/" +
"package-summary.html\">pkg</a> with annotations of type " +
"<a href=\"../../pkg/AnnotationType.html\" title=\"annotation " +
@ -657,7 +653,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg/class-use/AnnotationType.html",
{ "pkg/class-use/AnnotationType.html",
"<caption><span>Methods in <a href=\"../../pkg/" +
"package-summary.html\">pkg</a> with annotations of type " +
"<a href=\"../../pkg/AnnotationType.html\" title=\"annotation " +
@ -665,7 +661,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg/class-use/AnnotationType.html",
{ "pkg/class-use/AnnotationType.html",
"<caption><span>Method parameters in <a href=\"../../pkg/" +
"package-summary.html\">pkg</a> with annotations of type " +
"<a href=\"../../pkg/AnnotationType.html\" title=\"annotation " +
@ -673,7 +669,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg/class-use/AnnotationType.html",
{ "pkg/class-use/AnnotationType.html",
"<caption><span>Constructors in <a href=\"../../pkg/" +
"package-summary.html\">pkg</a> with annotations of type " +
"<a href=\"../../pkg/AnnotationType.html\" title=\"annotation " +
@ -681,7 +677,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"&nbsp;</span></caption>"
},
{BUG_ID + "/pkg/class-use/AnnotationType.html",
{ "pkg/class-use/AnnotationType.html",
"<caption><span>Constructor parameters in <a href=\"../../" +
"pkg/package-summary.html\">pkg</a> with annotations of " +
"type <a href=\"../../pkg/AnnotationType.html\" title=\"" +
@ -692,14 +688,14 @@ public class TestNewLanguageFeatures extends JavadocTester {
//=================================
// TYPE PARAMETER IN INDEX
//=================================
{BUG_ID + "/index-all.html",
{ "index-all.html",
"<span class=\"memberNameLink\"><a href=\"pkg2/Foo.html#method-java.util.Vector-\">" +
"method(Vector&lt;Object&gt;)</a></span>"
},
//=================================
// TYPE PARAMETER IN INDEX
//=================================
{BUG_ID + "/index-all.html",
{ "index-all.html",
"<span class=\"memberNameLink\"><a href=\"pkg2/Foo.html#method-java.util.Vector-\">" +
"method(Vector&lt;Object&gt;)</a></span>"
},
@ -709,12 +705,12 @@ public class TestNewLanguageFeatures extends JavadocTester {
// ENUM TESTING
//=================================
//NO constructor section
{BUG_ID + "/pkg/Coin.html", "<h3>Constructor Summary</h3>"},
{ "pkg/Coin.html", "<h3>Constructor Summary</h3>"},
//=================================
// TYPE PARAMETER TESTING
//=================================
//No type parameters in class frame.
{BUG_ID + "/allclasses-frame.html",
{ "allclasses-frame.html",
"<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
"TypeParameters</a>&lt;<a href=\"../pkg/TypeParameters.html\" " +
"title=\"type parameter in TypeParameters\">E</a>&gt;"
@ -725,25 +721,25 @@ public class TestNewLanguageFeatures extends JavadocTester {
//===============================================================
//CLASS
{BUG_ID + "/pkg/AnnotationTypeUsage.html",
{ "pkg/AnnotationTypeUsage.html",
"<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Class Annotation\",\n" +
" <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)\n" +
"public class <span class=\"typeNameLabel\">AnnotationTypeUsage</span></dt><dt>extends java.lang.Object</dt>"},
//FIELD
{BUG_ID + "/pkg/AnnotationTypeUsage.html",
{ "pkg/AnnotationTypeUsage.html",
"<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Field Annotation\",\n" +
" <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)\n" +
"public int <span class=\"memberNameLabel\">field</span>"},
//CONSTRUCTOR
{BUG_ID + "/pkg/AnnotationTypeUsage.html",
{ "pkg/AnnotationTypeUsage.html",
"<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Constructor Annotation\",\n" +
" <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)\n" +
"public <span class=\"typeNameLabel\">AnnotationTypeUsage</span>()"},
//METHOD
{BUG_ID + "/pkg/AnnotationTypeUsage.html",
{ "pkg/AnnotationTypeUsage.html",
"<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Method Annotation\",\n" +
" <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)\n" +
"public void <span class=\"memberNameLabel\">method</span>()"},
@ -766,18 +762,4 @@ public class TestNewLanguageFeatures extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java
View File

@ -35,12 +35,9 @@
public class TestNoPackagesFile extends JavadocTester {
//Test information.
private static final String BUG_ID = "4475679";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
SRC_DIR + "/C.java"
};
@ -51,24 +48,10 @@ public class TestNoPackagesFile extends JavadocTester {
public static void main(String[] args) {
TestNoPackagesFile tester = new TestNoPackagesFile();
tester.run(ARGS, NO_TEST, NO_TEST);
if ((new java.io.File(BUG_ID + "/packages.html")).exists()) {
if ((new java.io.File(OUTPUT_DIR + "/packages.html")).exists()) {
throw new Error("Test Fails: packages file should not be " + "generated anymore.");
} else {
System.out.println("Test passes: packages.html not found.");
}
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

19
langtools/test/com/sun/javadoc/testNonFrameWarning/TestNonFrameWarning.java
View File

@ -33,16 +33,15 @@
public class TestNonFrameWarning extends JavadocTester {
private static final String BUG_ID = "7001086";
private static final String[][] TEST = {
{BUG_ID + "/index.html",
{ "index.html",
"<p>This document is designed to be viewed using the frames feature. " +
"If you see this message, you are using a non-frame-capable web client. " +
"Link to <a href=\"pkg/package-summary.html\">Non-frame version</a>.</p>"
}
};
private static final String[] ARGS = new String[]{
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
};
/**
@ -54,18 +53,4 @@ public class TestNonFrameWarning extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

23
langtools/test/com/sun/javadoc/testNotifications/TestNotifications.java
View File

@ -36,12 +36,9 @@
public class TestNotifications extends JavadocTester {
//Test information.
private static final String BUG_ID = "4657239";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
};
private static final String[] ARGS2 = new String[] {
@ -50,10 +47,10 @@ public class TestNotifications extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{NOTICE_OUTPUT, "Creating destination directory: \"4657239"}
{NOTICE_OUTPUT, "Creating destination directory: \"" + OUTPUT_DIR}
};
private static final String[][] NEGATED_TEST = {
{NOTICE_OUTPUT, "Creating destination directory: \"4657239"}
{NOTICE_OUTPUT, "Creating destination directory: \"" + OUTPUT_DIR}
};
private static final String[][] NEGATED_TEST2 = {
@ -75,18 +72,4 @@ public class TestNotifications extends JavadocTester {
tester.run(ARGS2, NO_TEST, NEGATED_TEST2);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

23
langtools/test/com/sun/javadoc/testOptions/TestOptions.java
View File

@ -33,19 +33,16 @@
public class TestOptions extends JavadocTester {
//Test information.
private static final String BUG_ID = "4749567";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-header", "Test header", "-footer", "Test footer",
"-d", OUTPUT_DIR, "-header", "Test header", "-footer", "Test footer",
"-sourcepath", SRC_DIR, "pkg"
};
private static final String[][] TEST = {
{BUG_ID + "/pkg/package-summary.html",
{ "pkg/package-summary.html",
"<div class=\"aboutLanguage\">Test header</div>"},
{BUG_ID + "/pkg/package-summary.html",
{ "pkg/package-summary.html",
"<div class=\"aboutLanguage\">Test footer</div>"}
};
@ -58,19 +55,5 @@ public class TestOptions extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

31
langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java
View File

@ -35,29 +35,26 @@
public class TestMultiInheritence extends JavadocTester {
//Test information.
private static final String BUG_ID = "4933335";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg3"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg3"
};
//Method foo() is inherited from BOTH I2 and I3
private static final String[][] TEST = {
{BUG_ID + "/pkg3/I1.html",
{ "pkg3/I1.html",
"Methods inherited from interface&nbsp;pkg3." +
"<a href=\"../pkg3/I2.html\" title=\"interface in pkg3\">" +
"I2</a>"},
{BUG_ID + "/pkg3/I1.html",
{ "pkg3/I1.html",
"Methods inherited from interface&nbsp;pkg3." +
"<a href=\"../pkg3/I3.html\" title=\"interface in pkg3\">" +
"I3</a>"},
{BUG_ID + "/pkg3/I0.html",
{ "pkg3/I0.html",
"Methods inherited from interface&nbsp;pkg3." +
"<a href=\"../pkg3/I2.html\" title=\"interface in pkg3\">" +
"I2</a>"},
{BUG_ID + "/pkg3/I0.html",
{ "pkg3/I0.html",
"Methods inherited from interface&nbsp;pkg3." +
"<a href=\"../pkg3/I3.html\" title=\"interface in pkg3\">" +
"I3</a>"},
@ -66,11 +63,11 @@ public class TestMultiInheritence extends JavadocTester {
//Method foo() is NOT inherited from I4 because it is overriden by
//I3.
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/pkg3/I1.html",
{ "pkg3/I1.html",
"Methods inherited from interface&nbsp;pkg3." +
"<a href=\"../pkg3/I4.html\" title=\"interface in pkg3\">" +
"I4</a>"},
{BUG_ID + "/pkg3/I0.html",
{ "pkg3/I0.html",
"Methods inherited from interface&nbsp;pkg3." +
"<a href=\"../pkg3/I4.html\" title=\"interface in pkg3\">" +
"I4</a>"},
@ -85,18 +82,4 @@ public class TestMultiInheritence extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java
View File

@ -35,17 +35,14 @@
public class TestOverridenMethodDocCopy extends JavadocTester {
//Test information.
private static final String BUG_ID = "4368820";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1", "pkg2"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1", "pkg2"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg1/SubClass.html",
{ "pkg1/SubClass.html",
"<span class=\"descfrmTypeLabel\">Description copied from class:&nbsp;<code>" +
"<a href=\"../pkg1/BaseClass.html#overridenMethodWithDocsToCopy--\">" +
"BaseClass</a></code></span>"
@ -61,18 +58,4 @@ public class TestOverridenMethodDocCopy extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

30
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java
View File

@ -35,16 +35,14 @@
public class TestOverridenPrivateMethods extends JavadocTester {
private static final String BUG_ID = "4634891";
private static final String[][] TEST = {
//The public method should be overriden
{BUG_ID + "/pkg1/SubClass.html",
{ "pkg1/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"},
//The public method in different package should be overriden
{BUG_ID + "/pkg2/SubClass.html",
{ "pkg2/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"}
};
@ -53,29 +51,29 @@ public class TestOverridenPrivateMethods extends JavadocTester {
//The package private method should be overriden since the base and sub class are in the same
//package. However, the link should not show up because the package private methods are not documented.
{BUG_ID + "/pkg1/SubClass.html",
{ "pkg1/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"},
//The private method in should not be overriden
{BUG_ID + "/pkg1/SubClass.html",
{ "pkg1/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"},
//The private method in different package should not be overriden
{BUG_ID + "/pkg2/SubClass.html",
{ "pkg2/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"},
//The package private method should not be overriden since the base and sub class are in
//different packages.
{BUG_ID + "/pkg2/SubClass.html",
{ "pkg2/SubClass.html",
"Overrides:</span></dt><dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"}
};
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1", "pkg2"};
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1", "pkg2"};
/**
* The entry point of the test.
@ -86,18 +84,4 @@ public class TestOverridenPrivateMethods extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

30
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java
View File

@ -35,18 +35,16 @@
public class TestOverridenPrivateMethodsWithPackageFlag extends JavadocTester {
private static final String BUG_ID = "4634891";
private static final String[][] TEST = {
//The public method should be overriden
{BUG_ID + "/pkg1/SubClass.html",
{ "pkg1/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod--\">" +
"publicMethod</a></code>&nbsp;in class&nbsp;<code>" +
"<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>"},
//The public method in different package should be overriden
{BUG_ID + "/pkg2/SubClass.html",
{ "pkg2/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod--\">" +
"publicMethod</a></code>&nbsp;in class&nbsp;<code>" +
@ -54,7 +52,7 @@ public class TestOverridenPrivateMethodsWithPackageFlag extends JavadocTester {
//The package private method should be overriden since the base and sub class are in the same
//package.
{BUG_ID + "/pkg1/SubClass.html",
{ "pkg1/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod--\">" +
"packagePrivateMethod</a></code>&nbsp;in class&nbsp;<code>" +
@ -64,25 +62,25 @@ public class TestOverridenPrivateMethodsWithPackageFlag extends JavadocTester {
private static final String[][] NEGATED_TEST = {
//The private method in should not be overriden
{BUG_ID + "/pkg1/SubClass.html",
{ "pkg1/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod()\">"},
//The private method in different package should not be overriden
{BUG_ID + "/pkg2/SubClass.html",
{ "pkg2/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod()\">"},
//The package private method should not be overriden since the base and sub class are in
//different packages.
{BUG_ID + "/pkg2/SubClass.html",
{ "pkg2/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod()\">"},
};
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-package", "pkg1", "pkg2"};
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-package", "pkg1", "pkg2"};
/**
* The entry point of the test.
@ -93,18 +91,4 @@ public class TestOverridenPrivateMethodsWithPackageFlag extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

30
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java
View File

@ -35,22 +35,20 @@
public class TestOverridenPrivateMethodsWithPrivateFlag extends JavadocTester {
private static final String BUG_ID = "4634891";
private static final String[][] TEST = {
//The public method should be overriden
{BUG_ID + "/pkg1/SubClass.html",
{ "pkg1/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"},
//The package private method should be overriden since the base and sub class are in the same
//package.
{BUG_ID + "/pkg1/SubClass.html",
{ "pkg1/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"},
//The public method in different package should be overriden
{BUG_ID + "/pkg2/SubClass.html",
{ "pkg2/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"},
};
@ -58,18 +56,18 @@ public class TestOverridenPrivateMethodsWithPrivateFlag extends JavadocTester {
private static final String[][] NEGATED_TEST = {
//The private method in should not be overriden
{BUG_ID + "/pkg1/SubClass.html",
{ "pkg1/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"},
//The private method in different package should not be overriden
{BUG_ID + "/pkg2/SubClass.html",
{ "pkg2/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#privateMethod"},
//The package private method should not be overriden since the base and sub class are in
//different packages.
{BUG_ID + "/pkg2/SubClass.html",
{ "pkg2/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"}
@ -78,7 +76,7 @@ public class TestOverridenPrivateMethodsWithPrivateFlag extends JavadocTester {
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-private", "pkg1", "pkg2"};
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "-private", "pkg1", "pkg2"};
/**
* The entry point of the test.
@ -89,18 +87,4 @@ public class TestOverridenPrivateMethodsWithPrivateFlag extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

33
langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java
View File

@ -33,33 +33,30 @@
public class TestPackageDeprecation extends JavadocTester {
//Test information.
private static final String BUG_ID = "6492694";
//Javadoc arguments.
private static final String[] ARGS1 = new String[]{
"-d", BUG_ID + "-1", "-sourcepath", SRC_DIR, "-use", "pkg", "pkg1",
"-d", OUTPUT_DIR + "-1", "-sourcepath", SRC_DIR, "-use", "pkg", "pkg1",
SRC_DIR + "/C2.java", SRC_DIR + "/FooDepr.java"
};
private static final String[] ARGS2 = new String[]{
"-d", BUG_ID + "-2", "-sourcepath", SRC_DIR, "-use", "-nodeprecated",
"-d", OUTPUT_DIR + "-2", "-sourcepath", SRC_DIR, "-use", "-nodeprecated",
"pkg", "pkg1", SRC_DIR + "/C2.java", SRC_DIR + "/FooDepr.java"
};
//Input for string search tests.
private static final String[][] TEST1 = {
{BUG_ID + "-1/pkg1/package-summary.html",
{ "pkg1/package-summary.html",
"<div class=\"deprecatedContent\"><span class=\"deprecatedLabel\">Deprecated.</span>\n" +
"<div class=\"block\"><span class=\"deprecationComment\">This package is Deprecated." +
"</span></div>"
},
{BUG_ID + "-1/deprecated-list.html",
{ "deprecated-list.html",
"<li><a href=\"#package\">Deprecated Packages</a></li>"
}
};
private static final String[][] NEGATED_TEST2 = {
{BUG_ID + "-2/overview-summary.html", "pkg1"},
{BUG_ID + "-2/allclasses-frame.html", "FooDepr"}
{ "overview-summary.html", "pkg1"},
{ "allclasses-frame.html", "FooDepr"}
};
/**
@ -70,14 +67,14 @@ public class TestPackageDeprecation extends JavadocTester {
TestPackageDeprecation tester = new TestPackageDeprecation();
tester.run(ARGS1, TEST1, NO_TEST);
tester.run(ARGS2, NO_TEST, NEGATED_TEST2);
if ((new java.io.File(BUG_ID + "-2/pkg1/" +
if ((new java.io.File(OUTPUT_DIR + "-2/pkg1/" +
"package-summary.html")).exists()) {
throw new Error("Test Fails: packages summary should not be" +
"generated for deprecated package.");
} else {
System.out.println("Test passes: package-summary.html not found.");
}
if ((new java.io.File(BUG_ID + "-2/FooDepr.html")).exists()) {
if ((new java.io.File(OUTPUT_DIR + "-2/FooDepr.html")).exists()) {
throw new Error("Test Fails: FooDepr should not be" +
"generated as it is deprecated.");
} else {
@ -85,18 +82,4 @@ public class TestPackageDeprecation extends JavadocTester {
}
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

37
langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java
View File

@ -36,51 +36,50 @@
public class TestPackagePage extends JavadocTester {
private static final String BUG_ID = "4492643-4689286";
private static final String[][] TEST1 = {
{BUG_ID + "-1/com/pkg/package-summary.html",
{ "com/pkg/package-summary.html",
"This is a package page."
},
//With just one package, all general pages link to the single package page.
{BUG_ID + "-1/com/pkg/C.html",
{ "com/pkg/C.html",
"<a href=\"../../com/pkg/package-summary.html\">Package</a>"
},
{BUG_ID + "-1/com/pkg/package-tree.html",
{ "com/pkg/package-tree.html",
"<li><a href=\"../../com/pkg/package-summary.html\">Package</a></li>"
},
{BUG_ID + "-1/deprecated-list.html",
{ "deprecated-list.html",
"<li><a href=\"com/pkg/package-summary.html\">Package</a></li>"
},
{BUG_ID + "-1/index-all.html",
{ "index-all.html",
"<li><a href=\"com/pkg/package-summary.html\">Package</a></li>"
},
{BUG_ID + "-1/help-doc.html",
{ "help-doc.html",
"<li><a href=\"com/pkg/package-summary.html\">Package</a></li>"
},
};
private static final String[][] TEST2 = {
//With multiple packages, there is no package link in general pages.
{BUG_ID + "-2/deprecated-list.html",
{ "deprecated-list.html",
"<li>Package</li>"
},
{BUG_ID + "-2/index-all.html",
{ "index-all.html",
"<li>Package</li>"
},
{BUG_ID + "-2/help-doc.html",
{ "help-doc.html",
"<li>Package</li>"
},
};
private static final String[] ARGS1 =
new String[] {
"-d", BUG_ID + "-1", "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR + "-1", "-sourcepath", SRC_DIR,
SRC_DIR + "/com/pkg/C.java"
};
private static final String[] ARGS2 =
new String[] {
"-d", BUG_ID + "-2", "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR + "-2", "-sourcepath", SRC_DIR,
"com.pkg", "pkg2"
};
@ -94,18 +93,4 @@ public class TestPackagePage extends JavadocTester {
tester.run(ARGS2, TEST2, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

25
langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java
View File

@ -36,24 +36,21 @@
public class TestParamTaglet extends JavadocTester {
//Test information.
private static final String BUG_ID = "4802275-4967243";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
};
//Input for string search tests.
private static final String[][] TEST = {
//Regular param tags.
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<span class=\"paramLabel\">Parameters:</span></dt>\n" +
"<dd><code>param1</code> - testing 1 2 3.</dd>\n" +
"<dd><code>param2</code> - testing 1 2 3."
},
//Param tags that don't match with any real parameters.
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<span class=\"paramLabel\">Parameters:</span></dt>\n" +
"<dd><code><I>p1</I></code> - testing 1 2 3.</dd>\n" +
"<dd><code><I>p2</I></code> - testing 1 2 3."
@ -62,7 +59,7 @@ public class TestParamTaglet extends JavadocTester {
// Param is printed with nothing inherited.
//XXX: in the future when Configuration is available during doc inheritence,
//print a warning for this mistake.
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<code><I>inheritBug</I></code> -"
},
@ -77,18 +74,4 @@ public class TestParamTaglet extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

103
langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java
View File

@ -44,46 +44,43 @@
public class TestPrivateClasses extends JavadocTester {
//Test information.
private static final String BUG_ID = "4780441-4874845-4978816-8014017";
//Javadoc arguments.
private static final String[] ARGS1 = new String[] {
"-d", BUG_ID + "-1", "-sourcepath", SRC_DIR, "pkg", "pkg2"
"-d", OUTPUT_DIR + "-1", "-sourcepath", SRC_DIR, "pkg", "pkg2"
};
private static final String[] ARGS2 = new String[] {
"-d", BUG_ID + "-2", "-sourcepath", SRC_DIR, "-private",
"-d", OUTPUT_DIR + "-2", "-sourcepath", SRC_DIR, "-private",
"pkg", "pkg2"
};
// Test output when -private flag is not used.
private static final String[][] TEST1 = {
// Field inheritence from non-public superclass.
{BUG_ID + "-1/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"<a href=\"../pkg/PublicChild.html#fieldInheritedFromParent\">" +
"fieldInheritedFromParent</a>"
},
// Method inheritence from non-public superclass.
{BUG_ID + "-1/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"<a href=\"../pkg/PublicChild.html#methodInheritedFromParent-int-\">" +
"methodInheritedFromParent</a>"
},
// Field inheritence from non-public superinterface.
{BUG_ID + "-1/pkg/PublicInterface.html",
{ "pkg/PublicInterface.html",
"<a href=\"../pkg/PublicInterface.html#fieldInheritedFromInterface\">" +
"fieldInheritedFromInterface</a>"
},
// Method inheritence from non-public superinterface.
{BUG_ID + "-1/pkg/PublicInterface.html",
{ "pkg/PublicInterface.html",
"<a href=\"../pkg/PublicInterface.html#methodInterface-int-\">" +
"methodInterface</a>"
},
// private class does not show up in tree
{BUG_ID + "-1/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"<ul class=\"inheritance\">\n" +
"<li>java.lang.Object</li>\n" +
"<li>\n" +
@ -95,19 +92,19 @@ public class TestPrivateClasses extends JavadocTester {
},
// Method is documented as though it is declared in the inheriting method.
{BUG_ID + "-1/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"<pre>public&nbsp;void&nbsp;methodInheritedFromParent(int&nbsp;p1)"
},
//Make sure implemented interfaces from private superclass are inherited
{BUG_ID + "-1/pkg/PublicInterface.html",
{ "pkg/PublicInterface.html",
"<dl>\n" +
"<dt>All Known Implementing Classes:</dt>\n" +
"<dd><a href=\"../pkg/PublicChild.html\" title=\"class in pkg\">" +
"PublicChild</a></dd>\n" +
"</dl>"},
{BUG_ID + "-1/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"<dl>\n" +
"<dt>All Implemented Interfaces:</dt>\n" +
"<dd><a href=\"../pkg/PublicInterface.html\" title=\"interface in pkg\">" +
@ -115,111 +112,111 @@ public class TestPrivateClasses extends JavadocTester {
"</dl>"},
//Generic interface method test.
{BUG_ID + "-1/pkg2/C.html",
{ "pkg2/C.html",
"This comment should get copied to the implementing class"},
};
private static final String[][] NEGATED_TEST1 = {
// Should not document that a method overrides method from private class.
{BUG_ID + "-1/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"<span class=\"overrideSpecifyLabel\">Overrides:</span>"},
// Should not document that a method specified by private interface.
{BUG_ID + "-1/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"<span class=\"overrideSpecifyLabel\">Specified by:</span>"},
{BUG_ID + "-1/pkg/PublicInterface.html",
{ "pkg/PublicInterface.html",
"<span class=\"overrideSpecifyLabel\">Specified by:</span>"},
// Should not mention that any documentation was copied.
{BUG_ID + "-1/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"Description copied from"},
{BUG_ID + "-1/pkg/PublicInterface.html",
{ "pkg/PublicInterface.html",
"Description copied from"},
// Don't extend private classes or interfaces
{BUG_ID + "-1/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"PrivateParent"},
{BUG_ID + "-1/pkg/PublicInterface.html",
{ "pkg/PublicInterface.html",
"PrivateInterface"},
{BUG_ID + "-1/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"PrivateInterface"},
{BUG_ID + "-1/pkg/PublicInterface.html",
{ "pkg/PublicInterface.html",
"All Superinterfaces"},
// Make inherited constant are documented correctly.
{BUG_ID + "-1/constant-values.html",
{ "constant-values.html",
"PrivateInterface"},
//Do not inherit private interface method with generic parameters.
//This method has been implemented.
{BUG_ID + "-1/pkg2/C.html",
{ "pkg2/C.html",
"<span class=\"memberNameLink\"><a href=\"../pkg2/I.html#hello-T-\">hello</a></span>"},
};
// Test output when -private flag is used.
private static final String[][] TEST2 = {
// Field inheritence from non-public superclass.
{BUG_ID + "-2/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"Fields inherited from class&nbsp;pkg." +
"<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" +
"PrivateParent</a>"
},
{BUG_ID + "-2/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"<a href=\"../pkg/PrivateParent.html#fieldInheritedFromParent\">" +
"fieldInheritedFromParent</a>"
},
// Field inheritence from non-public superinterface.
{BUG_ID + "-2/pkg/PublicInterface.html",
{ "pkg/PublicInterface.html",
"Fields inherited from interface&nbsp;pkg." +
"<a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">" +
"PrivateInterface</a>"
},
{BUG_ID + "-2/pkg/PublicInterface.html",
{ "pkg/PublicInterface.html",
"<a href=\"../pkg/PrivateInterface.html#fieldInheritedFromInterface\">" +
"fieldInheritedFromInterface</a>"
},
// Method inheritence from non-public superclass.
{BUG_ID + "-2/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"Methods inherited from class&nbsp;pkg." +
"<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" +
"PrivateParent</a>"
},
{BUG_ID + "-2/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"<a href=\"../pkg/PrivateParent.html#methodInheritedFromParent-int-\">" +
"methodInheritedFromParent</a>"
},
// Should document that a method overrides method from private class.
{BUG_ID + "-2/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg/PrivateParent.html#methodOverridenFromParent-char:A-int-T-V-java.util.List-\">" +
"methodOverridenFromParent</a></code>&nbsp;in class&nbsp;<code>" +
"<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" +
"PrivateParent</a></code></dd>"},
// Should document that a method is specified by private interface.
{BUG_ID + "-2/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n" +
"<dd><code><a href=\"../pkg/PrivateInterface.html#methodInterface-int-\">" +
"methodInterface</a></code>&nbsp;in interface&nbsp;<code>" +
"<a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">" +
"PrivateInterface</a></code></dd>"},
// Method inheritence from non-public superinterface.
{BUG_ID + "-2/pkg/PublicInterface.html",
{ "pkg/PublicInterface.html",
"Methods inherited from interface&nbsp;pkg." +
"<a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">" +
"PrivateInterface</a>"
},
{BUG_ID + "-2/pkg/PrivateInterface.html",
{ "pkg/PrivateInterface.html",
"<a href=\"../pkg/PrivateInterface.html#methodInterface-int-\">" +
"methodInterface</a>"
},
// Should mention that any documentation was copied.
{BUG_ID + "-2/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"Description copied from"},
// Extend documented private classes or interfaces
{BUG_ID + "-2/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"extends"},
{BUG_ID + "-2/pkg/PublicInterface.html",
{ "pkg/PublicInterface.html",
"extends"},
{BUG_ID + "-2/pkg/PublicInterface.html",
{ "pkg/PublicInterface.html",
"All Superinterfaces"},
//Make sure implemented interfaces from private superclass are inherited
{BUG_ID + "-2/pkg/PublicInterface.html",
{ "pkg/PublicInterface.html",
"<dl>\n" +
"<dt>All Known Implementing Classes:</dt>\n" +
"<dd><a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" +
@ -228,7 +225,7 @@ public class TestPrivateClasses extends JavadocTester {
"</a></dd>\n" +
"</dl>"},
{BUG_ID + "-2/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"<dl>\n" +
"<dt>All Implemented Interfaces:</dt>\n" +
"<dd><a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">" +
@ -239,11 +236,11 @@ public class TestPrivateClasses extends JavadocTester {
//Since private flag is used, we can document that private interface method
//with generic parameters has been implemented.
{BUG_ID + "-2/pkg2/C.html",
{ "pkg2/C.html",
"<span class=\"descfrmTypeLabel\">Description copied from interface:&nbsp;<code>" +
"<a href=\"../pkg2/I.html#hello-T-\">I</a></code></span>"},
{BUG_ID + "-2/pkg2/C.html",
{ "pkg2/C.html",
"<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>\n" +
"<dd><code><a href=\"../pkg2/I.html#hello-T-\">hello</a></code>" +
"&nbsp;in interface&nbsp;<code>" +
@ -252,14 +249,14 @@ public class TestPrivateClasses extends JavadocTester {
//Make sure when no modifier appear in the class signature, the
//signature is displayed correctly without extra space at the beginning.
{BUG_ID + "-2/pkg/PrivateParent.html",
{ "pkg/PrivateParent.html",
"<pre>class <span class=\"typeNameLabel\">PrivateParent</span>"},
{BUG_ID + "-2/pkg/PublicChild.html",
{ "pkg/PublicChild.html",
"<pre>public class <span class=\"typeNameLabel\">PublicChild</span>"},
};
private static final String[][] NEGATED_TEST2 = {
{BUG_ID + "-2/pkg/PrivateParent.html",
{ "pkg/PrivateParent.html",
"<pre> class <span class=\"typeNameLabel\">PrivateParent</span>"},
};
@ -273,18 +270,4 @@ public class TestPrivateClasses extends JavadocTester {
tester.run(ARGS2, TEST2, NEGATED_TEST2);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

109
langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java
View File

@ -33,60 +33,59 @@
public class TestProfiles extends JavadocTester {
//Test information.
private static final String BUG_ID = "8006124-8009684-8016921";
private static final String PROFILE_BUG_ID = BUG_ID + "-1";
private static final String PACKAGE_BUG_ID = BUG_ID + "-2";
private static final String PROFILE_OUTPUT_DIR = OUTPUT_DIR + "-1";
private static final String PACKAGE_OUTPUT_DIR = OUTPUT_DIR + "-2";
//Javadoc arguments.
private static final String[] ARGS1 = new String[]{
"-d", PROFILE_BUG_ID, "-sourcepath", SRC_DIR, "-Xprofilespath",
"-d", PROFILE_OUTPUT_DIR, "-sourcepath", SRC_DIR, "-Xprofilespath",
SRC_DIR + "/profile-rtjar-includes.txt", "pkg1", "pkg2",
"pkg3", "pkg4", "pkg5", "pkgDeprecated"
};
private static final String[] ARGS2 = new String[]{
"-d", PACKAGE_BUG_ID, "-sourcepath", SRC_DIR, "pkg1", "pkg2",
"-d", PACKAGE_OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg1", "pkg2",
"pkg3", "pkg4", "pkg5"
};
//Input for string tests for profiles.
private static final String[][] PROFILES_TEST = {
// Tests for profile-overview-frame.html listing all profiles.
{PROFILE_BUG_ID + "/profile-overview-frame.html",
{ "profile-overview-frame.html",
"<span><a href=\"overview-frame.html\" "
+ "target=\"packageListFrame\">All&nbsp;Packages</a></span>"
},
{PROFILE_BUG_ID + "/profile-overview-frame.html",
{ "profile-overview-frame.html",
"<li><a href=\"compact1-frame.html\" target=\"packageListFrame\">"
+ "compact1</a></li>"
},
// Tests for profileName-frame.html listing all packages in a profile.
{PROFILE_BUG_ID + "/compact2-frame.html",
{ "compact2-frame.html",
"<span><a href=\"overview-frame.html\" target=\"packageListFrame\">"
+ "All&nbsp;Packages</a></span><span><a href=\"profile-overview-frame.html\" "
+ "target=\"packageListFrame\">All&nbsp;Profiles</a></span>"
},
{PROFILE_BUG_ID + "/compact2-frame.html",
{ "compact2-frame.html",
"<li><a href=\"pkg4/compact2-package-frame.html\" "
+ "target=\"packageFrame\">pkg4</a></li>"
},
// Test for profileName-package-frame.html listing all types in a
// package of a profile.
{PROFILE_BUG_ID + "/pkg2/compact2-package-frame.html",
{ "pkg2/compact2-package-frame.html",
"<a href=\"../compact2-summary.html\" target=\"classFrame\">"
+ "compact2</a> - <a href=\"../pkg2/compact2-package-summary.html\" "
+ "target=\"classFrame\">pkg2</a>"
},
// Tests for profileName-summary.html listing the summary for a profile.
{PROFILE_BUG_ID + "/compact2-summary.html",
{ "compact2-summary.html",
"<li><a href=\"compact1-summary.html\">Prev&nbsp;Profile</a></li>\n"
+ "<li><a href=\"compact3-summary.html\">Next&nbsp;Profile</a></li>"
},
{PROFILE_BUG_ID + "/compact2-summary.html",
{ "compact2-summary.html",
"<h1 title=\"Profile\" class=\"title\">Profile&nbsp;compact2</h1>"
},
{PROFILE_BUG_ID + "/compact2-summary.html",
{ "compact2-summary.html",
"<h3><a href=\"pkg2/compact2-package-summary.html\" "
+ "target=\"classFrame\">pkg2</a></h3>"
},
{PROFILE_BUG_ID + "/compact2-summary.html",
{ "compact2-summary.html",
"<ul class=\"blockList\">\n" +
"<li class=\"blockList\">\n"
+ "<h3><a href=\"pkg2/compact2-package-summary.html\" target=\"classFrame\">"
@ -95,7 +94,7 @@ public class TestProfiles extends JavadocTester {
+ "cellpadding=\"3\" cellspacing=\"0\" summary=\"Class Summary table, "
+ "listing classes, and an explanation\">"
},
{PROFILE_BUG_ID + "/compact2-summary.html",
{ "compact2-summary.html",
"<ul class=\"blockList\">\n" +
"<li class=\"blockList\">\n"
+ "<h3><a href=\"pkg4/compact2-package-summary.html\" target=\"classFrame\">"
@ -106,14 +105,14 @@ public class TestProfiles extends JavadocTester {
},
// Tests for profileName-package-summary.html listing the summary for a
// package in a profile.
{PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
{ "pkg5/compact3-package-summary.html",
"<li><a href=\"../pkg4/compact3-package-summary.html\">Prev&nbsp;Package"
+ "</a></li>"
},
{PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
{ "pkg5/compact3-package-summary.html",
"<div class=\"subTitle\">compact3</div>"
},
{PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
{ "pkg5/compact3-package-summary.html",
"<ul class=\"blockList\">\n" +
"<li class=\"blockList\">\n"
+ "<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\" "
@ -121,20 +120,20 @@ public class TestProfiles extends JavadocTester {
+ "interfaces, and an explanation\">"
},
//Test for "overview-frame.html" showing the "All Profiles" link.
{PROFILE_BUG_ID + "/overview-frame.html",
{ "overview-frame.html",
"<span><a href=\"profile-overview-frame.html\" "
+ "target=\"packageListFrame\">All&nbsp;Profiles</a></span>"
},
//Test for "className.html" showing the profile information for the type.
{PROFILE_BUG_ID + "/pkg2/Class1Pkg2.html",
{ "pkg2/Class1Pkg2.html",
"<div class=\"subTitle\">compact1, compact2, compact3</div>"
},
{PROFILE_BUG_ID + "/index.html",
{ "index.html",
"<frame src=\"overview-frame.html\" name=\"packageListFrame\" " +
"title=\"All Packages\">"
},
//Test for "overview-summary.html" showing the profile list.
{PROFILE_BUG_ID + "/overview-summary.html",
{ "overview-summary.html",
"<ul>\n" +
"<li><a href=\"compact1-summary.html\" target=\"classFrame\">" +
"compact1</a></li>\n" +
@ -145,28 +144,28 @@ public class TestProfiles extends JavadocTester {
"</ul>"
},
//Test deprecated class in profiles
{PROFILE_BUG_ID + "/compact1-summary.html","<td class=\"colFirst\">"
+ "<a href=\"pkg2/Class1Pkg2.html\" title=\"class in pkg2\">Class1Pkg2</a></td>\n"
{ "compact1-summary.html",
"<td class=\"colFirst\"><a href=\"pkg2/Class1Pkg2.html\" title=\"class in pkg2\">Class1Pkg2</a></td>\n"
+ "<td class=\"colLast\">Deprecated"
},
{PROFILE_BUG_ID + "/deprecated-list.html","<td class=\"colOne\">"
+ "<a href=\"pkg2/Class1Pkg2.html\" title=\"class in pkg2\">pkg2.Class1Pkg2</a>\n"
{ "deprecated-list.html",
"<td class=\"colOne\"><a href=\"pkg2/Class1Pkg2.html\" title=\"class in pkg2\">pkg2.Class1Pkg2</a>\n"
+"<div class=\"block\"><span class=\"deprecationComment\">Class1Pkg2. This class is deprecated</span></div>"
},
//Test deprecated package in profile
{PROFILE_BUG_ID + "/deprecated-list.html","<td class=\"colOne\">"
+ "<a href=\"pkgDeprecated/package-summary.html\">pkgDeprecated</a>\n"
{ "deprecated-list.html",
"<td class=\"colOne\"><a href=\"pkgDeprecated/package-summary.html\">pkgDeprecated</a>\n"
+"<div class=\"block\"><span class=\"deprecationComment\">This package is <b>Deprecated</b>."
+ " Use pkg1.</span></div>"
},
{PROFILE_BUG_ID + "/pkgDeprecated/package-summary.html",
{ "pkgDeprecated/package-summary.html",
"<div class=\"deprecatedContent\"><span class=\"deprecatedLabel\">Deprecated.</span>\n"
+ "<div class=\"block\"><span class=\"deprecationComment\">This package is <b>Deprecated</b>."
+ " Use pkg1.</span></div>"
},
// need to add teststring when JDK-8015496 will be fixed
//Test exception in profiles
{PROFILE_BUG_ID + "/compact1-summary.html",
{ "compact1-summary.html",
"<table class=\"typeSummary\" "
+ "border=\"0\" cellpadding=\"3\" cellspacing=\"0\" "
+ "summary=\"Exception Summary table, listing exceptions, and an explanation\">\n"
@ -184,7 +183,7 @@ public class TestProfiles extends JavadocTester {
+ " title=\"class in pkg2\">ClassException</a></td>"
},
//Test errors in profiles
{PROFILE_BUG_ID + "/compact1-summary.html",
{ "compact1-summary.html",
"<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" "
+ "summary=\"Error Summary table, listing errors, and an explanation\">\n"
+ "<caption><span>Error Summary</span><span class=\"tabEnd\">&nbsp;"
@ -202,19 +201,19 @@ public class TestProfiles extends JavadocTester {
}
};
private static final String[][] PROFILES_NEGATED_TEST = {
{PROFILE_BUG_ID + "/pkg3/Class2Pkg3.html",
{ "pkg3/Class2Pkg3.html",
"<div class=\"subTitle\">compact1"
},
{PROFILE_BUG_ID + "/pkg3/Interface1Pkg3.html",
{ "pkg3/Interface1Pkg3.html",
"<div class=\"subTitle\">compact1"
},
{PROFILE_BUG_ID + "/pkg4/compact2-package-frame.html",
{ "pkg4/compact2-package-frame.html",
"<li><a href=\"Anno1Pkg4.html\" title=\"annotation in pkg4\" "
+ "target=\"classFrame\">Anno1Pkg4</a></li>"
},
{PROFILE_BUG_ID + "/compact1-summary.html","<li>Use</li>"
{ "compact1-summary.html","<li>Use</li>"
},
{PROFILE_BUG_ID + "/compact2-summary.html",
{ "compact2-summary.html",
"<ul class=\"blockList\">\n" +
"<li class=\"blockList\">\n"
+ "<h3><a href=\"pkg2/compact2-package-summary.html\" target=\"classFrame\">"
@ -224,7 +223,7 @@ public class TestProfiles extends JavadocTester {
+ "cellpadding=\"3\" cellspacing=\"0\" summary=\"Class Summary table, "
+ "listing classes, and an explanation\">"
},
{PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
{ "pkg5/compact3-package-summary.html",
"<ul class=\"blockList\">\n" +
"<li class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
@ -234,14 +233,14 @@ public class TestProfiles extends JavadocTester {
}
};
private static final String[][] PACKAGES_TEST = {
{PACKAGE_BUG_ID + "/overview-frame.html",
{ "overview-frame.html",
"<h2 title=\"Packages\">Packages</h2>"
},
{PACKAGE_BUG_ID + "/pkg4/package-frame.html",
{ "pkg4/package-frame.html",
"<h1 class=\"bar\"><a href=\"../pkg4/package-summary.html\" "
+ "target=\"classFrame\">pkg4</a></h1>"
},
{PACKAGE_BUG_ID + "/pkg4/package-summary.html",
{ "pkg4/package-summary.html",
"<div class=\"header\">\n" +
"<h1 title=\"Package\" "
+ "class=\"title\">Package&nbsp;pkg4</h1>\n" +
@ -249,14 +248,14 @@ public class TestProfiles extends JavadocTester {
}
};
private static final String[][] PACKAGES_NEGATED_TEST = {
{PACKAGE_BUG_ID + "/overview-frame.html",
{ "overview-frame.html",
"<span><a href=\"profile-overview-frame.html\" "
+ "target=\"packageListFrame\">All&nbsp;Profiles</a></span>"
},
{PACKAGE_BUG_ID + "/pkg2/Class1Pkg2.html",
{ "pkg2/Class1Pkg2.html",
"<div class=\"subTitle\">compact1, compact2, compact3</div>"
},
{PACKAGE_BUG_ID + "/overview-summary.html",
{ "overview-summary.html",
"<ul>\n" +
"<li><a href=\"compact1-summary.html\" target=\"classFrame\">" +
"compact1</a></li>\n" +
@ -268,11 +267,11 @@ public class TestProfiles extends JavadocTester {
}
};
private static final String[] PACKAGES_NEGATED_FILE_TEST = {
PACKAGE_BUG_ID + "/profile-overview-frame.html",
PACKAGE_BUG_ID + "/compact2-frame.html",
PACKAGE_BUG_ID + "/pkg2/compact2-package-frame.html",
PACKAGE_BUG_ID + "/compact2-summary.html",
PACKAGE_BUG_ID + "/pkg5/compact3-package-summary.html"
"profile-overview-frame.html",
"compact2-frame.html",
"pkg2/compact2-package-frame.html",
"compact2-summary.html",
"pkg5/compact3-package-summary.html"
};
/**
@ -286,18 +285,4 @@ public class TestProfiles extends JavadocTester {
tester.run(ARGS2, PACKAGES_TEST, PACKAGES_NEGATED_TEST, NO_FILE_TEST, PACKAGES_NEGATED_FILE_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

41
langtools/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java
View File

@ -33,26 +33,25 @@
public class TestProfilesConfiguration extends JavadocTester {
//Test information.
private static final String BUG_ID = "8006124-8009684";
private static final String PROFILE_CONFIGURATION_BUG_ID = BUG_ID + "-3";
private static final String NODEPR_NOPKGS_BUG_ID = BUG_ID + "-4";
private static final String PROFILE_CONFIGURATION_OUTPUT_DIR = OUTPUT_DIR + "-3";
private static final String NODEPR_NOPKGS_OUTPUT_DIR = OUTPUT_DIR + "-4";
//Javadoc arguments.
private static final String[] ARGS3 = new String[]{
"-d", PROFILE_CONFIGURATION_BUG_ID, "-sourcepath", SRC_DIR,
"-d", PROFILE_CONFIGURATION_OUTPUT_DIR, "-sourcepath", SRC_DIR,
"-nocomment", "-keywords", "-Xprofilespath", SRC_DIR +
"/profile-rtjar-includes.txt", "-doctitle", "Simple doctitle",
"-use", "pkg3", "pkg1", "pkg2", "pkg4",
"pkg5", "-packagesheader", "Simple packages header","pkgDeprecated"
};
private static final String[] ARGS4 = new String[]{
"-d", NODEPR_NOPKGS_BUG_ID, "-sourcepath", SRC_DIR, "-nocomment",
"-d", NODEPR_NOPKGS_OUTPUT_DIR, "-sourcepath", SRC_DIR, "-nocomment",
"-nodeprecated", "-keywords", "-Xprofilespath", SRC_DIR +
"/profile-rtjar-includes-nopkgs.txt", "-doctitle", "Simple doctitle",
"-use", "-packagesheader", "Simple packages header",
"pkg1", "pkg2", "pkg3", "pkg4", "pkg5", "pkgDeprecated"
};
private static final String[][] NODEPR_NOPKGS_TEST = {
{NODEPR_NOPKGS_BUG_ID + "/overview-summary.html",
{ "overview-summary.html",
"<ul>\n" +
"<li><a href=\"compact2-summary.html\" target=\"classFrame\">" +
"compact2</a></li>\n" +
@ -60,7 +59,7 @@ public class TestProfilesConfiguration extends JavadocTester {
"classFrame\">compact3</a></li>\n" +
"</ul>"
},
{NODEPR_NOPKGS_BUG_ID + "/profile-overview-frame.html",
{ "profile-overview-frame.html",
"<ul title=\"Profiles\">\n" +
"<li><a href=\"compact2-frame.html\" target=\"packageListFrame\">" +
"compact2</a></li>\n" +
@ -70,30 +69,30 @@ public class TestProfilesConfiguration extends JavadocTester {
}
};
private static final String[][] NODEPR_NOPKGS_NEGATED_TEST = {
{NODEPR_NOPKGS_BUG_ID + "/overview-summary.html",
{ "overview-summary.html",
"compact1"
}
};
private static final String[][] PROFILES_CONFIGURATION_TEST = {
//-use option test string fo profile view page
{PROFILE_CONFIGURATION_BUG_ID + "/compact1-summary.html","<li>Use</li>"
{ "compact1-summary.html","<li>Use</li>"
},
//-doctitle option test string
{PROFILE_CONFIGURATION_BUG_ID + "/overview-summary.html",
{ "overview-summary.html",
"<div class=\"header\">\n" +
"<h1 class=\"title\">Simple doctitle</h1>"
},
//-packagesheader option test string fo profiles
{PROFILE_CONFIGURATION_BUG_ID + "/profile-overview-frame.html",
{ "profile-overview-frame.html",
"<h1 title=\"Simple packages header\" class=\"bar\">Simple packages header</h1>"
},
//-keywords option test string for profiles
{PROFILE_CONFIGURATION_BUG_ID + "/compact1-summary.html",
{ "compact1-summary.html",
"<meta name=\"keywords\" content=\"compact1 profile\">"
},
//Deprecated information on a package
{PROFILE_CONFIGURATION_BUG_ID + "/compact1-summary.html",
{ "compact1-summary.html",
"<h3><a href=\"pkgDeprecated/compact1-package-summary.html\" target=\"" +
"classFrame\">pkgDeprecated</a></h3>\n" +
"<div class=\"deprecatedContent\">" +
@ -102,7 +101,7 @@ public class TestProfilesConfiguration extends JavadocTester {
};
private static final String[][] PROFILES_CONFIGURATION_NEGATED_TEST = {
//-nocomments option test string
{PROFILE_CONFIGURATION_BUG_ID + "/compact1-summary.html",
{ "compact1-summary.html",
"<div class=\"block\"><i>Class1Pkg2.</i></div>"
}
};
@ -120,18 +119,4 @@ public class TestProfilesConfiguration extends JavadocTester {
NODEPR_NOPKGS_NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

21
langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java
View File

@ -34,10 +34,9 @@
public class TestRecurseSubPackages extends JavadocTester {
private static final String BUG_ID = "4074234";
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"-subpackages", "pkg1", "-exclude", "pkg1.pkg2.packageToExclude"
};
@ -48,28 +47,14 @@ public class TestRecurseSubPackages extends JavadocTester {
public static void main(String[] args) {
String[][] tests = new String[6][2];
for (int i = 0; i < tests.length; i++) {
tests[i][0] = BUG_ID + "/allclasses-frame.html";
tests[i][0] = "allclasses-frame.html";
tests[i][1] = "C" + (i+1) + ".html";
}
String[][] negatedTests = new String[][] {
{BUG_ID + "/allclasses-frame.html", "DummyClass.html"}
{ "allclasses-frame.html", "DummyClass.html"}
};
TestRecurseSubPackages tester = new TestRecurseSubPackages();
tester.run(ARGS, tests, negatedTests);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

53
langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java
View File

@ -35,27 +35,24 @@
public class TestRelativeLinks extends JavadocTester {
//Test information.
private static final String BUG_ID = "4460354-8014636";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-use", "-sourcepath", SRC_DIR, "pkg", "pkg2"
"-d", OUTPUT_DIR, "-use", "-sourcepath", SRC_DIR, "pkg", "pkg2"
};
//Input for string search tests.
private static final String[][] TEST = {
//These relative paths should stay relative because they appear
//in the right places.
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<a href=\"relative-class-link.html\">relative class link</a>"},
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<a href=\"relative-field-link.html\">relative field link</a>"},
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<a href=\"relative-method-link.html\">relative method link</a>"},
{BUG_ID + "/pkg/package-summary.html",
{ "pkg/package-summary.html",
"<a href=\"relative-package-link.html\">relative package link</a>"},
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
" <a\n" +
" href=\"relative-multi-line-link.html\">relative-multi-line-link</a>."},
@ -63,38 +60,38 @@ public class TestRelativeLinks extends JavadocTester {
//places.
//INDEX PAGE
{BUG_ID + "/index-all.html",
{ "index-all.html",
"<a href=\"./pkg/relative-class-link.html\">relative class link</a>"},
{BUG_ID + "/index-all.html",
{ "index-all.html",
"<a href=\"./pkg/relative-field-link.html\">relative field link</a>"},
{BUG_ID + "/index-all.html",
{ "index-all.html",
"<a href=\"./pkg/relative-method-link.html\">relative method link</a>"},
{BUG_ID + "/index-all.html",
{ "index-all.html",
"<a href=\"./pkg/relative-package-link.html\">relative package link</a>"},
{BUG_ID + "/index-all.html",
{ "index-all.html",
" <a\n" +
" href=\"./pkg/relative-multi-line-link.html\">relative-multi-line-link</a>."},
//PACKAGE USE
{BUG_ID + "/pkg/package-use.html",
{ "pkg/package-use.html",
"<a href=\"../pkg/relative-package-link.html\">relative package link</a>."},
{BUG_ID + "/pkg/package-use.html",
{ "pkg/package-use.html",
"<a href=\"../pkg/relative-class-link.html\">relative class link</a>"},
//CLASS_USE
{BUG_ID + "/pkg/class-use/C.html",
{ "pkg/class-use/C.html",
"<a href=\"../../pkg/relative-field-link.html\">relative field link</a>"},
{BUG_ID + "/pkg/class-use/C.html",
{ "pkg/class-use/C.html",
"<a href=\"../../pkg/relative-method-link.html\">relative method link</a>"},
{BUG_ID + "/pkg/class-use/C.html",
{ "pkg/class-use/C.html",
"<a href=\"../../pkg/relative-package-link.html\">relative package link</a>"},
{BUG_ID + "/pkg/class-use/C.html",
{ "pkg/class-use/C.html",
" <a\n" +
" href=\"../../pkg/relative-multi-line-link.html\">relative-multi-line-link</a>."},
//PACKAGE OVERVIEW
{BUG_ID + "/overview-summary.html",
{ "overview-summary.html",
"<a href=\"./pkg/relative-package-link.html\">relative package link</a>"},
};
@ -107,18 +104,4 @@ public class TestRelativeLinks extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

53
langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java
View File

@ -34,26 +34,25 @@
public class TestRepeatedAnnotations extends JavadocTester {
//Test information.
private static final String BUG_ID = "8005092";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "pkg1"
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg", "pkg1"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<a href=\"../pkg/ContaineeSynthDoc.html\" " +
"title=\"annotation in pkg\">@ContaineeSynthDoc</a> " +
"<a href=\"../pkg/ContaineeSynthDoc.html\" " +
"title=\"annotation in pkg\">@ContaineeSynthDoc</a>"},
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<a href=\"../pkg/ContaineeRegDoc.html\" " +
"title=\"annotation in pkg\">@ContaineeRegDoc</a> " +
"<a href=\"../pkg/ContaineeRegDoc.html\" " +
"title=\"annotation in pkg\">@ContaineeRegDoc</a>"},
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<a href=\"../pkg/RegContainerDoc.html\" " +
"title=\"annotation in pkg\">@RegContainerDoc</a>" +
"(<a href=\"../pkg/RegContainerDoc.html#value--\">value</a>={" +
@ -61,41 +60,41 @@ public class TestRepeatedAnnotations extends JavadocTester {
"title=\"annotation in pkg\">@RegContaineeNotDoc</a>," +
"<a href=\"../pkg/RegContaineeNotDoc.html\" " +
"title=\"annotation in pkg\">@RegContaineeNotDoc</a>})"},
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<a href=\"../pkg/ContaineeSynthDoc.html\" " +
"title=\"annotation in pkg\">@ContaineeSynthDoc</a> " +
"<a href=\"../pkg/ContaineeSynthDoc.html\" " +
"title=\"annotation in pkg\">@ContaineeSynthDoc</a> " +
"<a href=\"../pkg/ContaineeSynthDoc.html\" " +
"title=\"annotation in pkg\">@ContaineeSynthDoc</a>"},
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<a href=\"../pkg/ContainerSynthDoc.html\" " +
"title=\"annotation in pkg\">@ContainerSynthDoc</a>(" +
"<a href=\"../pkg/ContainerSynthDoc.html#value--\">value</a>=" +
"<a href=\"../pkg/ContaineeSynthDoc.html\" " +
"title=\"annotation in pkg\">@ContaineeSynthDoc</a>)"},
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<a href=\"../pkg/ContaineeSynthDoc.html\" " +
"title=\"annotation in pkg\">@ContaineeSynthDoc</a> " +
"<a href=\"../pkg/ContaineeSynthDoc.html\" " +
"title=\"annotation in pkg\">@ContaineeSynthDoc</a>"},
{BUG_ID + "/pkg/D.html",
{ "pkg/D.html",
"<a href=\"../pkg/RegDoc.html\" title=\"annotation in pkg\">@RegDoc</a>" +
"(<a href=\"../pkg/RegDoc.html#x--\">x</a>=1)"},
{BUG_ID + "/pkg/D.html",
{ "pkg/D.html",
"<a href=\"../pkg/RegArryDoc.html\" title=\"annotation in pkg\">@RegArryDoc</a>" +
"(<a href=\"../pkg/RegArryDoc.html#y--\">y</a>=1)"},
{BUG_ID + "/pkg/D.html",
{ "pkg/D.html",
"<a href=\"../pkg/RegArryDoc.html\" title=\"annotation in pkg\">@RegArryDoc</a>" +
"(<a href=\"../pkg/RegArryDoc.html#y--\">y</a>={1,2})"},
{BUG_ID + "/pkg/D.html",
{ "pkg/D.html",
"<a href=\"../pkg/NonSynthDocContainer.html\" " +
"title=\"annotation in pkg\">@NonSynthDocContainer</a>" +
"(<a href=\"../pkg/NonSynthDocContainer.html#value--\">value</a>=" +
"<a href=\"../pkg/RegArryDoc.html\" title=\"annotation in pkg\">@RegArryDoc</a>)"},
{BUG_ID + "/pkg1/C.html",
{ "pkg1/C.html",
"<a href=\"../pkg1/RegContainerValDoc.html\" " +
"title=\"annotation in pkg1\">@RegContainerValDoc</a>" +
"(<a href=\"../pkg1/RegContainerValDoc.html#value--\">value</a>={" +
@ -104,7 +103,7 @@ public class TestRepeatedAnnotations extends JavadocTester {
"<a href=\"../pkg1/RegContaineeNotDoc.html\" " +
"title=\"annotation in pkg1\">@RegContaineeNotDoc</a>}," +
"<a href=\"../pkg1/RegContainerValDoc.html#y--\">y</a>=3)"},
{BUG_ID + "/pkg1/C.html",
{ "pkg1/C.html",
"<a href=\"../pkg1/ContainerValDoc.html\" " +
"title=\"annotation in pkg1\">@ContainerValDoc</a>" +
"(<a href=\"../pkg1/ContainerValDoc.html#value--\">value</a>={" +
@ -116,12 +115,12 @@ public class TestRepeatedAnnotations extends JavadocTester {
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<a href=\"../pkg/RegContaineeDoc.html\" " +
"title=\"annotation in pkg\">@RegContaineeDoc</a> " +
"<a href=\"../pkg/RegContaineeDoc.html\" " +
"title=\"annotation in pkg\">@RegContaineeDoc</a>"},
{BUG_ID + "/pkg/C.html",
{ "pkg/C.html",
"<a href=\"../pkg/RegContainerNotDoc.html\" " +
"title=\"annotation in pkg\">@RegContainerNotDoc</a>" +
"(<a href=\"../pkg/RegContainerNotDoc.html#value--\">value</a>={" +
@ -130,12 +129,12 @@ public class TestRepeatedAnnotations extends JavadocTester {
"<a href=\"../pkg/RegContaineeNotDoc.html\" " +
"title=\"annotation in pkg\">@RegContaineeNotDoc</a>})"},
{BUG_ID + "/pkg1/C.html",
{ "pkg1/C.html",
"<a href=\"../pkg1/ContaineeSynthDoc.html\" " +
"title=\"annotation in pkg1\">@ContaineeSynthDoc</a> " +
"<a href=\"../pkg1/ContaineeSynthDoc.html\" " +
"title=\"annotation in pkg1\">@ContaineeSynthDoc</a>"},
{BUG_ID + "/pkg1/C.html",
{ "pkg1/C.html",
"<a href=\"../pkg1/RegContainerValNotDoc.html\" " +
"title=\"annotation in pkg1\">@RegContainerValNotDoc</a>" +
"(<a href=\"../pkg1/RegContainerValNotDoc.html#value--\">value</a>={" +
@ -144,7 +143,7 @@ public class TestRepeatedAnnotations extends JavadocTester {
"<a href=\"../pkg1/RegContaineeDoc.html\" " +
"title=\"annotation in pkg1\">@RegContaineeDoc</a>}," +
"<a href=\"../pkg1/RegContainerValNotDoc.html#y--\">y</a>=4)"},
{BUG_ID + "/pkg1/C.html",
{ "pkg1/C.html",
"<a href=\"../pkg1/ContainerValNotDoc.html\" " +
"title=\"annotation in pkg1\">@ContainerValNotDoc</a>" +
"(<a href=\"../pkg1/ContainerValNotDoc.html#value--\">value</a>={" +
@ -153,7 +152,7 @@ public class TestRepeatedAnnotations extends JavadocTester {
"<a href=\"../pkg1/ContaineeNotDoc.html\" " +
"title=\"annotation in pkg1\">@ContaineeNotDoc</a>}," +
"<a href=\"../pkg1/ContainerValNotDoc.html#x--\">x</a>=2)"},
{BUG_ID + "/pkg1/C.html",
{ "pkg1/C.html",
"<a href=\"../pkg1/ContainerSynthNotDoc.html\" " +
"title=\"annotation in pkg1\">@ContainerSynthNotDoc</a>(" +
"<a href=\"../pkg1/ContainerSynthNotDoc.html#value--\">value</a>=" +
@ -170,18 +169,4 @@ public class TestRepeatedAnnotations extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

19
langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java
View File

@ -34,12 +34,9 @@
public class TestReturnTag extends JavadocTester {
//Test information.
private static final String BUG_ID = "4490068";
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-Xdoclint:none", "-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR +
"-Xdoclint:none", "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, SRC_DIR +
"/TestReturnTag.java"
};
@ -65,18 +62,4 @@ public class TestReturnTag extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

22
langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java
View File

@ -33,10 +33,6 @@
public class TestSeeTag extends JavadocTester {
//Test information.
private static final String BUG_ID = "8017191";
private static final String OUTPUT_DIR = BUG_ID;
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR, "pkg"
@ -44,12 +40,12 @@ public class TestSeeTag extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{ OUTPUT_DIR + "/pkg/Test.html",
{ "pkg/Test.html",
"<code>List</code>"
}
};
private static final String[][] NEGATED_TEST = {
{ OUTPUT_DIR + "/pkg/Test.html",
{ "pkg/Test.html",
"&lt;code&gt;List&lt;/code&gt;"
}
};
@ -63,18 +59,4 @@ public class TestSeeTag extends JavadocTester {
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

20
langtools/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java
View File

@ -35,10 +35,6 @@
public class TestSerialVersionUID extends JavadocTester {
//Test information.
private static final String BUG_ID = "4525039";
private static final String OUTPUT_DIR = "docs-" + BUG_ID;
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", OUTPUT_DIR,
@ -47,7 +43,7 @@ public class TestSerialVersionUID extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{OUTPUT_DIR + "/serialized-form.html", "-111111111111111L"}
{ "serialized-form.html", "-111111111111111L"}
};
/**
@ -59,18 +55,4 @@ public class TestSerialVersionUID extends JavadocTester {
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
/**
* {@inheritDoc}
*/
public String getBugId() {
return BUG_ID;
}
/**
* {@inheritDoc}
*/
public String getBugName() {
return getClass().getName();
}
}

Some files were not shown because too many files have changed in this diff Show More