Skip to content

Commit b30d99a

Browse files
pombredannepombredanne
committed
Fix tests for demarkup updates
Signed-off-by: Philippe Ombredanne <[email protected]>
1 parent 9ec10fd commit b30d99a

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

‎tests/textcode/data/markup_expected/Label.html.stripmarkup.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"<!-- ========= START OF TOP NAVBAR ======= --",
4040
"NAME=\"navbar_top\" <!-- --",
4141
"title=\"Skip navigation links\"",
42-
"BORDER=\"0\" CELLPADDING=\"1\" CELLSPACING=\"0\" SUMMARY=\"\"",
42+
"BORDER=\"0\" WIDTH=\"100%\" CELLPADDING=\"1\" CELLSPACING=\"0\" SUMMARY=\"\"",
4343
"",
4444
"COLSPAN=2 BGCOLOR=\"#EEEEFF\"",
4545
"NAME=\"navbar_top_firstrow\" <!-- --",
@@ -143,13 +143,13 @@
143143
"<!-- ======== NESTED CLASS SUMMARY ======== --",
144144
"",
145145
"NAME=\"nested_class_summary\" <!-- --",
146-
"BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
146+
"BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
147147
"BGCOLOR=\"#CCCCFF\"",
148148
"ALIGN=\"left\" COLSPAN=\"2\" SIZE=\"+2\"",
149149
"Nested Class Summary",
150150
"",
151151
"BGCOLOR=\"white\"",
152-
"ALIGN=\"right\" VALIGN=\"top\" SIZE=\"-1\"",
152+
"ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\" SIZE=\"-1\"",
153153
"protected &nbsp;class",
154154
"title=\"class in java.awt\" Label.AccessibleAWTLabel",
155155
"",
@@ -159,7 +159,7 @@
159159
"",
160160
"",
161161
"&nbsp; NAME=\"nested_classes_inherited_from_class_java.awt.Component\" <!-- --",
162-
"BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
162+
"BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
163163
"BGCOLOR=\"#EEEEFF\"",
164164
"ALIGN=\"left\" Nested classes/interfaces inherited from class java.awt. title=\"class in java.awt\" Component",
165165
"",
@@ -171,29 +171,29 @@
171171
"<!-- =========== FIELD SUMMARY =========== --",
172172
"",
173173
"NAME=\"field_summary\" <!-- --",
174-
"BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
174+
"BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
175175
"BGCOLOR=\"#CCCCFF\"",
176176
"ALIGN=\"left\" COLSPAN=\"2\" SIZE=\"+2\"",
177177
"Field Summary",
178178
"",
179179
"BGCOLOR=\"white\"",
180-
"ALIGN=\"right\" VALIGN=\"top\" SIZE=\"-1\"",
180+
"ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\" SIZE=\"-1\"",
181181
"static&nbsp;int",
182182
"CENTER",
183183
"",
184184
"",
185185
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Indicates that the label should be centered.",
186186
"",
187187
"BGCOLOR=\"white\"",
188-
"ALIGN=\"right\" VALIGN=\"top\" SIZE=\"-1\"",
188+
"ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\" SIZE=\"-1\"",
189189
"static&nbsp;int",
190190
"LEFT",
191191
"",
192192
"",
193193
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Indicates that the label should be left justified.",
194194
"",
195195
"BGCOLOR=\"white\"",
196-
"ALIGN=\"right\" VALIGN=\"top\" SIZE=\"-1\"",
196+
"ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\" SIZE=\"-1\"",
197197
"static&nbsp;int",
198198
"RIGHT",
199199
"",
@@ -202,7 +202,7 @@
202202
"",
203203
"",
204204
"&nbsp; NAME=\"fields_inherited_from_class_java.awt.Component\" <!-- --",
205-
"BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
205+
"BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
206206
"BGCOLOR=\"#EEEEFF\"",
207207
"ALIGN=\"left\" Fields inherited from class java.awt. title=\"class in java.awt\" Component",
208208
"",
@@ -211,7 +211,7 @@
211211
"",
212212
"",
213213
"&nbsp; NAME=\"fields_inherited_from_class_java.awt.image.ImageObserver\" <!-- --",
214-
"BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
214+
"BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
215215
"BGCOLOR=\"#EEEEFF\"",
216216
"ALIGN=\"left\" Fields inherited from interface java.awt.image. title=\"interface in java.awt.image\" ImageObserver",
217217
"",
@@ -223,7 +223,7 @@
223223
"<!-- ======== CONSTRUCTOR SUMMARY ======== --",
224224
"",
225225
"NAME=\"constructor_summary\" <!-- --",
226-
"BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
226+
"BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
227227
"BGCOLOR=\"#CCCCFF\"",
228228
"ALIGN=\"left\" COLSPAN=\"2\" SIZE=\"+2\"",
229229
"Constructor Summary",
@@ -254,61 +254,61 @@
254254
"<!-- ========== METHOD SUMMARY =========== --",
255255
"",
256256
"NAME=\"method_summary\" <!-- --",
257-
"BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
257+
"BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
258258
"BGCOLOR=\"#CCCCFF\"",
259259
"ALIGN=\"left\" COLSPAN=\"2\" SIZE=\"+2\"",
260260
"Method Summary",
261261
"",
262262
"BGCOLOR=\"white\"",
263-
"ALIGN=\"right\" VALIGN=\"top\" SIZE=\"-1\"",
263+
"ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\" SIZE=\"-1\"",
264264
"&nbsp;void",
265265
"addNotify ()",
266266
"",
267267
"",
268268
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates the peer for this label.",
269269
"",
270270
"BGCOLOR=\"white\"",
271-
"ALIGN=\"right\" VALIGN=\"top\" SIZE=\"-1\"",
271+
"ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\" SIZE=\"-1\"",
272272
"&nbsp; title=\"class in javax.accessibility\" AccessibleContext",
273273
"getAccessibleContext ()",
274274
"",
275275
"",
276276
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the AccessibleContext associated with this Label.",
277277
"",
278278
"BGCOLOR=\"white\"",
279-
"ALIGN=\"right\" VALIGN=\"top\" SIZE=\"-1\"",
279+
"ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\" SIZE=\"-1\"",
280280
"&nbsp;int",
281281
"getAlignment ()",
282282
"",
283283
"",
284284
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the current alignment of this label.",
285285
"",
286286
"BGCOLOR=\"white\"",
287-
"ALIGN=\"right\" VALIGN=\"top\" SIZE=\"-1\"",
287+
"ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\" SIZE=\"-1\"",
288288
"&nbsp; title=\"class in java.lang\" String",
289289
"getText ()",
290290
"",
291291
"",
292292
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Gets the text of this label.",
293293
"",
294294
"BGCOLOR=\"white\"",
295-
"ALIGN=\"right\" VALIGN=\"top\" SIZE=\"-1\"",
295+
"ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\" SIZE=\"-1\"",
296296
"protected &nbsp; title=\"class in java.lang\" String",
297297
"paramString ()",
298298
"",
299299
"",
300300
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Returns a string representing the state of this Label .",
301301
"",
302302
"BGCOLOR=\"white\"",
303-
"ALIGN=\"right\" VALIGN=\"top\" SIZE=\"-1\"",
303+
"ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\" SIZE=\"-1\"",
304304
"&nbsp;void",
305305
"setAlignment (int&nbsp;alignment)",
306306
"",
307307
"",
308308
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Sets the alignment for this label to the specified alignment.",
309309
"",
310310
"BGCOLOR=\"white\"",
311-
"ALIGN=\"right\" VALIGN=\"top\" SIZE=\"-1\"",
311+
"ALIGN=\"right\" VALIGN=\"top\" WIDTH=\"1%\" SIZE=\"-1\"",
312312
"&nbsp;void",
313313
"setText ( title=\"class in java.lang\" String &nbsp;text)",
314314
"",
@@ -317,7 +317,7 @@
317317
"",
318318
"",
319319
"&nbsp; NAME=\"methods_inherited_from_class_java.awt.Component\" <!-- --",
320-
"BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
320+
"BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
321321
"BGCOLOR=\"#EEEEFF\"",
322322
"ALIGN=\"left\" Methods inherited from class java.awt. title=\"class in java.awt\" Component",
323323
"",
@@ -326,7 +326,7 @@
326326
"",
327327
"",
328328
"&nbsp; NAME=\"methods_inherited_from_class_java.lang.Object\" <!-- --",
329-
"BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
329+
"BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
330330
"BGCOLOR=\"#EEEEFF\"",
331331
"ALIGN=\"left\" Methods inherited from class java.lang. title=\"class in java.lang\" Object",
332332
"",
@@ -340,7 +340,7 @@
340340
"<!-- ============ FIELD DETAIL =========== --",
341341
"",
342342
"NAME=\"field_detail\" <!-- --",
343-
"BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
343+
"BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
344344
"BGCOLOR=\"#CCCCFF\"",
345345
"ALIGN=\"left\" COLSPAN=\"1\" SIZE=\"+2\"",
346346
"Field Detail",
@@ -387,7 +387,7 @@
387387
"<!-- ========= CONSTRUCTOR DETAIL ======== --",
388388
"",
389389
"NAME=\"constructor_detail\" <!-- --",
390-
"BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
390+
"BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
391391
"BGCOLOR=\"#CCCCFF\"",
392392
"ALIGN=\"left\" COLSPAN=\"1\" SIZE=\"+2\"",
393393
"Constructor Detail",
@@ -456,7 +456,7 @@
456456
"<!-- ============ METHOD DETAIL ========== --",
457457
"",
458458
"NAME=\"method_detail\" <!-- --",
459-
"BORDER=\"1\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
459+
"BORDER=\"1\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" SUMMARY=\"\"",
460460
"BGCOLOR=\"#CCCCFF\"",
461461
"ALIGN=\"left\" COLSPAN=\"1\" SIZE=\"+2\"",
462462
"Method Detail",
@@ -605,7 +605,7 @@
605605
"<!-- ======= START OF BOTTOM NAVBAR ====== --",
606606
"NAME=\"navbar_bottom\" <!-- --",
607607
"title=\"Skip navigation links\"",
608-
"BORDER=\"0\" CELLPADDING=\"1\" CELLSPACING=\"0\" SUMMARY=\"\"",
608+
"BORDER=\"0\" WIDTH=\"100%\" CELLPADDING=\"1\" CELLSPACING=\"0\" SUMMARY=\"\"",
609609
"",
610610
"COLSPAN=2 BGCOLOR=\"#EEEEFF\"",
611611
"NAME=\"navbar_bottom_firstrow\" <!-- --",

‎tests/textcode/data/markup_expected/a.htm.stripmarkup.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"<!-- saved from url=(0014)about:internet --",
33
"",
44
"",
5-
"CLASSID=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" HEIGHT=\"3\" CODEBASE=\"http://active.macromedia.com/flash5/cabs/swflash.cab#version=7,0,0,0\"",
5+
"CLASSID=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" WIDTH=\"1\" HEIGHT=\"3\" CODEBASE=\"http://active.macromedia.com/flash5/cabs/swflash.cab#version=7,0,0,0\"",
66
"NAME=movie VALUE=\"a.swf\"",
77
"NAME=play VALUE=true",
88
"NAME=loop VALUE=false",
99
"NAME=wmode VALUE=transparent",
1010
"NAME=quality VALUE=low",
11-
"SRC=\"a.swf\" HEIGHT=3 quality=low loop=false wmode=transparent TYPE=\"application/x-shockwave-flash\" PLUGINSPAGE=\"http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash\"",
11+
"SRC=\"a.swf\" WIDTH=1 HEIGHT=3 quality=low loop=false wmode=transparent TYPE=\"application/x-shockwave-flash\" PLUGINSPAGE=\"http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash\"",
1212
"",
1313
"",
1414
"src='a.js'",

0 commit comments

Comments
 (0)