Skip to content

Commit 5e471bb

Browse files
rbrirbri
committed
Firefox 149, Chrome 147
1 parent 4067f08 commit 5e471bb

8 files changed

Lines changed: 22 additions & 42 deletions

File tree

‎src/main/java/org/htmlunit/javascript/host/intl/NumberFormat.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ public class NumberFormat extends HtmlUnitScriptable {
9595
commonFormats.put("ar-YE", "\u066c\u066b\u0660");
9696

9797
FF_FORMATS_.putAll(commonFormats);
98+
FF_FORMATS_.put("de-CH", "'");
99+
FF_FORMATS_.put("it-CH", "'");
100+
98101
FF_ESR_FORMATS_.putAll(commonFormats);
99102

100103
commonFormats.put("be", ",.");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class BrowserVersionTest {
3838
*/
3939
@Test
4040
public void getBrowserVersionNumeric() {
41-
assertEquals(146, BrowserVersion.FIREFOX.getBrowserVersionNumeric());
41+
assertEquals(149, BrowserVersion.FIREFOX.getBrowserVersionNumeric());
4242
assertEquals(140, BrowserVersion.FIREFOX_ESR.getBrowserVersionNumeric());
4343
assertEquals(147, BrowserVersion.CHROME.getBrowserVersionNumeric());
4444
assertEquals(147, BrowserVersion.EDGE.getBrowserVersionNumeric());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public void serialization_withJSBackgroundTasks() throws Exception {
193193
*/
194194
@Test
195195
@Alerts(DEFAULT = "en-US,en;q=0.9",
196-
FF = "en-US,en;q=0.5",
196+
FF = "en-US,en;q=0.9",
197197
FF_ESR = "en-US,en;q=0.5")
198198
public void acceptLanguage() throws Exception {
199199
final String html = DOCTYPE_HTML + "<html><body></body></html>";

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -301,25 +301,13 @@ public void patternValidationTrimInitial() throws Exception {
301301
"false-false-false-false-false-false-false-false-false-true-false",
302302
"true",
303303
"§§URL§§?k=abc%40email.com", "2"},
304-
FF = {"null",
305-
"abc@email.com",
306-
"false",
307-
"false-false-false-false-false-false-false-false-true-false-false",
308-
"true",
309-
"§§URL§§", "1"},
310304
FF_ESR = {"null",
311305
"abc@email.com",
312306
"false",
313307
"false-false-false-false-false-false-false-false-true-false-false",
314308
"true",
315309
"§§URL§§", "1"})
316-
@HtmlUnitNYI(FF = {"null",
317-
"abc@email.com",
318-
"true",
319-
"false-false-false-false-false-false-false-false-false-true-false",
320-
"true",
321-
"§§URL§§?k=abc%40email.com", "2"},
322-
FF_ESR = {"null",
310+
@HtmlUnitNYI(FF_ESR = {"null",
323311
"abc@email.com",
324312
"true",
325313
"false-false-false-false-false-false-false-false-false-true-false",

‎src/test/java/org/htmlunit/javascript/host/html/HTMLDocumentTest.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,10 @@ public void getBoxObjectFor() throws Exception {
12271227
*/
12281228
@Test
12291229
@Alerts({"32 commands supported", "not supported: foo, 123"})
1230-
@BuggyWebDriver({"31 commands supported", "not supported: Paste, foo, 123"})
1230+
@BuggyWebDriver(
1231+
CHROME = {"31 commands supported", "not supported: Paste, foo, 123"},
1232+
EDGE = {"31 commands supported", "not supported: Paste, foo, 123"},
1233+
FF_ESR = {"31 commands supported", "not supported: Paste, foo, 123"})
12311234
public void queryCommandSupported_common() throws Exception {
12321235
final String[] commands = {"BackColor", "Bold",
12331236
"Copy", "CreateLink", "Cut", "Delete",

‎src/test/java/org/htmlunit/javascript/host/html/HTMLEmbedElementTest.java‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,10 @@ public class HTMLEmbedElementTest extends WebDriverTestCase {
3333
@Test
3434
@Alerts(DEFAULT = {"left", "right", "bottom", "middle", "top",
3535
"absbottom", "absmiddle", "baseline", "texttop", "wrong", ""},
36-
FF = {"left", "right", "bottom", "middle", "top",
37-
"absbottom", "absmiddle", "bottom", "texttop", "wrong", ""},
3836
FF_ESR = {"left", "right", "bottom", "middle", "top",
3937
"absbottom", "absmiddle", "bottom", "texttop", "wrong", ""})
40-
@HtmlUnitNYI(FF = {"left", "right", "bottom", "middle", "top",
41-
"absbottom", "absmiddle", "baseline", "texttop", "wrong", ""},
42-
FF_ESR = {"left", "right", "bottom", "middle", "top",
43-
"absbottom", "absmiddle", "baseline", "texttop", "wrong", ""})
38+
@HtmlUnitNYI(FF_ESR = {"left", "right", "bottom", "middle", "top",
39+
"absbottom", "absmiddle", "baseline", "texttop", "wrong", ""})
4440
public void getAlign() throws Exception {
4541
final String html = DOCTYPE_HTML
4642
+ "<html><body>\n"
@@ -73,14 +69,10 @@ public void getAlign() throws Exception {
7369
@Test
7470
@Alerts(DEFAULT = {"CenTer", "8", "foo", "left", "right", "bottom", "middle", "top",
7571
"absbottom", "absmiddle", "baseline", "texttop"},
76-
FF = {"CenTer", "8", "foo", "left", "right", "bottom", "middle", "top",
77-
"absbottom", "absmiddle", "bottom", "texttop"},
7872
FF_ESR = {"CenTer", "8", "foo", "left", "right", "bottom", "middle", "top",
7973
"absbottom", "absmiddle", "bottom", "texttop"})
80-
@HtmlUnitNYI(FF = {"CenTer", "8", "foo", "left", "right", "bottom", "middle", "top",
81-
"absbottom", "absmiddle", "baseline", "texttop"},
82-
FF_ESR = {"CenTer", "8", "foo", "left", "right", "bottom", "middle", "top",
83-
"absbottom", "absmiddle", "baseline", "texttop"})
74+
@HtmlUnitNYI(FF_ESR = {"CenTer", "8", "foo", "left", "right", "bottom", "middle", "top",
75+
"absbottom", "absmiddle", "baseline", "texttop"})
8476
public void setAlign() throws Exception {
8577
final String html = DOCTYPE_HTML
8678
+ "<html><body>\n"

‎src/test/java/org/htmlunit/javascript/host/html/HTMLImageElementTest.java‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -334,14 +334,10 @@ public void newImage() throws Exception {
334334
@Test
335335
@Alerts(DEFAULT = {"left", "right", "center", "justify", "bottom", "middle",
336336
"top", "absbottom", "absmiddle", "baseline", "texttop", "wrong", ""},
337-
FF = {"left", "right", "middle", "justify", "bottom", "middle",
338-
"top", "absbottom", "absmiddle", "bottom", "texttop", "wrong", ""},
339337
FF_ESR = {"left", "right", "middle", "justify", "bottom", "middle",
340338
"top", "absbottom", "absmiddle", "bottom", "texttop", "wrong", ""})
341-
@HtmlUnitNYI(FF = {"left", "right", "center", "justify", "bottom", "middle",
342-
"top", "absbottom", "absmiddle", "baseline", "texttop", "wrong", ""},
343-
FF_ESR = {"left", "right", "center", "justify", "bottom", "middle",
344-
"top", "absbottom", "absmiddle", "baseline", "texttop", "wrong", ""})
339+
@HtmlUnitNYI(FF_ESR = {"left", "right", "center", "justify", "bottom", "middle",
340+
"top", "absbottom", "absmiddle", "baseline", "texttop", "wrong", ""})
345341
public void getAlign() throws Exception {
346342
final String html = DOCTYPE_HTML
347343
+ "<html><body>\n"
@@ -376,14 +372,10 @@ public void getAlign() throws Exception {
376372
@Test
377373
@Alerts(DEFAULT = {"CenTer", "8", "foo", "left", "right", "center", "justify",
378374
"bottom", "middle", "top", "absbottom", "absmiddle", "baseline", "texttop"},
379-
FF = {"CenTer", "8", "foo", "left", "right", "middle", "justify",
380-
"bottom", "middle", "top", "absbottom", "absmiddle", "bottom", "texttop"},
381375
FF_ESR = {"CenTer", "8", "foo", "left", "right", "middle", "justify",
382376
"bottom", "middle", "top", "absbottom", "absmiddle", "bottom", "texttop"})
383-
@HtmlUnitNYI(FF = {"CenTer", "8", "foo", "left", "right", "center", "justify",
384-
"bottom", "middle", "top", "absbottom", "absmiddle", "baseline", "texttop"},
385-
FF_ESR = {"CenTer", "8", "foo", "left", "right", "center", "justify",
386-
"bottom", "middle", "top", "absbottom", "absmiddle", "baseline", "texttop"})
377+
@HtmlUnitNYI(FF_ESR = {"CenTer", "8", "foo", "left", "right", "center", "justify",
378+
"bottom", "middle", "top", "absbottom", "absmiddle", "baseline", "texttop"})
387379
public void setAlign() throws Exception {
388380
final String html = DOCTYPE_HTML
389381
+ "<html><body>\n"

‎src/test/java/org/htmlunit/javascript/host/intl/NumberFormat2Test.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,8 @@ public void format_de_at() throws Exception {
429429
* @throws Exception if the test fails
430430
*/
431431
@Test
432-
@Alerts("31\u2019415.927")
432+
@Alerts(DEFAULT = "31\u2019415.927",
433+
FF = "31'415.927")
433434
public void format_de_ch() throws Exception {
434435
test("new Intl.NumberFormat('de-CH').format(number)");
435436
}
@@ -982,7 +983,8 @@ public void format_it() throws Exception {
982983
* @throws Exception if the test fails
983984
*/
984985
@Test
985-
@Alerts("31\u2019415.927")
986+
@Alerts(DEFAULT = "31\u2019415.927",
987+
FF = "31'415.927")
986988
public void format_it_ch() throws Exception {
987989
test("new Intl.NumberFormat('it-CH').format(number)");
988990
}

0 commit comments

Comments
 (0)