\"<Hello World>\"
";
TestConstantValuesDriver tester = new TestConstantValuesDriver();
tester.run(ARGS, tests, NO_TEST);
@@ -58,20 +57,6 @@
}
/**
- * {@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
* @throws java.lang.NullPointerException comment three
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java
--- a/langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 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();
@@ -54,20 +53,6 @@
}
/**
- * {@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
* @throws java.lang.NullPointerException Test 3 passes
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/lib/JavadocTester.java
--- a/langtools/test/com/sun/javadoc/lib/JavadocTester.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/lib/JavadocTester.java Tue Apr 22 17:57:40 2014 -0700
@@ -21,8 +21,6 @@
* questions.
*/
-import com.sun.javadoc.*;
-import java.util.*;
import java.io.*;
@@ -56,6 +54,7 @@
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,11 +104,16 @@
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.
*/
private static int numTestsRun = 0;
@@ -131,18 +135,6 @@
}
/**
- * 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.
*
* @param args the arguments to pass to Javadoc
@@ -206,6 +198,13 @@
+ 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 @@
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 @@
* 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 @@
* @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 @@
/**
* 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 @@
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 @@
// Test failed
throw new Error("\n" + (numTestsRun - numTestsPassed)
+ " of " + (numTestsRun)
- + " subtests failed for bug " + getBugId()
- + " (" + getBugName() + ")" + "\n");
+ + " subtests failed\n");
}
}
@@ -432,28 +422,39 @@
* @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 @@
/**
* 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 @@
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 @@
/**
* 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 @@
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();
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java
--- a/langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
tester.run(ARGS2, TEST, NO_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java
--- a/langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java Tue Apr 22 17:57:40 2014 -0700
@@ -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",
"default void
abstract void
default void
abstract void
default void
DEFAULT_NAME" +
"
public static final java." + "lang.String DEFAULT_NAME"}, - {BUG_ID + "/pkg/AnnotationType.html", + { "pkg/AnnotationType.html", "
\n\n" + "
" +
@@ -90,18 +87,4 @@
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java
--- a/langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java
--- a/langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
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 @@
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java
--- a/langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
tester.checkExitCode(0, exitCode);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java
--- a/langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
throw new Error("Javadoc failed to execute.");
}
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java
--- a/langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java
--- a/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java Tue Apr 22 17:57:40 2014 -0700
@@ -37,17 +37,14 @@
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 @@
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 {
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testCharset/TestCharset.java
--- a/langtools/test/com/sun/javadoc/testCharset/TestCharset.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testCharset/TestCharset.java Tue Apr 22 17:57:40 2014 -0700
@@ -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",
""},
- {BUG_ID + "/pkg/Foo.html",
+ { "pkg/Foo.html",
""}
};
private static final String[][] NEGATED_TEST = {
- {BUG_ID + "/index.html",
+ { "index.html",
""},
- {BUG_ID + "/pkg/Foo.html",
+ { "pkg/Foo.html",
""}
};
@@ -65,18 +62,4 @@
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java
--- a/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java Tue Apr 22 17:57:40 2014 -0700
@@ -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",
"Link to math package
"},
- {BUG_ID + "/C.html",
+ { "C.html",
"Link to AttributeContext innerclass
"},
- {BUG_ID + "/C.html",
+ { "C.html",
"Link to external class BigDecimal
"},
- {BUG_ID + "/C.html",
+ { "C.html",
"Link to external member gcd
"},
- {BUG_ID + "/C.html",
+ { "C.html",
"
toString
in class java.lang.Object
Inner()
, \n" +
"Inner(int)
, \n" +
@@ -46,79 +44,79 @@
"Outer()
, \n" +
"Outer(int)
"
},
- {BUG_ID + "/pkg1/Outer.html",
+ { "pkg1/Outer.html",
"Link: Inner()
, " +
"Outer(int)
, " +
"" +
"NestedInner(int)
"
},
- {BUG_ID + "/pkg1/Outer.html",
+ { "pkg1/Outer.html",
"Outer()"
},
- {BUG_ID + "/pkg1/Outer.html",
+ { "pkg1/Outer.html",
""
},
- {BUG_ID + "/pkg1/Outer.html",
+ { "pkg1/Outer.html",
"Outer(int i)"
},
- {BUG_ID + "/pkg1/Outer.html",
+ { "pkg1/Outer.html",
""
},
- {BUG_ID + "/pkg1/Outer.Inner.html",
+ { "pkg1/Outer.Inner.html",
"Inner()"
},
- {BUG_ID + "/pkg1/Outer.Inner.html",
+ { "pkg1/Outer.Inner.html",
""
},
- {BUG_ID + "/pkg1/Outer.Inner.html",
+ { "pkg1/Outer.Inner.html",
"Inner(int i)"
},
- {BUG_ID + "/pkg1/Outer.Inner.html",
+ { "pkg1/Outer.Inner.html",
""
},
- {BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
+ { "pkg1/Outer.Inner.NestedInner.html",
"NestedInner()"
},
- {BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
+ { "pkg1/Outer.Inner.NestedInner.html",
""
},
- {BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
+ { "pkg1/Outer.Inner.NestedInner.html",
"NestedInner(int i)"
},
- {BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
+ { "pkg1/Outer.Inner.NestedInner.html",
""
}
};
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",
"Outer.Inner()
"
},
- {BUG_ID + "/pkg1/Outer.html",
+ { "pkg1/Outer.html",
"Outer.Inner(int)
"
},
- {BUG_ID + "/pkg1/Outer.html",
+ { "pkg1/Outer.html",
"Outer.Inner.NestedInner()
"
},
- {BUG_ID + "/pkg1/Outer.html",
+ { "pkg1/Outer.html",
"Outer.Inner.NestedInner(int)
"
}
};
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 @@
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java
--- a/langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
tester.run(ARGS3, TEST3, NO_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java
--- a/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java
--- a/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
};
private static final String[][] NEGATED_TEST = {
- {BUG_ID + "/stylesheet.css",
+ { "stylesheet.css",
"body {\n" +
" background-color:#ffffff;"}
};
@@ -65,19 +62,5 @@
tester.run(ARGS, NO_TEST, NEGATED_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java
--- a/langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
tester.checkExitCode(EXPECTED_EXIT_CODE, actualExitCode);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java
--- a/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java Tue Apr 22 17:57:40 2014 -0700
@@ -39,24 +39,18 @@
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 @@
//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 @@
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();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java
--- a/langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java
--- a/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java Tue Apr 22 17:57:40 2014 -0700
@@ -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",
"File
"},
- {BUG_ID + "/TestDocRootTag.html",
+ { "TestDocRootTag.html",
"glossary"},
- {BUG_ID + "/TestDocRootTag.html",
+ { "TestDocRootTag.html",
"Second File Link
"},
- {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 " +
"here"}
};
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 @@
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java
--- a/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 Here"
},
- {BUG_ID + "/pkg1/C1.html",
+ { "pkg1/C1.html",
"This Here should not be replaced\n" +
" with an absolute link."
},
- {BUG_ID + "/pkg1/C1.html",
+ { "pkg1/C1.html",
"Testing Link 1 and\n" +
" Link 2."
},
- {BUG_ID + "/pkg1/package-summary.html",
+ { "pkg1/package-summary.html",
"\n" +
" Test document 1"
},
- {BUG_ID + "/pkg1/package-summary.html",
+ { "pkg1/package-summary.html",
"\n" +
" Another Test document 1"
},
- {BUG_ID + "/pkg1/package-summary.html",
+ { "pkg1/package-summary.html",
"\n" +
" Another Test document 2."
}
};
private static final String[][] NEGATED_TEST1 = {
- {BUG_ID + "/pkg1/C1.html",
+ { "pkg1/C1.html",
""
},
- {BUG_ID + "/pkg1/C1.html",
+ { "pkg1/C1.html",
""
},
- {BUG_ID + "/pkg1/package-summary.html",
+ { "pkg1/package-summary.html",
""
},
- {BUG_ID + "/pkg1/package-summary.html",
+ { "pkg1/package-summary.html",
""
}
};
private static final String[][] TEST2 = {
- {BUG_ID + "-1/pkg2/C2.html",
+ { "pkg2/C2.html",
"Refer Here"
},
- {BUG_ID + "-1/pkg2/C2.html",
+ { "pkg2/C2.html",
"This Here should not be replaced\n" +
" with an absolute link."
},
- {BUG_ID + "-1/pkg2/C2.html",
+ { "pkg2/C2.html",
"Testing Link 1 and\n" +
" Link 2."
},
- {BUG_ID + "-1/pkg2/package-summary.html",
+ { "pkg2/package-summary.html",
"\n" +
" Test document 1"
},
- {BUG_ID + "-1/pkg2/package-summary.html",
+ { "pkg2/package-summary.html",
"\n" +
" Another Test document 1"
},
- {BUG_ID + "-1/pkg2/package-summary.html",
+ { "pkg2/package-summary.html",
"\n" +
" Another Test document 2."
}
};
private static final String[][] NEGATED_TEST2 = {
- {BUG_ID + "-1/pkg2/C2.html",
+ { "pkg2/C2.html",
""
},
- {BUG_ID + "-1/pkg2/C2.html",
+ { "pkg2/C2.html",
""
},
- {BUG_ID + "-1/pkg2/package-summary.html",
+ { "pkg2/package-summary.html",
""
},
- {BUG_ID + "-1/pkg2/package-summary.html",
+ { "pkg2/package-summary.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 @@
tester.run(ARGS2, TEST2, NEGATED_TEST2);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java
--- a/langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
tester.run(ARGS, NO_TEST, NEGATED_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java
--- a/langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java Tue Apr 22 17:57:40 2014 -0700
@@ -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", ""},
+ { "overview-tree.html", ""},
//The index page should not link to classes that were not documented
- {OUTPUT_DIR + "/index-all.html", ""},
+ { "index-all.html", ""},
};
private static final String[] ARGS =
new String[] {
@@ -50,8 +49,6 @@
"-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 @@
throw new Error("Error found while executing Javadoc");
}
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java
--- a/langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java
--- a/langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
tester.run(ARGS, NO_TEST, NEGATED_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java
--- a/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java Tue Apr 22 17:57:40 2014 -0700
@@ -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",
"read
in class " +
"FilterReader
readInt
in interface " +
@@ -52,7 +51,7 @@
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 @@
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java
--- a/langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
"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 @@
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 @@
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 @@
throw new Error("Error found while executing Javadoc");
}
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java
--- a/langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testGroupOption/TestGroupOption.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
};
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 @@
tester.run(ARGS2, TEST2, NO_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java
--- a/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java Tue Apr 22 17:57:40 2014 -0700
@@ -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",
"" +
"Class \n" +
"Modifier and Type \n" +
"Field and Description "
},
- {BUG_ID + "/pkg1/C1.html",
+ { "pkg1/C1.html",
"Methods inherited from class java.lang.Object
"
},
// Class use documentation
- {BUG_ID + "/pkg1/class-use/C1.html",
+ { "pkg1/class-use/C1.html",
"Package \n" +
"Description "
},
- {BUG_ID + "/pkg1/class-use/C1.html",
+ { "pkg1/class-use/C1.html",
"Modifier and Type \n" +
"Field and Description "
},
// Deprecated
- {BUG_ID + "/deprecated-list.html",
+ { "deprecated-list.html",
"Method and Description "
},
// Constant values
- {BUG_ID + "/constant-values.html",
+ { "constant-values.html",
"" +
"Modifier and Type \n" +
"Constant Field \n" +
@@ -86,27 +83,27 @@
},
// Serialized Form
- {BUG_ID + "/serialized-form.html",
+ { "serialized-form.html",
"Package pkg1
"
},
- {BUG_ID + "/serialized-form.html",
+ { "serialized-form.html",
"Class " +
"pkg1.C1 extends java.lang.Object implements Serializable
"
},
- {BUG_ID + "/serialized-form.html",
+ { "serialized-form.html",
"Serialized Fields
"
},
// Overview Frame
- {BUG_ID + "/overview-frame.html",
+ { "overview-frame.html",
"Test Files
"
},
- {BUG_ID + "/overview-frame.html",
+ { "overview-frame.html",
"Overview List "
},
// Overview Summary
- {BUG_ID + "/overview-summary.html",
+ { "overview-summary.html",
"Overview "
}
};
@@ -120,18 +117,4 @@
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java
--- a/langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java Tue Apr 22 17:57:40 2014 -0700
@@ -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",
"Constant Field Values"
},
};
@@ -57,18 +54,4 @@
tester.run(ARGS, TEST, NO_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java
--- a/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
};
private static final String[][] TEST2 = {
- {BUG_ID + "/TestHelpOption.html",
+ { "TestHelpOption.html",
"- Help
"
},
};
@@ -107,18 +104,4 @@
tester.run(ARGS2, TEST2, NO_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java
--- a/langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java Tue Apr 22 17:57:40 2014 -0700
@@ -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.BaseClass"}
};
private static final String[] ARGS =
new String[] {
- "-d", BUG_ID, "-sourcepath", SRC_DIR,
+ "-d", OUTPUT_DIR, "-sourcepath", SRC_DIR,
"pkg"
};
@@ -58,18 +57,4 @@
tester.run(ARGS, NO_TEST, NEGATED_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testHref/TestHref.java
--- a/langtools/test/com/sun/javadoc/testHref/TestHref.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testHref/TestHref.java Tue Apr 22 17:57:40 2014 -0700
@@ -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",
"\n" +
"\n" +
""
},
//Backward compatibility anchor test.
- {BUG_ID + "/pkg/C1.html",
+ { "pkg/C1.html",
"\n" +
"\n" +
""
},
//{@link} test.
- {BUG_ID + "/pkg/C2.html",
+ { "pkg/C2.html",
"Link: "
},
//@see test.
- {BUG_ID + "/pkg/C2.html",
+ { "pkg/C2.html",
"See Also:\n" +
"- "
},
//Header does not link to the page itself.
- {BUG_ID + "/pkg/C4.html",
+ { "pkg/C4.html",
"Class C4<E extends C4<E>>"
},
//Signature does not link to the page itself.
- {BUG_ID + "/pkg/C4.html",
+ { "pkg/C4.html",
"public abstract class C4<E extends C4<E>>"
},
};
@@ -98,18 +95,4 @@
tester.run(ARGS, TEST, NEGATED_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java
--- a/langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testHrefInDocComment/TestHrefInDocComment.java Tue Apr 22 17:57:40 2014 -0700
@@ -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 @@
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();
}
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java
--- a/langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java Tue Apr 22 17:57:40 2014 -0700
@@ -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",
""}
};
@@ -58,18 +55,4 @@
tester.run(ARGS, NO_TEST, NEGATED_TEST);
tester.printSummary();
}
-
- /**
- * {@inheritDoc}
- */
- public String getBugId() {
- return BUG_ID;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getBugName() {
- return getClass().getName();
- }
}
diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
--- a/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Tue Apr 22 17:41:11 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java Tue Apr 22 17:57:40 2014 -0700
@@ -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", "
public class " +
+ { "pkg1/C1.html", "public class " +
"C1\n" +
"extends java.lang.Object\n" +
"implements java.io.Serializable
"},
- {BUG_ID + "/pkg1/C4.html", "
\n" +
+ { "pkg1/C4.html", "\n" +
"- Default:
\n" +
"- true
\n" +
"
"}};
@@ -55,11 +53,11 @@
// 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", "\n" +
+ { "pkg1/package-summary.html", "\n" +
"- Since:
\n" +
"- JDK1.0
\n" +
"
"},
- {BUG_ID + "/pkg1/C1.html", "\n" +
+ { "pkg1/C1.html", "\n" +
"- Since:
\n" +
"- JDK1.0
\n" +
"- See Also:
\n" +
@@ -68,7 +66,7 @@
"" +
"Serialized Form
\n" +
"
setUndecorated(boolean)
\n" +
"title" +
"
- the titleHeadlessException
undecorated" +
"
- true
if no decorations are\n" +
@@ -104,7 +102,7 @@
"readObject()" +
"
java.io.IOException
setUndecorated(boolean)
set
- boolean" +
@@ -130,7 +128,7 @@
"- " +
"
C1.setUndecorated(boolean)
\n" +
"
C1.setUndecorated(boolean)
java.io.IOException
title
- the title" +
"HeadlessException
undecorated
- true
" +
@@ -214,7 +212,7 @@
"readObject()
java.io.IOException
setUndecorated(boolean)
" +
@@ -233,7 +231,7 @@
"- " +
"
C1.setUndecorated(boolean)
\n" +
"
C1.setUndecorated(boolean)
java.io.IOException
public void readObject()\n" + " throws java.io.IOException\n" + ""}, - {BUG_ID + "/pkg1/C2.html", "
public C2()\n" + + { "pkg1/C2.html", "
public C2()\n" + ""}, - {BUG_ID + "/pkg1/C1.ModalExclusionType.html", "
public " + + { "pkg1/C1.ModalExclusionType.html", "public " + "static final C1.ModalExclusionType " + "APPLICATION_EXCLUDE\n" + ""}, - {BUG_ID + "/serialized-form.html", "boolean " + + { "serialized-form.html", "boolean " + "undecorated\n" + "" + "Deprecated. As of JDK version 1.5, replaced by\n" + "\n" + ""}, - {BUG_ID + "/serialized-form.html", "" + + { "serialized-form.html", "" + "Deprecated. As of JDK version" + " 1.5, replaced by\n" + " " + @@ -299,54 +297,54 @@ // 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", "" + "setUndecorated(boolean)
."}, - {BUG_ID + "/pkg1/package-summary.html", "
\n" + + { "pkg1/package-summary.html", "
"}, + { "pkg1/package-summary.html", "
\n" + "
"}, - {BUG_ID + "/pkg1/C1.html", ""}, - {BUG_ID + "/pkg1/C1.html", "
\n" + + { "pkg1/C1.html", "
"}, + { "pkg1/C1.html", "
\n" + "
"}, - {BUG_ID + "/pkg1/C1.ModalExclusionType.html", ""}, - {BUG_ID + "/pkg1/C1.ModalExclusionType.html", "
\n" + + { "pkg1/C1.ModalExclusionType.html", "
"}, + { "pkg1/C1.ModalExclusionType.html", "
\n" + "
"}, - {BUG_ID + "/pkg1/C2.html", ""}, - {BUG_ID + "/pkg1/C2.html", "
\n" + + { "pkg1/C2.html", "
"}, + { "pkg1/C2.html", "
\n" + "
"}, - {BUG_ID + "/pkg1/C2.ModalType.html", ""}, - {BUG_ID + "/pkg1/C2.ModalType.html", "
\n" + + { "pkg1/C2.ModalType.html", "
"}, + { "pkg1/C2.ModalType.html", "
\n" + "
"}, - {BUG_ID + "/pkg1/C3.html", ""}, - {BUG_ID + "/pkg1/C3.html", "
\n" + + { "pkg1/C3.html", "
"}, + { "pkg1/C3.html", "
\n" + "
"}, - {BUG_ID + "/pkg1/C4.html", ""}, - {BUG_ID + "/pkg1/C4.html", "
\n" + + { "pkg1/C4.html", "
"}, + { "pkg1/C4.html", "
\n" + "
"}, - {BUG_ID + "/pkg1/C5.html", ""}, - {BUG_ID + "/pkg1/C5.html", "
\n" + + { "pkg1/C5.html", "
"}, + { "pkg1/C5.html", "
\n" + "
"}, - {BUG_ID + "/overview-tree.html", ""}, - {BUG_ID + "/overview-tree.html", "
\n" + + { "overview-tree.html", "
"}, + { "overview-tree.html", "
\n" + "
"}, - {BUG_ID + "/serialized-form.html", ""}, - {BUG_ID + "/serialized-form.html", "
\n" + + { "serialized-form.html", "
"}, + { "serialized-form.html", "
\n" + "
"}}; 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 @@ 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(); - } } diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java --- a/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java Tue Apr 22 17:41:11 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java Tue Apr 22 17:57:40 2014 -0700 @@ -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", "See Also:"}}; private static final String[][] NEGATED_TEST1 = { - {BUG_ID + "/pkg1/C1.html", "Method Summary"}, - {BUG_ID + "/pkg1/C1.html", ""}, - {BUG_ID + "/pkg1/package-summary.html", + { "pkg1/C1.html", "Method Summary"}, + { "pkg1/C1.html", ""}, + { "pkg1/package-summary.html", "Class Summary"}}; private static final String[][] TEST2 = { - {BUG_ID + "/pkg2/C2.html", "Comments:"}}; + { "pkg2/C2.html", "Comments:"}}; private static final String[][] NEGATED_TEST2 = { - {BUG_ID + "/pkg2/C2.html", "Method Summary"}, - {BUG_ID + "/pkg1/package-summary.html", + { "pkg2/C2.html", "Method Summary"}, + { "pkg1/package-summary.html", "Class Summary"}}; 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 @@ tester.run(ARGS2, TEST2, NEGATED_TEST2); tester.printSummary(); } - - /** - * {@inheritDoc} - */ - public String getBugId() { - return BUG_ID; - } - - /** - * {@inheritDoc} - */ - public String getBugName() { - return getClass().getName(); - } } diff -r b0845717434e -r e7549dcbc4af langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java --- a/langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java Tue Apr 22 17:41:11 2014 -0700 +++ b/langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java Tue Apr 22 17:57:40 2014 -0700 @@ -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", "