Skip to content

Commit bcc86b1

Browse files
rbrirbri
committed
on the way to use html5 doctype for all our tests
1 parent b74b008 commit bcc86b1

13 files changed

+314
-221
lines changed

‎src/test/java/org/htmlunit/WaitingRefreshHandlerTest.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ public final class WaitingRefreshHandlerTest extends SimpleWebTestCase {
3333
*/
3434
@Test
3535
public void refreshOnJavascriptThread() throws Exception {
36-
final String firstContent = "<html>\n"
36+
final String firstContent = DOCTYPE_HTML
37+
+ "<html>\n"
3738
+ "<head><title>First Page</title>\n"
3839
+ "<script>\n"
3940
+ "function doRedirect() {\n"
@@ -43,13 +44,15 @@ public void refreshOnJavascriptThread() throws Exception {
4344
+ "</head>\n"
4445
+ "<body onload='setTimeout(doRedirect, 1);'>first page body</body>\n"
4546
+ "</html>";
46-
final String secondContent = "<html>\n"
47+
final String secondContent = DOCTYPE_HTML
48+
+ "<html>\n"
4749
+ "<head><title>Meta Redirect Page</title>\n"
4850
+ "<meta http-equiv='Refresh' content='1; URL=" + URL_THIRD + "'>\n"
4951
+ "</head>\n"
5052
+ "<body>redirect page body</body>\n"
5153
+ "</html>";
52-
final String thirdContent = "<html>\n"
54+
final String thirdContent = DOCTYPE_HTML
55+
+ "<html>\n"
5356
+ "<head><title>Expected Last Page</title></head>\n"
5457
+ "<body>Success!</body>\n"
5558
+ "</html>";

‎src/test/java/org/htmlunit/WebAssertTest.java‎

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class WebAssertTest extends SimpleWebTestCase {
3232
*/
3333
@Test
3434
public void assertTitleEquals() throws Exception {
35-
final String html = "<html><head><title>foo</title></head><body>bar</body></html>";
35+
final String html = DOCTYPE_HTML + "<html><head><title>foo</title></head><body>bar</body></html>";
3636
final HtmlPage page = loadPage(html);
3737

3838
WebAssert.assertTitleEquals(page, "foo");
@@ -52,7 +52,7 @@ public void assertTitleEquals() throws Exception {
5252
*/
5353
@Test
5454
public void assertTitleContains() throws Exception {
55-
final String html = "<html><head><title>foo</title></head><body>bar</body></html>";
55+
final String html = DOCTYPE_HTML + "<html><head><title>foo</title></head><body>bar</body></html>";
5656
final HtmlPage page = loadPage(html);
5757

5858
WebAssert.assertTitleContains(page, "o");
@@ -72,7 +72,7 @@ public void assertTitleContains() throws Exception {
7272
*/
7373
@Test
7474
public void assertTitleMatches() throws Exception {
75-
final String html = "<html><head><title>foo</title></head><body>bar</body></html>";
75+
final String html = DOCTYPE_HTML + "<html><head><title>foo</title></head><body>bar</body></html>";
7676
final HtmlPage page = loadPage(html);
7777

7878
WebAssert.assertTitleMatches(page, "f..");
@@ -92,7 +92,7 @@ public void assertTitleMatches() throws Exception {
9292
*/
9393
@Test
9494
public void assertElementPresent() throws Exception {
95-
final String html = "<html><body><div id='a'>bar</div></body></html>";
95+
final String html = DOCTYPE_HTML + "<html><body><div id='a'>bar</div></body></html>";
9696
final HtmlPage page = loadPage(html);
9797

9898
WebAssert.assertElementPresent(page, "a");
@@ -112,7 +112,7 @@ public void assertElementPresent() throws Exception {
112112
*/
113113
@Test
114114
public void assertElementPresentByXPath() throws Exception {
115-
final String html = "<html><body><div id='a'>bar</div></body></html>";
115+
final String html = DOCTYPE_HTML + "<html><body><div id='a'>bar</div></body></html>";
116116
final HtmlPage page = loadPage(html);
117117

118118
WebAssert.assertElementPresentByXPath(page, "html/body/div");
@@ -132,7 +132,7 @@ public void assertElementPresentByXPath() throws Exception {
132132
*/
133133
@Test
134134
public void assertElementNotPresent() throws Exception {
135-
final String html = "<html><body><div id='a'>bar</div></body></html>";
135+
final String html = DOCTYPE_HTML + "<html><body><div id='a'>bar</div></body></html>";
136136
final HtmlPage page = loadPage(html);
137137

138138
WebAssert.assertElementNotPresent(page, "b");
@@ -152,7 +152,7 @@ public void assertElementNotPresent() throws Exception {
152152
*/
153153
@Test
154154
public void assertElementNotPresentByXPath() throws Exception {
155-
final String html = "<html><body><div id='a'>bar</div></body></html>";
155+
final String html = DOCTYPE_HTML + "<html><body><div id='a'>bar</div></body></html>";
156156
final HtmlPage page = loadPage(html);
157157

158158
WebAssert.assertElementNotPresentByXPath(page, "ul");
@@ -172,7 +172,7 @@ public void assertElementNotPresentByXPath() throws Exception {
172172
*/
173173
@Test
174174
public void assertTextPresent() throws Exception {
175-
final String html = "<html><body><div id='a'>bar</div></body></html>";
175+
final String html = DOCTYPE_HTML + "<html><body><div id='a'>bar</div></body></html>";
176176
final HtmlPage page = loadPage(html);
177177

178178
WebAssert.assertTextPresent(page, "bar");
@@ -192,7 +192,7 @@ public void assertTextPresent() throws Exception {
192192
*/
193193
@Test
194194
public void assertTextPresentInElement() throws Exception {
195-
final String html = "<html><body><div id='a'>bar</div></body></html>";
195+
final String html = DOCTYPE_HTML + "<html><body><div id='a'>bar</div></body></html>";
196196
final HtmlPage page = loadPage(html);
197197

198198
WebAssert.assertTextPresentInElement(page, "bar", "a");
@@ -221,7 +221,7 @@ public void assertTextPresentInElement() throws Exception {
221221
*/
222222
@Test
223223
public void assertTextNotPresent() throws Exception {
224-
final String html = "<html><body><div id='a'>bar</div></body></html>";
224+
final String html = DOCTYPE_HTML + "<html><body><div id='a'>bar</div></body></html>";
225225
final HtmlPage page = loadPage(html);
226226

227227
WebAssert.assertTextNotPresent(page, "baz");
@@ -241,7 +241,7 @@ public void assertTextNotPresent() throws Exception {
241241
*/
242242
@Test
243243
public void assertTextNotPresentInElement() throws Exception {
244-
final String html = "<html><body><div id='a'>bar</div></body></html>";
244+
final String html = DOCTYPE_HTML + "<html><body><div id='a'>bar</div></body></html>";
245245
final HtmlPage page = loadPage(html);
246246

247247
WebAssert.assertTextNotPresentInElement(page, "baz", "a");
@@ -270,7 +270,7 @@ public void assertTextNotPresentInElement() throws Exception {
270270
*/
271271
@Test
272272
public void assertLinkPresent() throws Exception {
273-
final String html = "<html><body><a href='foo.html' id='x'>bar</a></body></html>";
273+
final String html = DOCTYPE_HTML + "<html><body><a href='foo.html' id='x'>bar</a></body></html>";
274274
final HtmlPage page = loadPage(html);
275275

276276
WebAssert.assertLinkPresent(page, "x");
@@ -290,7 +290,7 @@ public void assertLinkPresent() throws Exception {
290290
*/
291291
@Test
292292
public void assertLinkNotPresent() throws Exception {
293-
final String html = "<html><body><a href='foo.html' id='x'>bar</a></body></html>";
293+
final String html = DOCTYPE_HTML + "<html><body><a href='foo.html' id='x'>bar</a></body></html>";
294294
final HtmlPage page = loadPage(html);
295295

296296
WebAssert.assertLinkNotPresent(page, "z");
@@ -310,7 +310,7 @@ public void assertLinkNotPresent() throws Exception {
310310
*/
311311
@Test
312312
public void assertLinkPresentWithText() throws Exception {
313-
final String html = "<html><body><a href='foo.html' id='x'>bar</a></body></html>";
313+
final String html = DOCTYPE_HTML + "<html><body><a href='foo.html' id='x'>bar</a></body></html>";
314314
final HtmlPage page = loadPage(html);
315315

316316
WebAssert.assertLinkPresentWithText(page, "r");
@@ -330,7 +330,7 @@ public void assertLinkPresentWithText() throws Exception {
330330
*/
331331
@Test
332332
public void assertLinkNotPresentWithText() throws Exception {
333-
final String html = "<html><body><a href='foo.html' id='x'>bar</a></body></html>";
333+
final String html = DOCTYPE_HTML + "<html><body><a href='foo.html' id='x'>bar</a></body></html>";
334334
final HtmlPage page = loadPage(html);
335335

336336
WebAssert.assertLinkNotPresentWithText(page, "x");
@@ -350,7 +350,7 @@ public void assertLinkNotPresentWithText() throws Exception {
350350
*/
351351
@Test
352352
public void assertFormPresent() throws Exception {
353-
final String html = "<html><body><form name='f'>bar</form></body></html>";
353+
final String html = DOCTYPE_HTML + "<html><body><form name='f'>bar</form></body></html>";
354354
final HtmlPage page = loadPage(html);
355355

356356
WebAssert.assertFormPresent(page, "f");
@@ -370,7 +370,7 @@ public void assertFormPresent() throws Exception {
370370
*/
371371
@Test
372372
public void assertFormNotPresent() throws Exception {
373-
final String html = "<html><body><form name='f'>bar</form></body></html>";
373+
final String html = DOCTYPE_HTML + "<html><body><form name='f'>bar</form></body></html>";
374374
final HtmlPage page = loadPage(html);
375375

376376
WebAssert.assertFormNotPresent(page, "x");
@@ -390,7 +390,8 @@ public void assertFormNotPresent() throws Exception {
390390
*/
391391
@Test
392392
public void assertInputPresent() throws Exception {
393-
final String html = "<html><body><form name='f'><input name='i' value='x'/></form></body></html>";
393+
final String html = DOCTYPE_HTML
394+
+ "<html><body><form name='f'><input name='i' value='x'/></form></body></html>";
394395
final HtmlPage page = loadPage(html);
395396

396397
WebAssert.assertInputPresent(page, "i");
@@ -410,7 +411,8 @@ public void assertInputPresent() throws Exception {
410411
*/
411412
@Test
412413
public void assertInputNotPresent() throws Exception {
413-
final String html = "<html><body><form name='f'><input name='i' value='x'/></form></body></html>";
414+
final String html = DOCTYPE_HTML
415+
+ "<html><body><form name='f'><input name='i' value='x'/></form></body></html>";
414416
final HtmlPage page = loadPage(html);
415417

416418
WebAssert.assertInputNotPresent(page, "q");
@@ -430,7 +432,8 @@ public void assertInputNotPresent() throws Exception {
430432
*/
431433
@Test
432434
public void assertInputContainsValue() throws Exception {
433-
final String html = "<html><body><form name='f'><input name='i' value='x'/></form></body></html>";
435+
final String html = DOCTYPE_HTML
436+
+ "<html><body><form name='f'><input name='i' value='x'/></form></body></html>";
434437
final HtmlPage page = loadPage(html);
435438

436439
WebAssert.assertInputContainsValue(page, "i", "x");
@@ -459,7 +462,8 @@ public void assertInputContainsValue() throws Exception {
459462
*/
460463
@Test
461464
public void assertInputDoesNotContainValue() throws Exception {
462-
final String html = "<html><body><form name='f'><input name='i' value='x'/></form></body></html>";
465+
final String html = DOCTYPE_HTML
466+
+ "<html><body><form name='f'><input name='i' value='x'/></form></body></html>";
463467
final HtmlPage page = loadPage(html);
464468

465469
WebAssert.assertInputDoesNotContainValue(page, "i", "z");
@@ -488,12 +492,12 @@ public void assertInputDoesNotContainValue() throws Exception {
488492
*/
489493
@Test
490494
public void assertAllTabIndexAttributesSet() throws Exception {
491-
final String html1 = "<html><body><a href='#' tabindex='1'>foo</a></body></html>";
495+
final String html1 = DOCTYPE_HTML + "<html><body><a href='#' tabindex='1'>foo</a></body></html>";
492496
final HtmlPage page1 = loadPage(html1);
493497

494498
WebAssert.assertAllTabIndexAttributesSet(page1);
495499

496-
final String html2 = "<html><body><a href='#'>foo</a></body></html>";
500+
final String html2 = DOCTYPE_HTML + "<html><body><a href='#'>foo</a></body></html>";
497501
final HtmlPage page2 = loadPage(html2);
498502

499503
boolean caught = false;
@@ -505,7 +509,7 @@ public void assertAllTabIndexAttributesSet() throws Exception {
505509
}
506510
assertTrue(caught);
507511

508-
final String html3 = "<html><body><a href='#' tabindex='x'>foo</a></body></html>";
512+
final String html3 = DOCTYPE_HTML + "<html><body><a href='#' tabindex='x'>foo</a></body></html>";
509513
final HtmlPage page3 = loadPage(html3);
510514

511515
caught = false;
@@ -523,12 +527,13 @@ public void assertAllTabIndexAttributesSet() throws Exception {
523527
*/
524528
@Test
525529
public void assertAllAccessKeyAttributesUnique() throws Exception {
526-
final String html1 = "<html><body><a accesskey='k'>foo</a></body></html>";
530+
final String html1 = DOCTYPE_HTML + "<html><body><a accesskey='k'>foo</a></body></html>";
527531
final HtmlPage page1 = loadPage(html1);
528532

529533
WebAssert.assertAllAccessKeyAttributesUnique(page1);
530534

531-
final String html2 = "<html><body><a accesskey='k'>foo</a><a accesskey='k'>bar</a></body></html>";
535+
final String html2 = DOCTYPE_HTML
536+
+ "<html><body><a accesskey='k'>foo</a><a accesskey='k'>bar</a></body></html>";
532537
final HtmlPage page2 = loadPage(html2);
533538

534539
boolean caught = false;
@@ -546,12 +551,12 @@ public void assertAllAccessKeyAttributesUnique() throws Exception {
546551
*/
547552
@Test
548553
public void assertAllIdAttributesUnique() throws Exception {
549-
final String html1 = "<html><body><a id='k'>foo</a></body></html>";
554+
final String html1 = DOCTYPE_HTML + "<html><body><a id='k'>foo</a></body></html>";
550555
final HtmlPage page1 = loadPage(html1);
551556

552557
WebAssert.assertAllIdAttributesUnique(page1);
553558

554-
final String html2 = "<html><body><a id='k'>foo</a><a id='k'>bar</a></body></html>";
559+
final String html2 = DOCTYPE_HTML + "<html><body><a id='k'>foo</a><a id='k'>bar</a></body></html>";
555560
final HtmlPage page2 = loadPage(html2);
556561

557562
boolean caught = false;

‎src/test/java/org/htmlunit/WebClient2Test.java‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public class WebClient2Test extends SimpleWebTestCase {
5252
*/
5353
@Test
5454
public void loadPage_HandleDoubleDotsAtRoot() throws Exception {
55-
final String htmlContent
56-
= "<html><head><title>foo</title></head><body>\n"
55+
final String htmlContent = DOCTYPE_HTML
56+
+ "<html><head><title>foo</title></head><body>\n"
5757
+ "</body></html>";
5858

5959
final WebClient client = getWebClient();
@@ -90,12 +90,12 @@ public void serialization_beforeUse() throws Exception {
9090
*/
9191
@Test
9292
public void serialization_pageLoad() throws Exception {
93-
final String page1Content = "<html><body>hello 1</body></html>";
93+
final String page1Content = DOCTYPE_HTML + "<html><body>hello 1</body></html>";
9494
try (WebClient client = getWebClient()) {
9595
final HtmlPage page1 = loadPage(client, page1Content, null, URL_FIRST);
9696
assertEquals("hello 1", page1.asNormalizedText());
9797

98-
final String page2Content = "<html><body>hello 2</body></html>";
98+
final String page2Content = DOCTYPE_HTML + "<html><body>hello 2</body></html>";
9999
try (WebClient copy = clone(client)) {
100100
final HtmlPage page2 = loadPage(copy, page2Content, null, URL_SECOND);
101101
assertEquals("hello 2", page2.asNormalizedText());
@@ -109,8 +109,8 @@ public void serialization_pageLoad() throws Exception {
109109
*/
110110
@Test
111111
public void serialization_withClickAfterwards() throws Exception {
112-
final String html =
113-
"<html><head>\n"
112+
final String html = DOCTYPE_HTML
113+
+ "<html><head>\n"
114114
+ "<script>\n"
115115
+ " function foo() {\n"
116116
+ " document.getElementById('mybox').innerHTML='hello world';\n"
@@ -139,8 +139,8 @@ public void serialization_withClickAfterwards() throws Exception {
139139
@Test
140140
@NotYetImplemented
141141
public void serialization_withJSBackgroundTasks() throws Exception {
142-
final String html =
143-
"<html><head>\n"
142+
final String html = DOCTYPE_HTML
143+
+ "<html><head>\n"
144144
+ "<script>\n"
145145
+ " function foo() {\n"
146146
+ " if (window.name == 'hello') {\n"
@@ -185,7 +185,7 @@ public void serialization_withJSBackgroundTasks() throws Exception {
185185
FF = "en-US,en;q=0.5",
186186
FF_ESR = "en-US,en;q=0.5")
187187
public void acceptLanguage() throws Exception {
188-
final String html = "<html><body></body></html>";
188+
final String html = DOCTYPE_HTML + "<html><body></body></html>";
189189
loadPage(html);
190190
assertEquals(getExpectedAlerts()[0],
191191
getMockWebConnection().getLastAdditionalHeaders().get(HttpHeader.ACCEPT_LANGUAGE));
@@ -197,7 +197,7 @@ public void acceptLanguage() throws Exception {
197197
*/
198198
@Test
199199
public void acceptLanguageFr() throws Exception {
200-
final String html = "<html><body></body></html>";
200+
final String html = DOCTYPE_HTML + "<html><body></body></html>";
201201

202202
final BrowserVersion frBrowser =
203203
new BrowserVersion.BrowserVersionBuilder(getBrowserVersion())
@@ -219,7 +219,7 @@ public void acceptLanguageFr() throws Exception {
219219
*/
220220
@Test
221221
public void newWindowScopeForAboutBlank() throws Exception {
222-
final HtmlPage p = loadPage("<html><body></body></html>");
222+
final HtmlPage p = loadPage(DOCTYPE_HTML + "<html><body></body></html>");
223223
p.executeJavaScript("top.foo = 'hello';");
224224
final ScriptResult result = p.executeJavaScript("top.foo");
225225
assertEquals("hello", result.getJavaScriptResult());
@@ -292,8 +292,8 @@ private void checkCookie(final String cookieString, final String name, final Str
292292
FF = {"loadExtraContent started at Page 1", " loadExtraContent finished at Page 2"},
293293
FF_ESR = {"loadExtraContent started at Page 1", " loadExtraContent finished at Page 2"})
294294
public void makeSureTheCurrentJobHasEndedBeforeReplaceWindowPage() throws Exception {
295-
final String htmlContent1
296-
= "<html>\n"
295+
final String htmlContent1 = DOCTYPE_HTML
296+
+ "<html>\n"
297297
+ "<head>"
298298
+ " <title>Page 1</title>\n"
299299
+ "</head>\n"
@@ -320,8 +320,8 @@ public void makeSureTheCurrentJobHasEndedBeforeReplaceWindowPage() throws Except
320320
+ "</body>\n"
321321
+ "</html>";
322322

323-
final String htmlContent2
324-
= "<html>\n"
323+
final String htmlContent2 = DOCTYPE_HTML
324+
+ "<html>\n"
325325
+ "<head>"
326326
+ " <title>Page 2</title>\n"
327327
+ "</head>\n"
@@ -356,8 +356,7 @@ public void makeSureTheCurrentJobHasEndedBeforeReplaceWindowPage() throws Except
356356
*/
357357
@Test
358358
public void toLocaleLowerCase() throws Exception {
359-
final String html
360-
= "<!DOCTYPE html>\n"
359+
final String html = DOCTYPE_HTML
361360
+ "<html><head><script>\n"
362361
+ " function doTest() {\n"
363362
+ " window.document.title = '\\u0130'.toLocaleLowerCase();\n"

0 commit comments

Comments
 (0)