archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8031649: Clean up javadoc tests

Browse source 
Reviewed-by: jjg
This commit is contained in:
Neil Toda 2014-04-16 16:17:09 -07:00 • committed by Jonathan Gibbons
parent 360461f136
commit 81730320bd
132 changed files with 2213 additions and 1892 deletions
Download patch file Download diff file Expand all files Collapse all files

14
langtools/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,10 +44,8 @@ public class AccessAsciiArt {
private static final String BUGID = "4706779-4956908";
private static final String BUGNAME = "AccessAsciiArt";
private static final String FS = System.getProperty("file.separator");
private static final String PS = System.getProperty("path.separator");
private static final String TMPDEST_DIR1 = "." + FS + "docs1" + FS;
private static final String TMPDEST_DIR2 = "." + FS + "docs2" + FS;
private static final String TMPDEST_DIR1 = "./docs1/";
private static final String TMPDEST_DIR2 = "./docs2/";
// Subtest number. Needed because runResultsOnHTML is run twice,
// and subtestNum should increment across subtest runs.
@ -85,17 +83,17 @@ public class AccessAsciiArt {
// Test the top line of the class tree
{
"<li><a href=\"../../p1/C.html\" title=\"class in p1\">p1.C</a></li>",
TMPDEST_DIR1 + "p1" + FS + "subpkg" + FS + "SSC.html" },
TMPDEST_DIR1 + "p1/subpkg/SSC.html" },
// Test the second line of the class tree
{
"<li><a href=\"../../p1/SC.html\" title=\"class in p1\">p1.SC</a></li>",
TMPDEST_DIR1 + "p1" + FS + "subpkg" + FS + "SSC.html" },
TMPDEST_DIR1 + "p1/subpkg/SSC.html" },
// Test the third line of the class tree
{
"<li>p1.subpkg.SSC</li>",
TMPDEST_DIR1 + "p1" + FS + "subpkg" + FS +"SSC.html" },
TMPDEST_DIR1 + "p1/subpkg/SSC.html" },
};

8
langtools/test/com/sun/javadoc/AccessFrameTitle/AccessFrameTitle.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,10 +44,8 @@ public class AccessFrameTitle {
private static final String BUGID = "4636655";
private static final String BUGNAME = "AccessFrameTitle";
private static final String FS = System.getProperty("file.separator");
private static final String PS = System.getProperty("path.separator");
private static final String TMPDEST_DIR1 = "." + FS + "docs1" + FS;
private static final String TMPDEST_DIR2 = "." + FS + "docs2" + FS;
private static final String TMPDEST_DIR1 = "./docs1/";
private static final String TMPDEST_DIR2 = "./docs2/";
// Subtest number. Needed because runResultsOnHTML is run twice,
// and subtestNum should increment across subtest runs.

16
langtools/test/com/sun/javadoc/AccessH1/AccessH1.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,13 +42,12 @@ import java.io.*;
*/
public class AccessH1 {
protected static final String NL = System.getProperty("line.separator");
private static final String BUGID = "4636667-7052425";
private static final String BUGNAME = "AccessH1";
private static final String FS = System.getProperty("file.separator");
private static final String PS = System.getProperty("path.separator");
private static final String LS = System.getProperty("line.separator");
private static final String TMPDEST_DIR1 = "." + FS + "docs1" + FS;
private static final String TMPDEST_DIR2 = "." + FS + "docs2" + FS;
private static final String TMPDEST_DIR1 = "./docs1/";
private static final String TMPDEST_DIR2 = "./docs2/";
// Subtest number. Needed because runResultsOnHTML is run twice,
// and subtestNum should increment across subtest runs.
@ -85,7 +84,8 @@ public class AccessH1 {
private static final String[][] testArray = {
// Test the style sheet
{
"h1 {" + LS + " font-size:20px;" + LS +
"h1 {\n" +
" font-size:20px;\n" +
"}",
TMPDEST_DIR1 + "stylesheet.css"
},
@ -161,6 +161,6 @@ public class AccessH1 {
}
public static int findString(String fileString, String stringToFind) {
return fileString.indexOf(stringToFind);
return fileString.replace(NL, "\n").indexOf(stringToFind);
}
}

31
langtools/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,13 +42,12 @@ import java.io.*;
*/
public class AccessSkipNav {
protected static final String NL = System.getProperty("line.separator");
private static final String BUGID = "4638136 - 7198273";
private static final String BUGNAME = "AccessSkipNav";
private static final String FS = System.getProperty("file.separator");
private static final String PS = System.getProperty("path.separator");
private static final String LS = System.getProperty("line.separator");
private static final String TMPDEST_DIR1 = "." + FS + "docs1" + FS;
private static final String TMPDEST_DIR2 = "." + FS + "docs2" + FS;
private static final String TMPDEST_DIR1 = "./docs1/";
private static final String TMPDEST_DIR2 = "./docs2/";
// Subtest number. Needed because runResultsOnHTML is run twice,
// and subtestNum should increment across subtest runs.
@ -87,21 +86,23 @@ public class AccessSkipNav {
// Top navbar <a href>
{ "<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a>",
TMPDEST_DIR1 + "p1" + FS + "C1.html" },
TMPDEST_DIR1 + "p1/C1.html" },
// Top navbar <a name>
{ "<a name=\"skip.navbar.top\">" + LS +
"<!-- -->" + LS + "</a>",
TMPDEST_DIR1 + "p1" + FS + "C1.html" },
{ "<a name=\"skip.navbar.top\">\n" +
"<!-- -->\n" +
"</a>",
TMPDEST_DIR1 + "p1/C1.html" },
// Bottom navbar <a href>
{ "<a href=\"#skip.navbar.bottom\" title=\"Skip navigation links\">Skip navigation links</a>",
TMPDEST_DIR1 + "p1" + FS + "C1.html" },
TMPDEST_DIR1 + "p1/C1.html" },
// Bottom navbar <a name>
{ "<a name=\"skip.navbar.bottom\">" + LS +
"<!-- -->" + LS + "</a>",
TMPDEST_DIR1 + "p1" + FS + "C1.html" }
{ "<a name=\"skip.navbar.bottom\">\n" +
"<!-- -->\n" +
"</a>",
TMPDEST_DIR1 + "p1/C1.html" }
};
public static void runTestsOnHTML(String[][] testArray) {
@ -169,6 +170,6 @@ public class AccessSkipNav {
}
public static int findString(String fileString, String stringToFind) {
return fileString.indexOf(stringToFind);
return fileString.replace(NL, "\n").indexOf(stringToFind);
}
}

6
langtools/test/com/sun/javadoc/AccessSummary/AccessSummary.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -35,7 +35,7 @@
public class AccessSummary extends JavadocTester {
private static final String BUG_ID = "4637604-4775148";
private static final String OUTPUT_DIR1 = "docs1-" + BUG_ID + FS;
private static final String OUTPUT_DIR1 = "docs1-" + BUG_ID + "/";
/**
* Assign value for [ fileToSearch, stringToFind ]
@ -47,7 +47,7 @@ public class AccessSummary extends JavadocTester {
"summary=\"Packages table, listing packages, and an explanation\"" },
// Test that the summary attribute appears
{ OUTPUT_DIR1 + "p1" + FS + "C1.html",
{ OUTPUT_DIR1 + "p1/C1.html",
"summary=\"Constructor Summary table, listing constructors, and an explanation\"" },
// Test that the summary attribute appears

20
langtools/test/com/sun/javadoc/AuthorDD/AuthorDD.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,11 +42,11 @@ import java.io.*;
*/
public class AuthorDD
{
protected static final String NL = System.getProperty("line.separator");
private static final String BUGID = "4651598";
private static final String BUGNAME = "AuthorDD";
private static final String FS = System.getProperty("file.separator");
private static final String PS = System.getProperty("path.separator");
private static final String NL = System.getProperty("line.separator");
// Subtest number. Needed because runResultsOnHTML is run twice, and subtestNum
// should increment across subtest runs.
@ -86,13 +86,15 @@ public class AuthorDD
// Test single @since tag:
{ "<dt><span class=\"simpleTagLabel\">Since:</span></dt>"+NL+"<dd>JDK 1.0</dd>",
BUGID + FS + "p1" + FS + "C1.html" },
{ "<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>"+NL+"<dd>Doug Kramer, Jamie, Neal</dd>",
BUGID + FS + "p1" + FS + "C1.html" },
{ "<dt><span class=\"simpleTagLabel\">Author:</span></dt>\n" +
"<dd>Doug Kramer, Jamie, Neal</dd>",
BUGID + "/p1/C1.html" },
};
@ -161,6 +163,6 @@ public class AuthorDD
}
public static int findString(String fileString, String stringToFind) {
return fileString.indexOf(stringToFind);
return fileString.replace(NL, "\n").indexOf(stringToFind);
}
}

12
langtools/test/com/sun/javadoc/DocRootSlash/DocRootSlash.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,9 +44,7 @@ public class DocRootSlash
{
private static final String BUGID = "4524350, 4662945, or 4633447";
private static final String BUGNAME = "DocRootSlash";
private static final String FS = System.getProperty("file.separator");
private static final String PS = System.getProperty("path.separator");
private static final String TMPDIR_STRING1 = "." + FS + "docs1" + FS;
private static final String TMPDIR_STRING1 = "./docs1/";
// Test number. Needed because runResultsOnHTMLFile is run twice, and subtestNum
// should increment across test runs.
@ -61,7 +59,7 @@ public class DocRootSlash
runJavadoc(new String[] {"-d", TMPDIR_STRING1,
"-Xdoclint:none",
"-overview", (srcdir + FS + "overview.html"),
"-overview", (srcdir + "/overview.html"),
"-header", "<A HREF=\"{@docroot}/package-list\">{&#064;docroot}</A> <A HREF=\"{@docRoot}/help-doc\">{&#064;docRoot}</A>",
"-sourcepath", srcdir,
"p1", "p2"});
@ -79,8 +77,8 @@ public class DocRootSlash
/** The array of filenames to test */
private static final String[] filenameArray = {
TMPDIR_STRING1 + "p1" + FS + "C1.html" ,
TMPDIR_STRING1 + "p1" + FS + "package-summary.html",
TMPDIR_STRING1 + "p1/C1.html" ,
TMPDIR_STRING1 + "p1/package-summary.html",
TMPDIR_STRING1 + "overview-summary.html"
};

39
langtools/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -43,13 +43,12 @@ import java.io.*;
*/
public class JavascriptWinTitle {
protected static final String NL = System.getProperty("line.separator");
private static final String BUGID = "4645058";
private static final String BUGNAME = "JavascriptWinTitle";
private static final String FS = System.getProperty("file.separator");
private static final String PS = System.getProperty("path.separator");
private static final String LS = System.getProperty("line.separator");
private static final String TMPDEST_DIR1 = "." + FS + "docs1" + FS;
private static final String TMPDEST_DIR2 = "." + FS + "docs2" + FS;
private static final String TMPDEST_DIR1 = "./docs1/";
private static final String TMPDEST_DIR2 = "./docs2/";
// Subtest number. Needed because runResultsOnHTML is run twice,
// and subtestNum should increment across subtest runs.
@ -66,7 +65,7 @@ public class JavascriptWinTitle {
runJavadoc(new String[] {"-d", TMPDEST_DIR1,
"-doctitle", "Document Title",
"-windowtitle", "Window Title",
"-overview", (srcdir + FS + "overview.html"),
"-overview", (srcdir + "/overview.html"),
"-linkoffline",
"http://java.sun.com/j2se/1.4/docs/api", srcdir,
"-sourcepath", srcdir,
@ -99,7 +98,7 @@ public class JavascriptWinTitle {
// Test onload is present:
{ "<body>",
TMPDEST_DIR1 + FS + "p1" + FS + "package-summary.html" },
TMPDEST_DIR1 + "/p1/package-summary.html" },
// Test that "onload" is not present in BODY tag:
{ "<body>",
@ -111,18 +110,20 @@ public class JavascriptWinTitle {
// Test that "onload" is not present in BODY tag:
{ "<body>",
TMPDEST_DIR1 + FS + "p1" + FS + "package-frame.html" },
TMPDEST_DIR1 + "/p1/package-frame.html" },
// Test that win title javascript is followed by NOSCRIPT code.
{"<script type=\"text/javascript\"><!--" + LS +
" try {" + LS +
" if (location.href.indexOf('is-external=true') == -1) {" + LS +
" parent.document.title=\"C (Window Title)\";" + LS +
" }" + LS +
" }" + LS +
" catch(err) {" + LS +
" }" + LS + "//-->" + LS + "</script>",
TMPDEST_DIR1 + FS + "p1" + FS + "C.html"
{"<script type=\"text/javascript\"><!--\n" +
" try {\n" +
" if (location.href.indexOf('is-external=true') == -1) {\n" +
" parent.document.title=\"C (Window Title)\";\n" +
" }\n" +
" }\n" +
" catch(err) {\n" +
" }\n" +
"//-->\n" +
"</script>",
TMPDEST_DIR1 + "/p1/C.html"
}
};
@ -192,6 +193,6 @@ public class JavascriptWinTitle {
}
public static int findString(String fileString, String stringToFind) {
return fileString.indexOf(stringToFind);
return fileString.replace(NL, "\n").indexOf(stringToFind);
}
}

34
langtools/test/com/sun/javadoc/MetaTag/MetaTag.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -63,30 +63,30 @@ public class MetaTag extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{ OUTPUT_DIR + FS + "p1" + FS + "C1.html",
{ OUTPUT_DIR + "/p1/C1.html",
"<meta name=\"keywords\" content=\"p1.C1 class\">" },
{ OUTPUT_DIR + FS + "p1" + FS + "C1.html",
{ OUTPUT_DIR + "/p1/C1.html",
"<meta name=\"keywords\" content=\"field1\">" },
{ OUTPUT_DIR + FS + "p1" + FS + "C1.html",
{ OUTPUT_DIR + "/p1/C1.html",
"<meta name=\"keywords\" content=\"field2\">" },
{ OUTPUT_DIR + FS + "p1" + FS + "C1.html",
{ OUTPUT_DIR + "/p1/C1.html",
"<meta name=\"keywords\" content=\"method1()\">" },
{ OUTPUT_DIR + FS + "p1" + FS + "C1.html",
{ OUTPUT_DIR + "/p1/C1.html",
"<meta name=\"keywords\" content=\"method2()\">" },
{ OUTPUT_DIR + FS + "p1" + FS + "package-summary.html",
{ OUTPUT_DIR + "/p1/package-summary.html",
"<meta name=\"keywords\" content=\"p1 package\">" },
{ OUTPUT_DIR + FS + "overview-summary.html",
{ OUTPUT_DIR + "/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 + FS + "overview-summary.html",
{OUTPUT_DIR + "/overview-summary.html",
"<meta name=\"date\" "
+ "content=\"" + m_dateFormat.format(new Date()) + "\">"},
};
@ -96,32 +96,32 @@ public class MetaTag extends JavadocTester {
private static final String[][] TEST2 = NO_TEST;
private static final String[][] NEGATED_TEST2 = {
//No keywords when -keywords is not used.
{ OUTPUT_DIR + "-2" + FS + "p1" + FS + "C1.html",
{ OUTPUT_DIR + "-2/p1/C1.html",
"<META NAME=\"keywords\" CONTENT=\"p1.C1 class\">" },
{ OUTPUT_DIR + "-2" + FS + "p1" + FS + "C1.html",
{ OUTPUT_DIR + "-2/p1/C1.html",
"<META NAME=\"keywords\" CONTENT=\"field1\">" },
{ OUTPUT_DIR + "-2" + FS + "p1" + FS + "C1.html",
{ OUTPUT_DIR + "-2/p1/C1.html",
"<META NAME=\"keywords\" CONTENT=\"field2\">" },
{ OUTPUT_DIR + "-2" + FS + "p1" + FS + "C1.html",
{ OUTPUT_DIR + "-2/p1/C1.html",
"<META NAME=\"keywords\" CONTENT=\"method1()\">" },
{ OUTPUT_DIR + "-2" + FS + "p1" + FS + "C1.html",
{ OUTPUT_DIR + "-2/p1/C1.html",
"<META NAME=\"keywords\" CONTENT=\"method2()\">" },
{ OUTPUT_DIR + "-2" + FS + "p1" + FS + "package-summary.html",
{ OUTPUT_DIR + "-2/p1/package-summary.html",
"<META NAME=\"keywords\" CONTENT=\"p1 package\">" },
{ OUTPUT_DIR + "-2" + FS + "overview-summary.html",
{ OUTPUT_DIR + "-2/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" + FS + "overview-summary.html",
{OUTPUT_DIR + "-2/overview-summary.html",
"<META NAME=\"date\" "
+ "CONTENT=\"" + m_dateFormat.format(new Date()) + "\">"},
};

8
langtools/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,9 +40,9 @@ public class PackagesHeader extends JavadocTester {
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 + FS;
private static final String OUTPUT_DIR2 = "docs2-" + BUG_ID + FS;
private static final String OUTPUT_DIR3 = "docs3-" + BUG_ID + FS;
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 + "/";
/**
* Assign value for [ fileToSearch, stringToFind ]

4
langtools/test/com/sun/javadoc/T6735320/T6735320.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -34,7 +34,7 @@ public class T6735320 extends JavadocTester {
private static final String BUG_ID = "6735320";
private static final String[] ARGS = new String[]{
"-d", BUG_ID + ".out",
SRC_DIR + FS + "SerialFieldTest.java"
SRC_DIR + "/SerialFieldTest.java"
};
public String getBugId() {

29
langtools/test/com/sun/javadoc/ValidHtml/ValidHtml.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,13 +44,12 @@ import java.io.*;
*/
public class ValidHtml {
protected static final String NL = System.getProperty("line.separator");
private static final String BUGID = "4275630";
private static final String BUGNAME = "ValidHtml";
private static final String FS = System.getProperty("file.separator");
private static final String PS = System.getProperty("path.separator");
private static final String LS = System.getProperty("line.separator");
private static final String TMPDEST_DIR1 = "." + FS + "docs1" + FS;
private static final String TMPDEST_DIR2 = "." + FS + "docs2" + FS;
private static final String TMPDEST_DIR1 = "./docs1/";
private static final String TMPDEST_DIR2 = "./docs2/";
// Subtest number. Needed because runResultsOnHTML is run twice,
// and subtestNum should increment across subtest runs.
@ -68,7 +67,7 @@ public class ValidHtml {
"-doctitle", "Document Title",
"-windowtitle", "Window Title",
"-use",
"-overview", (srcdir + FS + "overview.html"),
"-overview", (srcdir + "/overview.html"),
"-sourcepath", srcdir,
"p1", "p2"
});
@ -102,12 +101,12 @@ public class ValidHtml {
// Test the proper DOCTYPE element is present:
{
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
TMPDEST_DIR1 + "p1" + FS + "package-summary.html"
TMPDEST_DIR1 + "p1/package-summary.html"
},
// Test the proper DOCTYPE element is present:
{
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
TMPDEST_DIR1 + "p1" + FS + "C.html"
TMPDEST_DIR1 + "p1/C.html"
},
// Test the proper DOCTYPE element is present:
{
@ -122,17 +121,19 @@ public class ValidHtml {
// Test the proper DOCTYPE element is present:
{
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
TMPDEST_DIR1 + "p1" + FS + "package-frame.html"
TMPDEST_DIR1 + "p1/package-frame.html"
},
// Test that <NOFRAMES> is inside <FRAMESET> element:
{
"</noframes>" + LS + "</frameset>",
"</noframes>\n" +
"</frameset>",
TMPDEST_DIR1 + "index.html"
},
// Test the table elements are in the correct order:
{
"</td>" + LS + "</tr>",
TMPDEST_DIR1 + FS + "p1" + FS + "package-use.html"
"</td>\n" +
"</tr>",
TMPDEST_DIR1 + "/p1/package-use.html"
}
};
@ -197,6 +198,6 @@ public class ValidHtml {
}
public static int findString(String fileString, String stringToFind) {
return fileString.indexOf(stringToFind);
return fileString.replace(NL, "\n").indexOf(stringToFind);
}
}

11
langtools/test/com/sun/javadoc/VersionNumber/VersionNumber.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,11 +44,8 @@ public class VersionNumber {
private static final String BUGID = "4720849";
private static final String BUGNAME = "VersionNumber";
private static final String FS = System.getProperty("file.separator");
private static final String PS = System.getProperty("path.separator");
private static final String LS = System.getProperty("line.separator");
private static final String TMPDEST_DIR1 = "." + FS + "docs1" + FS;
private static final String TMPDEST_DIR2 = "." + FS + "docs2" + FS;
private static final String TMPDEST_DIR1 = "./docs1/";
private static final String TMPDEST_DIR2 = "./docs2/";
// Subtest number. Needed because runResultsOnHTML is run twice,
// and subtestNum should increment across subtest runs.
@ -85,7 +82,7 @@ public class VersionNumber {
// Test the proper DOCTYPE element is present:
{
"<!-- Generated by javadoc (",
TMPDEST_DIR1 + "p1" + FS + "C.html" },
TMPDEST_DIR1 + "p1/C.html" },
};

25
langtools/test/com/sun/javadoc/WindowTitles/WindowTitles.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -46,11 +46,8 @@ public class WindowTitles
{
private static final String BUGID = "4530730";
private static final String BUGNAME = "WindowTitles";
private static final String FS = System.getProperty("file.separator");
private static final String PS = System.getProperty("path.separator");
private static final String LS = System.getProperty("line.separator");
private static final String TMPDIR_STRING1 = "." + FS + "docs1" + FS;
private static final String TMPDIR_STRING2 = "." + FS + "docs2" + FS;
private static final String TMPDIR_STRING1 = "./docs1/";
private static final String TMPDIR_STRING2 = "./docs2/";
// Subtest number. Needed because runResultsOnHTML is run twice, and subtestNum
// should increment across subtest runs.
@ -90,7 +87,7 @@ public class WindowTitles
/**
* Assign value for [ stringToFind, filename ]
* NOTE: The standard doclet uses platform-specific line separators (LS)
* NOTE: The standard doclet uses platform-specific line separators ("\n")
*/
private static final String[][] testArray = {
@ -104,19 +101,19 @@ public class WindowTitles
TMPDIR_STRING1 + "overview-frame.html" },
{ "<title>p1</title>",
TMPDIR_STRING1 + "p1" + FS + "package-summary.html" },
TMPDIR_STRING1 + "p1/package-summary.html" },
{ "<title>p1</title>",
TMPDIR_STRING1 + "p1" + FS + "package-frame.html" },
TMPDIR_STRING1 + "p1/package-frame.html" },
{ "<title>p1 Class Hierarchy</title>",
TMPDIR_STRING1 + "p1" + FS + "package-tree.html" },
TMPDIR_STRING1 + "p1/package-tree.html" },
{ "<title>Uses of Package p1</title>",
TMPDIR_STRING1 + "p1" + FS + "package-use.html" },
TMPDIR_STRING1 + "p1/package-use.html" },
{ "<title>C1</title>",
TMPDIR_STRING1 + "p1" + FS + "C1.html" },
TMPDIR_STRING1 + "p1/C1.html" },
{ "<title>All Classes</title>",
TMPDIR_STRING1 + "allclasses-frame.html" },
@ -140,7 +137,7 @@ public class WindowTitles
TMPDIR_STRING1 + "index-all.html" },
{ "<title>Uses of Class p1.C1</title>",
TMPDIR_STRING1 + "p1" + FS + "class-use" + FS + "C1.html" },
TMPDIR_STRING1 + "p1/class-use/C1.html" },
};
/**
@ -148,7 +145,7 @@ public class WindowTitles
*/
private static final String[][] testSplitIndexArray = {
{ "<title>C-Index</title>",
TMPDIR_STRING2 + "index-files" + FS + "index-1.html" },
TMPDIR_STRING2 + "index-files/index-1.html" },
};
public static void runTestsOnHTML(String[][] testArray) {

12
langtools/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -35,9 +35,9 @@ 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 + FS + "TestConstantValues.java",
SRC_DIR + FS + "TestConstantValues2.java",
SRC_DIR + FS + "A.java"
"-d", BUG_ID, SRC_DIR + "/TestConstantValues.java",
SRC_DIR + "/TestConstantValues2.java",
SRC_DIR + "/A.java"
};
/**
@ -47,10 +47,10 @@ 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 + FS + "constant-values.html";
tests[i][0] = BUG_ID + "/constant-values.html";
tests[i][1] = "TEST"+(i+1)+"PASSES";
}
tests[tests.length-1][0] = BUG_ID + FS + "constant-values.html";
tests[tests.length-1][0] = BUG_ID + "/constant-values.html";
tests[tests.length-1][1] = "<code>\"&lt;Hello World&gt;\"</code>";
TestConstantValuesDriver tester = new TestConstantValuesDriver();
run(tester, ARGS, tests, NO_TEST);

6
langtools/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -35,7 +35,7 @@ public class TestDupThrowsTags extends JavadocTester {
private static final String BUG_ID = "4525364";
private static final String[] ARGS = new String[] {
"-d", BUG_ID, SRC_DIR + FS + "TestDupThrowsTags.java"
"-d", BUG_ID, SRC_DIR + "/TestDupThrowsTags.java"
};
/**
@ -45,7 +45,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 + FS + "TestDupThrowsTags.html";
tests[i][0] = BUG_ID + "/TestDupThrowsTags.html";
tests[i][1] = "Test "+(i+1)+" passes";
}
TestDupThrowsTags tester = new TestDupThrowsTags();

22
langtools/test/com/sun/javadoc/lib/JavadocTester.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -51,9 +51,9 @@ import java.io.*;
*/
public abstract class JavadocTester {
protected static final String FS = System.getProperty("file.separator");
protected static final String PS = System.getProperty("path.separator");
protected static final String NL = System.getProperty("line.separator");
protected static final String FS = System.getProperty("file.separator");
protected static final String SRC_DIR = System.getProperty("test.src", ".");
protected static final String JAVA_VERSION = System.getProperty("java.version");
protected static final String[][] NO_TEST = new String[][] {};
@ -124,14 +124,6 @@ public abstract class JavadocTester {
*/
private static int javadocRunNum = 0;
/**
* Whether or not to match newlines exactly.
* Set this value to false if the match strings
* contain text from javadoc comments containing
* non-platform newlines.
*/
protected boolean exactNewlineMatch = true;
/**
* Construct a JavadocTester.
*/
@ -504,19 +496,13 @@ public abstract class JavadocTester {
/**
* Search for the string in the given file and return true
* if the string was found.
* If exactNewlineMatch is false, newlines will be normalized
* before the comparison.
*
* @param fileString the contents of the file to search through
* @param stringToFind the string to search for
* @return true if the string was found
*/
private boolean findString(String fileString, String stringToFind) {
if (exactNewlineMatch) {
return fileString.indexOf(stringToFind) >= 0;
} else {
return fileString.replace(NL, "\n").indexOf(stringToFind.replace(NL, "\n")) >= 0;
}
return fileString.contains(stringToFind.replace("\n", NL));
}

6
langtools/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,7 +36,7 @@ public class TestAbsLinkPath extends JavadocTester {
private static final String BUG_ID = "4640745";
private static final String[][] TEST = {
{"tmp" + FS + "pkg1" + FS + "C1.html", "C2.html"}};
{"tmp/pkg1/C1.html", "C2.html"}};
private static final String[][] NEGATED_TEST = NO_TEST;
private static final String[] ARGS1 =
@ -45,7 +45,7 @@ public class TestAbsLinkPath extends JavadocTester {
private static final String[] ARGS2 =
new String[] {
"-d", "tmp", "-sourcepath", SRC_DIR,
"-link", ".." + FS + "tmp2", "pkg1"};
"-link", "../tmp2", "pkg1"};
/**
* The entry point of the test.

22
langtools/test/com/sun/javadoc/testAbstractMethod/TestAbstractMethod.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,9 +44,9 @@ public class TestAbstractMethod extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "A.html",
{BUG_ID + "/pkg/A.html",
"<td class=\"colFirst\"><code>default void</code></td>"},
{BUG_ID + FS + "pkg" + FS + "A.html",
{BUG_ID + "/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 +57,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 + FS + "pkg" + FS + "B.html",
{BUG_ID + "/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 +68,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 + FS + "pkg" + FS + "B.html",
{BUG_ID + "/pkg/B.html",
"<td class=\"colFirst\"><code>abstract void</code></td>"},
{BUG_ID + FS + "pkg" + FS + "C.html",
{BUG_ID + "/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 +79,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 + FS + "pkg" + FS + "C.html",
{BUG_ID + "/pkg/C.html",
"<td class=\"colFirst\"><code>default void</code></td>"}
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg" + FS + "A.html",
{BUG_ID + "/pkg/A.html",
"<td class=\"colFirst\"><code>abstract void</code></td>"},
{BUG_ID + FS + "pkg" + FS + "B.html",
{BUG_ID + "/pkg/B.html",
"<span><a href=\"javascript:show(16);\">Default Methods</a></span>" +
"<span class=\"tabEnd\">&nbsp;</span>"},
{BUG_ID + FS + "pkg" + FS + "B.html",
{BUG_ID + "/pkg/B.html",
"<td class=\"colFirst\"><code>default void</code></td>"},
{BUG_ID + FS + "pkg" + FS + "C.html",
{BUG_ID + "/pkg/C.html",
"<span><a href=\"javascript:show(4);\">Abstract Methods</a></span>" +
"<span class=\"tabEnd\">&nbsp;</span>"}
};

124
langtools/test/com/sun/javadoc/testAnchorNames/TestAnchorNames.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,34 +40,34 @@ public class TestAnchorNames extends JavadocTester {
//Test some section markers and links to these markers
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"skip.navbar.top\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"nested.class.summary\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"#nested.class.summary\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"method.summary\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"#method.summary\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"field.detail\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"#field.detail\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"constructor.detail\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"#constructor.detail\">"
},
@ -75,170 +75,170 @@ public class TestAnchorNames extends JavadocTester {
//The marker for this appears in the serialized-form.html which we will
//test below
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../serialized-form.html#pkg1.RegClass\">"
},
//Test some fields
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"Z:Z_\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#Z:Z_\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"Z:Z_:D\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#Z:Z_:D\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"Z:Z:D_\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#Z:Z:D_\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"Z:Z:Dfield\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#Z:Z:Dfield\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"fieldInCla:D:D\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#fieldInCla:D:D\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"S_:D:D:D:D:DINT\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#S_:D:D:D:D:DINT\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"method:D:D\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#method:D:D\">"
},
{BUG_ID + FS + "pkg1" + FS + "DeprMemClass.html",
{BUG_ID + "/pkg1/DeprMemClass.html",
"<a name=\"Z:Z_field_In_Class\">"
},
{BUG_ID + FS + "pkg1" + FS + "DeprMemClass.html",
{BUG_ID + "/pkg1/DeprMemClass.html",
"<a href=\"../pkg1/DeprMemClass.html#Z:Z_field_In_Class\">"
},
//Test constructor
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"RegClass-java.lang.String-int-\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#RegClass-java.lang.String-int-\">"
},
//Test some methods
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"Z:Z_methodInClass-java.lang.String-\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#Z:Z_methodInClass-java.lang.String-\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"method--\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#method--\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"foo-java.util.Map-\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#foo-java.util.Map-\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"methodInCla:Ds-java.lang.String:A-\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#methodInCla:Ds-java.lang.String:A-\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"Z:Z_methodInClas:D-java.lang.String-int-\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#Z:Z_methodInClas:D-java.lang.String-int-\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"methodD-pkg1.RegClass.:DA-\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#methodD-pkg1.RegClass.:DA-\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a name=\"methodD-pkg1.RegClass.D:A-\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
"<a href=\"../pkg1/RegClass.html#methodD-pkg1.RegClass.D:A-\">"
},
{BUG_ID + FS + "pkg1" + FS + "DeprMemClass.html",
{BUG_ID + "/pkg1/DeprMemClass.html",
"<a name=\"Z:Z:Dmethod_In_Class--\">"
},
{BUG_ID + FS + "pkg1" + FS + "DeprMemClass.html",
{BUG_ID + "/pkg1/DeprMemClass.html",
"<a href=\"../pkg1/DeprMemClass.html#Z:Z:Dmethod_In_Class--\">"
},
//Test enum
{BUG_ID + FS + "pkg1" + FS + "RegClass.Te$t_Enum.html",
{BUG_ID + "/pkg1/RegClass.Te$t_Enum.html",
"<a name=\"Z:Z:DFLD2\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.Te$t_Enum.html",
{BUG_ID + "/pkg1/RegClass.Te$t_Enum.html",
"<a href=\"../pkg1/RegClass.Te$t_Enum.html#Z:Z:DFLD2\">"
},
//Test nested class
{BUG_ID + FS + "pkg1" + FS + "RegClass._NestedClas$.html",
{BUG_ID + "/pkg1/RegClass._NestedClas$.html",
"<a name=\"Z:Z_NestedClas:D--\">"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass._NestedClas$.html",
{BUG_ID + "/pkg1/RegClass._NestedClas$.html",
"<a href=\"../pkg1/RegClass._NestedClas$.html#Z:Z_NestedClas:D--\">"
},
//Test class use page
{BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "DeprMemClass.html",
{BUG_ID + "/pkg1/class-use/DeprMemClass.html",
"<a href=\"../../pkg1/RegClass.html#d____mc\">"
},
//Test deprecated list page
{BUG_ID + FS + "deprecated-list.html",
{BUG_ID + "/deprecated-list.html",
"<a href=\"pkg1/DeprMemClass.html#Z:Z_field_In_Class\">"
},
{BUG_ID + FS + "deprecated-list.html",
{BUG_ID + "/deprecated-list.html",
"<a href=\"pkg1/DeprMemClass.html#Z:Z:Dmethod_In_Class--\">"
},
//Test constant values page
{BUG_ID + FS + "constant-values.html",
{BUG_ID + "/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 + FS + "serialized-form.html",
{BUG_ID + "/serialized-form.html",
"<a name=\"pkg1.RegClass\">"
},
//Test member name index page
{BUG_ID + FS + "index-all.html",
{BUG_ID + "/index-all.html",
"<a name=\"I:Z:Z:D\">"
},
{BUG_ID + FS + "index-all.html",
{BUG_ID + "/index-all.html",
"<a href=\"#I:Z:Z:D\">$"
},
{BUG_ID + FS + "index-all.html",
{BUG_ID + "/index-all.html",
"<a href=\"#I:Z:Z_\">_"
}
};
@ -246,16 +246,16 @@ 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 + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
" Z:Z_"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
" Z:Z:Dfield"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
" Z:Z_field_In_Class"
},
{BUG_ID + FS + "pkg1" + FS + "RegClass.html",
{BUG_ID + "/pkg1/RegClass.html",
" S_:D:D:D:D:DINT"
},
};

4
langtools/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -45,7 +45,7 @@ public class TestAnnotationOptional extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "AnnotationOptional.html",
{BUG_ID + "/pkg/AnnotationOptional.html",
"<a name=\"annotation.type.element.detail\">"
}
};

41
langtools/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,33 +44,40 @@ public class TestAnnotationTypes extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
"<li>Summary:&nbsp;</li>" + NL + "<li><a href=\"#annotation.type." +
{BUG_ID + "/pkg/AnnotationTypeField.html",
"<li>Summary:&nbsp;</li>\n" +
"<li><a href=\"#annotation.type." +
"field.summary\">Field</a>&nbsp;|&nbsp;</li>"},
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
"<li>Detail:&nbsp;</li>" + NL + "<li><a href=\"#annotation.type." +
{BUG_ID + "/pkg/AnnotationTypeField.html",
"<li>Detail:&nbsp;</li>\n" +
"<li><a href=\"#annotation.type." +
"field.detail\">Field</a>&nbsp;|&nbsp;</li>"},
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
{BUG_ID + "/pkg/AnnotationTypeField.html",
"<!-- =========== ANNOTATION TYPE FIELD SUMMARY =========== -->"},
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
{BUG_ID + "/pkg/AnnotationTypeField.html",
"<h3>Field Summary</h3>"},
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
{BUG_ID + "/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 + FS + "pkg" + FS + "AnnotationTypeField.html",
{BUG_ID + "/pkg/AnnotationTypeField.html",
"<!-- ============ ANNOTATION TYPE FIELD DETAIL =========== -->"},
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeField.html",
"<h4>DEFAULT_NAME</h4>" + NL + "<pre>public static final&nbsp;java." +
{BUG_ID + "/pkg/AnnotationTypeField.html",
"<h4>DEFAULT_NAME</h4>\n" +
"<pre>public static final&nbsp;java." +
"lang.String&nbsp;DEFAULT_NAME</pre>"},
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
"<li>Summary:&nbsp;</li>" + NL + "<li>Field&nbsp;|&nbsp;</li>"},
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
"<li>Detail:&nbsp;</li>" + NL + "<li>Field&nbsp;|&nbsp;</li>"},
{BUG_ID + "/pkg/AnnotationType.html",
"<li>Summary:&nbsp;</li>\n" +
"<li>Field&nbsp;|&nbsp;</li>"},
{BUG_ID + "/pkg/AnnotationType.html",
"<li>Detail:&nbsp;</li>\n" +
"<li>Field&nbsp;|&nbsp;</li>"},
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
"<HR>" + NL + NL + "<P>" + NL + NL + "<P>" +
{BUG_ID + "/pkg/AnnotationType.html",
"<HR>\n\n" +
"<P>\n\n" +
"<P>" +
"<!-- ========= END OF CLASS DATA ========= -->" + "<HR>"}
};

6
langtools/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -37,12 +37,12 @@ public class TestBackSlashInLink extends JavadocTester {
private static final String BUG_ID = "4511110";
private static final String[][] TEST = {
{BUG_ID + FS + "C.html", "src-html/C.html#line.7"}};
{BUG_ID + "/C.html", "src-html/C.html#line.7"}};
private static final String[][] NEGATED_TEST = NO_TEST;
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-linksource", SRC_DIR + FS + "C.java"};
"-linksource", SRC_DIR + "/C.java"};
/**
* The entry point of the test.

6
langtools/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -35,6 +35,8 @@
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 =
@ -46,7 +48,7 @@ public class TestBadPackageFileInJar extends JavadocTester {
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-classpath",
SRC_DIR + FS + "badPackageFileInJar.jar", "pkg"};
SRC_DIR + "/badPackageFileInJar.jar", "pkg"};
/**

4
langtools/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,7 +40,7 @@ public class TestBadSourceFile extends JavadocTester {
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-Xdoclint:none", "-d", BUG_ID, SRC_DIR + FS + "C2.java"
"-Xdoclint:none", "-d", BUG_ID, SRC_DIR + "/C2.java"
};
//Input for string search tests.

4
langtools/test/com/sun/javadoc/testBaseClass/TestBaseClass.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,7 +42,7 @@ public class TestBaseClass extends JavadocTester {
new String[] {
"-sourcepath", SRC_DIR,
"-docletpath", SRC_DIR, "-doclet", "BaseClass",
SRC_DIR + FS + "Bar.java", "baz"};
SRC_DIR + "/Bar.java", "baz"};
/**
* The entry point of the test.

4
langtools/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,7 +39,7 @@ public class TestBreakIterator extends JavadocTester {
private static final String BUG_ID = "4165985";
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "BreakIteratorTest.html",
{BUG_ID + "/pkg/BreakIteratorTest.html",
"The class is empty (i.e. it has no members)."}};
private static final String[][] NEGATED_TEST = NO_TEST;
private static final String[] ARGS =

5
langtools/test/com/sun/javadoc/testCRLineSeparator/TestCRLineSeparator.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -47,7 +47,8 @@ public class TestCRLineSeparator extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "MyClass.html", "Line 1" + NL + " Line 2"}
{BUG_ID + "/pkg/MyClass.html", "Line 1\n" +
" Line 2"}
};
private static final String[][] NEGATED_TEST = NO_TEST;

10
langtools/test/com/sun/javadoc/testCharset/TestCharset.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -43,16 +43,16 @@ public class TestCharset extends JavadocTester {
};
private static final String[][] TEST = {
{BUG_ID + FS + "index.html",
{BUG_ID + "/index.html",
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">"},
{BUG_ID + FS + "pkg" + FS + "Foo.html",
{BUG_ID + "/pkg/Foo.html",
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">"}
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "index.html",
{BUG_ID + "/index.html",
"<meta http-equiv=\"Content-Type\" content=\"text/html\" charset=\"UTF-8\">"},
{BUG_ID + FS + "pkg" + FS + "Foo.html",
{BUG_ID + "/pkg/Foo.html",
"<meta http-equiv=\"Content-Type\" content=\"text/html\" charset=\"UTF-8\">"}
};

19
langtools/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,20 +36,21 @@ public class TestClassCrossReferences extends JavadocTester {
private static final String BUG_ID = "4652655-4857717";
private static final String[][] TEST = {
{BUG_ID + FS + "C.html",
{BUG_ID + "/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 + FS + "C.html",
{BUG_ID + "/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 + FS + "C.html",
{BUG_ID + "/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 + FS + "C.html",
{BUG_ID + "/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 + FS + "C.html",
"<dl>" + NL + "<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
"<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>" + NL +
{BUG_ID + "/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" +
"</dl>"}
};
private static final String[][] NEGATED_TEST = NO_TEST;
@ -57,7 +58,7 @@ public class TestClassCrossReferences extends JavadocTester {
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-linkoffline", "http://java.sun.com/j2se/1.4/docs/api/",
SRC_DIR, SRC_DIR + FS + "C.java"};
SRC_DIR, SRC_DIR + "/C.java"};
/**
* The entry point of the test.

38
langtools/test/com/sun/javadoc/testClassTree/TestClassTree.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -47,28 +47,38 @@ public class TestClassTree extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "package-tree.html",
"<ul>" + NL + "<li type=\"circle\">pkg.<a href=\"../pkg/ParentClass.html\" " +
{BUG_ID + "/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 + FS + "pkg" + FS + "package-tree.html",
"<h2 title=\"Annotation Type Hierarchy\">Annotation Type Hierarchy</h2>" + NL +
"<ul>" + NL + "<li type=\"circle\">pkg.<a href=\"../pkg/AnnotationType.html\" " +
{BUG_ID + "/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\" " +
"title=\"annotation in pkg\"><span class=\"typeNameLink\">AnnotationType</span></a> " +
"(implements java.lang.annotation.Annotation)</li>" + NL + "</ul>"},
"(implements java.lang.annotation.Annotation)</li>\n" +
"</ul>"},
{BUG_ID + FS + "pkg" + FS + "package-tree.html",
"<h2 title=\"Enum Hierarchy\">Enum Hierarchy</h2>" + NL + "<ul>" + NL +
"<li type=\"circle\">java.lang.Object" + NL + "<ul>" + NL +
{BUG_ID + "/pkg/package-tree.html",
"<h2 title=\"Enum Hierarchy\">Enum Hierarchy</h2>\n" +
"<ul>\n" +
"<li type=\"circle\">java.lang.Object\n" +
"<ul>\n" +
"<li type=\"circle\">java.lang.Enum&lt;E&gt; (implements java.lang." +
"Comparable&lt;T&gt;, java.io.Serializable)" + NL + "<ul>" + NL +
"Comparable&lt;T&gt;, java.io.Serializable)\n" +
"<ul>\n" +
"<li type=\"circle\">pkg.<a href=\"../pkg/Coin.html\" " +
"title=\"enum in pkg\"><span class=\"typeNameLink\">Coin</span></a></li>" + NL +
"</ul>" + NL + "</li>" + NL + "</ul>" + NL + "</li>" + NL + "</ul>"
"title=\"enum in pkg\"><span class=\"typeNameLink\">Coin</span></a></li>\n" +
"</ul>\n" +
"</li>\n" +
"</ul>\n" +
"</li>\n" +
"</ul>"
},
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg" + FS + "package-tree.html",
{BUG_ID + "/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>"}
};

24
langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -43,23 +43,23 @@ public class TestCmndLineClass extends JavadocTester {
private static final String[] ARGS1 =
new String[] {
"-d", OUTPUT_DIR1, "-sourcepath", SRC_DIR,
"-notimestamp", SRC_DIR + FS + "C5.java", "pkg1", "pkg2"
"-notimestamp", SRC_DIR + "/C5.java", "pkg1", "pkg2"
};
private static final String[] ARGS2 =
new String[] {
"-d", OUTPUT_DIR2, "-sourcepath", SRC_DIR,
"-notimestamp", SRC_DIR + FS + "C5.java",
SRC_DIR + FS + "pkg1" + FS + "C1.java",
SRC_DIR + FS + "pkg1" + FS + "C2.java",
SRC_DIR + FS + "pkg2" + FS + "C3.java",
SRC_DIR + FS + "pkg2" + FS + "C4.java"
"-notimestamp", SRC_DIR + "/C5.java",
SRC_DIR + "/pkg1/C1.java",
SRC_DIR + "/pkg1/C2.java",
SRC_DIR + "/pkg2/C3.java",
SRC_DIR + "/pkg2/C4.java"
};
private static final String[][] FILES_TO_DIFF = {
{OUTPUT_DIR1 + FS + "C5.html", OUTPUT_DIR2 + FS + "C5.html"},
{OUTPUT_DIR2 + FS + "pkg1" + FS + "C1.html", OUTPUT_DIR2 + FS + "pkg1" + FS + "C1.html"},
{OUTPUT_DIR1 + FS + "pkg1" + FS + "C2.html", OUTPUT_DIR2 + FS + "pkg1" + FS + "C2.html"},
{OUTPUT_DIR1 + FS + "pkg2" + FS + "C3.html", OUTPUT_DIR2 + FS + "pkg2" + FS + "C3.html"},
{OUTPUT_DIR1 + FS + "pkg2" + FS + "C4.html", OUTPUT_DIR2 + FS + "pkg2" + FS + "C4.html"}
{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 BUG_ID = "4506980";

14
langtools/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,15 +40,17 @@ public class TestConstructorIndent extends JavadocTester {
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + FS + "C.java"
"-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + "/C.java"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "C.html", "<div class=\"block\">" +
"This is just a simple constructor.</div>" + NL +
"<dl>" + NL + "<dt><span class=\"paramLabel\">Parameters:</span></dt>" + NL +
"<dd><code>i</code> - a param.</dd>" + NL +"</dl>"
{BUG_ID + "/C.html", "<div class=\"block\">" +
"This is just a simple constructor.</div>\n" +
"<dl>\n" +
"<dt><span class=\"paramLabel\">Parameters:</span></dt>\n" +
"<dd><code>i</code> - a param.</dd>\n" +
"</dl>"
}
};
private static final String[][] NEGATED_TEST = NO_TEST;

56
langtools/test/com/sun/javadoc/testConstructors/TestConstructors.java
View file

@ -37,82 +37,82 @@ public class TestConstructors extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg1" + FS + "Outer.html",
"<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL +
"<dd><a href=\"../pkg1/Outer.Inner.html#Inner--\"><code>Inner()</code></a>, " + NL +
"<a href=\"../pkg1/Outer.Inner.html#Inner-int-\"><code>Inner(int)</code></a>, " + NL +
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner--\"><code>NestedInner()</code></a>, " + NL +
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\"><code>NestedInner(int)</code></a>, " + NL +
"<a href=\"../pkg1/Outer.html#Outer--\"><code>Outer()</code></a>, " + NL +
{BUG_ID + "/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" +
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner--\"><code>NestedInner()</code></a>, \n" +
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\"><code>NestedInner(int)</code></a>, \n" +
"<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 + FS + "pkg1" + FS + "Outer.html",
{BUG_ID + "/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 + FS + "pkg1" + FS + "Outer.html",
{BUG_ID + "/pkg1/Outer.html",
"<a href=\"../pkg1/Outer.html#Outer--\">Outer</a></span>()"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.html",
{BUG_ID + "/pkg1/Outer.html",
"<a name=\"Outer--\">"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.html",
{BUG_ID + "/pkg1/Outer.html",
"<a href=\"../pkg1/Outer.html#Outer-int-\">Outer</a></span>(int&nbsp;i)"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.html",
{BUG_ID + "/pkg1/Outer.html",
"<a name=\"Outer-int-\">"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html",
{BUG_ID + "/pkg1/Outer.Inner.html",
"<a href=\"../pkg1/Outer.Inner.html#Inner--\">Inner</a></span>()"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html",
{BUG_ID + "/pkg1/Outer.Inner.html",
"<a name=\"Inner--\">"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html",
{BUG_ID + "/pkg1/Outer.Inner.html",
"<a href=\"../pkg1/Outer.Inner.html#Inner-int-\">Inner</a></span>(int&nbsp;i)"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html",
{BUG_ID + "/pkg1/Outer.Inner.html",
"<a name=\"Inner-int-\">"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html",
{BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner--\">NestedInner</a></span>()"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html",
{BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
"<a name=\"NestedInner--\">"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html",
{BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#NestedInner-int-\">NestedInner</a></span>(int&nbsp;i)"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html",
{BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
"<a name=\"NestedInner-int-\">"
}
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html",
{BUG_ID + "/pkg1/Outer.Inner.html",
"Outer.Inner--"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.Inner.html",
{BUG_ID + "/pkg1/Outer.Inner.html",
"Outer.Inner-int-"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html",
{BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
"Outer.Inner.NestedInner--"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.Inner.NestedInner.html",
{BUG_ID + "/pkg1/Outer.Inner.NestedInner.html",
"Outer.Inner.NestedInner-int-"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.html",
{BUG_ID + "/pkg1/Outer.html",
"<a href=\"../pkg1/Outer.Inner.html#Outer.Inner--\"><code>Outer.Inner()</code></a>"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.html",
{BUG_ID + "/pkg1/Outer.html",
"<a href=\"../pkg1/Outer.Inner.html#Outer.Inner-int-\"><code>Outer.Inner(int)</code></a>"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.html",
{BUG_ID + "/pkg1/Outer.html",
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#Outer.Inner.NestedInner--\"><code>Outer.Inner.NestedInner()</code></a>"
},
{BUG_ID + FS + "pkg1" + FS + "Outer.html",
{BUG_ID + "/pkg1/Outer.html",
"<a href=\"../pkg1/Outer.Inner.NestedInner.html#Outer.Inner.NestedInner-int-\"><code>Outer.Inner.NestedInner(int)</code></a>"
}
};

14
langtools/test/com/sun/javadoc/testCustomTag/TestCustomTag.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,20 +40,22 @@ public class TestCustomTag extends JavadocTester {
private static final String[] ARGS = new String[] {
"-Xdoclint:none", "-d", BUG_ID, "-tagletpath", SRC_DIR,
"-taglet", "taglets.CustomTag", "-sourcepath",
SRC_DIR, SRC_DIR + FS + "TagTestClass.java"
SRC_DIR, SRC_DIR + "/TagTestClass.java"
};
private static final String[] ARGS1 = new String[] {
"-d", BUG_ID + "-1", "-tagletpath", SRC_DIR, "-taglet", "taglets.CustomTag",
"-sourcepath", SRC_DIR, SRC_DIR + FS + "TagTestClass.java"
"-d", BUG_ID + "-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",
SRC_DIR, SRC_DIR + FS + "TagTestClass.java"
SRC_DIR, SRC_DIR + "/TagTestClass.java"
};
private static final String[] ARGS3 = new String[] {
"-d", BUG_ID + "-3", "-sourcepath", SRC_DIR, SRC_DIR + FS + "TagTestClass.java"
"-d", BUG_ID + "-3", "-sourcepath",
SRC_DIR, SRC_DIR + "/TagTestClass.java"
};
//Input for string search tests.

22
langtools/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,10 +42,10 @@ public class TestDeprecatedDocs extends JavadocTester {
};
private static final String TARGET_FILE =
BUG_ID + FS + "deprecated-list.html";
BUG_ID + "/deprecated-list.html";
private static final String TARGET_FILE2 =
BUG_ID + FS + "pkg" + FS + "DeprecatedClassByAnnotation.html";
BUG_ID + "/pkg/DeprecatedClassByAnnotation.html";
//Input for string search tests.
private static final String[][] TEST = {
@ -75,20 +75,20 @@ public class TestDeprecatedDocs extends JavadocTester {
{TARGET_FILE, "pkg.DeprecatedClassByAnnotation.method()"},
{TARGET_FILE, "pkg.DeprecatedClassByAnnotation.field"},
{TARGET_FILE2, "<pre>@Deprecated" + NL +
"public class <span class=\"typeNameLabel\">DeprecatedClassByAnnotation</span>" + NL +
{TARGET_FILE2, "<pre>@Deprecated\n" +
"public class <span class=\"typeNameLabel\">DeprecatedClassByAnnotation</span>\n" +
"extends java.lang.Object</pre>"},
{TARGET_FILE2, "<pre>@Deprecated" + NL +
"public&nbsp;int field</pre>" + NL +
{TARGET_FILE2, "<pre>@Deprecated\n" +
"public&nbsp;int field</pre>\n" +
"<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span>&nbsp;</div>"},
{TARGET_FILE2, "<pre>@Deprecated" + NL +
"public&nbsp;DeprecatedClassByAnnotation()</pre>" + NL +
{TARGET_FILE2, "<pre>@Deprecated\n" +
"public&nbsp;DeprecatedClassByAnnotation()</pre>\n" +
"<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span>&nbsp;</div>"},
{TARGET_FILE2, "<pre>@Deprecated" + NL +
"public&nbsp;void&nbsp;method()</pre>" + NL +
{TARGET_FILE2, "<pre>@Deprecated\n" +
"public&nbsp;void&nbsp;method()</pre>\n" +
"<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span>&nbsp;</div>"},
};

7
langtools/test/com/sun/javadoc/testDocEncoding/TestDocEncoding.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -50,8 +50,9 @@ public class TestDocEncoding extends JavadocTester {
private static final String[][] TEST = NO_TEST;
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "stylesheet.css",
"body {" + NL + " background-color:#ffffff;"}
{BUG_ID + "/stylesheet.css",
"body {\n" +
" background-color:#ffffff;"}
};
/**

4
langtools/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -41,7 +41,7 @@ public class TestDocErrorReporter extends JavadocTester {
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-encoding", "xyz",
SRC_DIR + FS + "TestDocErrorReporter.java"
SRC_DIR + "/TestDocErrorReporter.java"
};
//Input for string search tests.

32
langtools/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,26 +42,26 @@ public class TestDocFileDir extends JavadocTester {
private static final String BUG_ID = "4258405-4973606";
private static final String[][] TEST1 = {
{BUG_ID + "-1" + FS + "pkg" + FS + "doc-files" + FS + "testfile.txt",
{BUG_ID + "-1/pkg/doc-files/testfile.txt",
"This doc file did not get trashed."}
};
private static final String[][] NEGATED_TEST1 = NO_TEST;
private static final String[] FILE_TEST2 = {
BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-used1" +
FS + "testfile.txt",
BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-used2" +
FS + "testfile.txt"
BUG_ID + "-2/pkg/doc-files/subdir-used1" +
"/testfile.txt",
BUG_ID + "-2/pkg/doc-files/subdir-used2" +
"/testfile.txt"
};
private static final String[] FILE_NEGATED_TEST2 = {
BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-excluded1" +
FS + "testfile.txt",
BUG_ID + "-2" + FS + "pkg" + FS + "doc-files" + FS + "subdir-excluded2" +
FS + "testfile.txt"
BUG_ID + "-2/pkg/doc-files/subdir-excluded1" +
"/testfile.txt",
BUG_ID + "-2/pkg/doc-files/subdir-excluded2" +
"/testfile.txt"
};
private static final String[][] TEST0 = {
{"pkg" + FS + "doc-files" + FS + "testfile.txt",
{"pkg/doc-files/testfile.txt",
"This doc file did not get trashed."}
};
private static final String[][] NEGATED_TEST0 = {};
@ -71,8 +71,8 @@ public class TestDocFileDir extends JavadocTester {
new String[] {
"-d", BUG_ID + "-1",
"-sourcepath",
"blah" + File.pathSeparator + BUG_ID + "-1" + File.pathSeparator + "blah",
"pkg"};
"blah" + File.pathSeparator + BUG_ID + "-1" +
File.pathSeparator + "blah", "pkg"};
//Exercising -docfilessubdirs and -excludedocfilessubdir
private static final String[] ARGS2 =
@ -85,7 +85,7 @@ public class TestDocFileDir extends JavadocTester {
//Output dir = "", Input dir = ""
private static final String[] ARGS0 =
new String[] {"pkg" + FS + "C.java"};
new String[] {"pkg/C.java"};
/**
@ -94,9 +94,9 @@ public class TestDocFileDir extends JavadocTester {
*/
public static void main(String[] args) {
TestDocFileDir tester = new TestDocFileDir();
copyDir(SRC_DIR + FS + "pkg", ".");
copyDir(SRC_DIR + "/pkg", ".");
run(tester, ARGS0, TEST0, NEGATED_TEST0);
copyDir(SRC_DIR + FS + "pkg", BUG_ID + "-1");
copyDir(SRC_DIR + "/pkg", BUG_ID + "-1");
run(tester, ARGS1, TEST1, NEGATED_TEST1);
run(tester, ARGS2, NO_TEST, NO_TEST, FILE_TEST2, FILE_NEGATED_TEST2);
tester.printSummary();

4
langtools/test/com/sun/javadoc/testDocFiles/TestDocFiles.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -35,7 +35,7 @@ public class TestDocFiles extends JavadocTester {
private static final String BUG_ID = "8008949";
private static final String[][] TEST = {
{"tmp" + FS + "pkg" + FS + "doc-files" + FS + "test.txt", "test file"}};
{"tmp/pkg/doc-files/test.txt", "test file"}};
private static final String[] ARGS =
new String[] {

14
langtools/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootInlineTag.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -38,16 +38,16 @@ public class TestDocRootInlineTag extends JavadocTester {
private static final String BUG_ID = "4369014-4851991";
private static final String[][] TEST = {
{BUG_ID + FS + "TestDocRootTag.html",
{BUG_ID + "/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 + FS + "TestDocRootTag.html",
{BUG_ID + "/TestDocRootTag.html",
"<a href=\"./glossary.html\">glossary</a>"},
{BUG_ID + FS + "TestDocRootTag.html",
{BUG_ID + "/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 + FS + "TestDocRootTag.html", "The value of @docRoot is \"./\""},
{BUG_ID + FS + "index-all.html", "My package page is " +
{BUG_ID + "/TestDocRootTag.html", "The value of @docRoot is \"./\""},
{BUG_ID + "/index-all.html", "My package page is " +
"<a href=\"./pkg/package-summary.html\">here</a>"}
};
private static final String[][] NEGATED_TEST = NO_TEST;
@ -56,7 +56,7 @@ public class TestDocRootInlineTag extends JavadocTester {
"-bottom", "The value of @docRoot is \"{@docRoot}\"",
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-linkoffline", "http://www.java.sun.com/j2se/1.4/docs/api",
SRC_DIR, SRC_DIR + FS + "TestDocRootTag.java", "pkg"
SRC_DIR, SRC_DIR + "/TestDocRootTag.java", "pkg"
};
/**

68
langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -34,78 +34,80 @@ public class TestDocRootLink extends JavadocTester {
private static final String BUG_ID = "6553182";
private static final String[][] TEST1 = {
{BUG_ID + FS + "pkg1" + FS + "C1.html",
{BUG_ID + "/pkg1/C1.html",
"Refer <a href=\"../../technotes/guides/index.html\">Here</a>"
},
{BUG_ID + FS + "pkg1" + FS + "C1.html",
"This <a href=\"../pkg2/C2.html\">Here</a> should not be replaced" + NL +
{BUG_ID + "/pkg1/C1.html",
"This <a href=\"../pkg2/C2.html\">Here</a> should not be replaced\n" +
" with an absolute link."
},
{BUG_ID + FS + "pkg1" + FS + "C1.html",
"Testing <a href=\"../technotes/guides/index.html\">Link 1</a> and" + NL +
{BUG_ID + "/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 + FS + "pkg1" + FS + "package-summary.html",
"<a href=\"../../technotes/guides/index.html\">" + NL +
{BUG_ID + "/pkg1/package-summary.html",
"<a href=\"../../technotes/guides/index.html\">\n" +
" Test document 1</a>"
},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
"<a href=\"../pkg2/C2.html\">" + NL +
{BUG_ID + "/pkg1/package-summary.html",
"<a href=\"../pkg2/C2.html\">\n" +
" Another Test document 1</a>"
},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
"<a href=\"../technotes/guides/index.html\">" + NL +
{BUG_ID + "/pkg1/package-summary.html",
"<a href=\"../technotes/guides/index.html\">\n" +
" Another Test document 2.</a>"
}
};
private static final String[][] NEGATED_TEST1 = {
{BUG_ID + FS + "pkg1" + FS + "C1.html",
{BUG_ID + "/pkg1/C1.html",
"<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
},
{BUG_ID + FS + "pkg1" + FS + "C1.html",
{BUG_ID + "/pkg1/C1.html",
"<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">"
},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
{BUG_ID + "/pkg1/package-summary.html",
"<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
{BUG_ID + "/pkg1/package-summary.html",
"<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">"
}
};
private static final String[][] TEST2 = {
{BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html",
{BUG_ID + "-1/pkg2/C2.html",
"Refer <a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">Here</a>"
},
{BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html",
"This <a href=\"../pkg1/C1.html\">Here</a> should not be replaced" + NL +
{BUG_ID + "-1/pkg2/C2.html",
"This <a href=\"../pkg1/C1.html\">Here</a> should not be replaced\n" +
" with an absolute link."
},
{BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html",
"Testing <a href=\"../technotes/guides/index.html\">Link 1</a> and" + NL +
{BUG_ID + "-1/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" + FS + "pkg2" + FS + "package-summary.html",
"<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + NL +
{BUG_ID + "-1/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" + FS + "pkg2" + FS + "package-summary.html",
"<a href=\"../pkg1/C1.html\">" + NL + " Another Test document 1</a>"
{BUG_ID + "-1/pkg2/package-summary.html",
"<a href=\"../pkg1/C1.html\">\n" +
" Another Test document 1</a>"
},
{BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html",
"<a href=\"../technotes/guides/index.html\">" + NL + " Another Test document 2.</a>"
{BUG_ID + "-1/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" + FS + "pkg2" + FS + "C2.html",
{BUG_ID + "-1/pkg2/C2.html",
"<a href=\"../../technotes/guides/index.html\">"
},
{BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html",
{BUG_ID + "-1/pkg2/C2.html",
"<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">"
},
{BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html",
{BUG_ID + "-1/pkg2/package-summary.html",
"<a href=\"../../technotes/guides/index.html\">"
},
{BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html",
{BUG_ID + "-1/pkg2/package-summary.html",
"<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">"
}
};
@ -115,7 +117,9 @@ public class TestDocRootLink extends JavadocTester {
};
private static final String[] ARGS2 =
new String[]{
"-d", BUG_ID + "-1", "-Xdocrootparent", "http://download.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg1", "pkg2"
"-d", BUG_ID + "-1", "-Xdocrootparent",
"http://download.oracle.com/javase/7/docs", "-sourcepath",
SRC_DIR, "pkg1", "pkg2"
};
/**

4
langtools/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -38,7 +38,7 @@ public class TestDupParamWarn extends JavadocTester {
private static final String BUG_ID = "4745855";
private static final String[] ARGS =
new String[] {"-d", BUG_ID, "-sourcepath",
SRC_DIR + FS, "pkg"};
SRC_DIR + "/", "pkg"};
private static final String[][] NEGATED_TEST =
new String[][] {{WARNING_OUTPUT,
"Parameter \"a\" is documented more than once."}};

15
langtools/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,18 +40,19 @@ public class TestEmptyClass extends JavadocTester {
private static final String[][] NEGATED_TEST = {
//The overview tree should not link to classes that were not documented
{OUTPUT_DIR + FS + "overview-tree.html", "<A HREF=\"TestEmptyClass.html\">"},
{OUTPUT_DIR + "/overview-tree.html", "<A HREF=\"TestEmptyClass.html\">"},
//The index page should not link to classes that were not documented
{OUTPUT_DIR + FS + "index-all.html", "<A HREF=\"TestEmptyClass.html\">"},
{OUTPUT_DIR + "/index-all.html", "<A HREF=\"TestEmptyClass.html\">"},
};
private static final String[] ARGS =
new String[] {
"-classpath", SRC_DIR + FS + "src",
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR + FS + "src",
SRC_DIR + FS + "src" + FS + "Empty.java"
"-classpath", SRC_DIR + "/src",
"-d", OUTPUT_DIR, "-sourcepath", SRC_DIR + "/src",
SRC_DIR + "/src/Empty.java"
};
private static final String BUG_ID = "4483401 4483407 4483409 4483413 4494343";
private static final String BUG_ID =
"4483401 4483407 4483409 4483413 4494343";
/**
* The entry point of the test.

4
langtools/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,7 +44,7 @@ public class TestEnclosingClass extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "MyClass.MyInterface.html", "Enclosing class:"}
{BUG_ID + "/pkg/MyClass.MyInterface.html", "Enclosing class:"}
};
private static final String[][] NEGATED_TEST = NO_TEST;

6
langtools/test/com/sun/javadoc/testEncoding/TestEncoding.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,12 +40,12 @@ public class TestEncoding extends JavadocTester {
//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 + FS + "EncodeTest.html", "??"}
{BUG_ID + "/EncodeTest.html", "??"}
};
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-encoding", "iso-8859-1", SRC_DIR + FS + "EncodeTest.java"
"-encoding", "iso-8859-1", SRC_DIR + "/EncodeTest.java"
};
/**

10
langtools/test/com/sun/javadoc/testExternalOverridenMethod/TestExternalOverridenMethod.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -37,14 +37,14 @@ public class TestExternalOverridenMethod extends JavadocTester {
private static final String BUG_ID = "4857717";
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "XReader.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/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 + FS + "pkg" + FS + "XReader.html",
"<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>" + NL +
{BUG_ID + "/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>" +
"<a href=\"http://java.sun.com/j2se/1.4.1/docs/api/java/io/DataInput.html?is-external=true\" " +

6
langtools/test/com/sun/javadoc/testGeneratedBy/TestGeneratedBy.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -74,7 +74,7 @@ public class TestGeneratedBy extends JavadocTester {
String genBy = "Generated by javadoc";
if (timestamp) genBy += " (" + version + ") on ";
tests[i] = new String[] {
OUTPUT_DIR + FS + FILES[i], genBy
OUTPUT_DIR + "/" + FILES[i], genBy
};
}
return tests;
@ -84,7 +84,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 + FS + FILES[i],
OUTPUT_DIR + "/" + FILES[i],
(timestamp
? "Generated by javadoc (version"
: "Generated by javadoc ("),

40
langtools/test/com/sun/javadoc/testHeadings/TestHeadings.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -46,65 +46,67 @@ public class TestHeadings extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
//Package summary
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
{BUG_ID + "/pkg1/package-summary.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Class</th>" + NL + "<th class=\"colLast\" scope=\"col\"" +
"Class</th>\n" +
"<th class=\"colLast\" scope=\"col\"" +
">Description</th>"
},
// Class documentation
{BUG_ID + FS + "pkg1" + FS + "C1.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
{BUG_ID + "/pkg1/C1.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Field and Description</th>"
},
{BUG_ID + FS + "pkg1" + FS + "C1.html",
{BUG_ID + "/pkg1/C1.html",
"<h3>Methods inherited from class&nbsp;java.lang.Object</h3>"
},
// Class use documentation
{BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html",
"<th class=\"colFirst\" scope=\"col\">Package</th>" + NL +
{BUG_ID + "/pkg1/class-use/C1.html",
"<th class=\"colFirst\" scope=\"col\">Package</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>"
},
{BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
{BUG_ID + "/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 + FS + "deprecated-list.html",
{BUG_ID + "/deprecated-list.html",
"<th class=\"colOne\" scope=\"col\">Method and Description</th>"
},
// Constant values
{BUG_ID + FS + "constant-values.html",
{BUG_ID + "/constant-values.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Modifier and Type</th>" + NL + "<th scope=\"col\">Constant Field</th>" + NL +
"Modifier and Type</th>\n" +
"<th scope=\"col\">Constant Field</th>\n" +
"<th class=\"colLast\" scope=\"col\">Value</th>"
},
// Serialized Form
{BUG_ID + FS + "serialized-form.html",
{BUG_ID + "/serialized-form.html",
"<h2 title=\"Package\">Package&nbsp;pkg1</h2>"
},
{BUG_ID + FS + "serialized-form.html",
{BUG_ID + "/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 + FS + "serialized-form.html",
{BUG_ID + "/serialized-form.html",
"<h3>Serialized Fields</h3>"
},
// Overview Frame
{BUG_ID + FS + "overview-frame.html",
{BUG_ID + "/overview-frame.html",
"<h1 title=\"Test Files\" class=\"bar\">Test Files</h1>"
},
{BUG_ID + FS + "overview-frame.html",
{BUG_ID + "/overview-frame.html",
"<title>Overview List</title>"
},
// Overview Summary
{BUG_ID + FS + "overview-summary.html",
{BUG_ID + "/overview-summary.html",
"<title>Overview</title>"
},

6
langtools/test/com/sun/javadoc/testHelpFile/TestHelpFile.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,13 +39,13 @@ public class TestHelpFile extends JavadocTester {
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
SRC_DIR + FS + "TestHelpFile.java"
SRC_DIR + "/TestHelpFile.java"
};
private static final String[][] NEGATED_TEST = NO_TEST;
private static final String[][] TEST = {
{BUG_ID + FS + "help-doc.html",
{BUG_ID + "/help-doc.html",
"<a href=\"constant-values.html\">Constant Field Values</a>"
},
};

8
langtools/test/com/sun/javadoc/testHelpOption/TestHelpOption.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,12 +40,12 @@ public class TestHelpOption extends JavadocTester {
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-help",
SRC_DIR + FS + "TestHelpOption.java"
SRC_DIR + "/TestHelpOption.java"
};
private static final String[] ARGS2 = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
SRC_DIR + FS + "TestHelpOption.java"
SRC_DIR + "/TestHelpOption.java"
};
private static final String[][] TEST = {
@ -89,7 +89,7 @@ public class TestHelpOption extends JavadocTester {
private static final String[][] NEGATED_TEST = NO_TEST;
private static final String[][] TEST2 = {
{BUG_ID + FS + "TestHelpOption.html",
{BUG_ID + "/TestHelpOption.html",
"<li><a href=\"help-doc.html\">Help</a></li>"
},
};

4
langtools/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -41,7 +41,7 @@ public class TestHiddenMembers extends JavadocTester {
//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 + FS + "pkg" + FS + "SubClass.html",
{BUG_ID + "/pkg/SubClass.html",
"inherited from class pkg.<A HREF=\"../pkg/BaseClass.html\">BaseClass</A>"}
};
private static final String[] ARGS =

29
langtools/test/com/sun/javadoc/testHref/TestHref.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -45,41 +45,42 @@ public class TestHref extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
//External link.
{BUG_ID + FS + "pkg" + FS + "C1.html",
{BUG_ID + "/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 + FS + "pkg" + FS + "C1.html",
{BUG_ID + "/pkg/C1.html",
"href=\"../pkg/C1.html#method-int-int-java.util.ArrayList-\""
},
//Anchor test.
{BUG_ID + FS + "pkg" + FS + "C1.html",
"<a name=\"method-int-int-java.util.ArrayList-\">" + NL +
"<!-- -->" + NL +
{BUG_ID + "/pkg/C1.html",
"<a name=\"method-int-int-java.util.ArrayList-\">\n" +
"<!-- -->\n" +
"</a>"
},
//Backward compatibility anchor test.
{BUG_ID + FS + "pkg" + FS + "C1.html",
"<a name=\"method-int-int-java.util.ArrayList-\">" + NL +
"<!-- -->" + NL +
{BUG_ID + "/pkg/C1.html",
"<a name=\"method-int-int-java.util.ArrayList-\">\n" +
"<!-- -->\n" +
"</a>"
},
//{@link} test.
{BUG_ID + FS + "pkg" + FS + "C2.html",
{BUG_ID + "/pkg/C2.html",
"Link: <a href=\"../pkg/C1.html#method-int-int-java.util.ArrayList-\">"
},
//@see test.
{BUG_ID + FS + "pkg" + FS + "C2.html",
"See Also:</span></dt>" + NL + "<dd><a href=\"../pkg/C1.html#method-int-int-java.util.ArrayList-\">"
{BUG_ID + "/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 + FS + "pkg" + FS + "C4.html",
{BUG_ID + "/pkg/C4.html",
"Class C4&lt;E extends C4&lt;E&gt;&gt;</h2>"
},
//Signature does not link to the page itself.
{BUG_ID + FS + "pkg" + FS + "C4.html",
{BUG_ID + "/pkg/C4.html",
"public abstract class <span class=\"typeNameLabel\">C4&lt;E extends C4&lt;E&gt;&gt;</span>"
},
};

6
langtools/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,13 +40,13 @@ public class TestHtmlComments extends JavadocTester {
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + FS + "C.java"
"-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + "/C.java"
};
//Input for string search tests.
private static final String[][] TEST = NO_TEST;
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "C.html",
{BUG_ID + "/C.html",
"<!-- ============ FIELD DETAIL =========== -->"}
};

394
langtools/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,77 +42,126 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
// Optional Element should print properly nested definition list tags
// for default value.
private static final String[][] TEST_ALL = {
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<pre>public class " +
"<span class=\"typeNameLabel\">C1</span>" + NL +
"extends java.lang.Object" + NL + "implements java.io.Serializable</pre>"},
{BUG_ID + FS + "pkg1" + FS + "C4.html", "<dl>" + NL +
"<dt>Default:</dt>" + NL + "<dd>true</dd>" + NL +
{BUG_ID + "/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" +
"<dt>Default:</dt>\n" +
"<dd>true</dd>\n" +
"</dl>"}};
// Test for normal run of javadoc in which various ClassDocs and
// serialized form should have properly nested definition list tags
// enclosing comments, tags and deprecated information.
private static final String[][] TEST_CMNT_DEPR = {
{BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<dl>" + NL +
"<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL +
"<dd>JDK1.0</dd>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL +
"<dd>JDK1.0</dd>" + NL + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL +
{BUG_ID + "/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" +
"<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n" +
"<dd>JDK1.0</dd>\n" +
"<dt><span class=\"seeLabel\">See Also:</span></dt>\n" +
"<dd><a href=\"../pkg1/C2.html\" title=\"class in pkg1\"><code>" +
"C2</code></a>, " + NL + "<a href=\"../serialized-form.html#pkg1.C1\">" +
"Serialized Form</a></dd>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL +
"<dd>1.4</dd>" + NL +
"<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd>" +
"C2</code></a>, \n" +
"<a href=\"../serialized-form.html#pkg1.C1\">" +
"Serialized Form</a></dd>\n" +
"</dl>"},
{BUG_ID + "/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" +
"<dd>" +
"<a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>"+ NL + "<dt><span class=\"paramLabel\">Parameters:</span></dt>" + NL + "<dd><code>title" +
"</code> - the title</dd>" + NL + "<dd><code>test</code> - boolean value" +
"</dd>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span></dt>" + NL +
"<code>setUndecorated(boolean)</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C1.html", "<dl>\n" +
"<dt><span class=\"paramLabel\">Parameters:</span></dt>\n" +
"<dd><code>title" +
"</code> - the title</dd>\n" +
"<dd><code>test</code> - boolean value" +
"</dd>\n" +
"<dt><span class=\"throwsLabel\">Throws:</span></dt>\n" +
"<dd><code>java.lang.IllegalArgumentException</code> - if the " +
"<code>owner</code>'s" + NL +
"<code>owner</code>'s\n" +
" <code>GraphicsConfiguration</code> is not from a screen " +
"device</dd>" + NL + "<dd><code>HeadlessException</code></dd>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"paramLabel\">Parameters:</span></dt>" + NL + "<dd><code>undecorated" +
"</code> - <code>true</code> if no decorations are" + NL +
" to be enabled;" + NL + " <code>false</code> " +
"if decorations are to be enabled.</dd>" + NL + "<dt><span class=\"simpleTagLabel\">Since:" +
"</span></dt>" + NL + "<dd>1.4</dd>" + NL +
"<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd>" +
"device</dd>\n" +
"<dd><code>HeadlessException</code></dd>\n" +
"</dl>"},
{BUG_ID + "/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" +
" to be enabled;\n" +
" <code>false</code> " +
"if decorations are to be enabled.</dd>\n" +
"<dt><span class=\"simpleTagLabel\">Since:" +
"</span></dt>\n" +
"<dd>1.4</dd>\n" +
"<dt><span class=\"seeLabel\">See Also:</span></dt>\n" +
"<dd>" +
"<a href=\"../pkg1/C1.html#readObject--\"><code>readObject()" +
"</code></a></dd>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span></dt>" + NL +
"<dd><code>java.io.IOException</code></dd>" + NL + "<dt><span class=\"seeLabel\">See Also:" +
"</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C2.html", "<dl>" + NL + "<dt><span class=\"paramLabel\">Parameters:" +
"</span></dt>" + NL + "<dd><code>set</code> - boolean</dd>" + NL + "<dt><span class=\"simpleTagLabel\">" +
"Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL + "</dl>"},
{BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span>" +
"</dt>" + NL + "<dd><code>" +
"java.io.IOException</code></dd>" + NL + "<dt><span class=\"seeLabel\">See Also:</span>" +
"</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"},
{BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" +
"&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL +
"</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/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:" +
"</span></dt>\n" +
"<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>setUndecorated(boolean)</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C2.html", "<dl>\n" +
"<dt><span class=\"paramLabel\">Parameters:" +
"</span></dt>\n" +
"<dd><code>set</code> - boolean</dd>\n" +
"<dt><span class=\"simpleTagLabel\">" +
"Since:</span></dt>\n" +
"<dd>1.4</dd>\n" +
"</dl>"},
{BUG_ID + "/serialized-form.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:</span>" +
"</dt>\n" +
"<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>C1.setUndecorated(boolean)</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/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-\">" +
"<code>setUndecorated(boolean)</code></a>.</span></div>" + NL +
"<code>setUndecorated(boolean)</code></a>.</span></div>\n" +
"<div class=\"block\">This field indicates whether the C1 is " +
"undecorated.</div>" + NL + "&nbsp;" + NL + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL +
"<dd>1.4</dd>" + NL + "<dt><span class=\"seeLabel\">See Also:</span>" +
"</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"},
{BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" +
"&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL +
"undecorated.</div>\n" +
"&nbsp;\n" +
"<dl>\n" +
"<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n" +
"<dd>1.4</dd>\n" +
"<dt><span class=\"seeLabel\">See Also:</span>" +
"</dt>\n" +
"<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>C1.setUndecorated(boolean)</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/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-\">" +
"<code>setUndecorated(boolean)</code></a>.</span></div>" + NL +
"<div class=\"block\">Reads the object stream.</div>" + NL +
"<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:" +
"</span></dt>" + NL + "<dd><code><code>" +
"IOException</code></code></dd>" + NL +
"<dd><code>java.io.IOException</code></dd>" + NL + "</dl>"},
{BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" +
"&nbsp;</div>" + NL +
"<code>setUndecorated(boolean)</code></a>.</span></div>\n" +
"<div class=\"block\">Reads the object stream.</div>\n" +
"<dl>\n" +
"<dt><span class=\"throwsLabel\">Throws:" +
"</span></dt>\n" +
"<dd><code><code>" +
"IOException</code></code></dd>\n" +
"<dd><code>java.io.IOException</code></dd>\n" +
"</dl>"},
{BUG_ID + "/serialized-form.html",
"<span class=\"deprecatedLabel\">Deprecated.</span>" +
"&nbsp;</div>\n" +
"<div class=\"block\">The name for this class.</div>"}};
// Test with -nodeprecated option. The ClassDocs should have properly nested
@ -121,104 +170,165 @@ 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 + FS + "pkg1" + FS + "package-summary.html", "<dl>" + NL +
"<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL +
"<dd>JDK1.0</dd>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span>" +
"</dt>" + NL + "<dd>JDK1.0</dd>" + NL + "<dt><span class=\"seeLabel\">See Also:" +
"</span></dt>" + NL + "<dd><a href=\"../pkg1/C2.html\" title=\"class in pkg1\">" +
"<code>C2</code></a>, " + NL + "<a href=\"../serialized-form.html#pkg1.C1\">" +
"Serialized Form</a></dd>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"paramLabel\">Parameters:" +
"</span></dt>" + NL + "<dd><code>title</code> - the title</dd>" + NL + "<dd><code>" +
"test</code> - boolean value</dd>" + NL + "<dt><span class=\"throwsLabel\">Throws:" +
"</span></dt>" + NL + "<dd><code>java.lang.IllegalArgumentException" +
"</code> - if the <code>owner</code>'s" + NL + " <code>GraphicsConfiguration" +
"</code> is not from a screen device</dd>" + NL + "<dd><code>" +
"HeadlessException</code></dd>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"paramLabel\">Parameters:" +
"</span></dt>" + NL + "<dd><code>undecorated</code> - <code>true</code>" +
" if no decorations are" + NL + " to be enabled;" + NL +
{BUG_ID + "/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" +
"<dt><span class=\"simpleTagLabel\">Since:</span>" +
"</dt>\n" +
"<dd>JDK1.0</dd>\n" +
"<dt><span class=\"seeLabel\">See Also:" +
"</span></dt>\n" +
"<dd><a href=\"../pkg1/C2.html\" title=\"class in pkg1\">" +
"<code>C2</code></a>, \n" +
"<a href=\"../serialized-form.html#pkg1.C1\">" +
"Serialized Form</a></dd>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C1.html", "<dl>\n" +
"<dt><span class=\"paramLabel\">Parameters:" +
"</span></dt>\n" +
"<dd><code>title</code> - the title</dd>\n" +
"<dd><code>" +
"test</code> - boolean value</dd>\n" +
"<dt><span class=\"throwsLabel\">Throws:" +
"</span></dt>\n" +
"<dd><code>java.lang.IllegalArgumentException" +
"</code> - if the <code>owner</code>'s\n" +
" <code>GraphicsConfiguration" +
"</code> is not from a screen device</dd>\n" +
"<dd><code>" +
"HeadlessException</code></dd>\n" +
"</dl>"},
{BUG_ID + "/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" +
" to be enabled;\n" +
" <code>false</code> if decorations are to be enabled." +
"</dd>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL + "<dd>1.4</dd>" + NL +
"<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#readObject--\">" +
"<code>readObject()</code></a></dd>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span>" +
"</dt>" + NL + "<dd><code>java.io.IOException</code></dd>" + NL + "<dt>" +
"<span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"},
{BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:</span>" +
"</dt>" + NL + "<dd><code>" +
"java.io.IOException</code></dd>" + NL + "<dt><span class=\"seeLabel\">See Also:</span>" +
"</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"},
{BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" +
"&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL +
"</dd>\n" +
"<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n" +
"<dd>1.4</dd>\n" +
"<dt><span class=\"seeLabel\">See Also:</span></dt>\n" +
"<dd><a href=\"../pkg1/C1.html#readObject--\">" +
"<code>readObject()</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/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:</span></dt>\n" +
"<dd><a href=\"../pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>setUndecorated(boolean)</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/serialized-form.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:</span>" +
"</dt>\n" +
"<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>C1.setUndecorated(boolean)</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/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-\">" +
"<code>setUndecorated(boolean)</code></a>.</span></div>" + NL +
"<code>setUndecorated(boolean)</code></a>.</span></div>\n" +
"<div class=\"block\">This field indicates whether the C1 is " +
"undecorated.</div>" + NL + "&nbsp;" + NL + "<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Since:</span></dt>" + NL +
"<dd>1.4</dd>" + NL + "<dt><span class=\"seeLabel\">See Also:</span>" +
"</dt>" + NL + "<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>C1.setUndecorated(boolean)</code></a></dd>" + NL + "</dl>"},
{BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" +
"&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL +
"undecorated.</div>\n" +
"&nbsp;\n" +
"<dl>\n" +
"<dt><span class=\"simpleTagLabel\">Since:</span></dt>\n" +
"<dd>1.4</dd>\n" +
"<dt><span class=\"seeLabel\">See Also:</span>" +
"</dt>\n" +
"<dd><a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>C1.setUndecorated(boolean)</code></a></dd>\n" +
"</dl>"},
{BUG_ID + "/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-\">" +
"<code>setUndecorated(boolean)</code></a>.</span></div>" + NL +
"<div class=\"block\">Reads the object stream.</div>" + NL +
"<dl>" + NL + "<dt><span class=\"throwsLabel\">Throws:" +
"</span></dt>" + NL + "<dd><code><code>" +
"IOException</code></code></dd>" + NL +
"<dd><code>java.io.IOException</code></dd>" + NL + "</dl>"},
{BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">Deprecated.</span>" +
"&nbsp;</div>" + NL + "<div class=\"block\">" +
"<code>setUndecorated(boolean)</code></a>.</span></div>\n" +
"<div class=\"block\">Reads the object stream.</div>\n" +
"<dl>\n" +
"<dt><span class=\"throwsLabel\">Throws:" +
"</span></dt>\n" +
"<dd><code><code>" +
"IOException</code></code></dd>\n" +
"<dd><code>java.io.IOException</code></dd>\n" +
"</dl>"},
{BUG_ID + "/serialized-form.html",
"<span class=\"deprecatedLabel\">Deprecated.</span>" +
"&nbsp;</div>\n" +
"<div class=\"block\">" +
"The name for this class.</div>"}};
// 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 + FS + "pkg1" + FS + "C1.html", "<pre>public&nbsp;void&nbsp;readObject()" + NL +
" throws java.io.IOException</pre>" + NL + "</li>"},
{BUG_ID + FS + "pkg1" + FS + "C2.html", "<pre>public&nbsp;C2()</pre>" + NL +
{BUG_ID + "/pkg1/C1.html",
"<pre>public&nbsp;void&nbsp;readObject()\n" +
" throws java.io.IOException</pre>\n" +
"</li>"},
{BUG_ID + FS + "pkg1" + FS + "C1.ModalExclusionType.html", "<pre>public " +
{BUG_ID + "/pkg1/C2.html", "<pre>public&nbsp;C2()</pre>\n" +
"</li>"},
{BUG_ID + "/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>" + NL + "</li>"},
{BUG_ID + FS + "serialized-form.html", "<pre>boolean " +
"undecorated</pre>" + NL + "<div class=\"block\"><span class=\"deprecatedLabel\">" +
"Deprecated.</span>&nbsp;<span class=\"deprecationComment\">As of JDK version 1.5, replaced by" + NL +
"APPLICATION_EXCLUDE</pre>\n" +
"</li>"},
{BUG_ID + "/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>" + NL + "</li>"},
{BUG_ID + FS + "serialized-form.html", "<span class=\"deprecatedLabel\">" +
"setUndecorated(boolean)</code></a>.</span></div>\n" +
"</li>"},
{BUG_ID + "/serialized-form.html", "<span class=\"deprecatedLabel\">" +
"Deprecated.</span>&nbsp;<span class=\"deprecationComment\">As of JDK version" +
" 1.5, replaced by" + NL +
" 1.5, replaced by\n" +
" <a href=\"pkg1/C1.html#setUndecorated-boolean-\">" +
"<code>setUndecorated(boolean)</code></a>.</span></div>" + NL + "</li>"}};
"<code>setUndecorated(boolean)</code></a>.</span></div>\n" +
"</li>"}};
// Test for valid HTML generation which should not comprise of empty
// definition list tags.
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<dl></dl>"},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<dl>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl></dl>"},
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<dl>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C1.ModalExclusionType.html", "<dl></dl>"},
{BUG_ID + FS + "pkg1" + FS + "C1.ModalExclusionType.html", "<dl>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C2.html", "<dl></dl>"},
{BUG_ID + FS + "pkg1" + FS + "C2.html", "<dl>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C2.ModalType.html", "<dl></dl>"},
{BUG_ID + FS + "pkg1" + FS + "C2.ModalType.html", "<dl>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C3.html", "<dl></dl>"},
{BUG_ID + FS + "pkg1" + FS + "C3.html", "<dl>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C4.html", "<dl></dl>"},
{BUG_ID + FS + "pkg1" + FS + "C4.html", "<dl>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "C5.html", "<dl></dl>"},
{BUG_ID + FS + "pkg1" + FS + "C5.html", "<dl>" + NL + "</dl>"},
{BUG_ID + FS + "overview-tree.html", "<dl></dl>"},
{BUG_ID + FS + "overview-tree.html", "<dl>" + NL + "</dl>"},
{BUG_ID + FS + "serialized-form.html", "<dl></dl>"},
{BUG_ID + FS + "serialized-form.html", "<dl>" + NL + "</dl>"}};
{BUG_ID + "/pkg1/package-summary.html", "<dl></dl>"},
{BUG_ID + "/pkg1/package-summary.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C1.html", "<dl></dl>"},
{BUG_ID + "/pkg1/C1.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C1.ModalExclusionType.html", "<dl></dl>"},
{BUG_ID + "/pkg1/C1.ModalExclusionType.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C2.html", "<dl></dl>"},
{BUG_ID + "/pkg1/C2.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C2.ModalType.html", "<dl></dl>"},
{BUG_ID + "/pkg1/C2.ModalType.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C3.html", "<dl></dl>"},
{BUG_ID + "/pkg1/C3.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C4.html", "<dl></dl>"},
{BUG_ID + "/pkg1/C4.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/pkg1/C5.html", "<dl></dl>"},
{BUG_ID + "/pkg1/C5.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/overview-tree.html", "<dl></dl>"},
{BUG_ID + "/overview-tree.html", "<dl>\n" +
"</dl>"},
{BUG_ID + "/serialized-form.html", "<dl></dl>"},
{BUG_ID + "/serialized-form.html", "<dl>\n" +
"</dl>"}};
private static final String[] ARGS1 =
new String[] {
@ -226,15 +336,18 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
private static final String[] ARGS2 =
new String[] {
"-Xdoclint:none", "-d", BUG_ID, "-nocomment", "-sourcepath", SRC_DIR, "pkg1"};
"-Xdoclint:none", "-d", BUG_ID, "-nocomment", "-sourcepath",
SRC_DIR, "pkg1"};
private static final String[] ARGS3 =
new String[] {
"-Xdoclint:none", "-d", BUG_ID, "-nodeprecated", "-sourcepath", SRC_DIR, "pkg1"};
"-Xdoclint:none", "-d", BUG_ID, "-nodeprecated", "-sourcepath",
SRC_DIR, "pkg1"};
private static final String[] ARGS4 =
new String[] {
"-Xdoclint:none", "-d", BUG_ID, "-nocomment", "-nodeprecated", "-sourcepath", SRC_DIR, "pkg1"};
"-Xdoclint:none", "-d", BUG_ID, "-nocomment", "-nodeprecated",
"-sourcepath", SRC_DIR, "pkg1"};
/**
* The entry point of the test.
@ -242,7 +355,6 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
*/
public static void main(String[] args) {
TestHtmlDefinitionListTag tester = new TestHtmlDefinitionListTag();
tester.exactNewlineMatch = false;
run(tester, ARGS1, TEST_ALL, NEGATED_TEST);
run(tester, ARGS1, TEST_CMNT_DEPR, NEGATED_TEST);
run(tester, ARGS2, TEST_ALL, NEGATED_TEST);

10
langtools/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -41,16 +41,16 @@ import com.sun.tools.doclets.formats.html.markup.*;
*/
public class TestHtmlDocument {
protected static final String NL = System.getProperty("line.separator");
private static final String BUGID = "6851834";
private static final String BUGNAME = "TestHtmlDocument";
private static final String FS = System.getProperty("file.separator");
private static final String LS = System.getProperty("line.separator");
private static String srcdir = System.getProperty("test.src", ".");
// Entry point
public static void main(String[] args) throws IOException {
// Check whether the generated markup is same as the existing markup.
if (generateHtmlTree().equals(readFileToString(srcdir + FS + "testMarkup.html"))) {
if (generateHtmlTree().equals(readFileToString(srcdir + "/testMarkup.html"))) {
System.out.println("\nTest passed for bug " + BUGID + " (" + BUGNAME + ")\n");
} else {
throw new Error("\nTest failed for bug " + BUGID + " (" + BUGNAME + ")\n");
@ -150,7 +150,7 @@ public class TestHtmlDocument {
String line;
while ((line = in.readLine()) != null) {
fileString.append(line);
fileString.append(LS);
fileString.append(NL);
}
} finally {
in.close();

19
langtools/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -38,16 +38,19 @@ public class TestHtmlStrongTag extends JavadocTester {
private static final String BUG_ID = "6786028";
private static final String[][] TEST1 = {
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<span class=\"seeLabel\">See Also:</span>"}};
{BUG_ID + "/pkg1/C1.html",
"<span class=\"seeLabel\">See Also:</span>"}};
private static final String[][] NEGATED_TEST1 = {
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<STRONG>Method Summary</STRONG>"},
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<B>"},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<STRONG>Class Summary</STRONG>"}};
{BUG_ID + "/pkg1/C1.html", "<STRONG>Method Summary</STRONG>"},
{BUG_ID + "/pkg1/C1.html", "<B>"},
{BUG_ID + "/pkg1/package-summary.html",
"<STRONG>Class Summary</STRONG>"}};
private static final String[][] TEST2 = {
{BUG_ID + FS + "pkg2" + FS + "C2.html", "<B>Comments:</B>"}};
{BUG_ID + "/pkg2/C2.html", "<B>Comments:</B>"}};
private static final String[][] NEGATED_TEST2 = {
{BUG_ID + FS + "pkg2" + FS + "C2.html", "<STRONG>Method Summary</STRONG>"},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<STRONG>Class Summary</STRONG>"}};
{BUG_ID + "/pkg2/C2.html", "<STRONG>Method Summary</STRONG>"},
{BUG_ID + "/pkg1/package-summary.html",
"<STRONG>Class Summary</STRONG>"}};
private static final String[] ARGS1 =
new String[] {

20
langtools/test/com/sun/javadoc/testHtmlTableStyles/TestHtmlTableStyles.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -37,43 +37,43 @@ public class TestHtmlTableStyles extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg1" + FS + "TestTable.html",
{BUG_ID + "/pkg1/TestTable.html",
"<table border cellpadding=3 cellspacing=1>"
},
{BUG_ID + FS + "pkg1" + FS + "TestTable.html",
{BUG_ID + "/pkg1/TestTable.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Field Summary table, listing fields, " +
"and an explanation\">"
},
{BUG_ID + FS + "pkg1" + FS + "TestTable.html",
{BUG_ID + "/pkg1/TestTable.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Constructor Summary table, listing " +
"constructors, and an explanation\">"
},
{BUG_ID + FS + "pkg1" + FS + "TestTable.html",
{BUG_ID + "/pkg1/TestTable.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Method Summary table, listing methods, " +
"and an explanation\">"
},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
{BUG_ID + "/pkg1/package-summary.html",
"<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Class Summary table, listing classes, " +
"and an explanation\">"
},
{BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "TestTable.html",
{BUG_ID + "/pkg1/class-use/TestTable.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Use table, listing fields, and an explanation\">"
},
{BUG_ID + FS + "overview-summary.html",
{BUG_ID + "/overview-summary.html",
"<table class=\"overviewSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Packages table, listing packages, and an explanation\">"
},
{BUG_ID + FS + "deprecated-list.html",
{BUG_ID + "/deprecated-list.html",
"<table class=\"deprecatedSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Deprecated Methods table, listing " +
"deprecated methods, and an explanation\">"
},
{BUG_ID + FS + "constant-values.html",
{BUG_ID + "/constant-values.html",
"<table class=\"constantsSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Constant Field Values table, listing " +
"constant fields, and values\">"

204
langtools/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -49,127 +49,127 @@ public class TestHtmlTableTags extends JavadocTester {
*/
//Package summary
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
{BUG_ID + "/pkg1/package-summary.html",
"<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\"" +
" cellspacing=\"0\" summary=\"Class Summary table, " +
"listing classes, and an explanation\">"
},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
{BUG_ID + "/pkg1/package-summary.html",
"<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\"" +
" cellspacing=\"0\" summary=\"Interface Summary table, " +
"listing interfaces, and an explanation\">"
},
{BUG_ID + FS + "pkg2" + FS + "package-summary.html",
{BUG_ID + "/pkg2/package-summary.html",
"<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\"" +
" cellspacing=\"0\" summary=\"Enum Summary table, " +
"listing enums, and an explanation\">"
},
{BUG_ID + FS + "pkg2" + FS + "package-summary.html",
{BUG_ID + "/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 + FS + "pkg1" + FS + "C1.html",
{BUG_ID + "/pkg1/C1.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Field Summary table, listing fields, " +
"and an explanation\">"
},
{BUG_ID + FS + "pkg1" + FS + "C1.html",
{BUG_ID + "/pkg1/C1.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Method Summary table, listing methods, " +
"and an explanation\">"
},
{BUG_ID + FS + "pkg2" + FS + "C2.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "C2.html",
{BUG_ID + "/pkg2/C2.html",
"<table class=\"memberSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Constructor Summary table, listing " +
"constructors, and an explanation\">"
},
{BUG_ID + FS + "pkg2" + FS + "C2.ModalExclusionType.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "C3.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "C4.html",
{BUG_ID + "/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 + FS + "pkg1" + FS + "class-use" + FS + "I1.html",
{BUG_ID + "/pkg1/class-use/I1.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing packages, and an explanation\">"
},
{BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html",
{BUG_ID + "/pkg1/class-use/C1.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing fields, and an explanation\">"
},
{BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html",
{BUG_ID + "/pkg1/class-use/C1.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing methods, and an explanation\">"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html",
{BUG_ID + "/pkg2/class-use/C2.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing fields, and an explanation\">"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.html",
{BUG_ID + "/pkg2/class-use/C2.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing methods, and an explanation\">"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html",
{BUG_ID + "/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 + FS + "pkg1" + FS + "package-use.html",
{BUG_ID + "/pkg1/package-use.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing packages, and an explanation\">"
},
{BUG_ID + FS + "pkg1" + FS + "package-use.html",
{BUG_ID + "/pkg1/package-use.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing classes, and an explanation\">"
},
{BUG_ID + FS + "pkg2" + FS + "package-use.html",
{BUG_ID + "/pkg2/package-use.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing packages, and an explanation\">"
},
{BUG_ID + FS + "pkg2" + FS + "package-use.html",
{BUG_ID + "/pkg2/package-use.html",
"<table class=\"useSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" summary=\"Use " +
"table, listing classes, and an explanation\">"
},
// Deprecated
{BUG_ID + FS + "deprecated-list.html",
{BUG_ID + "/deprecated-list.html",
"<table class=\"deprecatedSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" " +
"summary=\"Deprecated Fields table, listing deprecated fields, " +
"and an explanation\">"
},
{BUG_ID + FS + "deprecated-list.html",
{BUG_ID + "/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 + FS + "constant-values.html",
{BUG_ID + "/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 + FS + "overview-summary.html",
{BUG_ID + "/overview-summary.html",
"<table class=\"overviewSummary\" border=\"0\" cellpadding=\"3\" " +
"cellspacing=\"0\" summary=\"Packages table, " +
"listing packages, and an explanation\">"
@ -180,27 +180,27 @@ public class TestHtmlTableTags extends JavadocTester {
*/
//Package summary
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
{BUG_ID + "/pkg1/package-summary.html",
"<caption><span>Class Summary</span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
{BUG_ID + "/pkg1/package-summary.html",
"<caption><span>Interface Summary</span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + FS + "pkg2" + FS + "package-summary.html",
{BUG_ID + "/pkg2/package-summary.html",
"<caption><span>Enum Summary</span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + FS + "pkg2" + FS + "package-summary.html",
{BUG_ID + "/pkg2/package-summary.html",
"<caption><span>Annotation Types Summary</span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
// Class documentation
{BUG_ID + FS + "pkg1" + FS + "C1.html",
{BUG_ID + "/pkg1/C1.html",
"<caption><span>Fields</span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + FS + "pkg1" + FS + "C1.html",
{BUG_ID + "/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 +211,94 @@ public class TestHtmlTableTags extends JavadocTester {
"Deprecated Methods</a></span><span class=\"tabEnd\">&nbsp;</span></span>" +
"</caption>"
},
{BUG_ID + FS + "pkg2" + FS + "C2.html",
{BUG_ID + "/pkg2/C2.html",
"<caption><span>Nested Classes</span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + FS + "pkg2" + FS + "C2.html",
{BUG_ID + "/pkg2/C2.html",
"<caption><span>Constructors</span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + FS + "pkg2" + FS + "C2.ModalExclusionType.html",
{BUG_ID + "/pkg2/C2.ModalExclusionType.html",
"<caption><span>Enum Constants</span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + FS + "pkg2" + FS + "C3.html",
{BUG_ID + "/pkg2/C3.html",
"<caption><span>Required Elements</span><span class=\"tabEnd\">&nbsp;" +
"</span></caption>"
},
{BUG_ID + FS + "pkg2" + FS + "C4.html",
{BUG_ID + "/pkg2/C4.html",
"<caption><span>Optional Elements</span><span class=\"tabEnd\">&nbsp;" +
"</span></caption>"
},
// Class use documentation
{BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "I1.html",
{BUG_ID + "/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 + FS + "pkg1" + FS + "class-use" + FS + "C1.html",
{BUG_ID + "/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 + FS + "pkg1" + FS + "class-use" + FS + "C1.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "C2.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "C2.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html",
{BUG_ID + "/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 + FS + "pkg1" + FS + "package-use.html",
{BUG_ID + "/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 + FS + "pkg1" + FS + "package-use.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "package-use.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "package-use.html",
{BUG_ID + "/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 + FS + "deprecated-list.html",
{BUG_ID + "/deprecated-list.html",
"<caption><span>Deprecated Fields</span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
{BUG_ID + FS + "deprecated-list.html",
{BUG_ID + "/deprecated-list.html",
"<caption><span>Deprecated Methods</span><span class=\"tabEnd\">" +
"&nbsp;</span></caption>"
},
// Constant values
{BUG_ID + FS + "constant-values.html",
{BUG_ID + "/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 + FS + "overview-summary.html",
{BUG_ID + "/overview-summary.html",
"<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>"
},
@ -307,115 +307,121 @@ public class TestHtmlTableTags extends JavadocTester {
*/
//Package summary
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
{BUG_ID + "/pkg1/package-summary.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Class</th>" + NL + "<th class=\"colLast\" scope=\"col\"" +
"Class</th>\n" +
"<th class=\"colLast\" scope=\"col\"" +
">Description</th>"
},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
{BUG_ID + "/pkg1/package-summary.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Interface</th>" + NL + "<th class=\"colLast\" scope=\"col\"" +
"Interface</th>\n" +
"<th class=\"colLast\" scope=\"col\"" +
">Description</th>"
},
{BUG_ID + FS + "pkg2" + FS + "package-summary.html",
{BUG_ID + "/pkg2/package-summary.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Enum</th>" + NL + "<th class=\"colLast\" scope=\"col\"" +
"Enum</th>\n" +
"<th class=\"colLast\" scope=\"col\"" +
">Description</th>"
},
{BUG_ID + FS + "pkg2" + FS + "package-summary.html",
{BUG_ID + "/pkg2/package-summary.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Annotation Type</th>" + NL + "<th class=\"colLast\"" +
"Annotation Type</th>\n" +
"<th class=\"colLast\"" +
" scope=\"col\">Description</th>"
},
// Class documentation
{BUG_ID + FS + "pkg1" + FS + "C1.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
{BUG_ID + "/pkg1/C1.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Field and Description</th>"
},
{BUG_ID + FS + "pkg1" + FS + "C1.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
{BUG_ID + "/pkg1/C1.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Method and Description</th>"
},
{BUG_ID + FS + "pkg2" + FS + "C2.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
{BUG_ID + "/pkg2/C2.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Class and Description</th>"
},
{BUG_ID + FS + "pkg2" + FS + "C2.html",
{BUG_ID + "/pkg2/C2.html",
"<th class=\"colOne\" scope=\"col\">Constructor and Description</th>"
},
{BUG_ID + FS + "pkg2" + FS + "C2.ModalExclusionType.html",
{BUG_ID + "/pkg2/C2.ModalExclusionType.html",
"<th class=\"colOne\" scope=\"col\">Enum Constant and Description</th>"
},
{BUG_ID + FS + "pkg2" + FS + "C3.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
{BUG_ID + "/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 + FS + "pkg2" + FS + "C4.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
{BUG_ID + "/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 + FS + "pkg1" + FS + "class-use" + FS + "I1.html",
"<th class=\"colFirst\" scope=\"col\">Package</th>" + NL +
{BUG_ID + "/pkg1/class-use/I1.html",
"<th class=\"colFirst\" scope=\"col\">Package</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>"
},
{BUG_ID + FS + "pkg1" + FS + "class-use" + FS + "C1.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
{BUG_ID + "/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 + FS + "pkg1" + FS + "class-use" + FS + "C1.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "C2.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "C2.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html",
"<th class=\"colFirst\" scope=\"col\">Package</th>" + NL +
{BUG_ID + "/pkg2/class-use/C2.ModalExclusionType.html",
"<th class=\"colFirst\" scope=\"col\">Package</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "C2.ModalExclusionType.html",
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
{BUG_ID + "/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 + FS + "pkg1" + FS + "package-use.html",
"<th class=\"colFirst\" scope=\"col\">Package</th>" + NL +
{BUG_ID + "/pkg1/package-use.html",
"<th class=\"colFirst\" scope=\"col\">Package</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>"
},
{BUG_ID + FS + "pkg1" + FS + "package-use.html",
{BUG_ID + "/pkg1/package-use.html",
"<th class=\"colOne\" scope=\"col\">Class and Description</th>"
},
{BUG_ID + FS + "pkg2" + FS + "package-use.html",
"<th class=\"colFirst\" scope=\"col\">Package</th>" + NL +
{BUG_ID + "/pkg2/package-use.html",
"<th class=\"colFirst\" scope=\"col\">Package</th>\n" +
"<th class=\"colLast\" scope=\"col\">Description</th>"
},
{BUG_ID + FS + "pkg2" + FS + "package-use.html",
{BUG_ID + "/pkg2/package-use.html",
"<th class=\"colOne\" scope=\"col\">Class and Description</th>"
},
// Deprecated
{BUG_ID + FS + "deprecated-list.html",
{BUG_ID + "/deprecated-list.html",
"<th class=\"colOne\" scope=\"col\">Field and Description</th>"
},
{BUG_ID + FS + "deprecated-list.html",
{BUG_ID + "/deprecated-list.html",
"<th class=\"colOne\" scope=\"col\">Method and Description</th>"
},
// Constant values
{BUG_ID + FS + "constant-values.html",
{BUG_ID + "/constant-values.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Modifier and Type</th>" + NL + "<th" +
" scope=\"col\">Constant Field</th>" + NL +
"Modifier and Type</th>\n" +
"<th" +
" scope=\"col\">Constant Field</th>\n" +
"<th class=\"colLast\" scope=\"col\">Value</th>"
},
// Overview Summary
{BUG_ID + FS + "overview-summary.html",
{BUG_ID + "/overview-summary.html",
"<th class=\"colFirst\" scope=\"col\">" +
"Package</th>" + NL + "<th class=\"colLast\" scope=\"col\"" +
"Package</th>\n" +
"<th class=\"colLast\" scope=\"col\"" +
">Description</th>"
}
};

22
langtools/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,20 +40,22 @@ public class TestHtmlTag extends JavadocTester {
private static final String BUG_ID = "6786682";
private static final String[][] TEST1 = {
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<html lang=\"" + Locale.getDefault().getLanguage() + "\">"},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<html lang=\"" + Locale.getDefault().getLanguage() + "\">"}};
{BUG_ID + "/pkg1/C1.html",
"<html lang=\"" + Locale.getDefault().getLanguage() + "\">"},
{BUG_ID + "/pkg1/package-summary.html",
"<html lang=\"" + Locale.getDefault().getLanguage() + "\">"}};
private static final String[][] NEGATED_TEST1 = {
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<html>"}};
{BUG_ID + "/pkg1/C1.html", "<html>"}};
private static final String[][] TEST2 = {
{BUG_ID + FS + "pkg2" + FS + "C2.html", "<html lang=\"ja\">"},
{BUG_ID + FS + "pkg2" + FS + "package-summary.html", "<html lang=\"ja\">"}};
{BUG_ID + "/pkg2/C2.html", "<html lang=\"ja\">"},
{BUG_ID + "/pkg2/package-summary.html", "<html lang=\"ja\">"}};
private static final String[][] NEGATED_TEST2 = {
{BUG_ID + FS + "pkg2" + FS + "C2.html", "<html>"}};
{BUG_ID + "/pkg2/C2.html", "<html>"}};
private static final String[][] TEST3 = {
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<html lang=\"en\">"},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html", "<html lang=\"en\">"}};
{BUG_ID + "/pkg1/C1.html", "<html lang=\"en\">"},
{BUG_ID + "/pkg1/package-summary.html", "<html lang=\"en\">"}};
private static final String[][] NEGATED_TEST3 = {
{BUG_ID + FS + "pkg1" + FS + "C1.html", "<html>"}};
{BUG_ID + "/pkg1/C1.html", "<html>"}};
private static final String[] ARGS1 =
new String[] {

14
langtools/test/com/sun/javadoc/testIndentation/TestIndentation.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,12 +42,14 @@ public class TestIndentation extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{ BUG_ID + FS + "p" + FS + "Indent.html",
{ BUG_ID + "/p/Indent.html",
"<pre>public&nbsp;&lt;T&gt;&nbsp;void&nbsp;m(T&nbsp;t1," },
{ BUG_ID + FS + "p" + FS + "Indent.html",
NL + " T&nbsp;t2)" },
{ BUG_ID + FS + "p" + FS + "Indent.html",
NL + " throws java.lang.Exception" }
{ BUG_ID + "/p/Indent.html",
"\n" +
" T&nbsp;t2)" },
{ BUG_ID + "/p/Indent.html",
"\n" +
" throws java.lang.Exception" }
};
private static final String[][] NEGATED_TEST = NO_TEST;

28
langtools/test/com/sun/javadoc/testIndex/TestIndex.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -41,41 +41,45 @@ public class TestIndex extends JavadocTester {
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", SRC_DIR + FS + "NoPackage.java"
"-d", BUG_ID, "-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 + FS + "index.html",
{BUG_ID + "/index.html",
"<frame src=\"overview-summary.html\" name=\"classFrame\" title=\"" +
"Package, class and interface descriptions\" scrolling=\"yes\">"},
//Test index-all.html
{BUG_ID + FS + "index-all.html",
{BUG_ID + "/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 + FS + "index-all.html",
{BUG_ID + "/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 + FS + "index-all.html",
{BUG_ID + "/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 + FS + "index-all.html",
{BUG_ID + "/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 + FS + "index-all.html",
{BUG_ID + "/index-all.html",
"Class in <a href=\"package-summary.html\">&lt;Unnamed&gt;</a>"},
{BUG_ID + FS + "index-all.html",
"<dl>" + NL + "<dt><span class=\"memberNameLink\"><a href=\"pkg/C.html#Java\">" +
{BUG_ID + "/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\" " +
"title=\"class in pkg\">C</a></dt>" + NL + "<dd>&nbsp;</dd>" + NL +
"title=\"class in pkg\">C</a></dt>\n" +
"<dd>&nbsp;</dd>\n" +
"<dt><span class=\"memberNameLink\"><a href=\"pkg/C.html#JDK\">JDK</a></span> " +
"- Static variable in class pkg.<a href=\"pkg/C.html\" title=\"class in pkg\">" +
"C</a></dt>" + NL + "<dd>&nbsp;</dd>" + NL + "</dl>"},
"C</a></dt>\n" +
"<dd>&nbsp;</dd>\n" +
"</dl>"},
};
private static final String[][] NEGATED_TEST = NO_TEST;

8
langtools/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -37,10 +37,12 @@ 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 + FS + "pkg" + FS + "C1.html" , "<a href=\"../pkg/package-summary.html\"><code>Here is a link to a package</code></a>"},
{BUG_ID + "/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 + FS + "pkg" + FS + "C1.html" , "<a href=\"../pkg/C2.html\" title=\"class in pkg\"><code>Here is a link to a class</code></a>"}
{BUG_ID + "/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[][] NEGATED_TEST = NO_TEST;
private static final String[] ARGS =

62
langtools/test/com/sun/javadoc/testInterface/TestInterface.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -47,43 +47,57 @@ public class TestInterface extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "Interface.html",
{BUG_ID + "/pkg/Interface.html",
"<pre>int&nbsp;method()</pre>"},
{BUG_ID + FS + "pkg" + FS + "Interface.html",
{BUG_ID + "/pkg/Interface.html",
"<pre>static final&nbsp;int field</pre>"},
// Make sure known implementing class list is correct and omits type parameters.
{BUG_ID + FS + "pkg" + FS + "Interface.html",
"<dl>" + NL + "<dt>All Known Implementing Classes:</dt>" + NL +
{BUG_ID + "/pkg/Interface.html",
"<dl>\n" +
"<dt>All Known Implementing Classes:</dt>\n" +
"<dd><a href=\"../pkg/Child.html\" title=\"class in pkg\">Child" +
"</a>, <a href=\"../pkg/Parent.html\" title=\"class in pkg\">Parent" +
"</a></dd>" + NL + "</dl>"},
"</a></dd>\n" +
"</dl>"},
// Make sure "All Implemented Interfaces": has substituted type parameters
{BUG_ID + FS + "pkg" + FS + "Child.html",
"<dl>" + NL + "<dt>All Implemented Interfaces:</dt>" + NL +
{BUG_ID + "/pkg/Child.html",
"<dl>\n" +
"<dt>All Implemented Interfaces:</dt>\n" +
"<dd><a href=\"../pkg/Interface.html\" title=\"interface in pkg\">" +
"Interface</a>&lt;T&gt;</dd>" + NL + "</dl>"
"Interface</a>&lt;T&gt;</dd>\n" +
"</dl>"
},
//Make sure Class Tree has substituted type parameters.
{BUG_ID + FS + "pkg" + FS + "Child.html",
"<ul class=\"inheritance\">" + NL + "<li>java.lang.Object</li>" + NL +
"<li>" + NL + "<ul class=\"inheritance\">" + NL +
{BUG_ID + "/pkg/Child.html",
"<ul class=\"inheritance\">\n" +
"<li>java.lang.Object</li>\n" +
"<li>\n" +
"<ul class=\"inheritance\">\n" +
"<li><a href=\"../pkg/Parent.html\" title=\"class in pkg\">" +
"pkg.Parent</a>&lt;T&gt;</li>" + NL + "<li>" + NL +
"<ul class=\"inheritance\">" + NL + "<li>pkg.Child&lt;T&gt;</li>" + NL +
"</ul>" + NL + "</li>" + NL + "</ul>" + NL + "</li>" + NL + "</ul>"
"pkg.Parent</a>&lt;T&gt;</li>\n" +
"<li>\n" +
"<ul class=\"inheritance\">\n" +
"<li>pkg.Child&lt;T&gt;</li>\n" +
"</ul>\n" +
"</li>\n" +
"</ul>\n" +
"</li>\n" +
"</ul>"
},
//Make sure "Direct Know Subclasses" omits type parameters
{BUG_ID + FS + "pkg" + FS + "Parent.html",
"<dl>" + NL + "<dt>Direct Known Subclasses:</dt>" + NL +
{BUG_ID + "/pkg/Parent.html",
"<dl>\n" +
"<dt>Direct Known Subclasses:</dt>\n" +
"<dd><a href=\"../pkg/Child.html\" title=\"class in pkg\">Child" +
"</a></dd>" + NL + "</dl>"
"</a></dd>\n" +
"</dl>"
},
//Make sure "Specified By" has substituted type parameters.
{BUG_ID + FS + "pkg" + FS + "Child.html",
"<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>" + NL +
{BUG_ID + "/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>" +
"<a href=\"../pkg/Interface.html\" title=\"interface in pkg\">" +
@ -91,8 +105,8 @@ public class TestInterface extends JavadocTester {
"T</a>&gt;</code></dd>"
},
//Make sure "Overrides" has substituted type parameters.
{BUG_ID + FS + "pkg" + FS + "Child.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/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\" " +
"title=\"class in pkg\">Parent</a>&lt;<a href=\"../pkg/Child.html\" " +
@ -100,9 +114,9 @@ public class TestInterface extends JavadocTester {
},
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg" + FS + "Interface.html",
{BUG_ID + "/pkg/Interface.html",
"public int&nbsp;method()"},
{BUG_ID + FS + "pkg" + FS + "Interface.html",
{BUG_ID + "/pkg/Interface.html",
"public static final&nbsp;int field"},
};

32
langtools/test/com/sun/javadoc/testJavaFX/TestJavaFX.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -38,24 +38,28 @@ public class TestJavaFX extends JavadocTester {
private static final String[][] TEST =
new String[][] {
{"./" + BUG_ID + "/C.html",
"<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd><a href=\"C.html#getRate--\"><code>getRate()</code></a>, " + NL +
"<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",
"<pre>public final&nbsp;void&nbsp;setRate(double&nbsp;value)</pre>" + NL +
"<div class=\"block\">Sets the value of the property rate.</div>" + NL +
"<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>" },
"<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",
"<pre>public final&nbsp;double&nbsp;getRate()</pre>" + NL +
"<div class=\"block\">Gets the value of the property rate.</div>" + NL +
"<dl>" + NL + "<dt><span class=\"simpleTagLabel\">Property description:</span></dt>" },
"<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",
"<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"C.html#rateProperty\">rate</a></span></code>" + NL +
"<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",
"<span class=\"simpleTagLabel\">Default value:</span>"},
{"./" + BUG_ID + "/C.html",
"<span class=\"simpleTagLabel\">Since:</span></dt>" + NL + "<dd>JavaFX 8.0</dd>" },
"<span class=\"simpleTagLabel\">Since:</span></dt>\n" +
"<dd>JavaFX 8.0</dd>" },
{"./" + BUG_ID + "/C.html",
"<p>Sets the value of the property <code>Property</code>"},
{"./" + BUG_ID + "/C.html",
@ -65,11 +69,11 @@ public class TestJavaFX extends JavadocTester {
{"./" + BUG_ID + "/C.html",
"<td class=\"colLast\"><code><span class=\"memberNameLink\"><a href=\"C.html#setTestMethodProperty--\">setTestMethodProperty</a></span>()</code>&nbsp;</td>" },
{"./" + BUG_ID + "/C.html",
"<h4>isPaused</h4>" + NL +
"<pre>public final&nbsp;double&nbsp;isPaused()</pre>" + NL +
"<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",
"<h3>Properties inherited from class&nbsp;<a href=\"C.html\" title=\"class in &lt;Unnamed&gt;\">C</a></h3>" + NL +
"<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 =
@ -81,7 +85,7 @@ public class TestJavaFX extends JavadocTester {
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "-javafx",
SRC_DIR + FS + "C.java", SRC_DIR + FS + "D.java"
SRC_DIR + "/C.java", SRC_DIR + "/D.java"
};
/**

127
langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,77 +39,78 @@ public class TestJavascript extends JavadocTester {
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", SRC_DIR + FS + "TestJavascript.java"
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", SRC_DIR +
"/TestJavascript.java"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "C.html",
{BUG_ID + "/pkg/C.html",
"<a href=\"../index.html?pkg/C.html\" target=\"_top\">Frames</a>"},
{BUG_ID + FS + "TestJavascript.html",
{BUG_ID + "/TestJavascript.html",
"<a href=\"index.html?TestJavascript.html\" target=\"_top\">Frames</a>"},
{BUG_ID + FS + "index.html",
"<script type=\"text/javascript\">" + NL +
" targetPage = \"\" + window.location.search;" + NL +
" if (targetPage != \"\" && targetPage != \"undefined\")" + NL +
" targetPage = targetPage.substring(1);" + NL +
" if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + NL +
" targetPage = \"undefined\";" + NL +
" function validURL(url) {" + NL +
" try {" + NL +
" url = decodeURIComponent(url);" + NL +
" }" + NL +
" catch (error) {" + NL +
" return false;" + NL +
" }" + NL +
" var pos = url.indexOf(\".html\");" + NL +
" if (pos == -1 || pos != url.length - 5)" + NL +
" return false;" + NL +
" var allowNumber = false;" + NL +
" var allowSep = false;" + NL +
" var seenDot = false;" + NL +
" for (var i = 0; i < url.length - 5; i++) {" + NL +
" var ch = url.charAt(i);" + NL +
" if ('a' <= ch && ch <= 'z' ||" + NL +
" 'A' <= ch && ch <= 'Z' ||" + NL +
" ch == '$' ||" + NL +
" ch == '_' ||" + NL +
" ch.charCodeAt(0) > 127) {" + NL +
" allowNumber = true;" + NL +
" allowSep = true;" + NL +
" } else if ('0' <= ch && ch <= '9'" + NL +
" || ch == '-') {" + NL +
" if (!allowNumber)" + NL +
" return false;" + NL +
" } else if (ch == '/' || ch == '.') {" + NL +
" if (!allowSep)" + NL +
" return false;" + NL +
" allowNumber = false;" + NL +
" allowSep = false;" + NL +
" if (ch == '.')" + NL +
" seenDot = true;" + NL +
" if (ch == '/' && seenDot)" + NL +
" return false;" + NL +
" } else {" + NL +
" return false;" + NL +
" }" + NL +
" }" + NL +
" return true;" + NL +
" }" + NL +
" function loadFrames() {" + NL +
" if (targetPage != \"\" && targetPage != \"undefined\")" + NL +
" top.classFrame.location = top.targetPage;" + NL +
" }" + NL +
{BUG_ID + "/index.html",
"<script type=\"text/javascript\">\n" +
" targetPage = \"\" + window.location.search;\n" +
" if (targetPage != \"\" && targetPage != \"undefined\")\n" +
" targetPage = targetPage.substring(1);\n" +
" if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))\n" +
" targetPage = \"undefined\";\n" +
" function validURL(url) {\n" +
" try {\n" +
" url = decodeURIComponent(url);\n" +
" }\n" +
" catch (error) {\n" +
" return false;\n" +
" }\n" +
" var pos = url.indexOf(\".html\");\n" +
" if (pos == -1 || pos != url.length - 5)\n" +
" return false;\n" +
" var allowNumber = false;\n" +
" var allowSep = false;\n" +
" var seenDot = false;\n" +
" for (var i = 0; i < url.length - 5; i++) {\n" +
" var ch = url.charAt(i);\n" +
" if ('a' <= ch && ch <= 'z' ||\n" +
" 'A' <= ch && ch <= 'Z' ||\n" +
" ch == '$' ||\n" +
" ch == '_' ||\n" +
" ch.charCodeAt(0) > 127) {\n" +
" allowNumber = true;\n" +
" allowSep = true;\n" +
" } else if ('0' <= ch && ch <= '9'\n" +
" || ch == '-') {\n" +
" if (!allowNumber)\n" +
" return false;\n" +
" } else if (ch == '/' || ch == '.') {\n" +
" if (!allowSep)\n" +
" return false;\n" +
" allowNumber = false;\n" +
" allowSep = false;\n" +
" if (ch == '.')\n" +
" seenDot = true;\n" +
" if (ch == '/' && seenDot)\n" +
" return false;\n" +
" } else {\n" +
" return false;\n" +
" }\n" +
" }\n" +
" return true;\n" +
" }\n" +
" function loadFrames() {\n" +
" if (targetPage != \"\" && targetPage != \"undefined\")\n" +
" top.classFrame.location = top.targetPage;\n" +
" }\n" +
"</script>"},
//Make sure title javascript only runs if is-external is not true
{BUG_ID + FS + "pkg" + FS + "C.html",
" try {" + NL +
" if (location.href.indexOf('is-external=true') == -1) {" + NL +
" parent.document.title=\"C\";" + NL +
" }" + NL +
" }" + NL +
" catch(err) {" + NL +
{BUG_ID + "/pkg/C.html",
" try {\n" +
" if (location.href.indexOf('is-external=true') == -1) {\n" +
" parent.document.title=\"C\";\n" +
" }\n" +
" }\n" +
" catch(err) {\n" +
" }"},
};

46
langtools/test/com/sun/javadoc/testLambdaFeature/TestLambdaFeature.java
View file

@ -54,11 +54,11 @@ public class TestLambdaFeature extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "A.html",
{BUG_ID + "/pkg/A.html",
"<td class=\"colFirst\"><code>default void</code></td>"},
{BUG_ID + FS + "pkg" + FS + "A.html",
{BUG_ID + "/pkg/A.html",
"<pre>default&nbsp;void&nbsp;defaultMethod()</pre>"},
{BUG_ID + FS + "pkg" + FS + "A.html",
{BUG_ID + "/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,35 +69,43 @@ 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 + FS + "pkg" + FS + "A.html",
"<dl>" + NL + "<dt>Functional Interface:</dt>" + NL +
{BUG_ID + "/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>" + NL + "</dl>"},
{BUG_ID + FS + "pkg1" + FS + "FuncInf.html",
"<dl>" + NL + "<dt>Functional Interface:</dt>" + NL +
"reference.</dd>\n" +
"</dl>"},
{BUG_ID + "/pkg1/FuncInf.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>" + NL + "</dl>"}
"reference.</dd>\n" +
"</dl>"}
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg" + FS + "A.html",
{BUG_ID + "/pkg/A.html",
"<td class=\"colFirst\"><code>default default void</code></td>"},
{BUG_ID + FS + "pkg" + FS + "A.html",
{BUG_ID + "/pkg/A.html",
"<pre>default&nbsp;default&nbsp;void&nbsp;defaultMethod()</pre>"},
{BUG_ID + FS + "pkg" + FS + "B.html",
{BUG_ID + "/pkg/B.html",
"<td class=\"colFirst\"><code>default void</code></td>"},
{BUG_ID + FS + "pkg1" + FS + "NotAFuncInf.html",
"<dl>" + NL + "<dt>Functional Interface:</dt>" + NL +
{BUG_ID + "/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>" + NL + "</dl>"},
{BUG_ID + FS + "pkg" + FS + "B.html",
"<dl>" + NL + "<dt>Functional Interface:</dt>"}
"reference.</dd>\n" +
"</dl>"},
{BUG_ID + "/pkg/B.html",
"<dl>\n" +
"<dt>Functional Interface:</dt>"}
};
private static final String[][] NEGATED_TEST_1 = {
{BUG_ID + "-2" + FS + "pkg1" + FS + "FuncInf.html",
"<dl>" + NL + "<dt>Functional Interface:</dt>"}
{BUG_ID + "-2/pkg1/FuncInf.html",
"<dl>\n" +
"<dt>Functional Interface:</dt>"}
};
/**

18
langtools/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,20 +39,20 @@ public class LeadingSpaces extends JavadocTester {
private static final String BUG_ID = "4232882-8014636";
private static final String[][] TEST = {
{BUG_ID + FS + "LeadingSpaces.html",
" 1" + NL +
" 2" + NL +
" 3" + NL +
" 4" + NL +
" 5" + NL +
" 6" + NL +
{BUG_ID + "/LeadingSpaces.html",
" 1\n" +
" 2\n" +
" 3\n" +
" 4\n" +
" 5\n" +
" 6\n" +
" 7"}
};
private static final String[][] NEGATED_TEST = NO_TEST;
private static final String[] ARGS =
new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
SRC_DIR + FS + "LeadingSpaces.java"};
SRC_DIR + "/LeadingSpaces.java"};
/**
* The entry point of the test.

10
langtools/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,14 +39,14 @@ public class TestLegacyTaglet extends JavadocTester {
private static final String[] ARGS =
new String[] {"-d", BUG_ID, "-sourcepath", SRC_DIR,
"-tagletpath", SRC_DIR, "-taglet", "ToDoTaglet", "-taglet", "Check",
"-taglet", "UnderlineTaglet", SRC_DIR + FS + "C.java"};
"-taglet", "UnderlineTaglet", SRC_DIR + "/C.java"};
private static final String[][] TEST = new String[][] {
{BUG_ID + FS + "C.html", "This is an <u>underline</u>"},
{BUG_ID + FS + "C.html",
{BUG_ID + "/C.html", "This is an <u>underline</u>"},
{BUG_ID + "/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 + FS + "C.html",
{BUG_ID + "/C.html",
"<DT><B>To Do:</B><DD><table cellpadding=2 cellspacing=0><tr>" +
"<td bgcolor=\"yellow\">Tag in Method.</td></tr></table></DD>"}
};

28
langtools/test/com/sun/javadoc/testLinkOption/TestLinkOption.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,24 +44,24 @@ public class TestLinkOption extends JavadocTester {
};
private static final String[][] TEST1 = {
{BUG_ID + "-1" + FS + "pkg" + FS + "C.html",
{BUG_ID + "-1/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" + FS + "pkg" + FS + "C.html",
"(int&nbsp;p1," + NL +
" int&nbsp;p2," + NL +
{BUG_ID + "-1/pkg/C.html",
"(int&nbsp;p1,\n" +
" int&nbsp;p2,\n" +
" int&nbsp;p3)"
},
{BUG_ID + "-1" + FS + "pkg" + FS + "C.html",
"(int&nbsp;p1," + NL +
" int&nbsp;p2," + NL +
{BUG_ID + "-1/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" + FS + "java" + FS + "lang" + FS + "StringBuilderChild.html",
"<pre>public abstract class <span class=\"typeNameLabel\">StringBuilderChild</span>" + NL +
{BUG_ID + "-1/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>"
},
@ -73,12 +73,14 @@ public class TestLinkOption extends JavadocTester {
//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"
"-linkoffline", "../" + BUG_ID + "-1",
BUG_ID + "-1", "-package", "pkg2"
};
private static final String[][] TEST2 = {
{BUG_ID + "-2" + FS + "pkg2" + FS + "C2.html",
"This is a link to <a href=\"../../" + BUG_ID + "-1/pkg/C.html?is-external=true\" " +
{BUG_ID + "-2/pkg2/C2.html",
"This is a link to <a href=\"../../" + BUG_ID +
"-1/pkg/C.html?is-external=true\" " +
"title=\"class or interface in pkg\"><code>Class C</code></a>."
}
};

30
langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -40,27 +40,29 @@ public class TestLinkTaglet extends JavadocTester {
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", SRC_DIR + FS + "checkPkg" + FS + "B.java"
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", SRC_DIR +
"/checkPkg/B.java"
};
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "C.html",
"Qualified Link: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>" + NL +
" Unqualified Link1: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>" + NL +
" Unqualified Link2: <a href=\"../pkg/C.InnerC.html\" title=\"class in pkg\"><code>C.InnerC</code></a>.<br/>" + NL +
" Qualified Link: <a href=\"../pkg/C.html#method-pkg.C.InnerC-pkg.C.InnerC2-\"><code>method(pkg.C.InnerC, pkg.C.InnerC2)</code></a>.<br/>" + NL +
" Unqualified Link: <a href=\"../pkg/C.html#method-pkg.C.InnerC-pkg.C.InnerC2-\"><code>method(C.InnerC, C.InnerC2)</code></a>.<br/>" + NL +
{BUG_ID + "/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" +
" Qualified Link: <a href=\"../pkg/C.html#method-pkg.C.InnerC-pkg.C.InnerC2-\"><code>method(pkg.C.InnerC, pkg.C.InnerC2)</code></a>.<br/>\n" +
" 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 + FS + "pkg" + FS + "C.InnerC.html",
"Link to member in outer class: <a href=\"../pkg/C.html#MEMBER\"><code>C.MEMBER</code></a> <br/>" + NL +
" Link to member in inner class: <a href=\"../pkg/C.InnerC2.html#MEMBER2\"><code>C.InnerC2.MEMBER2</code></a> <br/>" + NL +
{BUG_ID + "/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 + FS + "pkg" + FS + "C.InnerC2.html",
"<dl>" + NL + "<dt>Enclosing class:</dt>" + NL +
"<dd><a href=\"../pkg/C.html\" title=\"class in pkg\">C</a></dd>" + NL +
{BUG_ID + "/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" +
"</dl>"
},
};

6
langtools/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -37,8 +37,8 @@ public class TestLinkToSerialForm extends JavadocTester {
private static final String BUG_ID = "4521661";
private static final String[][] TEST = {
{BUG_ID + FS + "serialized-form.html", "<a name=\"pkg.C\">"},
{BUG_ID + FS + "pkg" + FS + "C.html", "<a href=\"../serialized-form.html#pkg.C\">"}
{BUG_ID + "/serialized-form.html", "<a name=\"pkg.C\">"},
{BUG_ID + "/pkg/C.html", "<a href=\"../serialized-form.html#pkg.C\">"}
};
private static final String[][] NEGATED_TEST = NO_TEST;
private static final String[] ARGS =

72
langtools/test/com/sun/javadoc/testLiteralCodeInPre/TestLiteralCodeInPre.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -43,49 +43,49 @@ public class TestLiteralCodeInPre extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{ BUG_ID + FS + "pkg" + FS + "Test.html",
"no_pre()</pre>" + NL +
{ BUG_ID + "/pkg/Test.html",
"no_pre()</pre>\n" +
"<div class=\"block\">abc<code>def</code>ghi</div>" },
{ BUG_ID + FS + "pkg" + FS + "Test.html",
"no_pre_extra_whitespace()</pre>" + NL +
{ BUG_ID + "/pkg/Test.html",
"no_pre_extra_whitespace()</pre>\n" +
"<div class=\"block\">abc<code>def </code>ghi</div>" },
{ BUG_ID + FS + "pkg" + FS + "Test.html",
"in_pre()</pre>" + NL +
{ BUG_ID + "/pkg/Test.html",
"in_pre()</pre>\n" +
"<div class=\"block\"><pre> abc<code> def </code>ghi</pre></div>" },
{ BUG_ID + FS + "pkg" + FS + "Test.html",
"pre_after_text()</pre>" + NL +
{ BUG_ID + "/pkg/Test.html",
"pre_after_text()</pre>\n" +
"<div class=\"block\">xyz <pre> abc<code> def </code>ghi</pre></div>" },
{ BUG_ID + FS + "pkg" + FS + "Test.html",
"after_pre()</pre>" + NL +
{ BUG_ID + "/pkg/Test.html",
"after_pre()</pre>\n" +
"<div class=\"block\">xyz <pre> pqr </pre> abc<code>def </code>ghi</div>" },
{ BUG_ID + FS + "pkg" + FS + "Test.html",
"back_in_pre()</pre>" + NL +
{ BUG_ID + "/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 + FS + "pkg" + FS + "Test.html",
"typical_usage_code()</pre>" + NL +
"<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit." + NL +
" Example: <pre><code>" + NL +
" line 1 &lt;T&gt; void m(T t) {" + NL +
" line 2 // do something with T" + NL +
" line 3 }" + NL +
" </code></pre>" + NL +
{ BUG_ID + "/pkg/Test.html",
"typical_usage_code()</pre>\n" +
"<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n" +
" Example: <pre><code>\n" +
" line 1 &lt;T&gt; void m(T t) {\n" +
" line 2 // do something with T\n" +
" line 3 }\n" +
" </code></pre>\n" +
" and so it goes.</div>" },
{ BUG_ID + FS + "pkg" + FS + "Test.html",
"typical_usage_literal()</pre>" + NL +
"<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit." + NL +
" Example: <pre>" + NL +
" line 1 &lt;T&gt; void m(T t) {" + NL +
" line 2 // do something with T" + NL +
" line 3 }" + NL +
" </pre>" + NL +
{ BUG_ID + "/pkg/Test.html",
"typical_usage_literal()</pre>\n" +
"<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n" +
" Example: <pre>\n" +
" line 1 &lt;T&gt; void m(T t) {\n" +
" line 2 // do something with T\n" +
" line 3 }\n" +
" </pre>\n" +
" and so it goes.</div>" },
{ BUG_ID + FS + "pkg" + FS + "Test.html",
"recommended_usage_literal()</pre>" + NL +
"<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit." + NL +
" Example: <pre>" + NL +
" line 1 &lt;T&gt; void m(T t) {" + NL +
" line 2 // do something with T" + NL +
" line 3 } </pre>" + NL +
{ BUG_ID + "/pkg/Test.html",
"recommended_usage_literal()</pre>\n" +
"<div class=\"block\">Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n" +
" Example: <pre>\n" +
" line 1 &lt;T&gt; void m(T t) {\n" +
" line 2 // do something with T\n" +
" line 3 } </pre>\n" +
" and so it goes.</div>" }
};

35
langtools/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,62 +39,65 @@ public class TestMemberInheritence extends JavadocTester {
private static final String[][] TEST = {
//Public field should be inherited
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
{BUG_ID + "/pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.html#pubField\">"},
//Public method should be inherited
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
{BUG_ID + "/pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.html#pubMethod--\">"},
//Public inner class should be inherited.
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
{BUG_ID + "/pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.pubInnerClass.html\" title=\"class in pkg\">"},
//Protected field should be inherited
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
{BUG_ID + "/pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.html#proField\">"},
//Protected method should be inherited
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
{BUG_ID + "/pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.html#proMethod--\">"},
//Protected inner class should be inherited.
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
{BUG_ID + "/pkg/SubClass.html",
"<a href=\"../pkg/BaseClass.proInnerClass.html\" title=\"class in pkg\">"},
// New labels as of 1.5.0
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
{BUG_ID + "/pkg/SubClass.html",
"Nested classes/interfaces inherited from class&nbsp;pkg." +
"<a href=\"../pkg/BaseClass.html\" title=\"class in pkg\">BaseClass</a>"},
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
{BUG_ID + "/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 + FS + "pkg" + FS + "BaseClass.html",
"<dl>" + NL + "<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>" + NL +
{BUG_ID + "/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-\">" +
"getAnnotation</a></code>&nbsp;in interface&nbsp;<code>" +
"<a href=\"../pkg/BaseInterface.html\" title=\"interface in pkg\">" +
"BaseInterface</a></code></dd>" + NL + "</dl>"},
"BaseInterface</a></code></dd>\n" +
"</dl>"},
// Test diamond inheritence member summary (6256068)
{BUG_ID + FS + "diamond" + FS + "Z.html",
{BUG_ID + "/diamond/Z.html",
"<code><a href=\"../diamond/A.html#aMethod--\">aMethod</a></code>"},
// Test that doc is inherited from closed parent (6270645)
{BUG_ID + FS + "inheritDist" + FS + "C.html",
{BUG_ID + "/inheritDist/C.html",
"<div class=\"block\">m1-B</div>"},
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg" + FS + "SubClass.html",
{BUG_ID + "/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", "inheritDist"};
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg", "diamond",
"inheritDist"};
/**
* The entry point of the test.

18
langtools/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -47,23 +47,23 @@ public class TestMemberSummary extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
// Check return type in member summary.
{BUG_ID + FS + "pkg" + FS + "PublicChild.html",
"<code><a href=\"../pkg/PublicChild.html\" title=\"class in pkg\">PublicChild</a></code></td>" + NL +
{BUG_ID + "/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 + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "A.html",
"<a name=\"f-java.lang.Object:A-\">" + NL +
"<!-- -->" + NL +
"</a><a name=\"f-T:A-\">" + NL +
"<!-- -->" + NL +
{BUG_ID + "/pkg2/A.html",
"<a name=\"f-java.lang.Object:A-\">\n" +
"<!-- -->\n" +
"</a><a name=\"f-T:A-\">\n" +
"<!-- -->\n" +
"</a>"
},
};

22
langtools/test/com/sun/javadoc/testMethodTypes/TestMethodTypes.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,11 +42,11 @@ public class TestMethodTypes extends JavadocTester {
};
private static final String[][] TEST = {
{BUG_ID + FS + "pkg1" + FS + "A.html",
{BUG_ID + "/pkg1/A.html",
"var methods = {"
},
{BUG_ID + FS + "pkg1" + FS + "A.html",
{BUG_ID + "/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 +60,11 @@ public class TestMethodTypes extends JavadocTester {
"</caption>"
},
{BUG_ID + FS + "pkg1" + FS + "A.html",
{BUG_ID + "/pkg1/A.html",
"<tr id=\"i0\" class=\"altColor\">"
},
{BUG_ID + FS + "pkg1" + FS + "B.html",
{BUG_ID + "/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 +74,11 @@ public class TestMethodTypes extends JavadocTester {
"</caption>"
},
{BUG_ID + FS + "pkg1" + FS + "D.html",
{BUG_ID + "/pkg1/D.html",
"var methods = {"
},
{BUG_ID + FS + "pkg1" + FS + "D.html",
{BUG_ID + "/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 +92,22 @@ public class TestMethodTypes extends JavadocTester {
"</caption>"
},
{BUG_ID + FS + "pkg1" + FS + "D.html",
{BUG_ID + "/pkg1/D.html",
"<tr id=\"i0\" class=\"altColor\">"
},
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg1" + FS + "A.html",
{BUG_ID + "/pkg1/A.html",
"<caption><span>Methods</span><span class=\"tabEnd\">&nbsp;</span>" +
"</caption>"
},
{BUG_ID + FS + "pkg1" + FS + "B.html",
{BUG_ID + "/pkg1/B.html",
"<caption><span>Methods</span><span class=\"tabEnd\">&nbsp;</span>" +
"</caption>"
},
{BUG_ID + FS + "pkg1" + FS + "D.html",
{BUG_ID + "/pkg1/D.html",
"<caption><span>Methods</span><span class=\"tabEnd\">&nbsp;</span>" +
"</caption>"
},

4
langtools/test/com/sun/javadoc/testModifier/TestModifier.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -42,7 +42,7 @@ public class TestModifier extends JavadocTester {
new String[] {
"-sourcepath", SRC_DIR,
"-docletpath", SRC_DIR, "-doclet", "ModifierAbstract",
SRC_DIR + FS + "Interface.java", SRC_DIR + FS + "Test.java"};
SRC_DIR + "/Interface.java", SRC_DIR + "/Test.java"};
/**
* The entry point of the test.

26
langtools/test/com/sun/javadoc/testNavigation/TestNavigation.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,24 +44,26 @@ public class TestNavigation extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "A.html", "<li>Prev&nbsp;Class</li>"},
{BUG_ID + FS + "pkg" + FS + "A.html",
{BUG_ID + "/pkg/A.html", "<li>Prev&nbsp;Class</li>"},
{BUG_ID + "/pkg/A.html",
"<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">Next&nbsp;Class</span></a>"},
{BUG_ID + FS + "pkg" + FS + "C.html",
{BUG_ID + "/pkg/C.html",
"<a href=\"../pkg/A.html\" title=\"annotation in pkg\"><span class=\"typeNameLink\">Prev&nbsp;Class</span></a>"},
{BUG_ID + FS + "pkg" + FS + "C.html",
{BUG_ID + "/pkg/C.html",
"<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"typeNameLink\">Next&nbsp;Class</span></a>"},
{BUG_ID + FS + "pkg" + FS + "E.html",
{BUG_ID + "/pkg/E.html",
"<a href=\"../pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">Prev&nbsp;Class</span></a>"},
{BUG_ID + FS + "pkg" + FS + "E.html",
{BUG_ID + "/pkg/E.html",
"<a href=\"../pkg/I.html\" title=\"interface in pkg\"><span class=\"typeNameLink\">Next&nbsp;Class</span></a>"},
{BUG_ID + FS + "pkg" + FS + "I.html",
{BUG_ID + "/pkg/I.html",
"<a href=\"../pkg/E.html\" title=\"enum in pkg\"><span class=\"typeNameLink\">Prev&nbsp;Class</span></a>"},
{BUG_ID + FS + "pkg" + FS + "I.html", "<li>Next&nbsp;Class</li>"},
{BUG_ID + "/pkg/I.html", "<li>Next&nbsp;Class</li>"},
// Test for 4664607
{BUG_ID + FS + "pkg" + FS + "I.html",
"<div class=\"skipNav\"><a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a></div>" + NL + "<a name=\"navbar.top.firstrow\">" + NL +
"<!-- -->" + NL + "</a>"}
{BUG_ID + "/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" +
"</a>"}
};
private static final String[][] NEGATED_TEST = NO_TEST;

4
langtools/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,7 +44,7 @@ public class TestNestedGenerics extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "NestedGenerics.html",
{BUG_ID + "/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>"

12
langtools/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -57,22 +57,22 @@ public class TestNestedInlineTag extends JavadocTester {
private static final String BUG_ID = "no-bug-id";
private static final String[][] TEST = {
//Test nested inline tag in class description.
{BUG_ID + FS + "TestNestedInlineTag.html",
{BUG_ID + "/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 + FS + "TestNestedInlineTag.html",
{BUG_ID + "/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 + FS + "TestNestedInlineTag.html",
{BUG_ID + "/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 + FS + "TestNestedInlineTag.html",
{BUG_ID + "/TestNestedInlineTag.html",
"This should be green, underlined and bold (Method): <u><b><font color=\"green\">My test</font></b></u>"
}
};
@ -84,7 +84,7 @@ public class TestNestedInlineTag extends JavadocTester {
"-taglet", "testtaglets.UnderlineTaglet",
"-taglet", "testtaglets.BoldTaglet",
"-taglet", "testtaglets.GreenTaglet",
SRC_DIR + FS + "TestNestedInlineTag.java"
SRC_DIR + "/TestNestedInlineTag.java"
};
/**

344
langtools/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,11 +36,13 @@
public class TestNewLanguageFeatures extends JavadocTester {
//Test information.
private static final String BUG_ID = "4789689-4905985-4927164-4827184-4993906";
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, "pkg", "pkg1", "pkg2"
"-Xdoclint:none", "-d", BUG_ID, "-use", "-sourcepath", SRC_DIR,
"pkg", "pkg1", "pkg2"
};
//Input for string search tests.
@ -50,64 +52,72 @@ public class TestNewLanguageFeatures extends JavadocTester {
// ENUM TESTING
//=================================
//Make sure enum header is correct.
{BUG_ID + FS + "pkg" + FS + "Coin.html", "Enum Coin</h2>"},
{BUG_ID + "/pkg/Coin.html", "Enum Coin</h2>"},
//Make sure enum signature is correct.
{BUG_ID + FS + "pkg" + FS + "Coin.html", "<pre>public enum " +
"<span class=\"typeNameLabel\">Coin</span>" + NL +
{BUG_ID + "/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 + FS + "pkg" + FS + "Coin.html", "<caption><span>Enum Constants" +
{BUG_ID + "/pkg/Coin.html", "<caption><span>Enum Constants" +
"</span><span class=\"tabEnd\">&nbsp;</span></caption>"},
//Detail for enum constant
{BUG_ID + FS + "pkg" + FS + "Coin.html",
{BUG_ID + "/pkg/Coin.html",
"<span class=\"memberNameLink\"><a href=\"../pkg/Coin.html#Dime\">Dime</a></span>"},
//Automatically insert documentation for values() and valueOf().
{BUG_ID + FS + "pkg" + FS + "Coin.html",
{BUG_ID + "/pkg/Coin.html",
"Returns an array containing the constants of this enum type,"},
{BUG_ID + FS + "pkg" + FS + "Coin.html",
{BUG_ID + "/pkg/Coin.html",
"Returns the enum constant of this type with the specified name"},
{BUG_ID + FS + "pkg" + FS + "Coin.html", "for (Coin c : Coin.values())"},
{BUG_ID + FS + "pkg" + FS + "Coin.html", "Overloaded valueOf() method has correct documentation."},
{BUG_ID + FS + "pkg" + FS + "Coin.html", "Overloaded values method has correct documentation."},
{BUG_ID + "/pkg/Coin.html", "for (Coin c : Coin.values())"},
{BUG_ID + "/pkg/Coin.html",
"Overloaded valueOf() method has correct documentation."},
{BUG_ID + "/pkg/Coin.html",
"Overloaded values method has correct documentation."},
//=================================
// TYPE PARAMETER TESTING
//=================================
//Make sure the header is correct.
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
{BUG_ID + "/pkg/TypeParameters.html",
"Class TypeParameters&lt;E&gt;</h2>"},
//Check class type parameters section.
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
"<dt><span class=\"paramLabel\">Type Parameters:</span></dt>" + NL + "<dd><code>E</code> - " +
{BUG_ID + "/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 + FS + "pkg" + FS + "TypeParameters.html",
"<dl>" + NL + "<dt><span class=\"seeLabel\">See Also:</span></dt>" + NL + "<dd>" +
{BUG_ID + "/pkg/TypeParameters.html",
"<dl>\n" +
"<dt><span class=\"seeLabel\">See Also:</span></dt>\n" +
"<dd>" +
"<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
"<code>TypeParameters</code></a></dd>" + NL + "</dl>"},
"<code>TypeParameters</code></a></dd>\n" +
"</dl>"},
//Method that uses class type parameter.
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
{BUG_ID + "/pkg/TypeParameters.html",
"(<a href=\"../pkg/TypeParameters.html\" title=\"type " +
"parameter in TypeParameters\">E</a>&nbsp;param)"},
//Method type parameter section.
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
"<span class=\"paramLabel\">Type Parameters:</span></dt>" + NL + "<dd><code>T</code> - This is the first " +
"type parameter.</dd>" + NL + "<dd><code>V</code> - This is the second type " +
{BUG_ID + "/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 + FS + "pkg" + FS + "TypeParameters.html",
{BUG_ID + "/pkg/TypeParameters.html",
"public&nbsp;&lt;T extends java.util.List,V&gt;&nbsp;" +
"java.lang.String[]&nbsp;methodThatHasTypeParameters"},
//Wildcard testing.
{BUG_ID + FS + "pkg" + FS + "Wildcards.html",
{BUG_ID + "/pkg/Wildcards.html",
"<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
"TypeParameters</a>&lt;? super java.lang.String&gt;&nbsp;a"},
{BUG_ID + FS + "pkg" + FS + "Wildcards.html",
{BUG_ID + "/pkg/Wildcards.html",
"<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
"TypeParameters</a>&lt;? extends java.lang.StringBuffer&gt;&nbsp;b"},
{BUG_ID + FS + "pkg" + FS + "Wildcards.html",
{BUG_ID + "/pkg/Wildcards.html",
"<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
"TypeParameters</a>&nbsp;c"},
//Bad type parameter warnings.
@ -117,36 +127,42 @@ public class TestNewLanguageFeatures extends JavadocTester {
"\"<BadMethodTypeParam>\" is not a type parameter name."},
//Signature of subclass that has type parameters.
{BUG_ID + FS + "pkg" + FS + "TypeParameterSubClass.html",
{BUG_ID + "/pkg/TypeParameterSubClass.html",
"<pre>public class <span class=\"typeNameLabel\">TypeParameterSubClass&lt;T extends " +
"java.lang.String&gt;</span>" + NL + "extends " +
"java.lang.String&gt;</span>\n" +
"extends " +
"<a href=\"../pkg/TypeParameterSuperClass.html\" title=\"class in pkg\">" +
"TypeParameterSuperClass</a>&lt;T&gt;</pre>"},
//Interface generic parameter substitution
//Signature of subclass that has type parameters.
{BUG_ID + FS + "pkg" + FS + "TypeParameters.html",
"<dl>" + NL + "<dt>All Implemented Interfaces:</dt>" + NL +
{BUG_ID + "/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>" + NL +
"title=\"interface in pkg\">SuperInterface</a>&lt;E&gt;</dd>\n" +
"</dl>"},
{BUG_ID + FS + "pkg" + FS + "SuperInterface.html",
"<dl>" + NL + "<dt>All Known Subinterfaces:</dt>" + NL +
{BUG_ID + "/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>" + NL + "</dl>"},
{BUG_ID + FS + "pkg" + FS + "SubInterface.html",
"<dl>" + NL + "<dt>All Superinterfaces:</dt>" + NL +
"SubInterface</a>&lt;V&gt;</dd>\n" +
"</dl>"},
{BUG_ID + "/pkg/SubInterface.html",
"<dl>\n" +
"<dt>All Superinterfaces:</dt>\n" +
"<dd><a href=\"../pkg/SuperInterface.html\" title=\"interface in pkg\">" +
"SuperInterface</a>&lt;V&gt;</dd>" + NL + "</dl>"},
"SuperInterface</a>&lt;V&gt;</dd>\n" +
"</dl>"},
//=================================
// VAR ARG TESTING
//=================================
{BUG_ID + FS + "pkg" + FS + "VarArgs.html", "(int...&nbsp;i)"},
{BUG_ID + FS + "pkg" + FS + "VarArgs.html", "(int[][]...&nbsp;i)"},
{BUG_ID + FS + "pkg" + FS + "VarArgs.html", "-int:A...-"},
{BUG_ID + FS + "pkg" + FS + "VarArgs.html",
{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",
"<a href=\"../pkg/TypeParameters.html\" title=\"class in pkg\">" +
"TypeParameters</a>...&nbsp;t"},
@ -154,32 +170,37 @@ public class TestNewLanguageFeatures extends JavadocTester {
// ANNOTATION TYPE TESTING
//=================================
//Make sure the summary links are correct.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
"<li>Summary:&nbsp;</li>" + NL + "<li>Field&nbsp;|&nbsp;</li>" + NL +
{BUG_ID + "/pkg/AnnotationType.html",
"<li>Summary:&nbsp;</li>\n" +
"<li>Field&nbsp;|&nbsp;</li>\n" +
"<li><a href=\"#annotation.type.required.element.summary\">" +
"Required</a>&nbsp;|&nbsp;</li>" + NL + "<li>" +
"Required</a>&nbsp;|&nbsp;</li>\n" +
"<li>" +
"<a href=\"#annotation.type.optional.element.summary\">Optional</a></li>"},
//Make sure the detail links are correct.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
"<li>Detail:&nbsp;</li>" + NL + "<li>Field&nbsp;|&nbsp;</li>" + NL +
{BUG_ID + "/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 + FS + "pkg" + FS + "AnnotationType.html",
{BUG_ID + "/pkg/AnnotationType.html",
"Annotation Type AnnotationType</h2>"},
//Make sure the signature is correct.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
{BUG_ID + "/pkg/AnnotationType.html",
"public @interface <span class=\"memberNameLabel\">AnnotationType</span>"},
//Make sure member summary headings are correct.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
{BUG_ID + "/pkg/AnnotationType.html",
"<h3>Required Element Summary</h3>"},
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
{BUG_ID + "/pkg/AnnotationType.html",
"<h3>Optional Element Summary</h3>"},
//Make sure element detail heading is correct
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
{BUG_ID + "/pkg/AnnotationType.html",
"Element Detail"},
//Make sure default annotation type value is printed when necessary.
{BUG_ID + FS + "pkg" + FS + "AnnotationType.html",
"<dl>" + NL + "<dt>Default:</dt>" + NL + "<dd>\"unknown\"</dd>" + NL +
{BUG_ID + "/pkg/AnnotationType.html",
"<dl>\n" +
"<dt>Default:</dt>\n" +
"<dd>\"unknown\"</dd>\n" +
"</dl>"},
//=================================
@ -187,65 +208,70 @@ public class TestNewLanguageFeatures extends JavadocTester {
//=================================
//PACKAGE
{BUG_ID + FS + "pkg" + FS + "package-summary.html",
"<a href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>=\"Package Annotation\"," + NL +
{BUG_ID + "/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 + FS + "pkg" + FS + "AnnotationTypeUsage.html",
{BUG_ID + "/pkg/AnnotationTypeUsage.html",
"<pre><a href=\"../pkg/AnnotationType.html\" " +
"title=\"annotation in pkg\">@AnnotationType</a>(" +
"<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>" +
"=\"Class Annotation\"," + NL +
"=\"Class Annotation\",\n" +
" <a href=\"../pkg/AnnotationType.html#required--\">" +
"required</a>=1994)" + NL + "public class <span class=\"typeNameLabel\">" +
"AnnotationTypeUsage</span>" + NL + "extends java.lang.Object</pre>"},
"required</a>=1994)\n" +
"public class <span class=\"typeNameLabel\">" +
"AnnotationTypeUsage</span>\n" +
"extends java.lang.Object</pre>"},
//FIELD
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
{BUG_ID + "/pkg/AnnotationTypeUsage.html",
"<pre><a href=\"../pkg/AnnotationType.html\" " +
"title=\"annotation in pkg\">@AnnotationType</a>(" +
"<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>" +
"=\"Field Annotation\"," + NL +
"=\"Field Annotation\",\n" +
" <a href=\"../pkg/AnnotationType.html#required--\">" +
"required</a>=1994)" + NL + "public&nbsp;int field</pre>"},
"required</a>=1994)\n" +
"public&nbsp;int field</pre>"},
//CONSTRUCTOR
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
{BUG_ID + "/pkg/AnnotationTypeUsage.html",
"<pre><a href=\"../pkg/AnnotationType.html\" " +
"title=\"annotation in pkg\">@AnnotationType</a>(" +
"<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>" +
"=\"Constructor Annotation\"," + NL +
"=\"Constructor Annotation\",\n" +
" <a href=\"../pkg/AnnotationType.html#required--\">" +
"required</a>=1994)" + NL + "public&nbsp;AnnotationTypeUsage()</pre>"},
"required</a>=1994)\n" +
"public&nbsp;AnnotationTypeUsage()</pre>"},
//METHOD
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
{BUG_ID + "/pkg/AnnotationTypeUsage.html",
"<pre><a href=\"../pkg/AnnotationType.html\" " +
"title=\"annotation in pkg\">@AnnotationType</a>(" +
"<a href=\"../pkg/AnnotationType.html#optional--\">optional</a>" +
"=\"Method Annotation\"," + NL +
"=\"Method Annotation\",\n" +
" <a href=\"../pkg/AnnotationType.html#required--\">" +
"required</a>=1994)" + NL + "public&nbsp;void&nbsp;method()</pre>"},
"required</a>=1994)\n" +
"public&nbsp;void&nbsp;method()</pre>"},
//METHOD PARAMS
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
{BUG_ID + "/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--\">" +
"optional</a>=\"Parameter Annotation\",<a " +
"href=\"../pkg/AnnotationType.html#required--\">required</a>=1994)" + NL +
" int&nbsp;documented," + NL +
"href=\"../pkg/AnnotationType.html#required--\">required</a>=1994)\n" +
" int&nbsp;documented,\n" +
" int&nbsp;undocmented)</pre>"},
//CONSTRUCTOR PARAMS
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
{BUG_ID + "/pkg/AnnotationTypeUsage.html",
"<pre>public&nbsp;AnnotationTypeUsage(<a " +
"href=\"../pkg/AnnotationType.html\" title=\"annotation in pkg\">" +
"@AnnotationType</a>(<a href=\"../pkg/AnnotationType.html#optional--\">" +
"optional</a>=\"Constructor Param Annotation\",<a " +
"href=\"../pkg/AnnotationType.html#required--\">required</a>=1994)" + NL +
" int&nbsp;documented," + NL +
"href=\"../pkg/AnnotationType.html#required--\">required</a>=1994)\n" +
" int&nbsp;documented,\n" +
" int&nbsp;undocmented)</pre>"},
//=================================
@ -253,59 +279,59 @@ public class TestNewLanguageFeatures extends JavadocTester {
//=================================
//Integer
{BUG_ID + FS + "pkg1" + FS + "B.html",
{BUG_ID + "/pkg1/B.html",
"<a href=\"../pkg1/A.html#d--\">d</a>=3.14,"},
//Double
{BUG_ID + FS + "pkg1" + FS + "B.html",
{BUG_ID + "/pkg1/B.html",
"<a href=\"../pkg1/A.html#d--\">d</a>=3.14,"},
//Boolean
{BUG_ID + FS + "pkg1" + FS + "B.html",
{BUG_ID + "/pkg1/B.html",
"<a href=\"../pkg1/A.html#b--\">b</a>=true,"},
//String
{BUG_ID + FS + "pkg1" + FS + "B.html",
{BUG_ID + "/pkg1/B.html",
"<a href=\"../pkg1/A.html#s--\">s</a>=\"sigh\","},
//Class
{BUG_ID + FS + "pkg1" + FS + "B.html",
{BUG_ID + "/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 + FS + "pkg1" + FS + "B.html",
{BUG_ID + "/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 + FS + "pkg1" + FS + "B.html",
{BUG_ID + "/pkg1/B.html",
"<a href=\"../pkg1/A.html#e--\">e</a>=<a href=\"../pkg/Coin.html#Penny\">Penny</a>,"},
//Annotation Type
{BUG_ID + FS + "pkg1" + FS + "B.html",
{BUG_ID + "/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 + FS + "pkg1" + FS + "B.html",
{BUG_ID + "/pkg1/B.html",
"<a href=\"../pkg1/A.html#sa--\">sa</a>={\"up\",\"down\"},"},
//Primitive
{BUG_ID + FS + "pkg1" + FS + "B.html",
{BUG_ID + "/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 + FS + "pkg1" + FS + "B.html",
{BUG_ID + "/pkg1/B.html",
"<pre><a href=\"../pkg1/A.html\" title=\"annotation in pkg1\">@A</a>"},
{BUG_ID + FS + "pkg1" + FS + "B.html",
{BUG_ID + "/pkg1/B.html",
"public interface <span class=\"typeNameLabel\">B</span></pre>"},
//==============================================================
// Handle multiple bounds.
//==============================================================
{BUG_ID + FS + "pkg" + FS + "MultiTypeParameters.html",
{BUG_ID + "/pkg/MultiTypeParameters.html",
"public&nbsp;&lt;T extends java.lang.Number &amp; java.lang.Runnable&gt;&nbsp;T&nbsp;foo(T&nbsp;t)"},
//==============================================================
@ -313,79 +339,79 @@ public class TestNewLanguageFeatures extends JavadocTester {
//==============================================================
//ClassUseTest1: <T extends Foo & Foo2>
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo2.html",
{BUG_ID + "/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>" +
@ -393,53 +419,53 @@ public class TestNewLanguageFeatures extends JavadocTester {
},
//ClassUseTest2: <T extends ParamTest<Foo3>>
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "ParamTest.html",
{BUG_ID + "/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 " +
@ -449,40 +475,40 @@ public class TestNewLanguageFeatures extends JavadocTester {
"pkg2\">Foo3</a>&gt;</code></td>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo3.html",
{BUG_ID + "/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" +
@ -492,14 +518,14 @@ public class TestNewLanguageFeatures extends JavadocTester {
},
//ClassUseTest3: <T extends ParamTest2<List<? extends Foo4>>>
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
{BUG_ID + "/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\">" +
@ -507,19 +533,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 + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "ParamTest2.html",
{BUG_ID + "/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=\".." +
@ -530,14 +556,14 @@ public class TestNewLanguageFeatures extends JavadocTester {
"class in pkg2\">Foo4</a>&gt;&gt;</code></td>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
{BUG_ID + "/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\">" +
@ -545,26 +571,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 + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
{BUG_ID + "/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 + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
{BUG_ID + "/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=\".." +
@ -576,24 +602,28 @@ public class TestNewLanguageFeatures extends JavadocTester {
},
//Type parameters in constructor and method args
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
{BUG_ID + "/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 " +
"pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;" +
"</span></caption>" + NL + "<tr>" + NL +
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>" + NL +
"<th class=\"colLast\" scope=\"col\">Method and Description</th>" + NL +
"</tr>" + NL + "<tbody>" + NL + "<tr class=\"altColor\">" + NL +
"<td class=\"colFirst\"><code>void</code></td>" + NL +
"</span></caption>\n" +
"<tr>\n" +
"<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n" +
"<th class=\"colLast\" scope=\"col\">Method and Description</th>\n" +
"</tr>\n" +
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<td class=\"colFirst\"><code>void</code></td>\n" +
"<td class=\"colLast\"><span class=\"typeNameLabel\">ClassUseTest3." +
"</span><code><span class=\"memberNameLink\"><a href=\"../../pkg2/ClassUseTest3." +
"html#method-java.util.Set-\">method</a></span>(java." +
"util.Set&lt;<a href=\"../../pkg2/Foo4.html\" title=\"" +
"class in pkg2\">Foo4</a>&gt;&nbsp;p)</code>&nbsp;</td>" + NL +
"</tr>" + NL + "</tbody>"
"class in pkg2\">Foo4</a>&gt;&nbsp;p)</code>&nbsp;</td>\n" +
"</tr>\n" +
"</tbody>"
},
{BUG_ID + FS + "pkg2" + FS + "class-use" + FS + "Foo4.html",
{BUG_ID + "/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 " +
@ -604,14 +634,14 @@ public class TestNewLanguageFeatures extends JavadocTester {
//=================================
// Annotatation Type Usage
//=================================
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
{BUG_ID + "/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 + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
{BUG_ID + "/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=\"" +
@ -619,7 +649,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"=\"tabEnd\">&nbsp;</span></caption>"
},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
{BUG_ID + "/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 " +
@ -627,7 +657,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"&nbsp;</span></caption>"
},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
{BUG_ID + "/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 " +
@ -635,7 +665,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"&nbsp;</span></caption>"
},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
{BUG_ID + "/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 " +
@ -643,7 +673,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"&nbsp;</span></caption>"
},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
{BUG_ID + "/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 " +
@ -651,7 +681,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
"&nbsp;</span></caption>"
},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "AnnotationType.html",
{BUG_ID + "/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=\"" +
@ -662,14 +692,14 @@ public class TestNewLanguageFeatures extends JavadocTester {
//=================================
// TYPE PARAMETER IN INDEX
//=================================
{BUG_ID + FS + "index-all.html",
{BUG_ID + "/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 + FS + "index-all.html",
{BUG_ID + "/index-all.html",
"<span class=\"memberNameLink\"><a href=\"pkg2/Foo.html#method-java.util.Vector-\">" +
"method(Vector&lt;Object&gt;)</a></span>"
},
@ -679,12 +709,12 @@ public class TestNewLanguageFeatures extends JavadocTester {
// ENUM TESTING
//=================================
//NO constructor section
{BUG_ID + FS + "pkg" + FS + "Coin.html", "<h3>Constructor Summary</h3>"},
{BUG_ID + "/pkg/Coin.html", "<h3>Constructor Summary</h3>"},
//=================================
// TYPE PARAMETER TESTING
//=================================
//No type parameters in class frame.
{BUG_ID + FS + "allclasses-frame.html",
{BUG_ID + "/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;"
@ -695,27 +725,27 @@ public class TestNewLanguageFeatures extends JavadocTester {
//===============================================================
//CLASS
{BUG_ID + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Class Annotation\"," + NL +
" <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL +
{BUG_ID + "/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 + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Field Annotation\"," + NL +
" <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL +
{BUG_ID + "/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 + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Constructor Annotation\"," + NL +
" <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL +
{BUG_ID + "/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 + FS + "pkg" + FS + "AnnotationTypeUsage.html",
"<a href=\"../pkg/AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"../pkg/AnnotationType.html#optional\">optional</a>=\"Method Annotation\"," + NL +
" <a href=\"../pkg/AnnotationType.html#required\">required</a>=1994)" + NL +
{BUG_ID + "/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>()"},
//=================================

6
langtools/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -41,7 +41,7 @@ public class TestNoPackagesFile extends JavadocTester {
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-d", BUG_ID, "-sourcepath", SRC_DIR,
SRC_DIR + FS + "C.java"
SRC_DIR + "/C.java"
};
/**
@ -51,7 +51,7 @@ public class TestNoPackagesFile extends JavadocTester {
public static void main(String[] args) {
TestNoPackagesFile tester = new TestNoPackagesFile();
run(tester, ARGS, NO_TEST, NO_TEST);
if ((new java.io.File(BUG_ID + FS + "packages.html")).exists()) {
if ((new java.io.File(BUG_ID + "/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.");

4
langtools/test/com/sun/javadoc/testNonFrameWarning/TestNonFrameWarning.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -35,7 +35,7 @@ public class TestNonFrameWarning extends JavadocTester {
private static final String BUG_ID = "7001086";
private static final String[][] TEST = {
{BUG_ID + FS + "index.html",
{BUG_ID + "/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>"

6
langtools/test/com/sun/javadoc/testOptions/TestOptions.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -43,9 +43,9 @@ public class TestOptions extends JavadocTester {
};
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "package-summary.html",
{BUG_ID + "/pkg/package-summary.html",
"<div class=\"aboutLanguage\">Test header</div>"},
{BUG_ID + FS + "pkg" + FS + "package-summary.html",
{BUG_ID + "/pkg/package-summary.html",
"<div class=\"aboutLanguage\">Test footer</div>"}
};

14
langtools/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -45,19 +45,19 @@ public class TestMultiInheritence extends JavadocTester {
//Method foo() is inherited from BOTH I2 and I3
private static final String[][] TEST = {
{BUG_ID + FS + "pkg3" + FS + "I1.html",
{BUG_ID + "/pkg3/I1.html",
"Methods inherited from interface&nbsp;pkg3." +
"<a href=\"../pkg3/I2.html\" title=\"interface in pkg3\">" +
"I2</a>"},
{BUG_ID + FS + "pkg3" + FS +"I1.html",
{BUG_ID + "/pkg3/I1.html",
"Methods inherited from interface&nbsp;pkg3." +
"<a href=\"../pkg3/I3.html\" title=\"interface in pkg3\">" +
"I3</a>"},
{BUG_ID + FS + "pkg3" + FS + "I0.html",
{BUG_ID + "/pkg3/I0.html",
"Methods inherited from interface&nbsp;pkg3." +
"<a href=\"../pkg3/I2.html\" title=\"interface in pkg3\">" +
"I2</a>"},
{BUG_ID + FS + "pkg3" + FS +"I0.html",
{BUG_ID + "/pkg3/I0.html",
"Methods inherited from interface&nbsp;pkg3." +
"<a href=\"../pkg3/I3.html\" title=\"interface in pkg3\">" +
"I3</a>"},
@ -66,11 +66,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 + FS + "pkg3" + FS + "I1.html",
{BUG_ID + "/pkg3/I1.html",
"Methods inherited from interface&nbsp;pkg3." +
"<a href=\"../pkg3/I4.html\" title=\"interface in pkg3\">" +
"I4</a>"},
{BUG_ID + FS + "pkg3" + FS + "I0.html",
{BUG_ID + "/pkg3/I0.html",
"Methods inherited from interface&nbsp;pkg3." +
"<a href=\"../pkg3/I4.html\" title=\"interface in pkg3\">" +
"I4</a>"},

4
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -45,7 +45,7 @@ public class TestOverridenMethodDocCopy extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
{BUG_ID + "/pkg1/SubClass.html",
"<span class=\"descfrmTypeLabel\">Description copied from class:&nbsp;<code>" +
"<a href=\"../pkg1/BaseClass.html#overridenMethodWithDocsToCopy--\">" +
"BaseClass</a></code></span>"

24
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,13 +39,13 @@ public class TestOverridenPrivateMethods extends JavadocTester {
private static final String[][] TEST = {
//The public method should be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/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 + FS + "pkg2" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/pkg2/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"}
};
@ -53,23 +53,23 @@ 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 + FS + "pkg1" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/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 + FS + "pkg1" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/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 + FS + "pkg2" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/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 + FS + "pkg2" + FS + "SubClass.html",
{BUG_ID + "/pkg2/SubClass.html",
"Overrides:</span></dt><dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"}
};

26
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,23 +39,23 @@ public class TestOverridenPrivateMethodsWithPackageFlag extends JavadocTester {
private static final String[][] TEST = {
//The public method should be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/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 + FS + "pkg2" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/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>" +
"<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>"},
//The package private method should be overriden since the base and sub class are in the same
//package.
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/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>" +
"<a href=\"../pkg1/BaseClass.html\" title=\"class in pkg1\">BaseClass</a></code></dd>"}
@ -64,19 +64,19 @@ public class TestOverridenPrivateMethodsWithPackageFlag extends JavadocTester {
private static final String[][] NEGATED_TEST = {
//The private method in should not be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/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 + FS + "pkg2" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/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 + FS + "pkg2" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/pkg2/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod()\">"},
};

26
langtools/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,38 +39,38 @@ public class TestOverridenPrivateMethodsWithPrivateFlag extends JavadocTester {
private static final String[][] TEST = {
//The public method should be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/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 + FS + "pkg1" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/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 + FS + "pkg2" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/pkg2/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#publicMethod"},
};
private static final String[][] NEGATED_TEST = {
//The private method in should not be overriden
{BUG_ID + FS + "pkg1" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/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 + FS + "pkg2" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/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 + FS + "pkg2" + FS + "SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "/pkg2/SubClass.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>\n" +
"<dd><code><a href=\"../pkg1/BaseClass.html#packagePrivateMethod"}

20
langtools/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,29 +39,29 @@ public class TestPackageDeprecation extends JavadocTester {
//Javadoc arguments.
private static final String[] ARGS1 = new String[]{
"-d", BUG_ID + "-1", "-sourcepath", SRC_DIR, "-use", "pkg", "pkg1",
SRC_DIR + FS + "C2.java", SRC_DIR + FS + "FooDepr.java"
SRC_DIR + "/C2.java", SRC_DIR + "/FooDepr.java"
};
private static final String[] ARGS2 = new String[]{
"-d", BUG_ID + "-2", "-sourcepath", SRC_DIR, "-use", "-nodeprecated",
"pkg", "pkg1", SRC_DIR + FS + "C2.java", SRC_DIR + FS + "FooDepr.java"
"pkg", "pkg1", SRC_DIR + "/C2.java", SRC_DIR + "/FooDepr.java"
};
//Input for string search tests.
private static final String[][] TEST1 = {
{BUG_ID + "-1" + FS + "pkg1" + FS + "package-summary.html",
"<div class=\"deprecatedContent\"><span class=\"deprecatedLabel\">Deprecated.</span>" + NL +
{BUG_ID + "-1/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" + FS + "deprecated-list.html",
{BUG_ID + "-1/deprecated-list.html",
"<li><a href=\"#package\">Deprecated Packages</a></li>"
}
};
private static final String[][] TEST2 = NO_TEST;
private static final String[][] NEGATED_TEST1 = NO_TEST;
private static final String[][] NEGATED_TEST2 = {
{BUG_ID + "-2" + FS + "overview-summary.html", "pkg1"},
{BUG_ID + "-2" + FS + "allclasses-frame.html", "FooDepr"}
{BUG_ID + "-2/overview-summary.html", "pkg1"},
{BUG_ID + "-2/allclasses-frame.html", "FooDepr"}
};
/**
@ -72,14 +72,14 @@ public class TestPackageDeprecation extends JavadocTester {
TestPackageDeprecation tester = new TestPackageDeprecation();
run(tester, ARGS1, TEST1, NEGATED_TEST1);
run(tester, ARGS2, TEST2, NEGATED_TEST2);
if ((new java.io.File(BUG_ID + "-2" + FS + "pkg1" + FS +
if ((new java.io.File(BUG_ID + "-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" + FS + "FooDepr.html")).exists()) {
if ((new java.io.File(BUG_ID + "-2/FooDepr.html")).exists()) {
throw new Error("Test Fails: FooDepr should not be" +
"generated as it is deprecated.");
} else {

22
langtools/test/com/sun/javadoc/testPackagePage/TestPackagePage.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -38,36 +38,36 @@ public class TestPackagePage extends JavadocTester {
private static final String BUG_ID = "4492643-4689286";
private static final String[][] TEST1 = {
{BUG_ID + "-1" + FS + "com" + FS + "pkg" + FS + "package-summary.html",
{BUG_ID + "-1/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" + FS + "com" + FS + "pkg" + FS + "C.html",
{BUG_ID + "-1/com/pkg/C.html",
"<a href=\"../../com/pkg/package-summary.html\">Package</a>"
},
{BUG_ID + "-1" + FS + "com" + FS + "pkg" + FS + "package-tree.html",
{BUG_ID + "-1/com/pkg/package-tree.html",
"<li><a href=\"../../com/pkg/package-summary.html\">Package</a></li>"
},
{BUG_ID + "-1" + FS + "deprecated-list.html",
{BUG_ID + "-1/deprecated-list.html",
"<li><a href=\"com/pkg/package-summary.html\">Package</a></li>"
},
{BUG_ID + "-1" + FS + "index-all.html",
{BUG_ID + "-1/index-all.html",
"<li><a href=\"com/pkg/package-summary.html\">Package</a></li>"
},
{BUG_ID + "-1" + FS + "help-doc.html",
{BUG_ID + "-1/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" + FS + "deprecated-list.html",
{BUG_ID + "-2/deprecated-list.html",
"<li>Package</li>"
},
{BUG_ID + "-2" + FS + "index-all.html",
{BUG_ID + "-2/index-all.html",
"<li>Package</li>"
},
{BUG_ID + "-2" + FS + "help-doc.html",
{BUG_ID + "-2/help-doc.html",
"<li>Package</li>"
},
};
@ -75,7 +75,7 @@ public class TestPackagePage extends JavadocTester {
private static final String[] ARGS1 =
new String[] {
"-d", BUG_ID + "-1", "-sourcepath", SRC_DIR,
SRC_DIR + FS + "com" + FS + "pkg" + FS + "C.java"
SRC_DIR + "/com/pkg/C.java"
};
private static final String[] ARGS2 =

18
langtools/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -47,20 +47,22 @@ public class TestParamTaglet extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
//Regular param tags.
{BUG_ID + FS + "pkg" + FS + "C.html",
"<span class=\"paramLabel\">Parameters:</span></dt>" + NL + "<dd><code>param1</code> - testing 1 2 3.</dd>" +
NL + "<dd><code>param2</code> - testing 1 2 3."
{BUG_ID + "/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 + FS + "pkg" + FS + "C.html",
"<span class=\"paramLabel\">Parameters:</span></dt>" + NL + "<dd><code><I>p1</I></code> - testing 1 2 3.</dd>" +
NL + "<dd><code><I>p2</I></code> - testing 1 2 3."
{BUG_ID + "/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."
},
//{@inherit} doc misuse does not cause doclet to throw exception.
// 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 + FS + "pkg" + FS + "C.html",
{BUG_ID + "/pkg/C.html",
"<code><I>inheritBug</I></code> -"
},

125
langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -59,179 +59,192 @@ public class TestPrivateClasses extends JavadocTester {
// Test output when -private flag is not used.
private static final String[][] TEST1 = {
// Field inheritence from non-public superclass.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "-1/pkg/PublicChild.html",
"<a href=\"../pkg/PublicChild.html#fieldInheritedFromParent\">" +
"fieldInheritedFromParent</a>"
},
// Method inheritence from non-public superclass.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "-1/pkg/PublicChild.html",
"<a href=\"../pkg/PublicChild.html#methodInheritedFromParent-int-\">" +
"methodInheritedFromParent</a>"
},
// Field inheritence from non-public superinterface.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
{BUG_ID + "-1/pkg/PublicInterface.html",
"<a href=\"../pkg/PublicInterface.html#fieldInheritedFromInterface\">" +
"fieldInheritedFromInterface</a>"
},
// Method inheritence from non-public superinterface.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
{BUG_ID + "-1/pkg/PublicInterface.html",
"<a href=\"../pkg/PublicInterface.html#methodInterface-int-\">" +
"methodInterface</a>"
},
// private class does not show up in tree
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
"<ul class=\"inheritance\">" + NL + "<li>java.lang.Object</li>" + NL +
"<li>" + NL + "<ul class=\"inheritance\">" + NL + "<li>pkg.PublicChild</li>" + NL +
"</ul>" + NL + "</li>" + NL + "</ul>"
{BUG_ID + "-1/pkg/PublicChild.html",
"<ul class=\"inheritance\">\n" +
"<li>java.lang.Object</li>\n" +
"<li>\n" +
"<ul class=\"inheritance\">\n" +
"<li>pkg.PublicChild</li>\n" +
"</ul>\n" +
"</li>\n" +
"</ul>"
},
// Method is documented as though it is declared in the inheriting method.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "-1/pkg/PublicChild.html",
"<pre>public&nbsp;void&nbsp;methodInheritedFromParent(int&nbsp;p1)"
},
//Make sure implemented interfaces from private superclass are inherited
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
"<dl>" + NL + "<dt>All Known Implementing Classes:</dt>" + NL +
{BUG_ID + "-1/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>" + NL + "</dl>"},
"PublicChild</a></dd>\n" +
"</dl>"},
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
"<dl>" + NL + "<dt>All Implemented Interfaces:</dt>" + NL +
{BUG_ID + "-1/pkg/PublicChild.html",
"<dl>\n" +
"<dt>All Implemented Interfaces:</dt>\n" +
"<dd><a href=\"../pkg/PublicInterface.html\" title=\"interface in pkg\">" +
"PublicInterface</a></dd>" + NL + "</dl>"},
"PublicInterface</a></dd>\n" +
"</dl>"},
//Generic interface method test.
{BUG_ID + "-1" + FS + "pkg2" + FS + "C.html",
{BUG_ID + "-1/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" + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "-1/pkg/PublicChild.html",
"<span class=\"overrideSpecifyLabel\">Overrides:</span>"},
// Should not document that a method specified by private interface.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "-1/pkg/PublicChild.html",
"<span class=\"overrideSpecifyLabel\">Specified by:</span>"},
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
{BUG_ID + "-1/pkg/PublicInterface.html",
"<span class=\"overrideSpecifyLabel\">Specified by:</span>"},
// Should not mention that any documentation was copied.
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "-1/pkg/PublicChild.html",
"Description copied from"},
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
{BUG_ID + "-1/pkg/PublicInterface.html",
"Description copied from"},
// Don't extend private classes or interfaces
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "-1/pkg/PublicChild.html",
"PrivateParent"},
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
{BUG_ID + "-1/pkg/PublicInterface.html",
"PrivateInterface"},
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "-1/pkg/PublicChild.html",
"PrivateInterface"},
{BUG_ID + "-1" + FS + "pkg" + FS + "PublicInterface.html",
{BUG_ID + "-1/pkg/PublicInterface.html",
"All Superinterfaces"},
// Make inherited constant are documented correctly.
{BUG_ID + "-1" + FS + "constant-values.html",
{BUG_ID + "-1/constant-values.html",
"PrivateInterface"},
//Do not inherit private interface method with generic parameters.
//This method has been implemented.
{BUG_ID + "-1" + FS + "pkg2" + FS + "C.html",
{BUG_ID + "-1/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" + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "-2/pkg/PublicChild.html",
"Fields inherited from class&nbsp;pkg." +
"<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" +
"PrivateParent</a>"
},
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "-2/pkg/PublicChild.html",
"<a href=\"../pkg/PrivateParent.html#fieldInheritedFromParent\">" +
"fieldInheritedFromParent</a>"
},
// Field inheritence from non-public superinterface.
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicInterface.html",
{BUG_ID + "-2/pkg/PublicInterface.html",
"Fields inherited from interface&nbsp;pkg." +
"<a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">" +
"PrivateInterface</a>"
},
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicInterface.html",
{BUG_ID + "-2/pkg/PublicInterface.html",
"<a href=\"../pkg/PrivateInterface.html#fieldInheritedFromInterface\">" +
"fieldInheritedFromInterface</a>"
},
// Method inheritence from non-public superclass.
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "-2/pkg/PublicChild.html",
"Methods inherited from class&nbsp;pkg." +
"<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" +
"PrivateParent</a>"
},
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "-2/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" + FS + "pkg" + FS + "PublicChild.html",
"<dt><span class=\"overrideSpecifyLabel\">Overrides:</span></dt>" + NL +
{BUG_ID + "-2/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" + FS + "pkg" + FS + "PublicChild.html",
"<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>" + NL +
{BUG_ID + "-2/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" + FS + "pkg" + FS + "PublicInterface.html",
{BUG_ID + "-2/pkg/PublicInterface.html",
"Methods inherited from interface&nbsp;pkg." +
"<a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">" +
"PrivateInterface</a>"
},
{BUG_ID + "-2" + FS + "pkg" + FS + "PrivateInterface.html",
{BUG_ID + "-2/pkg/PrivateInterface.html",
"<a href=\"../pkg/PrivateInterface.html#methodInterface-int-\">" +
"methodInterface</a>"
},
// Should mention that any documentation was copied.
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "-2/pkg/PublicChild.html",
"Description copied from"},
// Extend documented private classes or interfaces
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "-2/pkg/PublicChild.html",
"extends"},
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicInterface.html",
{BUG_ID + "-2/pkg/PublicInterface.html",
"extends"},
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicInterface.html",
{BUG_ID + "-2/pkg/PublicInterface.html",
"All Superinterfaces"},
//Make sure implemented interfaces from private superclass are inherited
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicInterface.html",
"<dl>" + NL + "<dt>All Known Implementing Classes:</dt>" + NL +
{BUG_ID + "-2/pkg/PublicInterface.html",
"<dl>\n" +
"<dt>All Known Implementing Classes:</dt>\n" +
"<dd><a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" +
"PrivateParent</a>, " +
"<a href=\"../pkg/PublicChild.html\" title=\"class in pkg\">PublicChild" +
"</a></dd>" + NL + "</dl>"},
"</a></dd>\n" +
"</dl>"},
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
"<dl>" + NL + "<dt>All Implemented Interfaces:</dt>" + NL +
{BUG_ID + "-2/pkg/PublicChild.html",
"<dl>\n" +
"<dt>All Implemented Interfaces:</dt>\n" +
"<dd><a href=\"../pkg/PrivateInterface.html\" title=\"interface in pkg\">" +
"PrivateInterface</a>, " +
"<a href=\"../pkg/PublicInterface.html\" title=\"interface in pkg\">" +
"PublicInterface</a></dd>" + NL + "</dl>"},
"PublicInterface</a></dd>\n" +
"</dl>"},
//Since private flag is used, we can document that private interface method
//with generic parameters has been implemented.
{BUG_ID + "-2" + FS + "pkg2" + FS + "C.html",
{BUG_ID + "-2/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" + FS + "pkg2" + FS + "C.html",
"<dt><span class=\"overrideSpecifyLabel\">Specified by:</span></dt>" + NL +
{BUG_ID + "-2/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>" +
"<a href=\"../pkg2/I.html\" title=\"interface in pkg2\">I</a>" +
@ -239,14 +252,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" + FS + "pkg" + FS + "PrivateParent.html",
{BUG_ID + "-2/pkg/PrivateParent.html",
"<pre>class <span class=\"typeNameLabel\">PrivateParent</span>"},
{BUG_ID + "-2" + FS + "pkg" + FS + "PublicChild.html",
{BUG_ID + "-2/pkg/PublicChild.html",
"<pre>public class <span class=\"typeNameLabel\">PublicChild</span>"},
};
private static final String[][] NEGATED_TEST2 = {
{BUG_ID + "-2" + FS + "pkg" + FS + "PrivateParent.html",
{BUG_ID + "-2/pkg/PrivateParent.html",
"<pre> class <span class=\"typeNameLabel\">PrivateParent</span>"},
};

196
langtools/test/com/sun/javadoc/testProfiles/TestProfiles.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,210 +39,240 @@ public class TestProfiles extends JavadocTester {
//Javadoc arguments.
private static final String[] ARGS1 = new String[]{
"-d", PROFILE_BUG_ID, "-sourcepath", SRC_DIR, "-Xprofilespath",
SRC_DIR + FS + "profile-rtjar-includes.txt", "pkg1", "pkg2",
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", "pkg3", "pkg4", "pkg5"
"-d", PACKAGE_BUG_ID, "-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 + FS + "profile-overview-frame.html",
{PROFILE_BUG_ID + "/profile-overview-frame.html",
"<span><a href=\"overview-frame.html\" "
+ "target=\"packageListFrame\">All&nbsp;Packages</a></span>"
},
{PROFILE_BUG_ID + FS + "profile-overview-frame.html",
{PROFILE_BUG_ID + "/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 + FS + "compact2-frame.html",
{PROFILE_BUG_ID + "/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 + FS + "compact2-frame.html",
{PROFILE_BUG_ID + "/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 + FS + "pkg2" + FS + "compact2-package-frame.html",
{PROFILE_BUG_ID + "/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 + FS + "compact2-summary.html",
"<li><a href=\"compact1-summary.html\">Prev&nbsp;Profile</a></li>" + NL
{PROFILE_BUG_ID + "/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 + FS + "compact2-summary.html",
{PROFILE_BUG_ID + "/compact2-summary.html",
"<h1 title=\"Profile\" class=\"title\">Profile&nbsp;compact2</h1>"
},
{PROFILE_BUG_ID + FS + "compact2-summary.html",
{PROFILE_BUG_ID + "/compact2-summary.html",
"<h3><a href=\"pkg2/compact2-package-summary.html\" "
+ "target=\"classFrame\">pkg2</a></h3>"
},
{PROFILE_BUG_ID + FS + "compact2-summary.html",
"<ul class=\"blockList\">" + NL + "<li class=\"blockList\">" + NL
{PROFILE_BUG_ID + "/compact2-summary.html",
"<ul class=\"blockList\">\n" +
"<li class=\"blockList\">\n"
+ "<h3><a href=\"pkg2/compact2-package-summary.html\" target=\"classFrame\">"
+ "pkg2</a></h3>" + NL + "<table class=\"typeSummary\" border=\"0\" "
+ "pkg2</a></h3>\n" +
"<table class=\"typeSummary\" border=\"0\" "
+ "cellpadding=\"3\" cellspacing=\"0\" summary=\"Class Summary table, "
+ "listing classes, and an explanation\">"
},
{PROFILE_BUG_ID + FS + "compact2-summary.html",
"<ul class=\"blockList\">" + NL + "<li class=\"blockList\">" + NL
{PROFILE_BUG_ID + "/compact2-summary.html",
"<ul class=\"blockList\">\n" +
"<li class=\"blockList\">\n"
+ "<h3><a href=\"pkg4/compact2-package-summary.html\" target=\"classFrame\">"
+ "pkg4</a></h3>" + NL + "<table class=\"typeSummary\" border=\"0\" "
+ "pkg4</a></h3>\n" +
"<table class=\"typeSummary\" border=\"0\" "
+ "cellpadding=\"3\" cellspacing=\"0\" summary=\"Class Summary table, "
+ "listing classes, and an explanation\">"
},
// Tests for profileName-package-summary.html listing the summary for a
// package in a profile.
{PROFILE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html",
{PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
"<li><a href=\"../pkg4/compact3-package-summary.html\">Prev&nbsp;Package"
+ "</a></li>"
},
{PROFILE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html",
{PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
"<div class=\"subTitle\">compact3</div>"
},
{PROFILE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html",
"<ul class=\"blockList\">" + NL + "<li class=\"blockList\">" + NL
{PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
"<ul class=\"blockList\">\n" +
"<li class=\"blockList\">\n"
+ "<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\" "
+ "cellspacing=\"0\" summary=\"Interface Summary table, listing "
+ "interfaces, and an explanation\">"
},
//Test for "overview-frame.html" showing the "All Profiles" link.
{PROFILE_BUG_ID + FS + "overview-frame.html",
{PROFILE_BUG_ID + "/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 + FS + "pkg2" + FS + "Class1Pkg2.html",
{PROFILE_BUG_ID + "/pkg2/Class1Pkg2.html",
"<div class=\"subTitle\">compact1, compact2, compact3</div>"
},
{PROFILE_BUG_ID + FS + "index.html",
{PROFILE_BUG_ID + "/index.html",
"<frame src=\"overview-frame.html\" name=\"packageListFrame\" " +
"title=\"All Packages\">"
},
//Test for "overview-summary.html" showing the profile list.
{PROFILE_BUG_ID + FS + "overview-summary.html",
"<ul>" + NL +"<li><a href=\"compact1-summary.html\" target=\"classFrame\">" +
"compact1</a></li>" + NL + "<li><a href=\"compact2-summary.html\" " +
"target=\"classFrame\">compact2</a></li>" + NL + "<li><a href=\"" +
"compact3-summary.html\" target=\"classFrame\">compact3</a></li>" + NL +
{PROFILE_BUG_ID + "/overview-summary.html",
"<ul>\n" +
"<li><a href=\"compact1-summary.html\" target=\"classFrame\">" +
"compact1</a></li>\n" +
"<li><a href=\"compact2-summary.html\" " +
"target=\"classFrame\">compact2</a></li>\n" +
"<li><a href=\"" +
"compact3-summary.html\" target=\"classFrame\">compact3</a></li>\n" +
"</ul>"
},
//Test deprecated class in profiles
{PROFILE_BUG_ID + FS + "compact1-summary.html","<td class=\"colFirst\">"
+ "<a href=\"pkg2/Class1Pkg2.html\" title=\"class in pkg2\">Class1Pkg2</a></td>"
+ NL + "<td class=\"colLast\">Deprecated"
{PROFILE_BUG_ID + "/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 + FS + "deprecated-list.html","<td class=\"colOne\">"
+ "<a href=\"pkg2/Class1Pkg2.html\" title=\"class in pkg2\">pkg2.Class1Pkg2</a>"
+ NL +"<div class=\"block\"><span class=\"deprecationComment\">Class1Pkg2. This class is deprecated</span></div>"
{PROFILE_BUG_ID + "/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 + FS + "deprecated-list.html","<td class=\"colOne\">"
+ "<a href=\"pkgDeprecated/package-summary.html\">pkgDeprecated</a>"
+ NL +"<div class=\"block\"><span class=\"deprecationComment\">This package is <b>Deprecated</b>."
{PROFILE_BUG_ID + "/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 + FS + "pkgDeprecated" + FS + "package-summary.html",
"<div class=\"deprecatedContent\"><span class=\"deprecatedLabel\">Deprecated.</span>"
+ NL + "<div class=\"block\"><span class=\"deprecationComment\">This package is <b>Deprecated</b>."
{PROFILE_BUG_ID + "/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 + FS + "compact1-summary.html","<table class=\"typeSummary\" "
{PROFILE_BUG_ID + "/compact1-summary.html",
"<table class=\"typeSummary\" "
+ "border=\"0\" cellpadding=\"3\" cellspacing=\"0\" "
+ "summary=\"Exception Summary table, listing exceptions, and an explanation\">"
+ NL + "<caption><span>Exception Summary</span><span class=\"tabEnd\">"
+ "&nbsp;</span></caption>" + NL + "<tr>" + NL + "<th class=\"colFirst\" "
+ "scope=\"col\">Exception</th>" + NL + "<th class=\"colLast\" scope=\"col\">"
+ "Description</th>" + NL + "</tr>" + NL + "<tbody>" + NL + "<tr class=\"altColor\">"
+ NL + "<td class=\"colFirst\"><a href=\"pkg2/ClassException.html\""
+ "summary=\"Exception Summary table, listing exceptions, and an explanation\">\n"
+ "<caption><span>Exception Summary</span><span class=\"tabEnd\">"
+ "&nbsp;</span></caption>\n" +
"<tr>\n" +
"<th class=\"colFirst\" "
+ "scope=\"col\">Exception</th>\n" +
"<th class=\"colLast\" scope=\"col\">"
+ "Description</th>\n" +
"</tr>\n" +
"<tbody>\n" +
"<tr class=\"altColor\">\n"
+ "<td class=\"colFirst\"><a href=\"pkg2/ClassException.html\""
+ " title=\"class in pkg2\">ClassException</a></td>"
},
//Test errors in profiles
{PROFILE_BUG_ID + FS + "compact1-summary.html",
{PROFILE_BUG_ID + "/compact1-summary.html",
"<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\" cellspacing=\"0\" "
+ "summary=\"Error Summary table, listing errors, and an explanation\">"
+ NL + "<caption><span>Error Summary</span><span class=\"tabEnd\">&nbsp;"
+ "</span></caption>" + NL + "<tr>" + NL + "<th class=\"colFirst\""
+ " scope=\"col\">Error</th>" + NL + "<th class=\"colLast\" "
+ "scope=\"col\">Description</th>" + NL + "</tr>" + NL + "<tbody>"
+ NL + "<tr class=\"altColor\">" + NL + "<td class=\"colFirst\">"
+ "summary=\"Error Summary table, listing errors, and an explanation\">\n"
+ "<caption><span>Error Summary</span><span class=\"tabEnd\">&nbsp;"
+ "</span></caption>\n" +
"<tr>\n" +
"<th class=\"colFirst\""
+ " scope=\"col\">Error</th>\n" +
"<th class=\"colLast\" "
+ "scope=\"col\">Description</th>\n" +
"</tr>\n" +
"<tbody>\n"
+ "<tr class=\"altColor\">\n" +
"<td class=\"colFirst\">"
+ "<a href=\"pkg2/ClassError.html\" title=\"class in pkg2\">ClassError</a></td>"
}
};
private static final String[][] PROFILES_NEGATED_TEST = {
{PROFILE_BUG_ID + FS + "pkg3" + FS + "Class2Pkg3.html",
{PROFILE_BUG_ID + "/pkg3/Class2Pkg3.html",
"<div class=\"subTitle\">compact1"
},
{PROFILE_BUG_ID + FS + "pkg3" + FS + "Interface1Pkg3.html",
{PROFILE_BUG_ID + "/pkg3/Interface1Pkg3.html",
"<div class=\"subTitle\">compact1"
},
{PROFILE_BUG_ID + FS + "pkg4" + FS + "compact2-package-frame.html",
{PROFILE_BUG_ID + "/pkg4/compact2-package-frame.html",
"<li><a href=\"Anno1Pkg4.html\" title=\"annotation in pkg4\" "
+ "target=\"classFrame\">Anno1Pkg4</a></li>"
},
{PROFILE_BUG_ID + FS + "compact1-summary.html","<li>Use</li>"
{PROFILE_BUG_ID + "/compact1-summary.html","<li>Use</li>"
},
{PROFILE_BUG_ID + FS + "compact2-summary.html",
"<ul class=\"blockList\">" + NL + "<li class=\"blockList\">" + NL
{PROFILE_BUG_ID + "/compact2-summary.html",
"<ul class=\"blockList\">\n" +
"<li class=\"blockList\">\n"
+ "<h3><a href=\"pkg2/compact2-package-summary.html\" target=\"classFrame\">"
+ "pkg2</a></h3>" + NL + "<li class=\"blockList\">" + NL
+ "pkg2</a></h3>\n" +
"<li class=\"blockList\">\n"
+ "<table class=\"typeSummary\" border=\"0\" "
+ "cellpadding=\"3\" cellspacing=\"0\" summary=\"Class Summary table, "
+ "listing classes, and an explanation\">"
},
{PROFILE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html",
"<ul class=\"blockList\">" + NL + "<li class=\"blockList\">" + NL
+ "<li class=\"blockList\">" + NL
{PROFILE_BUG_ID + "/pkg5/compact3-package-summary.html",
"<ul class=\"blockList\">\n" +
"<li class=\"blockList\">\n"
+ "<li class=\"blockList\">\n"
+ "<table class=\"typeSummary\" border=\"0\" cellpadding=\"3\" "
+ "cellspacing=\"0\" summary=\"Interface Summary table, listing "
+ "interfaces, and an explanation\">"
}
};
private static final String[][] PACKAGES_TEST = {
{PACKAGE_BUG_ID + FS + "overview-frame.html",
{PACKAGE_BUG_ID + "/overview-frame.html",
"<h2 title=\"Packages\">Packages</h2>"
},
{PACKAGE_BUG_ID + FS + "pkg4" + FS + "package-frame.html",
{PACKAGE_BUG_ID + "/pkg4/package-frame.html",
"<h1 class=\"bar\"><a href=\"../pkg4/package-summary.html\" "
+ "target=\"classFrame\">pkg4</a></h1>"
},
{PACKAGE_BUG_ID + FS + "pkg4" + FS + "package-summary.html",
"<div class=\"header\">" + NL + "<h1 title=\"Package\" "
+ "class=\"title\">Package&nbsp;pkg4</h1>" + NL + "</div>"
{PACKAGE_BUG_ID + "/pkg4/package-summary.html",
"<div class=\"header\">\n" +
"<h1 title=\"Package\" "
+ "class=\"title\">Package&nbsp;pkg4</h1>\n" +
"</div>"
}
};
private static final String[][] PACKAGES_NEGATED_TEST = {
{PACKAGE_BUG_ID + FS + "overview-frame.html",
{PACKAGE_BUG_ID + "/overview-frame.html",
"<span><a href=\"profile-overview-frame.html\" "
+ "target=\"packageListFrame\">All&nbsp;Profiles</a></span>"
},
{PACKAGE_BUG_ID + FS + "pkg2" + FS + "Class1Pkg2.html",
{PACKAGE_BUG_ID + "/pkg2/Class1Pkg2.html",
"<div class=\"subTitle\">compact1, compact2, compact3</div>"
},
{PACKAGE_BUG_ID + FS + "overview-summary.html",
"<ul>" + NL +"<li><a href=\"compact1-summary.html\" target=\"classFrame\">" +
"compact1</a></li>" + NL + "<li><a href=\"compact2-summary.html\" " +
"target=\"classFrame\">compact2</a></li>" + NL + "<li><a href=\"" +
"compact3-summary.html\" target=\"classFrame\">compact3</a></li>" + NL +
{PACKAGE_BUG_ID + "/overview-summary.html",
"<ul>\n" +
"<li><a href=\"compact1-summary.html\" target=\"classFrame\">" +
"compact1</a></li>\n" +
"<li><a href=\"compact2-summary.html\" " +
"target=\"classFrame\">compact2</a></li>\n" +
"<li><a href=\"" +
"compact3-summary.html\" target=\"classFrame\">compact3</a></li>\n" +
"</ul>"
}
};
private static final String[] PACKAGES_NEGATED_FILE_TEST = {
PACKAGE_BUG_ID + FS + "profile-overview-frame.html",
PACKAGE_BUG_ID + FS + "compact2-frame.html",
PACKAGE_BUG_ID + FS + "pkg2" + FS + "compact2-package-frame.html",
PACKAGE_BUG_ID + FS + "compact2-summary.html",
PACKAGE_BUG_ID + FS + "pkg5" + FS + "compact3-package-summary.html"
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"
};
/**

58
langtools/test/com/sun/javadoc/testProfiles/TestProfilesConfiguration.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -38,61 +38,71 @@ public class TestProfilesConfiguration extends JavadocTester {
private static final String NODEPR_NOPKGS_BUG_ID = BUG_ID + "-4";
//Javadoc arguments.
private static final String[] ARGS3 = new String[]{
"-d", PROFILE_CONFIGURATION_BUG_ID, "-sourcepath", SRC_DIR, "-nocomment",
"-keywords", "-Xprofilespath", SRC_DIR + FS + "profile-rtjar-includes.txt",
"-doctitle", "Simple doctitle", "-use", "pkg3", "pkg1", "pkg2", "pkg4",
"-d", PROFILE_CONFIGURATION_BUG_ID, "-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", "-nodeprecated",
"-keywords", "-Xprofilespath", SRC_DIR + FS + "profile-rtjar-includes-nopkgs.txt",
"-doctitle", "Simple doctitle", "-use", "-packagesheader", "Simple packages header",
"-d", NODEPR_NOPKGS_BUG_ID, "-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 + FS + "overview-summary.html",
"<ul>" + NL + "<li><a href=\"compact2-summary.html\" target=\"classFrame\">" +
"compact2</a></li>" + NL + "<li><a href=\"compact3-summary.html\" target=\"" +
"classFrame\">compact3</a></li>" + NL + "</ul>"
{NODEPR_NOPKGS_BUG_ID + "/overview-summary.html",
"<ul>\n" +
"<li><a href=\"compact2-summary.html\" target=\"classFrame\">" +
"compact2</a></li>\n" +
"<li><a href=\"compact3-summary.html\" target=\"" +
"classFrame\">compact3</a></li>\n" +
"</ul>"
},
{NODEPR_NOPKGS_BUG_ID + FS + "profile-overview-frame.html",
"<ul title=\"Profiles\">" + NL + "<li><a href=\"compact2-frame.html\" target=\"packageListFrame\">" +
"compact2</a></li>" + NL + "<li><a href=\"compact3-frame.html\" target=\"" +
"packageListFrame\">compact3</a></li>" + NL + "</ul>"
{NODEPR_NOPKGS_BUG_ID + "/profile-overview-frame.html",
"<ul title=\"Profiles\">\n" +
"<li><a href=\"compact2-frame.html\" target=\"packageListFrame\">" +
"compact2</a></li>\n" +
"<li><a href=\"compact3-frame.html\" target=\"" +
"packageListFrame\">compact3</a></li>\n" +
"</ul>"
}
};
private static final String[][] NODEPR_NOPKGS_NEGATED_TEST = {
{NODEPR_NOPKGS_BUG_ID + FS + "overview-summary.html",
{NODEPR_NOPKGS_BUG_ID + "/overview-summary.html",
"compact1"
}
};
private static final String[][] PROFILES_CONFIGURATION_TEST = {
//-use option test string fo profile view page
{PROFILE_CONFIGURATION_BUG_ID + FS + "compact1-summary.html","<li>Use</li>"
{PROFILE_CONFIGURATION_BUG_ID + "/compact1-summary.html","<li>Use</li>"
},
//-doctitle option test string
{PROFILE_CONFIGURATION_BUG_ID + FS + "overview-summary.html",
"<div class=\"header\">" + NL + "<h1 class=\"title\">Simple doctitle</h1>"
{PROFILE_CONFIGURATION_BUG_ID + "/overview-summary.html",
"<div class=\"header\">\n" +
"<h1 class=\"title\">Simple doctitle</h1>"
},
//-packagesheader option test string fo profiles
{PROFILE_CONFIGURATION_BUG_ID + FS + "profile-overview-frame.html",
{PROFILE_CONFIGURATION_BUG_ID + "/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 + FS + "compact1-summary.html",
{PROFILE_CONFIGURATION_BUG_ID + "/compact1-summary.html",
"<meta name=\"keywords\" content=\"compact1 profile\">"
},
//Deprecated information on a package
{PROFILE_CONFIGURATION_BUG_ID + FS + "compact1-summary.html",
{PROFILE_CONFIGURATION_BUG_ID + "/compact1-summary.html",
"<h3><a href=\"pkgDeprecated/compact1-package-summary.html\" target=\"" +
"classFrame\">pkgDeprecated</a></h3>" + NL + "<div class=\"deprecatedContent\">" +
"classFrame\">pkgDeprecated</a></h3>\n" +
"<div class=\"deprecatedContent\">" +
"<span class=\"deprecatedLabel\">Deprecated.</span></div>"
}
};
private static final String[][] PROFILES_CONFIGURATION_NEGATED_TEST = {
//-nocomments option test string
{PROFILE_CONFIGURATION_BUG_ID + FS + "compact1-summary.html",
{PROFILE_CONFIGURATION_BUG_ID + "/compact1-summary.html",
"<div class=\"block\"><i>Class1Pkg2.</i></div>"
}
};

6
langtools/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -48,11 +48,11 @@ 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 + FS + "allclasses-frame.html";
tests[i][0] = BUG_ID + "/allclasses-frame.html";
tests[i][1] = "C" + (i+1) + ".html";
}
String[][] negatedTests = new String[][] {
{BUG_ID + FS + "allclasses-frame.html", "DummyClass.html"}
{BUG_ID + "/allclasses-frame.html", "DummyClass.html"}
};
TestRecurseSubPackages tester = new TestRecurseSubPackages();
run(tester, ARGS, tests, negatedTests);

42
langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -47,54 +47,54 @@ public class TestRelativeLinks extends JavadocTester {
private static final String[][] TEST = {
//These relative paths should stay relative because they appear
//in the right places.
{BUG_ID + FS + "pkg" + FS + "C.html",
{BUG_ID + "/pkg/C.html",
"<a href=\"relative-class-link.html\">relative class link</a>"},
{BUG_ID + FS + "pkg" + FS + "C.html",
{BUG_ID + "/pkg/C.html",
"<a href=\"relative-field-link.html\">relative field link</a>"},
{BUG_ID + FS + "pkg" + FS + "C.html",
{BUG_ID + "/pkg/C.html",
"<a href=\"relative-method-link.html\">relative method link</a>"},
{BUG_ID + FS + "pkg" + FS + "package-summary.html",
{BUG_ID + "/pkg/package-summary.html",
"<a href=\"relative-package-link.html\">relative package link</a>"},
{BUG_ID + FS + "pkg" + FS + "C.html",
" <a" + NL +
{BUG_ID + "/pkg/C.html",
" <a\n" +
" href=\"relative-multi-line-link.html\">relative-multi-line-link</a>."},
//These relative paths should be redirected because they are in different
//places.
//INDEX PAGE
{BUG_ID + FS + "index-all.html",
{BUG_ID + "/index-all.html",
"<a href=\"./pkg/relative-class-link.html\">relative class link</a>"},
{BUG_ID + FS + "index-all.html",
{BUG_ID + "/index-all.html",
"<a href=\"./pkg/relative-field-link.html\">relative field link</a>"},
{BUG_ID + FS + "index-all.html",
{BUG_ID + "/index-all.html",
"<a href=\"./pkg/relative-method-link.html\">relative method link</a>"},
{BUG_ID + FS + "index-all.html",
{BUG_ID + "/index-all.html",
"<a href=\"./pkg/relative-package-link.html\">relative package link</a>"},
{BUG_ID + FS + "index-all.html",
" <a" + NL +
{BUG_ID + "/index-all.html",
" <a\n" +
" href=\"./pkg/relative-multi-line-link.html\">relative-multi-line-link</a>."},
//PACKAGE USE
{BUG_ID + FS + "pkg" + FS + "package-use.html",
{BUG_ID + "/pkg/package-use.html",
"<a href=\"../pkg/relative-package-link.html\">relative package link</a>."},
{BUG_ID + FS + "pkg" + FS + "package-use.html",
{BUG_ID + "/pkg/package-use.html",
"<a href=\"../pkg/relative-class-link.html\">relative class link</a>"},
//CLASS_USE
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html",
{BUG_ID + "/pkg/class-use/C.html",
"<a href=\"../../pkg/relative-field-link.html\">relative field link</a>"},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html",
{BUG_ID + "/pkg/class-use/C.html",
"<a href=\"../../pkg/relative-method-link.html\">relative method link</a>"},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html",
{BUG_ID + "/pkg/class-use/C.html",
"<a href=\"../../pkg/relative-package-link.html\">relative package link</a>"},
{BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html",
" <a" + NL +
{BUG_ID + "/pkg/class-use/C.html",
" <a\n" +
" href=\"../../pkg/relative-multi-line-link.html\">relative-multi-line-link</a>."},
//PACKAGE OVERVIEW
{BUG_ID + FS + "overview-summary.html",
{BUG_ID + "/overview-summary.html",
"<a href=\"./pkg/relative-package-link.html\">relative package link</a>"},

38
langtools/test/com/sun/javadoc/testRepeatedAnnotations/TestRepeatedAnnotations.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -43,17 +43,17 @@ public class TestRepeatedAnnotations extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{BUG_ID + FS + "pkg" + FS + "C.html",
{BUG_ID + "/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 + FS + "pkg" + FS + "C.html",
{BUG_ID + "/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 + FS + "pkg" + FS + "C.html",
{BUG_ID + "/pkg/C.html",
"<a href=\"../pkg/RegContainerDoc.html\" " +
"title=\"annotation in pkg\">@RegContainerDoc</a>" +
"(<a href=\"../pkg/RegContainerDoc.html#value--\">value</a>={" +
@ -61,41 +61,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 + FS + "pkg" + FS + "C.html",
{BUG_ID + "/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 + FS + "pkg" + FS + "C.html",
{BUG_ID + "/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 + FS + "pkg" + FS + "C.html",
{BUG_ID + "/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 + FS + "pkg" + FS + "D.html",
{BUG_ID + "/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 + FS + "pkg" + FS + "D.html",
{BUG_ID + "/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 + FS + "pkg" + FS + "D.html",
{BUG_ID + "/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 + FS + "pkg" + FS + "D.html",
{BUG_ID + "/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 + FS + "pkg1" + FS + "C.html",
{BUG_ID + "/pkg1/C.html",
"<a href=\"../pkg1/RegContainerValDoc.html\" " +
"title=\"annotation in pkg1\">@RegContainerValDoc</a>" +
"(<a href=\"../pkg1/RegContainerValDoc.html#value--\">value</a>={" +
@ -104,7 +104,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 + FS + "pkg1" + FS + "C.html",
{BUG_ID + "/pkg1/C.html",
"<a href=\"../pkg1/ContainerValDoc.html\" " +
"title=\"annotation in pkg1\">@ContainerValDoc</a>" +
"(<a href=\"../pkg1/ContainerValDoc.html#value--\">value</a>={" +
@ -116,12 +116,12 @@ public class TestRepeatedAnnotations extends JavadocTester {
};
private static final String[][] NEGATED_TEST = {
{BUG_ID + FS + "pkg" + FS + "C.html",
{BUG_ID + "/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 + FS + "pkg" + FS + "C.html",
{BUG_ID + "/pkg/C.html",
"<a href=\"../pkg/RegContainerNotDoc.html\" " +
"title=\"annotation in pkg\">@RegContainerNotDoc</a>" +
"(<a href=\"../pkg/RegContainerNotDoc.html#value--\">value</a>={" +
@ -130,12 +130,12 @@ public class TestRepeatedAnnotations extends JavadocTester {
"<a href=\"../pkg/RegContaineeNotDoc.html\" " +
"title=\"annotation in pkg\">@RegContaineeNotDoc</a>})"},
{BUG_ID + FS + "pkg1" + FS + "C.html",
{BUG_ID + "/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 + FS + "pkg1" + FS + "C.html",
{BUG_ID + "/pkg1/C.html",
"<a href=\"../pkg1/RegContainerValNotDoc.html\" " +
"title=\"annotation in pkg1\">@RegContainerValNotDoc</a>" +
"(<a href=\"../pkg1/RegContainerValNotDoc.html#value--\">value</a>={" +
@ -144,7 +144,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 + FS + "pkg1" + FS + "C.html",
{BUG_ID + "/pkg1/C.html",
"<a href=\"../pkg1/ContainerValNotDoc.html\" " +
"title=\"annotation in pkg1\">@ContainerValNotDoc</a>" +
"(<a href=\"../pkg1/ContainerValNotDoc.html#value--\">value</a>={" +
@ -153,7 +153,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 + FS + "pkg1" + FS + "C.html",
{BUG_ID + "/pkg1/C.html",
"<a href=\"../pkg1/ContainerSynthNotDoc.html\" " +
"title=\"annotation in pkg1\">@ContainerSynthNotDoc</a>(" +
"<a href=\"../pkg1/ContainerSynthNotDoc.html#value--\">value</a>=" +

5
langtools/test/com/sun/javadoc/testReturnTag/TestReturnTag.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,7 +39,8 @@ public class TestReturnTag extends JavadocTester {
//Javadoc arguments.
private static final String[] ARGS = new String[] {
"-Xdoclint:none", "-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + FS + "TestReturnTag.java"
"-Xdoclint:none", "-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR +
"/TestReturnTag.java"
};
//Input for string search tests.

6
langtools/test/com/sun/javadoc/testSeeTag/TestSeeTag.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,12 +44,12 @@ public class TestSeeTag extends JavadocTester {
//Input for string search tests.
private static final String[][] TEST = {
{ OUTPUT_DIR + FS + "pkg" + FS + "Test.html",
{ OUTPUT_DIR + "/pkg/Test.html",
"<code>List</code>"
}
};
private static final String[][] NEGATED_TEST = {
{ OUTPUT_DIR + FS + "pkg" + FS + "Test.html",
{ OUTPUT_DIR + "/pkg/Test.html",
"&lt;code&gt;List&lt;/code&gt;"
}
};

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