--- a/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java Wed Nov 23 16:16:36 2016 +0000
+++ b/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java Thu Dec 01 09:02:42 2016 +0000
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995 8162363
+ * @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995 8162363 8168766
* @summary Test modules support in javadoc.
* @author bpatel
* @library ../lib
@@ -181,6 +181,34 @@
checkModuleFilesAndLinks(true);
}
+ /**
+ * Test generated module pages for a deprecated module.
+ */
+ @Test
+ void testModuleDeprecation() {
+ javadoc("-d", "out-moduledepr",
+ "-tag", "regular:a:Regular Tag:",
+ "-tag", "moduletag:s:Module Tag:",
+ "--module-source-path", testSrc,
+ "--module", "module1,module2,moduletags",
+ "testpkgmdl1", "testpkgmdl2", "testpkgmdltags");
+ checkExit(Exit.OK);
+ checkModuleDeprecation(true);
+ }
+
+ /**
+ * Test annotations on modules.
+ */
+ @Test
+ void testModuleAnnotation() {
+ javadoc("-d", "out-moduleanno",
+ "--module-source-path", testSrc,
+ "--module", "module1,module2",
+ "testpkgmdl1", "testpkgmdl2");
+ checkExit(Exit.OK);
+ checkModuleAnnotation();
+ }
+
void checkDescription(boolean found) {
checkOutput("module1-summary.html", found,
"<!-- ============ MODULE DESCRIPTION =========== -->\n"
@@ -218,6 +246,9 @@
void checkHtml5Description(boolean found) {
checkOutput("module1-summary.html", found,
"<section role=\"region\">\n"
+ + "<div class=\"deprecatedContent\"><span class=\"deprecatedLabel\">Deprecated.</span>\n"
+ + "<div class=\"block\"><span class=\"deprecationComment\">This module is deprecated.</span></div>\n"
+ + "</div>\n"
+ "<!-- ============ MODULE DESCRIPTION =========== -->\n"
+ "<a id=\"module.description\">\n"
+ "<!-- -->\n"
@@ -556,4 +587,37 @@
+ "<dd> </dd>\n"
+ "</dl>");
}
+
+ void checkModuleDeprecation(boolean found) {
+ checkOutput("module1-summary.html", found,
+ "<div class=\"deprecatedContent\"><span class=\"deprecatedLabel\">Deprecated.</span>\n"
+ + "<div class=\"block\"><span class=\"deprecationComment\">This module is deprecated.</span></div>\n"
+ + "</div>");
+ checkOutput("deprecated-list.html", found,
+ "<ul>\n"
+ + "<li><a href=\"#module\">Deprecated Modules</a></li>\n"
+ + "</ul>",
+ "<tr class=\"altColor\">\n"
+ + "<th class=\"colFirst\" scope=\"row\"><a href=\"module1-summary.html\">module1</a></th>\n"
+ + "<td class=\"colLast\">\n"
+ + "<div class=\"block\"><span class=\"deprecationComment\">This module is deprecated.</span></div>\n"
+ + "</td>\n"
+ + "</tr>");
+ checkOutput("module2-summary.html", !found,
+ "<div class=\"deprecatedContent\"><span class=\"deprecatedLabel\">Deprecated.</span>\n"
+ + "<div class=\"block\"><span class=\"deprecationComment\">This module is deprecated using just the javadoc tag.</span></div>");
+ checkOutput("moduletags-summary.html", found,
+ "<p>@Deprecated\n"
+ + "</p>",
+ "<div class=\"deprecatedContent\"><span class=\"deprecatedLabel\">Deprecated.</span></div>");
+ }
+
+ void checkModuleAnnotation() {
+ checkOutput("module2-summary.html", true,
+ "<p><a href=\"testpkgmdl2/AnnotationType.html\" title=\"annotation in testpkgmdl2\">@AnnotationType</a>(<a href=\"testpkgmdl2/AnnotationType.html#optional--\">optional</a>=\"Module Annotation\",\n"
+ + " <a href=\"testpkgmdl2/AnnotationType.html#required--\">required</a>=2016)\n"
+ + "</p>");
+ checkOutput("module2-summary.html", false,
+ "@AnnotationTypeUndocumented");
}
+}