8249903: jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java needs to be updated after 8146022 got closed

Reviewed-by: jjg
This commit is contained in:
Hannes Wallnöfer 2021-04-30 07:47:39 +00:00
parent 51b218842f
commit 4d77171540

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2021, 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,38 +38,38 @@
* @run main TestSerializedForm
*/
import java.io.*;
import javadoc.tester.JavadocTester;
public class TestSerializedForm extends JavadocTester {
public static void main(String... args) throws Exception {
TestSerializedForm tester = new TestSerializedForm();
tester.runTests();
// tester.run(ARGS, TEST, NEGATED_TEST);
// tester.run(ARGS_PRIVATE, TEST_PRIVATE, NEGATED_TEST_PRIVATE);
// tester.printSummary();
}
// @ignore 8146022
// @Test
@Test
public void testDefault() {
javadoc("-d", "out-default", "-serialwarn", "-Xdoclint:none",
"-sourcepath", testSrc,
"--no-platform-links", "-sourcepath", testSrc,
testSrc("SerializedForm.java"), testSrc("ExternalizedForm.java"), "pkg1");
checkExit(Exit.OK);
checkOutput("serialized-form.html", true,
"protected java.lang.Object readResolve()",
"protected java.lang.Object writeReplace()",
"protected java.lang.Object readObjectNoData()",
"""
<h3>Serialization Overview</h3>
<span class="modifiers">protected</span>&nbsp;<span class="return-type">java.lan\
g.Object</span>&nbsp;<span class="element-name">readResolve</span>()""",
"""
<span class="modifiers">protected</span>&nbsp;<span class="return-type">java.lan\
g.Object</span>&nbsp;<span class="element-name">writeReplace</span>()""",
"""
<span class="modifiers">protected</span>&nbsp;<span class="return-type">java.lan\
g.Object</span>&nbsp;<span class="element-name">readObjectNoData</span>()""",
"""
<h4>Serialization Overview</h4>
<ul class="block-list">
<li class="block-list">
<div class="block"><span class="deprecated-label">Deprecated.</span>&nbsp;</div>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
<dl class="notes">
<dt>See Also:</dt>
<dd><code>TestSerializedForm</code></dd>
</dl>""",
"<h3>Class pkg1.NestedInnerClass.InnerClass.ProNestedInnerClass "
@ -97,15 +97,15 @@ public class TestSerializedForm extends JavadocTester {
checkOutput("serialized-form.html", true,
"""
<h3>Serialized Fields</h3>
<h4>Serialized Fields</h4>
<ul class="block-list">
<li class="block-list">
<h4>longs</h4>
<h5>longs</h5>
<pre>Long[] longs</pre>
<div class="block">the longs</div>
</li>
<li class="block-list">
<h4>name</h4>
<h5>name</h5>
<pre>java.lang.String name</pre>
<div class="block">a test</div>""");
}