--- a/langtools/test/com/sun/javadoc/AuthorDD/AuthorDD.java Fri May 09 23:31:05 2014 +0200
+++ b/langtools/test/com/sun/javadoc/AuthorDD/AuthorDD.java Fri May 09 15:37:12 2014 -0700
@@ -26,143 +26,37 @@
* @bug 4651598 8026567
* @summary Javadoc wrongly inserts </DD> tags when using multiple @author tags
* @author dkramer
+ * @library ../lib
+ * @build JavadocTester
* @run main AuthorDD
*/
-
-import com.sun.javadoc.*;
-import java.util.*;
-import java.io.*;
-
-
/**
* Runs javadoc and runs regression tests on the resulting HTML.
- * It reads each file, complete with newlines, into a string to easily
- * find strings that contain newlines.
*/
-public class AuthorDD
-{
-
- protected static final String NL = System.getProperty("line.separator");
-
- private static final String BUGID = "4651598";
- private static final String BUGNAME = "AuthorDD";
-
- // Subtest number. Needed because runResultsOnHTML is run twice, and subtestNum
- // should increment across subtest runs.
- public static int subtestNum = 0;
- public static int numSubtestsPassed = 0;
-
- // Entry point
- public static void main(String[] args) {
+public class AuthorDD extends JavadocTester {
- // Directory that contains source files that javadoc runs on
- String srcdir = System.getProperty("test.src", ".");
-
- // Test for all cases except the split index page
- runJavadoc(new String[] {"-d", BUGID,
- "-author",
- "-version",
- "-sourcepath", srcdir,
- "p1"});
- runTestsOnHTML(testArray);
-
- printSummary();
- }
-
- /** Run javadoc */
- public static void runJavadoc(String[] javadocArgs) {
- if (com.sun.tools.javadoc.Main.execute(AuthorDD.class.getClassLoader(),
- javadocArgs) != 0) {
- throw new Error("Javadoc failed to execute");
- }
+ public static void main(String... args) throws Exception {
+ AuthorDD tester = new AuthorDD();
+ tester.runTests();
}
- /**
- * Assign value for [ stringToFind, filename ]
- * NOTE: The standard doclet uses the same separator "\n" for all OS's
- */
- private static final String[][] testArray = {
-
- // Test single @since tag:
-
- { "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n" +
- "<dd>JDK 1.0</dd>",
- BUGID + "/p1/C1.html" },
-
- // Test multiple @author tags:
-
- { "<dt><span class=\"simpleTagLabel\">Author:</span></dt>\n" +
- "<dd>Doug Kramer, Jamie, Neal</dd>",
- BUGID + "/p1/C1.html" },
-
- };
-
- public static void runTestsOnHTML(String[][] testArray) {
-
- for (int i = 0; i < testArray.length; i++) {
-
- subtestNum += 1;
-
- // Read contents of file into a string
- String fileString = readFileToString(testArray[i][1]);
-
- // Get string to find
- String stringToFind = testArray[i][0];
+ @Test
+ void test() {
+ // Test for all cases except the split index page
+ javadoc("-d", "out",
+ "-author",
+ "-version",
+ "-sourcepath", testSrc,
+ "p1");
+ checkExit(Exit.OK);
- // Find string in file's contents
- if (findString(fileString, stringToFind) == -1) {
- System.out.println("\nSub-test " + (subtestNum)
- + " for bug " + BUGID + " (" + BUGNAME + ") FAILED\n"
- + "when searching for:\n"
- + stringToFind);
- } else {
- numSubtestsPassed += 1;
- System.out.println("\nSub-test " + (subtestNum) + " passed:\n" + stringToFind);
- }
- }
- }
-
- public static void printSummary() {
- if ( numSubtestsPassed == subtestNum ) {
- System.out.println("\nAll " + numSubtestsPassed + " subtests passed");
- } else {
- throw new Error("\n" + (subtestNum - numSubtestsPassed) + " of " + (subtestNum)
- + " subtests failed for bug " + BUGID + " (" + BUGNAME + ")\n");
- }
- }
-
- // Read the file into a String
- public static String readFileToString(String filename) {
- try {
- File file = new File(filename);
- if ( !file.exists() ) {
- System.out.println("\nFILE DOES NOT EXIST: " + filename);
- }
- BufferedReader in = new BufferedReader(new FileReader(file));
-
- // Create an array of characters the size of the file
- char[] allChars = new char[(int)file.length()];
-
- // Read the characters into the allChars array
- in.read(allChars, 0, (int)file.length());
- in.close();
-
- // Convert to a string
- String allCharsString = new String(allChars);
-
- return allCharsString;
-
- } catch (FileNotFoundException e) {
- System.err.println(e);
- return "";
- } catch (IOException e) {
- System.err.println(e);
- return "";
- }
- }
-
- public static int findString(String fileString, String stringToFind) {
- return fileString.replace(NL, "\n").indexOf(stringToFind);
+ checkOutput("p1/C1.html", true,
+ // Test single @since tag:
+ "<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n"
+ + "<dd>JDK 1.0</dd>",
+ // Test multiple @author tags:
+ "<dt><span class=\"simpleTagLabel\">Author:</span></dt>\n"
+ + "<dd>Doug Kramer, Jamie, Neal</dd>");
}
}