--- old/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Fri Jan 22 12:27:15 2016 +++ /dev/null Fri Jan 22 12:27:15 2016 @@ -1,166 +0,0 @@ -/* - * Copyright (c) 2009, 2015, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test - * @bug 6802694 8025633 8026567 - * @summary This test verifies deprecation info in serialized-form.html. - * @author Bhavesh Patel - * @library ../lib - * @modules jdk.javadoc - * @build JavadocTester - * @run main TestSerializedFormDeprecationInfo - */ - -public class TestSerializedFormDeprecationInfo extends JavadocTester { - - public static void main(String... args) throws Exception { - TestSerializedFormDeprecationInfo tester = new TestSerializedFormDeprecationInfo(); - tester.runTests(); - } - - @Test - void testDefault() { - javadoc("-d", "out-default", - "-sourcepath", testSrc, - "pkg1"); - checkExit(Exit.FAILED); // TODO: should be OK - - checkCommentDeprecated(true); - checkNoComment(false); - } - - @Test - void testNoComment() { - javadoc("-d", "out-nocmnt", - "-nocomment", - "-sourcepath", testSrc, - "pkg1"); - checkExit(Exit.FAILED); // TODO: should be OK - - checkNoComment(true); - checkCommentDeprecated(false); - } - - @Test - void testNoDeprecated() { - javadoc("-d", "out-nodepr", - "-nodeprecated", - "-sourcepath", testSrc, - "pkg1"); - checkExit(Exit.FAILED); // TODO: should be OK - - checkNoDeprecated(true); - checkNoCommentNoDeprecated(false); - } - - @Test - void testNoCommentNoDeprecated() { - javadoc("-d", "out-nocmnt-nodepr", - "-nocomment", - "-nodeprecated", - "-sourcepath", testSrc, - "pkg1"); - checkExit(Exit.FAILED); // TODO: should be OK - checkNoCommentNoDeprecated(true); - checkNoDeprecated(false); - } - - // Test for normal run of javadoc. The serialized-form.html should - // display the inline comments, tags and deprecation information if any. - void checkCommentDeprecated(boolean expectFound) { - checkOutput("serialized-form.html", expectFound, - "
"
- + "java.io.IOException
C1.setUndecorated(boolean)
setUndecorated(boolean)
.\n"
- + "C1.setUndecorated(boolean)
setUndecorated(boolean)
.\n"
- + "java.io.IOException
boolean undecorated\n" - + "
"
- + "setUndecorated(boolean)
.setUndecorated(boolean)
.\n"
- + "");
- }
-
- // Test with -nodeprecated option. The serialized-form.html should
- // ignore the -nodeprecated tag and display the deprecation info. This
- // test is similar to the normal run of javadoc in which inline comment, tags
- // and deprecation information will be displayed.
- void checkNoDeprecated(boolean expectFound) {
- checkCommentDeprecated(expectFound);
- }
-
- // Test with -nodeprecated and -nocomment options. The serialized-form.html should
- // ignore the -nodeprecated tag and display the deprecation info but should not
- // display the inline comments and tags. This test is similar to the test with
- // -nocomment option.
- void checkNoCommentNoDeprecated(boolean expectFound) {
- checkNoComment(expectFound);
- }
-}
--- /dev/null Fri Jan 22 12:27:15 2016
+++ new/test/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java Fri Jan 22 12:27:14 2016
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2009, 2015, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6802694 8025633 8026567
+ * @summary This test verifies deprecation info in serialized-form.html.
+ * @author Bhavesh Patel
+ * @library ../lib
+ * @modules jdk.javadoc
+ * @build JavadocTester
+ * @run main TestSerializedFormDeprecationInfo
+ */
+
+public class TestSerializedFormDeprecationInfo extends JavadocTester {
+
+ public static void main(String... args) throws Exception {
+ TestSerializedFormDeprecationInfo tester = new TestSerializedFormDeprecationInfo();
+ tester.runTests();
+ }
+
+ @Test
+ void testDefault() {
+ javadoc("-d", "out-default",
+ "-sourcepath", testSrc,
+ "pkg1");
+ checkExit(Exit.FAILED); // TODO: should be OK
+
+ checkCommentDeprecated(true);
+ checkNoComment(false);
+ }
+
+ @Test
+ void testNoComment() {
+ javadoc("-d", "out-nocmnt",
+ "-nocomment",
+ "-sourcepath", testSrc,
+ "pkg1");
+ checkExit(Exit.FAILED); // TODO: should be OK
+
+ checkNoComment(true);
+ checkCommentDeprecated(false);
+ }
+
+ @Test
+ void testNoDeprecated() {
+ javadoc("-d", "out-nodepr",
+ "-nodeprecated",
+ "-sourcepath", testSrc,
+ "pkg1");
+ checkExit(Exit.FAILED); // TODO: should be OK
+
+ checkNoDeprecated(true);
+ checkNoCommentNoDeprecated(false);
+ }
+
+ @Test
+ void testNoCommentNoDeprecated() {
+ javadoc("-d", "out-nocmnt-nodepr",
+ "-nocomment",
+ "-nodeprecated",
+ "-sourcepath", testSrc,
+ "pkg1");
+ checkExit(Exit.FAILED); // TODO: should be OK
+ checkNoCommentNoDeprecated(true);
+ checkNoDeprecated(false);
+ }
+
+ // Test for normal run of javadoc. The serialized-form.html should
+ // display the inline comments, tags and deprecation information if any.
+ void checkCommentDeprecated(boolean expectFound) {
+ checkOutput("serialized-form.html", expectFound,
+ ""
+ + "java.io.IOException
C1.setUndecorated(boolean)
setUndecorated(boolean)
.\n"
+ + "C1.setUndecorated(boolean)
setUndecorated(boolean)
.\n"
+ + "java.io.IOException
boolean undecorated\n" + + "
"
+ + "setUndecorated(boolean)
.setUndecorated(boolean)
.\n"
+ + "");
+ }
+
+ // Test with -nodeprecated option. The serialized-form.html should
+ // ignore the -nodeprecated tag and display the deprecation info. This
+ // test is similar to the normal run of javadoc in which inline comment, tags
+ // and deprecation information will be displayed.
+ void checkNoDeprecated(boolean expectFound) {
+ checkCommentDeprecated(expectFound);
+ }
+
+ // Test with -nodeprecated and -nocomment options. The serialized-form.html should
+ // ignore the -nodeprecated tag and display the deprecation info but should not
+ // display the inline comments and tags. This test is similar to the test with
+ // -nocomment option.
+ void checkNoCommentNoDeprecated(boolean expectFound) {
+ checkNoComment(expectFound);
+ }
+}