1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
|
/*
* Copyright (c) 2025, 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 8352389
* @summary Remove incidental whitespace in pre/code content
* @library /tools/lib ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
* @build javadoc.tester.* toolbox.ToolBox builder.ClassBuilder
* @run main TestPreCode
*/
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import builder.AbstractBuilder;
import builder.ClassBuilder;
import toolbox.ToolBox;
import javadoc.tester.JavadocTester;
public class TestPreCode extends JavadocTester {
final ToolBox tb;
public static void main(String... args) throws Exception {
var tester = new TestPreCode();
tester.runTests();
}
TestPreCode() {
tb = new ToolBox();
}
@Test
public void testWhitespace(Path base) throws Exception {
Path srcDir = base.resolve("src");
Path outDir = base.resolve("out");
new ClassBuilder(tb, "pkg.A")
.setComments("""
Class A.
<pre> \t<code>
first line
second line
</code></pre>""")
.setModifiers("public", "class")
.addMembers(ClassBuilder.MethodBuilder.parse("public void m0() {}")
.setComments("""
Method m0.
<pre> {@code
first line
second line
}</pre>"""),
ClassBuilder.MethodBuilder.parse("public void m1() {}")
.setComments("""
Method m1.
<pre> <code> first line
second line
</code></pre>"""),
ClassBuilder.MethodBuilder.parse("public void m2() {}")
.setComments("""
Method m2.
<pre> {@code\s
first line
second line
}</pre>"""),
ClassBuilder.MethodBuilder.parse("public void m3() {}")
.setComments("""
Method m3.
<pre> .<code>
second line
</code></pre>"""))
.write(srcDir);
javadoc("-d", outDir.toString(),
"-sourcepath", srcDir.toString(),
"pkg");
checkExit(Exit.OK);
checkOrder("pkg/A.html",
"""
Class A.
<pre><code> first line
second line
</code></pre>""",
"""
Method m0.
<pre><code> first line
second line
</code></pre>""",
"""
Method m1.
<pre> <code> first line
second line
</code></pre>""",
"""
Method m2.
<pre><code> first line
second line
</code></pre>""",
"""
Method m3.
<pre> .<code>
second line
</code></pre>""");
}
@Test
public void testUnclosed(Path base) throws Exception {
Path srcDir = base.resolve("src");
Path outDir = base.resolve("out");
new ClassBuilder(tb, "pkg.A")
.setComments("""
Class A.
<pre><code>
first line
second line
</code>""")
.setModifiers("public", "class")
.write(srcDir);
javadoc("-d", outDir.toString(),
"-sourcepath", srcDir.toString(),
"pkg");
checkExit(Exit.ERROR);
// No whitespace normalization for unclosed <pre> element
checkOrder("pkg/A.html",
"""
Class A.
<pre><code>
first line
second line
</code></div>""");
}
}
|
