Skip to content

Commit 9545e28

Browse files
rbrirbri
committed
on the way to use html5 doctype for all our tests
1 parent 253fa61 commit 9545e28

File tree

9 files changed

+209
-179
lines changed

9 files changed

+209
-179
lines changed

‎src/test/java/org/htmlunit/html/impl/SimpleRangeTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ public class SimpleRangeTest extends SimpleWebTestCase {
3434
*/
3535
@Test
3636
public void toStringOneNode() throws Exception {
37-
final String content = "<html><head><title>Test page</title></head>\n"
37+
final String content = DOCTYPE_HTML
38+
+ "<html><head><title>Test page</title></head>\n"
3839
+ "<body>\n"
3940
+ " <input type='text' id='myInput' value='abcd'>\n"
4041
+ "</body>\n"

‎src/test/java/org/htmlunit/html/serializer/HtmlSerializerInnerOuterText2Test.java‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ public void getInnerTextWhiteSpaceBreakPreLine() throws Exception {
9595
}
9696

9797
private void getInnerTextWhiteSpaceBreak(final String whiteSpace) throws Exception {
98-
final String htmlContent
99-
= "<html>\n"
98+
final String htmlContent = DOCTYPE_HTML
99+
+ "<html>\n"
100100
+ "<head></head>\n"
101101
+ "<body>\n"
102102
+ " <br id='tester' " + (whiteSpace == null ? "" : ("style='white-space: " + whiteSpace + "'")) + ">\n"
@@ -169,8 +169,8 @@ public void getInnerTextWhiteSpaceInputHiddenPreLine() throws Exception {
169169
}
170170

171171
private void getInnerTextWhiteSpaceInputHidden(final String whiteSpace) throws Exception {
172-
final String htmlContent
173-
= "<html>\n"
172+
final String htmlContent = DOCTYPE_HTML
173+
+ "<html>\n"
174174
+ "<head></head>\n"
175175
+ "<body>\n"
176176
+ "<form id='form1'>\n"
@@ -247,8 +247,8 @@ public void getInnerTextWhiteSpaceScriptPreLine() throws Exception {
247247
}
248248

249249
private void getInnerTextWhiteSpaceScript(final String whiteSpace) throws Exception {
250-
final String htmlContent
251-
= "<html>\n"
250+
final String htmlContent = DOCTYPE_HTML
251+
+ "<html>\n"
252252
+ "<head></head>\n"
253253
+ "<body>\n"
254254
+ " <script id='tester' " + (whiteSpace == null ? "" : ("style='white-space: " + whiteSpace + "'")) + ">"
@@ -322,8 +322,8 @@ public void getInnerTextWhiteSpaceStylePreLine() throws Exception {
322322
}
323323

324324
private void getInnerTextWhiteSpaceStyle(final String whiteSpace) throws Exception {
325-
final String htmlContent
326-
= "<html>\n"
325+
final String htmlContent = DOCTYPE_HTML
326+
+ "<html>\n"
327327
+ "<head></head>\n"
328328
+ "<body>\n"
329329
+ " <style id='tester' " + (whiteSpace == null ? "" : ("style='white-space: " + whiteSpace + "'")) + ">"
@@ -397,8 +397,8 @@ public void getInnerTextWhiteSpaceNoframesPreLine() throws Exception {
397397
}
398398

399399
private void getInnerTextWhiteSpaceNoframes(final String whiteSpace) throws Exception {
400-
final String htmlContent
401-
= "<html>\n"
400+
final String htmlContent = DOCTYPE_HTML
401+
+ "<html>\n"
402402
+ "<head></head>\n"
403403
+ "<body>\n"
404404
+ " <noframes id='tester' " + (whiteSpace == null ? "" : ("style='white-space: " + whiteSpace + "'")) + ">"
@@ -477,8 +477,8 @@ public void getInnerTextWhiteSpaceDivPreLine() throws Exception {
477477
}
478478

479479
private void getInnerTextWhiteSpaceDiv(final String whiteSpace) throws Exception {
480-
final String htmlContent
481-
= "<html>\n"
480+
final String htmlContent = DOCTYPE_HTML
481+
+ "<html>\n"
482482
+ "<head></head>\n"
483483
+ "<body>\n"
484484
+ " <div id='tester' " + (whiteSpace == null ? "" : ("style='white-space: " + whiteSpace + "'")) + ">"
@@ -561,8 +561,8 @@ public void getInnerTextWhiteSpacePrePreLine() throws Exception {
561561
}
562562

563563
private void getInnerTextWhiteSpacePre(final String whiteSpace) throws Exception {
564-
final String htmlContent
565-
= "<html>\n"
564+
final String htmlContent = DOCTYPE_HTML
565+
+ "<html>\n"
566566
+ "<head></head>\n"
567567
+ "<body>\n"
568568
+ " <pre id='tester' " + (whiteSpace == null ? "" : ("style='white-space: " + whiteSpace + "'")) + ">"
@@ -636,8 +636,8 @@ public void getInnerTextWhiteSpaceTextAreaPreLine() throws Exception {
636636
}
637637

638638
private void getInnerTextWhiteSpaceTextArea(final String whiteSpace) throws Exception {
639-
final String htmlContent
640-
= "<html>\n"
639+
final String htmlContent = DOCTYPE_HTML
640+
+ "<html>\n"
641641
+ "<head></head>\n"
642642
+ "<body>\n"
643643
+ " <textarea id='tester' " + (whiteSpace == null ? "" : ("style='white-space: " + whiteSpace + "'")) + ">"
@@ -711,8 +711,8 @@ public void getInnerTextWhiteSpaceTitlePreLine() throws Exception {
711711
}
712712

713713
private void getInnerTextWhiteSpaceTitle(final String whiteSpace) throws Exception {
714-
final String htmlContent
715-
= "<html>\n"
714+
final String htmlContent = DOCTYPE_HTML
715+
+ "<html>\n"
716716
+ "<head>\n"
717717
+ "<title id='tester' " + (whiteSpace == null ? "" : ("style='white-space: " + whiteSpace + "'")) + ">"
718718
+ " A B C\t \t D \r\nEF\nG \n H <br> I </title>\n"
@@ -823,8 +823,8 @@ public void getInnerTextWhiteSpaceSelectPreLine() throws Exception {
823823
}
824824

825825
private void getInnerTextWhiteSpaceSelect(final String whiteSpace) throws Exception {
826-
final String htmlContent
827-
= "<html>\n"
826+
final String htmlContent = DOCTYPE_HTML
827+
+ "<html>\n"
828828
+ "<head></head>\n"
829829
+ "<body>\n"
830830
+ " <form>\n"
@@ -902,8 +902,8 @@ public void getInnerTextWhiteSpaceInputSubmitPreLine() throws Exception {
902902
}
903903

904904
private void getInnerTextWhiteSpaceInputSubmit(final String whiteSpace) throws Exception {
905-
final String htmlContent
906-
= "<html>\n"
905+
final String htmlContent = DOCTYPE_HTML
906+
+ "<html>\n"
907907
+ "<head></head>\n"
908908
+ "<body>\n"
909909
+ "<form id='form1'>\n"
@@ -926,8 +926,8 @@ private void getInnerTextWhiteSpaceInputSubmit(final String whiteSpace) throws E
926926
@Test
927927
@Alerts("")
928928
public void getInnerTextInputSubmitNoValue() throws Exception {
929-
final String htmlContent
930-
= "<html>\n"
929+
final String htmlContent = DOCTYPE_HTML
930+
+ "<html>\n"
931931
+ "<head></head>\n"
932932
+ "<body>\n"
933933
+ "<form id='form1'>\n"
@@ -948,8 +948,8 @@ public void getInnerTextInputSubmitNoValue() throws Exception {
948948
@Test
949949
@Alerts("")
950950
public void getInnerTextInputResetNoValue() throws Exception {
951-
final String htmlContent
952-
= "<html>\n"
951+
final String htmlContent = DOCTYPE_HTML
952+
+ "<html>\n"
953953
+ "<head></head>\n"
954954
+ "<body>\n"
955955
+ "<form id='form1'>\n"
@@ -970,8 +970,8 @@ public void getInnerTextInputResetNoValue() throws Exception {
970970
@Test
971971
@Alerts("")
972972
public void getInnerTextInputResetBlankValue() throws Exception {
973-
final String htmlContent
974-
= "<html>\n"
973+
final String htmlContent = DOCTYPE_HTML
974+
+ "<html>\n"
975975
+ "<head></head>\n"
976976
+ "<body>\n"
977977
+ "<form id='form1'>\n"
@@ -992,8 +992,8 @@ public void getInnerTextInputResetBlankValue() throws Exception {
992992
@Test
993993
@Alerts("")
994994
public void getInnerTextInputSubmitBlankValue() throws Exception {
995-
final String htmlContent
996-
= "<html>\n"
995+
final String htmlContent = DOCTYPE_HTML
996+
+ "<html>\n"
997997
+ "<head></head>\n"
998998
+ "<body>\n"
999999
+ "<form id='form1'>\n"
@@ -1068,8 +1068,8 @@ public void getInnerTextWhiteSpaceInputResetPreLine() throws Exception {
10681068
}
10691069

10701070
private void getInnerTextWhiteSpaceInputReset(final String whiteSpace) throws Exception {
1071-
final String htmlContent
1072-
= "<html>\n"
1071+
final String htmlContent = DOCTYPE_HTML
1072+
+ "<html>\n"
10731073
+ "<head></head>\n"
10741074
+ "<body>\n"
10751075
+ "<form id='form1'>\n"
@@ -1146,8 +1146,8 @@ public void getInnerTextWhiteSpaceInputCheckboxPreLine() throws Exception {
11461146
}
11471147

11481148
private void getInnerTextWhiteSpaceInputCheckbox(final String whiteSpace) throws Exception {
1149-
final String htmlContent
1150-
= "<html>\n"
1149+
final String htmlContent = DOCTYPE_HTML
1150+
+ "<html>\n"
11511151
+ "<head></head>\n"
11521152
+ "<body>\n"
11531153
+ "<form id='form1'>\n"
@@ -1224,8 +1224,8 @@ public void getInnerTextWhiteSpaceInputRadioPreLine() throws Exception {
12241224
}
12251225

12261226
private void getInnerTextWhiteSpaceInputRadio(final String whiteSpace) throws Exception {
1227-
final String htmlContent
1228-
= "<html>\n"
1227+
final String htmlContent = DOCTYPE_HTML
1228+
+ "<html>\n"
12291229
+ "<head></head>\n"
12301230
+ "<body>\n"
12311231
+ "<form id='form1'>\n"
@@ -1330,8 +1330,8 @@ public void getInnerTextWhiteSpaceOrderedListPreLine() throws Exception {
13301330
}
13311331

13321332
private void getInnerTextWhiteSpaceOrderedList(final String whiteSpace) throws Exception {
1333-
final String htmlContent
1334-
= "<html>\n"
1333+
final String htmlContent = DOCTYPE_HTML
1334+
+ "<html>\n"
13351335
+ "<head></head>\n"
13361336
+ "<body>\n"
13371337
+ " <ol id='tester' " + (whiteSpace == null ? "" : ("style='white-space: " + whiteSpace + "'")) + ">\n"
@@ -1438,8 +1438,8 @@ public void getInnerTextWhiteSpaceUnorderedListPreLine() throws Exception {
14381438
}
14391439

14401440
private void getInnerTextWhiteSpaceUnorderedList(final String whiteSpace) throws Exception {
1441-
final String htmlContent
1442-
= "<html>\n"
1441+
final String htmlContent = DOCTYPE_HTML
1442+
+ "<html>\n"
14431443
+ "<head></head>\n"
14441444
+ "<body>\n"
14451445
+ " <ul id='tester' " + (whiteSpace == null ? "" : ("style='white-space: " + whiteSpace + "'")) + ">\n"
@@ -1714,8 +1714,8 @@ public void getInnerTextDetailsOpen() throws Exception {
17141714
}
17151715

17161716
private void getInnerTextFormated(final String htmlTesterSnipped) throws Exception {
1717-
final String htmlContent
1718-
= "<html>\n"
1717+
final String htmlContent = DOCTYPE_HTML
1718+
+ "<html>\n"
17191719
+ "<head></head>\n"
17201720
+ "<body>\n"
17211721
+ " " + htmlTesterSnipped + "\n"
@@ -1728,8 +1728,8 @@ private void getInnerTextFormated(final String htmlTesterSnipped) throws Excepti
17281728
}
17291729

17301730
private void getOuterTextFormated(final String htmlTesterSnipped) throws Exception {
1731-
final String htmlContent
1732-
= "<html>\n"
1731+
final String htmlContent = DOCTYPE_HTML
1732+
+ "<html>\n"
17331733
+ "<head></head>\n"
17341734
+ "<body>\n"
17351735
+ " " + htmlTesterSnipped + "\n"
@@ -1761,8 +1761,8 @@ public void getVisibleNumberInputInvalidNumber() throws Exception {
17611761

17621762
private void getInnerTextFormatedAfterTyping(final String htmlTesterSnipped,
17631763
final String... typed) throws Exception {
1764-
final String htmlContent
1765-
= "<html>\n"
1764+
final String htmlContent = DOCTYPE_HTML
1765+
+ "<html>\n"
17661766
+ "<head></head>\n"
17671767
+ "<body>\n"
17681768
+ " " + htmlTesterSnipped + "\n"
@@ -1820,8 +1820,8 @@ public void getInnerTextTitle() throws Exception {
18201820
@Test
18211821
@Alerts("y")
18221822
public void getInnerTextTitleInHead() throws Exception {
1823-
final String htmlContent
1824-
= "<html>\n"
1823+
final String htmlContent = DOCTYPE_HTML
1824+
+ "<html>\n"
18251825
+ "<head id='tester'><title>y</title></head>\n"
18261826
+ "<body>\n"
18271827
+ "</body></html>";

0 commit comments

Comments
 (0)