8025416: doclet not substituting {@docRoot} in some cases

Reviewed-by: jjg
This commit is contained in:
Bhavesh Patel 2013-12-03 14:21:45 -08:00
parent a64e195ca9
commit 81ef12b24a
7 changed files with 123 additions and 82 deletions

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2013, 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
@ -23,7 +23,7 @@
/*
* @test
* @bug 6553182
* @bug 6553182 8025416
* @summary This test verifies the -Xdocrootparent option.
* @author Bhavesh Patel
* @library ../lib/
@ -35,43 +35,87 @@ public class TestDocRootLink extends JavadocTester {
private static final String BUG_ID = "6553182";
private static final String[][] TEST1 = {
{BUG_ID + FS + "pkg1" + FS + "C1.html",
"<a href=\"../../technotes/guides/index.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 +
" with an absolute link."
},
{BUG_ID + FS + "pkg1" + FS + "C1.html",
"Testing <a href=\"../technotes/guides/index.html\">Link 1</a> and" + NL +
" <a href=\"../pkg2/C2.html\">Link 2</a>."
},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
"<a href=\"../../technotes/guides/index.html\">"
"<a href=\"../../technotes/guides/index.html\">" + NL +
" Test document 1</a>"
},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
"<a href=\"../pkg2/C2.html\">" + NL +
" Another Test document 1</a>"
},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
"<a href=\"../technotes/guides/index.html\">" + NL +
" Another Test document 2.</a>"
}
};
private static final String[][] NEGATED_TEST1 = {
{BUG_ID + FS + "pkg1" + FS + "C1.html",
"<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
},
{BUG_ID + FS + "pkg1" + FS + "C1.html",
"<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">"
},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
"<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
},
{BUG_ID + FS + "pkg1" + FS + "package-summary.html",
"<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">"
}
};
private static final String[][] TEST2 = {
{BUG_ID + FS + "pkg2" + FS + "C2.html",
"<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
{BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html",
"Refer <a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">Here</a>"
},
{BUG_ID + FS + "pkg2" + FS + "package-summary.html",
"<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">"
{BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html",
"This <a href=\"../pkg1/C1.html\">Here</a> should not be replaced" + NL +
" with an absolute link."
},
{BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html",
"Testing <a href=\"../technotes/guides/index.html\">Link 1</a> and" + NL +
" <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 +
" 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" + FS + "pkg2" + FS + "package-summary.html",
"<a href=\"../technotes/guides/index.html\">" + NL + " Another Test document 2.</a>"
}
};
private static final String[][] NEGATED_TEST2 = {
{BUG_ID + FS + "pkg2" + FS + "C2.html",
{BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html",
"<a href=\"../../technotes/guides/index.html\">"
},
{BUG_ID + FS + "pkg2" + FS + "package-summary.html",
{BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html",
"<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">"
},
{BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html",
"<a href=\"../../technotes/guides/index.html\">"
},
{BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html",
"<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">"
}
};
private static final String[] ARGS1 =
new String[]{
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1"
"-d", BUG_ID, "-sourcepath", SRC_DIR, "pkg1", "pkg2"
};
private static final String[] ARGS2 =
new String[]{
"-d", BUG_ID, "-Xdocrootparent", "http://download.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg2"
"-d", BUG_ID + "-1", "-Xdocrootparent", "http://download.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg1", "pkg2"
};
/**