Skip to content

Commit 11ea5ab

Browse files
rbrirbri
committed
on the way to use html5 doctype for all our tests
1 parent fd39abb commit 11ea5ab

39 files changed

+518
-407
lines changed

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

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class BrowserVersion2Test extends WebDriverTestCase {
4747
FF = "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
4848
FF_ESR = "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
4949
public void acceptHeaderGetUrl() throws Exception {
50-
final String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
50+
final String html = DOCTYPE_HTML
5151
+ "<html><body>Response</body></html>";
5252
loadPage2(html);
5353

@@ -64,11 +64,11 @@ public void acceptHeaderGetUrl() throws Exception {
6464
FF = {"2", "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"},
6565
FF_ESR = {"2", "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"})
6666
public void acceptHeaderWindowOpen() throws Exception {
67-
String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
67+
String html = DOCTYPE_HTML
6868
+ "<html><body>Response</body></html>";
6969
getMockWebConnection().setDefaultResponse(html);
7070

71-
html = HtmlPageTest.STANDARDS_MODE_PREFIX_
71+
html = DOCTYPE_HTML
7272
+ "<html><head><title>First</title></head>\n"
7373
+ "<body>\n"
7474
+ " <a id='clickme' href='javascript: window.open(\"" + URL_SECOND + "\")'>Click me</a>\n"
@@ -92,11 +92,11 @@ public void acceptHeaderWindowOpen() throws Exception {
9292
FF = {"2", "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"},
9393
FF_ESR = {"2", "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"})
9494
public void acceptHeaderAnchorClick() throws Exception {
95-
String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
95+
String html = DOCTYPE_HTML
9696
+ "<html><body>Response</body></html>";
9797
getMockWebConnection().setDefaultResponse(html);
9898

99-
html = HtmlPageTest.STANDARDS_MODE_PREFIX_
99+
html = DOCTYPE_HTML
100100
+ "<html><head><title>First</title></head>\n"
101101
+ "<body>\n"
102102
+ " <a id='clickme' href='test.html'>Click me</a>\n"
@@ -118,11 +118,11 @@ public void acceptHeaderAnchorClick() throws Exception {
118118
FF = "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
119119
FF_ESR = "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
120120
public void acceptHeaderAnchorClickWithType() throws Exception {
121-
String html = HtmlPageTest.STANDARDS_MODE_PREFIX_
121+
String html = DOCTYPE_HTML
122122
+ "<html><body>Response</body></html>";
123123
getMockWebConnection().setDefaultResponse(html);
124124

125-
html = HtmlPageTest.STANDARDS_MODE_PREFIX_
125+
html = DOCTYPE_HTML
126126
+ "<html><head><title>First</title></head>\n"
127127
+ "<body>\n"
128128
+ " <a id='clickme' href='test.html' type='text/plain'>Click me</a>\n"
@@ -145,8 +145,7 @@ public void acceptHeaderAnchorClickWithType() throws Exception {
145145
FF = "Accept: image/avif,image/webp,image/png,image/svg+xml,image/*;q=0.8,*/*;q=0.5",
146146
FF_ESR = "Accept: image/avif,image/webp,image/png,image/svg+xml,image/*;q=0.8,*/*;q=0.5")
147147
public void acceptHeaderImage() throws Exception {
148-
final String html
149-
= HtmlPageTest.STANDARDS_MODE_PREFIX_
148+
final String html = DOCTYPE_HTML
150149
+ "<html><head>\n"
151150
+ "<script>\n"
152151
+ " function doTest() {\n"
@@ -170,8 +169,7 @@ public void acceptHeaderImage() throws Exception {
170169
@Test
171170
@Alerts("Accept: text/css,*/*;q=0.1")
172171
public void acceptHeaderCss() throws Exception {
173-
final String html
174-
= HtmlPageTest.STANDARDS_MODE_PREFIX_
172+
final String html = DOCTYPE_HTML
175173
+ "<html><head>\n"
176174
+ " <link href='test.css' rel='stylesheet' type='text/css'>\n"
177175
+ "<script>\n"
@@ -196,8 +194,7 @@ public void acceptHeaderCss() throws Exception {
196194
@Test
197195
@Alerts("Accept: */*")
198196
public void acceptHeaderJavascript() throws Exception {
199-
final String html
200-
= HtmlPageTest.STANDARDS_MODE_PREFIX_
197+
final String html = DOCTYPE_HTML
201198
+ "<html><head>\n"
202199
+ " <script src='test.js' type='text/javascript'></script>\n"
203200
+ "</head>\n"
@@ -216,8 +213,7 @@ public void acceptHeaderJavascript() throws Exception {
216213
@Test
217214
@Alerts("Accept: */*")
218215
public void acceptHeaderJavascriptWithoutType() throws Exception {
219-
final String html
220-
= HtmlPageTest.STANDARDS_MODE_PREFIX_
216+
final String html = DOCTYPE_HTML
221217
+ "<html><head>\n"
222218
+ " <script src='test.js'></script>\n"
223219
+ "</head>\n"
@@ -236,8 +232,7 @@ public void acceptHeaderJavascriptWithoutType() throws Exception {
236232
@Test
237233
@Alerts("Accept: text/css,*/*;q=0.1")
238234
public void acceptHeaderCssWithoutType() throws Exception {
239-
final String html
240-
= HtmlPageTest.STANDARDS_MODE_PREFIX_
235+
final String html = DOCTYPE_HTML
241236
+ "<html><head>\n"
242237
+ " <link href='test.css' rel='stylesheet'>\n"
243238
+ "<script>\n"
@@ -262,8 +257,7 @@ public void acceptHeaderCssWithoutType() throws Exception {
262257
@Test
263258
@Alerts({"2", "Accept: text/css,*/*;q=0.1"})
264259
public void acceptHeaderCssEmptyType() throws Exception {
265-
final String html
266-
= HtmlPageTest.STANDARDS_MODE_PREFIX_
260+
final String html = DOCTYPE_HTML
267261
+ "<html><head>\n"
268262
+ " <link href='test.css' rel='stylesheet' type=''>\n"
269263
+ "<script>\n"
@@ -291,8 +285,7 @@ public void acceptHeaderCssEmptyType() throws Exception {
291285
@Test
292286
@Alerts({"2", "Accept: text/css,*/*;q=0.1"})
293287
public void acceptHeaderCssBlankType() throws Exception {
294-
final String html
295-
= HtmlPageTest.STANDARDS_MODE_PREFIX_
288+
final String html = DOCTYPE_HTML
296289
+ "<html><head>\n"
297290
+ " <link href='test.css' rel='stylesheet' type=' '>\n"
298291
+ "<script>\n"
@@ -326,8 +319,7 @@ public void acceptHeaderCssBlankType() throws Exception {
326319
+ "application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;"
327320
+ "q=0.8,application/signed-exchange;v=b3;q=0.7"})
328321
public void acceptHeaderCssDifferentType() throws Exception {
329-
final String html
330-
= HtmlPageTest.STANDARDS_MODE_PREFIX_
322+
final String html = DOCTYPE_HTML
331323
+ "<html><head>\n"
332324
+ " <link href='test.css' rel='stylesheet' type='text/html'>\n"
333325
+ "<script>\n"
@@ -361,8 +353,7 @@ public void acceptHeaderCssDifferentType() throws Exception {
361353
+ "application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;"
362354
+ "q=0.8,application/signed-exchange;v=b3;q=0.7"})
363355
public void acceptHeaderCssWrongType() throws Exception {
364-
final String html
365-
= HtmlPageTest.STANDARDS_MODE_PREFIX_
356+
final String html = DOCTYPE_HTML
366357
+ "<html><head>\n"
367358
+ " <link href='test.css' rel='stylesheet' type='css'>\n"
368359
+ "<script>\n"
@@ -390,8 +381,7 @@ public void acceptHeaderCssWrongType() throws Exception {
390381
@Test
391382
@Alerts("Accept: */*")
392383
public void acceptHeaderXMLHttpRequest() throws Exception {
393-
final String html
394-
= HtmlPageTest.STANDARDS_MODE_PREFIX_
384+
final String html = DOCTYPE_HTML
395385
+ "<html>\n"
396386
+ " <head>\n"
397387
+ " <title>XMLHttpRequest Test</title>\n"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,8 @@ private void addEventListener_error(final boolean throwOnFailingStatusCode) thro
238238
*/
239239
@Test
240240
public void isDisplayed() throws Exception {
241-
final String html = DOCTYPE_HTML + "<html><head><title>Page A</title></head><body><script>var x = 1;</script></body></html>";
241+
final String html = DOCTYPE_HTML
242+
+ "<html><head><title>Page A</title></head><body><script>var x = 1;</script></body></html>";
242243
final HtmlPage page = loadPageWithAlerts(html);
243244
final HtmlScript script = page.getFirstByXPath("//script");
244245
assertFalse(script.isDisplayed());

0 commit comments

Comments
 (0)