Skip to content

Commit 80e23d3

Browse files
rbrirbri
committed
on the way to use html5 doctype for all our tests
1 parent a837400 commit 80e23d3

33 files changed

+493
-371
lines changed

‎src/test/java/org/htmlunit/html/HtmlFrame2Test.java‎

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,14 @@ public class HtmlFrame2Test extends WebDriverTestCase {
4444
@Test
4545
@Alerts("2")
4646
public void crossFrameJavascript() throws Exception {
47-
final String firstHtml = "<html><body>\n"
47+
final String firstHtml = DOCTYPE_HTML
48+
+ "<html><body>\n"
4849
+ "<script>function render() { window.bar.real_render(); }</script>\n"
4950
+ "<iframe src='" + URL_SECOND + "' onload='render();' name='bar'></iframe>\n"
5051
+ "</body></html>";
5152

52-
final String secondHtml = "<html><body>\n"
53+
final String secondHtml = DOCTYPE_HTML
54+
+ "<html><body>\n"
5355
+ "<script>"
5456
+ LOG_WINDOW_NAME_FUNCTION
5557
+ "function real_render() { log(2); }</script>\n"
@@ -73,7 +75,8 @@ public void crossFrameJavascript() throws Exception {
7375
@HtmlUnitNYI(CHROME = "1",
7476
EDGE = "1")
7577
public void iframeOnloadCalledOnlyOnce() throws Exception {
76-
final String firstHtml = "<html><body>\n"
78+
final String firstHtml = DOCTYPE_HTML
79+
+ "<html><body>\n"
7780
+ "<iframe src='" + URL_SECOND + "' onload='window.top.name += \"1\\u00a7\"'></iframe>\n"
7881
+ "</body></html>";
7982

@@ -90,7 +93,8 @@ public void iframeOnloadCalledOnlyOnce() throws Exception {
9093
@Test
9194
@Alerts("1")
9295
public void iframeOnloadAboutBlank() throws Exception {
93-
final String html = "<html><body>\n"
96+
final String html = DOCTYPE_HTML
97+
+ "<html><body>\n"
9498
+ "<iframe src='about:blank' onload='window.top.name += \"1\\u00a7\"'></iframe>\n"
9599
+ "</body></html>";
96100

@@ -114,12 +118,14 @@ public void postponeLoading() throws Exception {
114118
+ " <FRAME name='third' frameborder='0' src='third.html'>\n"
115119
+ "</FRAMESET>";
116120

117-
final String secondHtml = "<html>\n"
121+
final String secondHtml = DOCTYPE_HTML
122+
+ "<html>\n"
118123
+ "<body onload=\"top.document.title += ' second ' + window.parent.frames['third'].document.frm\">\n"
119124
+ " <h1>second</h1>\n"
120125
+ "</body></html>";
121126

122-
final String thirdHtml = "<html>\n"
127+
final String thirdHtml = DOCTYPE_HTML
128+
+ "<html>\n"
123129
+ "<body onload=\"top.document.title += ' third ' + window.parent.frames['third'].document.frm\">\n"
124130
+ " <form name='frm' id='frm'>\n"
125131
+ " <input type='text' id='one' name='one' value='something'>\n"
@@ -145,12 +151,14 @@ public void frameOnload() throws Exception {
145151
+ " <FRAME name='third' src='third.html'>\n"
146152
+ "</FRAMESET>";
147153

148-
final String secondHtml = "<html>\n"
154+
final String secondHtml = DOCTYPE_HTML
155+
+ "<html>\n"
149156
+ "<body onload=\"top.document.title += ' second'\">\n"
150157
+ " <h1>second</h1>\n"
151158
+ "</body></html>";
152159

153-
final String thirdHtml = "<html>\n"
160+
final String thirdHtml = DOCTYPE_HTML
161+
+ "<html>\n"
154162
+ "<body onload=\"top.document.title += ' third'\">\n"
155163
+ " <h1>third</h1>\n"
156164
+ "</body></html>";
@@ -175,7 +183,8 @@ public void frameOnloadFrameInFrame() throws Exception {
175183
+ " <FRAME name='third' src='third.html'>\n"
176184
+ "</FRAMESET>";
177185

178-
final String secondHtml = "<html>\n"
186+
final String secondHtml = DOCTYPE_HTML
187+
+ "<html>\n"
179188
+ "<body onload=\"top.document.title += ' second'\">\n"
180189
+ " <h1>second</h1>\n"
181190
+ "</body></html>";
@@ -184,7 +193,8 @@ public void frameOnloadFrameInFrame() throws Exception {
184193
+ " <FRAME name='fourth' src='fourth.html'>\n"
185194
+ "</FRAMESET>";
186195

187-
final String fourthHtml = "<html>\n"
196+
final String fourthHtml = DOCTYPE_HTML
197+
+ "<html>\n"
188198
+ "<body onload=\"top.document.title += ' fourth'\">\n"
189199
+ " <h1>fourth</h1>\n"
190200
+ "</body></html>";
@@ -207,7 +217,8 @@ public void frameOnloadFrameInFrame() throws Exception {
207217
@Test
208218
@Alerts("myInputName")
209219
public void iframeContentNotLoaded() throws Exception {
210-
final String html = "<html>\n"
220+
final String html = DOCTYPE_HTML
221+
+ "<html>\n"
211222
+ "<head><title>FooBar</title></head>\n"
212223
+ "<body>\n"
213224
+ "<iframe id='myFrame' name='myFrame'></iframe>\n"
@@ -248,16 +259,18 @@ public void iframeContentNotLoaded() throws Exception {
248259
@Test
249260
@Alerts("foo")
250261
public void onloadInNavigatedFrame() throws Exception {
251-
final String html = "<html><head><title>first</title></head>\n"
262+
final String html = DOCTYPE_HTML
263+
+ "<html><head><title>first</title></head>\n"
252264
+ "<frameset cols='20%,80%'>\n"
253265
+ " <frame src='frame1.html' id='frame1'>\n"
254266
+ "</frameset></html>";
255267

256-
final String firstHtml = "<html><body>\n"
268+
final String firstHtml = DOCTYPE_HTML
269+
+ "<html><body>\n"
257270
+ "<a id='a1' href='frame2.html'>hello</a>\n"
258271
+ "</body></html>";
259272

260-
final String secondHtml = "<html><body onload='alert(\"foo\")'></body></html>";
273+
final String secondHtml = DOCTYPE_HTML + "<html><body onload='alert(\"foo\")'></body></html>";
261274

262275
final MockWebConnection webConnection = getMockWebConnection();
263276
webConnection.setResponse(new URL(URL_FIRST, "frame1.html"), firstHtml);
@@ -277,17 +290,17 @@ public void onloadInNavigatedFrame() throws Exception {
277290
@Test
278291
@Alerts("loaded")
279292
public void lineBreaksInUrl() throws Exception {
280-
final String html
281-
= "<html><head>\n"
293+
final String html = DOCTYPE_HTML
294+
+ "<html><head>\n"
282295
+ "</head>\n"
283296
+ "<body onload='alert(\"loaded\");'>Test</body>\n"
284297
+ "</html>";
285298

286299
getMockWebConnection().setResponse(new URL(URL_SECOND, "abcd"), html);
287300
expandExpectedAlertsVariables(URL_SECOND);
288301

289-
final String frame
290-
= "<html>\n"
302+
final String frame = DOCTYPE_HTML
303+
+ "<html>\n"
291304
+ " <frameset cols='100%'>\n"
292305
+ " <frame src='" + URL_SECOND + "a\rb\nc\r\nd' id='myFrame'>\n"
293306
+ " </frameset></html>";
@@ -302,17 +315,17 @@ public void lineBreaksInUrl() throws Exception {
302315
@Test
303316
@Alerts("loaded")
304317
public void lineBreaksInUrlIFrame() throws Exception {
305-
final String html
306-
= "<html><head>\n"
318+
final String html = DOCTYPE_HTML
319+
+ "<html><head>\n"
307320
+ "</head>\n"
308321
+ "<body onload='alert(\"loaded\");'>Test</body>\n"
309322
+ "</html>";
310323

311324
getMockWebConnection().setResponse(new URL(URL_SECOND, "abcd"), html);
312325
expandExpectedAlertsVariables(URL_SECOND);
313326

314-
final String frame
315-
= "<html>\n"
327+
final String frame = DOCTYPE_HTML
328+
+ "<html>\n"
316329
+ " <body>\n"
317330
+ " <iframe src='" + URL_SECOND + "a\rb\nc\r\nd' id='myFrame'></iframe>\n"
318331
+ " </body>\n"

0 commit comments

Comments
 (0)