diff options
| author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
| commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
| tree | e396d4bf89dcce6ed02071be66212495b1df1dec /LayoutTests/fast | |
| parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
| download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 | |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'LayoutTests/fast')
24 files changed, 54 insertions, 30 deletions
diff --git a/LayoutTests/fast/dom/HTMLAnchorElement/script-tests/set-href-attribute-hash.js b/LayoutTests/fast/dom/HTMLAnchorElement/script-tests/set-href-attribute-hash.js index 5cce834..c28dceb 100644 --- a/LayoutTests/fast/dom/HTMLAnchorElement/script-tests/set-href-attribute-hash.js +++ b/LayoutTests/fast/dom/HTMLAnchorElement/script-tests/set-href-attribute-hash.js @@ -50,7 +50,7 @@ shouldBe("a.href", "'mailto:e-mail_address@goes_here#hash-value'"); debug("Add hash to file: protocol"); a.href = "file:///some path"; a.hash = "hash value"; -shouldBe("a.href", "'file:///some%20path#hash%20value'"); +shouldBe("a.href", "'file:///some%20path#hash value'"); debug("Set hash to '#'"); a.href = "http://mydomain.com#middle"; diff --git a/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-hash-expected.txt b/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-hash-expected.txt index 6515820..a757f84 100644 --- a/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-hash-expected.txt +++ b/LayoutTests/fast/dom/HTMLAnchorElement/set-href-attribute-hash-expected.txt @@ -18,7 +18,7 @@ PASS a.href is 'https://www.mydomain.com/path/testurl.html#' Add hash to mailto: protocol PASS a.href is 'mailto:e-mail_address@goes_here#hash-value' Add hash to file: protocol -PASS a.href is 'file:///some%20path#hash%20value' +PASS a.href is 'file:///some%20path#hash value' Set hash to '#' PASS a.href is 'http://mydomain.com/#' Add hash to non-standard protocol diff --git a/LayoutTests/fast/encoding/css-charset-default-expected.txt b/LayoutTests/fast/encoding/css-charset-default-expected.txt index 954790e..69ddbb1 100644 --- a/LayoutTests/fast/encoding/css-charset-default-expected.txt +++ b/LayoutTests/fast/encoding/css-charset-default-expected.txt @@ -7,3 +7,5 @@ Stylesheet 2 (inherit document charset using link): SUССЕSS Stylesheet 3 (inherit referring stylesheet charset): SUССЕSS Stylesheet 4 (inherit referring inline stylesheet charset): SUССЕSS + +Stylesheet 5 (inherit document charset using link after document.charset was set): SUССЕSS diff --git a/LayoutTests/fast/encoding/css-charset-default.xhtml b/LayoutTests/fast/encoding/css-charset-default.xhtml index 24432f2..87a6d68 100644 --- a/LayoutTests/fast/encoding/css-charset-default.xhtml +++ b/LayoutTests/fast/encoding/css-charset-default.xhtml @@ -10,6 +10,8 @@ <style type="text/css"> @import "css-charset-inherit-iso-8859-5.css?4"; </style> + <script>document.charset = "koi8-r";</script> + <link rel="stylesheet" type="text/css" href="css-charset-inherit-koi-8.css?2"/> </head> <body onload="test()"> <p>Test for <a href="http://bugs.webkit.org/show_bug.cgi?id=11011">bug 11011</a>: @@ -19,6 +21,7 @@ External CSS is parsed as iso-8859-1 even though the main document is utf-8.</p> <p id="res2">Stylesheet 2 (inherit document charset using link): </p> <p id="res3">Stylesheet 3 (inherit referring stylesheet charset): </p> <p id="res4">Stylesheet 4 (inherit referring inline stylesheet charset): </p> +<p id="res5">Stylesheet 5 (inherit document charset using link after document.charset was set): </p> <script type="text/javascript"> if (window.layoutTestController) @@ -33,6 +36,8 @@ function test() { document.getElementById("res3").innerHTML += document.styleSheets[2].cssRules[1].styleSheet.cssRules[0].style.content; document.getElementById("res4").innerHTML += document.styleSheets[3].cssRules[0].styleSheet.cssRules[0].style.content; + + document.getElementById("res5").innerHTML += document.styleSheets[4].cssRules[0].style.content; } catch (ex) { alert(ex.toString()); } diff --git a/LayoutTests/fast/encoding/external-script-charset-expected.txt b/LayoutTests/fast/encoding/external-script-charset-expected.txt index 6575759..0b4c6df 100644 --- a/LayoutTests/fast/encoding/external-script-charset-expected.txt +++ b/LayoutTests/fast/encoding/external-script-charset-expected.txt @@ -1,3 +1,5 @@ Test that external scripts in XHTML documents inherit document charset. -PASS +Javascript 1 (original document charset): PASS + +Javascript 2 (after document.charset was set): PASS diff --git a/LayoutTests/fast/encoding/external-script-charset-koi-8.js b/LayoutTests/fast/encoding/external-script-charset-koi-8.js new file mode 100644 index 0000000..141c931 --- /dev/null +++ b/LayoutTests/fast/encoding/external-script-charset-koi-8.js @@ -0,0 +1 @@ +document.getElementById("result2").innerHTML += ("" == "\u0421") ? "PASS" : "FAIL"; diff --git a/LayoutTests/fast/encoding/external-script-charset.js b/LayoutTests/fast/encoding/external-script-charset.js index 841824d..a8306cb 100644 --- a/LayoutTests/fast/encoding/external-script-charset.js +++ b/LayoutTests/fast/encoding/external-script-charset.js @@ -1,4 +1,4 @@ if (window.layoutTestController) layoutTestController.dumpAsText(); -document.getElementById("result").innerHTML = ("Я" == "\u042F") ? "PASS" : "FAIL";
\ No newline at end of file +document.getElementById("result1").innerHTML += ("Я" == "\u042F") ? "PASS" : "FAIL"; diff --git a/LayoutTests/fast/encoding/external-script-charset.xhtml b/LayoutTests/fast/encoding/external-script-charset.xhtml index d89b9d6..f6e8bf3 100644 --- a/LayoutTests/fast/encoding/external-script-charset.xhtml +++ b/LayoutTests/fast/encoding/external-script-charset.xhtml @@ -1,7 +1,10 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" dir="ltr"> <body> <p>Test that external scripts in XHTML documents inherit document charset.</p> - <div id="result"></div> + <p id="result1">Javascript 1 (original document charset): </p> + <p id="result2">Javascript 2 (after document.charset was set): </p> <script type="text/javascript" src="external-script-charset.js"></script> + <script>document.charset = "koi8-r";</script> + <script type="text/javascript" src="external-script-charset-koi-8.js"></script> </body> </html> diff --git a/LayoutTests/fast/url/anchor-expected.txt b/LayoutTests/fast/url/anchor-expected.txt index 15dc84f..c7c8b1d 100644 --- a/LayoutTests/fast/url/anchor-expected.txt +++ b/LayoutTests/fast/url/anchor-expected.txt @@ -3,14 +3,15 @@ Test URLs that have an anchor. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -FAIL canonicalize('http://www.example.com/#hello, world') should be http://www.example.com/#hello, world. Was http://www.example.com/#hello,%20world. +PASS canonicalize('http://www.example.com/#hello, world') is 'http://www.example.com/#hello, world' FAIL canonicalize('http://www.example.com/#©') should be http://www.example.com/#©. Was http://www.example.com/#%C2%A9. FAIL canonicalize('http://www.example.com/#𐌀ss') should be http://www.example.com/#𐌀ss. Was http://www.example.com/#%26%2366304%3Bss. PASS canonicalize('http://www.example.com/#%41%a') is 'http://www.example.com/#%41%a' FAIL canonicalize('http://www.example.com/#\ud800\u597d') should be http://www.example.com/#�好. Was http://www.example.com/#%26%2355296%3B%26%2322909%3B. FAIL canonicalize('http://www.example.com/#a\uFDD0') should be http://www.example.com/#a. Was http://www.example.com/#a%26%2364976%3B. -FAIL canonicalize('http://www.example.com/#asdf#qwer') should be http://www.example.com/#asdf#qwer. Was http://www.example.com/#asdf%23qwer. -FAIL canonicalize('http://www.example.com/##asdf') should be http://www.example.com/##asdf. Was http://www.example.com/#%23asdf. +PASS canonicalize('http://www.example.com/#asdf#qwer') is 'http://www.example.com/#asdf#qwer' +PASS canonicalize('http://www.example.com/##asdf') is 'http://www.example.com/##asdf' +PASS canonicalize('http://www.example.com/#a\nb\rc\td') is 'http://www.example.com/#abcd' PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/url/file-expected.txt b/LayoutTests/fast/url/file-expected.txt index e85ff52..d274673 100644 --- a/LayoutTests/fast/url/file-expected.txt +++ b/LayoutTests/fast/url/file-expected.txt @@ -17,7 +17,7 @@ PASS canonicalize('/\\server/file') is 'file://server/file' FAIL canonicalize('file:c:foo/bar.html') should be file:///C:/foo/bar.html. Was file:///tmp/mock/c:foo/bar.html. FAIL canonicalize('file:/\\/\\C:\\\\//foo\\bar.html') should be file:///C:////foo/bar.html. Was file:////C:////foo/bar.html. PASS canonicalize('file:///foo/bar.txt') is 'file:///foo/bar.txt' -FAIL canonicalize('FILE:/\\/\\7:\\\\//foo\\bar.html') should be file://7:////foo/bar.html. Was FILE:////7:////foo/bar.html. +FAIL canonicalize('FILE:/\\/\\7:\\\\//foo\\bar.html') should be file://7:////foo/bar.html. Was file:////7:////foo/bar.html. FAIL canonicalize('file:filer/home\\me') should be file://filer/home/me. Was file:///tmp/mock/filer/home/me. FAIL canonicalize('file:///C:/foo/../../../bar.html') should be file:///C:/bar.html. Was file:///bar.html. FAIL canonicalize('file:///C:/asdf#\xc2') should be file:///C:/asdf#�. Was file:///C:/asdf#%C2. diff --git a/LayoutTests/fast/url/file-http-base-expected.txt b/LayoutTests/fast/url/file-http-base-expected.txt index aa860a1..afd3131 100644 --- a/LayoutTests/fast/url/file-http-base-expected.txt +++ b/LayoutTests/fast/url/file-http-base-expected.txt @@ -4,7 +4,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE FAIL canonicalize('file:c:\\foo\\bar.html') should be file:///C:/foo/bar.html. Was file://c:/foo/bar.html. -FAIL canonicalize(' File:c|////foo\\bar.html') should be file:///C:////foo/bar.html. Was File://c|////foo/bar.html. +FAIL canonicalize(' File:c|////foo\\bar.html') should be file:///C:////foo/bar.html. Was file://c|////foo/bar.html. FAIL canonicalize('file:') should be file:///. Was file:. FAIL canonicalize('file:UNChost/path') should be file://unchost/path. Was file://UNChost/path. FAIL canonicalize('c:\\foo\\bar') should be file:///C:/foo/bar. Was c:/foo/bar. @@ -17,7 +17,7 @@ FAIL canonicalize('/\\server/file') should be file://server/file. Was http://ser FAIL canonicalize('file:c:foo/bar.html') should be file:///C:/foo/bar.html. Was file://c:foo/bar.html. FAIL canonicalize('file:/\\/\\C:\\\\//foo\\bar.html') should be file:///C:////foo/bar.html. Was file:////C:////foo/bar.html. PASS canonicalize('file:///foo/bar.txt') is 'file:///foo/bar.txt' -FAIL canonicalize('FILE:/\\/\\7:\\\\//foo\\bar.html') should be file://7:////foo/bar.html. Was FILE:////7:////foo/bar.html. +FAIL canonicalize('FILE:/\\/\\7:\\\\//foo\\bar.html') should be file://7:////foo/bar.html. Was file:////7:////foo/bar.html. PASS canonicalize('file:filer/home\\me') is 'file://filer/home/me' FAIL canonicalize('file:///C:/foo/../../../bar.html') should be file:///C:/bar.html. Was file:///bar.html. FAIL canonicalize('file:///C:/asdf#\xc2') should be file:///C:/asdf#�. Was file:///C:/asdf#%C2. diff --git a/LayoutTests/fast/url/path-expected.txt b/LayoutTests/fast/url/path-expected.txt index 629806b..93bfb03 100644 --- a/LayoutTests/fast/url/path-expected.txt +++ b/LayoutTests/fast/url/path-expected.txt @@ -17,7 +17,10 @@ PASS canonicalize('http://example.com/foo/../../../ton') is 'http://example.com/ FAIL canonicalize('http://example.com/foo/%2e') should be http://example.com/foo/. Was http://example.com/foo/%2e. FAIL canonicalize('http://example.com/foo/%2e%2') should be http://example.com/foo/.%2. Was http://example.com/foo/%2e%2. FAIL canonicalize('http://example.com/foo/%2e./%2e%2e/.%2e/%2e.bar') should be http://example.com/..bar. Was http://example.com/foo/%2e./%2e%2e/.%2e/%2e.bar. -FAIL canonicalize('http://example.com////../..') should be http://example.com//. Was http://example.com/. +PASS canonicalize('http://example.com////../..') is 'http://example.com//' +PASS canonicalize('http://example.com/foo/bar//../..') is 'http://example.com/foo/' +PASS canonicalize('http://example.com/foo/bar//..') is 'http://example.com/foo/bar/' +PASS canonicalize('http://example.com/foo/bar/..') is 'http://example.com/foo/' PASS canonicalize('http://example.com/foo') is 'http://example.com/foo' PASS canonicalize('http://example.com/%20foo') is 'http://example.com/%20foo' PASS canonicalize('http://example.com/foo%') is 'http://example.com/foo%' diff --git a/LayoutTests/fast/url/path-url-expected.txt b/LayoutTests/fast/url/path-url-expected.txt index 73eaf54..278b623 100644 --- a/LayoutTests/fast/url/path-url-expected.txt +++ b/LayoutTests/fast/url/path-url-expected.txt @@ -4,7 +4,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE PASS canonicalize('javascript:') is 'javascript:' -FAIL canonicalize('JavaScript:Foo') should be javascript:Foo. Was JavaScript:Foo. +PASS canonicalize('JavaScript:Foo') is 'javascript:Foo' PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/url/port-expected.txt b/LayoutTests/fast/url/port-expected.txt index d64dd3a..11ab371 100644 --- a/LayoutTests/fast/url/port-expected.txt +++ b/LayoutTests/fast/url/port-expected.txt @@ -5,8 +5,9 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE FAIL canonicalize('http://www.example.com:as df/') should be http://www.example.com:as%20df/. Was http://www.example.com:as df/. PASS canonicalize('http://www.example.com:-2/') is 'http://www.example.com:-2/' -FAIL canonicalize('http://www.example.com:80/') should be http://www.example.com/. Was http://www.example.com:80/. +PASS canonicalize('http://www.example.com:80/') is 'http://www.example.com/' PASS canonicalize('http://www.example.com:8080/') is 'http://www.example.com:8080/' +PASS canonicalize('http://www.example.com:/') is 'http://www.example.com/' PASS canonicalize('foobar://www.example.com:80/') is 'foobar://www.example.com:80/' PASS successfullyParsed is true diff --git a/LayoutTests/fast/url/relative-expected.txt b/LayoutTests/fast/url/relative-expected.txt index 684253f..8ee781c 100644 --- a/LayoutTests/fast/url/relative-expected.txt +++ b/LayoutTests/fast/url/relative-expected.txt @@ -14,7 +14,7 @@ PASS canonicalize(' ') is 'http://foo/bar' PASS canonicalize('http:path') is 'http://host/path' PASS canonicalize('http:path') is 'http://host/a/path' FAIL canonicalize('http:/path') should be http://host/path. Was http:/path. -FAIL canonicalize('HTTP:/path') should be http://host/path. Was HTTP:/path. +FAIL canonicalize('HTTP:/path') should be http://host/path. Was http:/path. FAIL canonicalize('https:host2') should be https://host2/. Was https:host2. PASS canonicalize('htto:/host2') is 'htto:/host2' PASS canonicalize('/b/c/d') is 'http://host/b/c/d' diff --git a/LayoutTests/fast/url/relative-unix-expected.txt b/LayoutTests/fast/url/relative-unix-expected.txt index acd59ab..32c1a75 100644 --- a/LayoutTests/fast/url/relative-unix-expected.txt +++ b/LayoutTests/fast/url/relative-unix-expected.txt @@ -5,7 +5,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE FAIL canonicalize('\\\\Another\\path') should be http://another/path. Was http://Another/path. PASS canonicalize('/c:\\foo') is 'http://host/c:/foo' -FAIL canonicalize('//c:\\foo') should be http://c/foo. Was http://c:/foo. +PASS canonicalize('//c:\\foo') is 'http://c/foo' PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/url/relative-win-expected.txt b/LayoutTests/fast/url/relative-win-expected.txt index 733f815..1cb8d67 100644 --- a/LayoutTests/fast/url/relative-win-expected.txt +++ b/LayoutTests/fast/url/relative-win-expected.txt @@ -8,7 +8,7 @@ PASS canonicalize('bar') is 'file:///C:/bar' FAIL canonicalize('../../../bar.html') should be file:///C:/bar.html. Was file:///bar.html. FAIL canonicalize('/../bar.html') should be file:///C:/bar.html. Was file:///bar.html. FAIL canonicalize('\\\\another\\path') should be . Was http://another/path. -FAIL canonicalize('//c:/foo') should be file:///C:/foo. Was file://c:/foo. +FAIL canonicalize('//c:/foo') should be file:///C:/foo. Was file://c/foo. FAIL canonicalize('//localhost/c:/foo') should be file:///C:/foo. Was file:///c:/foo. FAIL canonicalize('c:') should be . Was c:. FAIL canonicalize('c:/foo') should be . Was c:/foo. diff --git a/LayoutTests/fast/url/scheme-expected.txt b/LayoutTests/fast/url/scheme-expected.txt index 8709b81..fbc130d 100644 --- a/LayoutTests/fast/url/scheme-expected.txt +++ b/LayoutTests/fast/url/scheme-expected.txt @@ -4,7 +4,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE PASS canonicalize('http://example.com/') is 'http://example.com/' -FAIL canonicalize('HTTP://example.com/') should be http://example.com/. Was HTTP://example.com/. +PASS canonicalize('HTTP://example.com/') is 'http://example.com/' PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/url/script-tests/anchor.js b/LayoutTests/fast/url/script-tests/anchor.js index 0387a86..8791b74 100644 --- a/LayoutTests/fast/url/script-tests/anchor.js +++ b/LayoutTests/fast/url/script-tests/anchor.js @@ -9,6 +9,7 @@ cases = [ ["a\\uFDD0", "a\\uFDD0"], ["asdf#qwer", "asdf#qwer"], ["#asdf", "#asdf"], + ["a\\nb\\rc\\td", "abcd"], ]; for (var i = 0; i < cases.length; ++i) { diff --git a/LayoutTests/fast/url/script-tests/path.js b/LayoutTests/fast/url/script-tests/path.js index 10aaf4d..fb082ad 100644 --- a/LayoutTests/fast/url/script-tests/path.js +++ b/LayoutTests/fast/url/script-tests/path.js @@ -23,6 +23,9 @@ cases = [ // Multiple slashes in a row should be preserved and treated like empty // directory names. ["////../..", "//"], + ["/foo/bar//../..", "/foo/"], + ["/foo/bar//..", "/foo/bar/"], + ["/foo/bar/..", "/foo/"], // ----- escaping tests ----- ["/foo", "/foo"], diff --git a/LayoutTests/fast/url/script-tests/port.js b/LayoutTests/fast/url/script-tests/port.js index b3228b1..e9e6057 100644 --- a/LayoutTests/fast/url/script-tests/port.js +++ b/LayoutTests/fast/url/script-tests/port.js @@ -7,6 +7,8 @@ cases = [ // Default port should be omitted. ["80", ""], ["8080", ":8080"], + // Empty ports (just a colon) should also be removed + ["", ""], ]; for (var i = 0; i < cases.length; ++i) { diff --git a/LayoutTests/fast/url/segments-expected.txt b/LayoutTests/fast/url/segments-expected.txt index 2da6912..659be5f 100644 --- a/LayoutTests/fast/url/segments-expected.txt +++ b/LayoutTests/fast/url/segments-expected.txt @@ -8,7 +8,7 @@ PASS segments('http:foo.com') is '["http:","example.org","0","/foo/foo.com",""," PASS segments('\t :foo.com \n') is '["http:","example.org","0","/foo/:foo.com","",""]' PASS segments(' foo.com ') is '["http:","example.org","0","/foo/foo.com","",""]' PASS segments('a:\t foo.com') is '["a:","","0"," foo.com","",""]' -FAIL segments('http://f:21/ b ? d # e ') should be ["http:","f","21","/%20b%20","?%20d%20","# e"]. Was ["http:","f","21","/ b ","?%20d%20","#%20e"]. +FAIL segments('http://f:21/ b ? d # e ') should be ["http:","f","21","/%20b%20","?%20d%20","# e"]. Was ["http:","f","21","/ b ","?%20d%20","# e"]. PASS segments('http://f:/c') is '["http:","f","0","/c","",""]' PASS segments('http://f:0/c') is '["http:","f","0","/c","",""]' PASS segments('http://f:00000000000000/c') is '["http:","f","0","/c","",""]' @@ -55,7 +55,7 @@ PASS segments('foo://///////bar.com/') is '["foo:","","0","/////////bar.com/","" PASS segments('foo:////://///') is '["foo:","","0","////://///","",""]' PASS segments('c:/foo') is '["c:","","0","/foo","",""]' PASS segments('//foo/bar') is '["http:","foo","0","/bar","",""]' -FAIL segments('http://foo/path;a??e#f#g') should be ["http:","foo","0","/path;a","??e","#f#g"]. Was ["http:","foo","0","/path;a","??e","#f%23g"]. +PASS segments('http://foo/path;a??e#f#g') is '["http:","foo","0","/path;a","??e","#f#g"]' PASS segments('http://foo/abcd?efgh?ijkl') is '["http:","foo","0","/abcd","?efgh?ijkl",""]' PASS segments('http://foo/abcd#foo?bar') is '["http:","foo","0","/abcd","","#foo?bar"]' PASS segments('[61:24:74]:98') is '["http:","example.org","0","/foo/[61:24:74]:98","",""]' @@ -67,7 +67,7 @@ PASS segments('http://[2001::1') is '[":","","0","","",""]' PASS segments('http://2001::1]') is '[":","","0","","",""]' PASS segments('http://2001::1]:80') is '[":","","0","","",""]' PASS segments('http://[2001::1]') is '["http:","[2001::1]","0","/","",""]' -FAIL segments('http://[2001::1]:80') should be ["http:","[2001::1]","0","/","",""]. Was ["http:","[2001::1]","80","/","",""]. +PASS segments('http://[2001::1]:80') is '["http:","[2001::1]","0","/","",""]' PASS segments('http://[[::]]') is '[":","","0","","",""]' PASS successfullyParsed is true diff --git a/LayoutTests/fast/url/segments-from-data-url-expected.txt b/LayoutTests/fast/url/segments-from-data-url-expected.txt index 6e1853e..b97e489 100644 --- a/LayoutTests/fast/url/segments-from-data-url-expected.txt +++ b/LayoutTests/fast/url/segments-from-data-url-expected.txt @@ -8,7 +8,7 @@ FAIL segments('http:foo.com') should be ["http:","foo.com","0","/","",""]. Was [ PASS segments('\t :foo.com \n') is '[":","","0","","",""]' PASS segments(' foo.com ') is '[":","","0","","",""]' PASS segments('a:\t foo.com') is '["a:","","0"," foo.com","",""]' -FAIL segments('http://f:21/ b ? d # e ') should be ["http:","f","21","/%20b%20","?%20d%20","# e"]. Was ["http:","f","21","/ b ","?%20d%20","#%20e"]. +FAIL segments('http://f:21/ b ? d # e ') should be ["http:","f","21","/%20b%20","?%20d%20","# e"]. Was ["http:","f","21","/ b ","?%20d%20","# e"]. PASS segments('http://f:/c') is '["http:","f","0","/c","",""]' PASS segments('http://f:0/c') is '["http:","f","0","/c","",""]' PASS segments('http://f:00000000000000/c') is '["http:","f","0","/c","",""]' @@ -55,7 +55,7 @@ PASS segments('foo://///////bar.com/') is '["foo:","","0","/////////bar.com/","" PASS segments('foo:////://///') is '["foo:","","0","////://///","",""]' PASS segments('c:/foo') is '["c:","","0","/foo","",""]' PASS segments('//foo/bar') is '[":","","0","","",""]' -FAIL segments('http://foo/path;a??e#f#g') should be ["http:","foo","0","/path;a","??e","#f#g"]. Was ["http:","foo","0","/path;a","??e","#f%23g"]. +PASS segments('http://foo/path;a??e#f#g') is '["http:","foo","0","/path;a","??e","#f#g"]' PASS segments('http://foo/abcd?efgh?ijkl') is '["http:","foo","0","/abcd","?efgh?ijkl",""]' PASS segments('http://foo/abcd#foo?bar') is '["http:","foo","0","/abcd","","#foo?bar"]' FAIL segments('[61:24:74]:98') should be ["data:","","0","text/[61:24:74]:98","",""]. Was [":","","0","","",""]. @@ -67,7 +67,7 @@ PASS segments('http://[2001::1') is '[":","","0","","",""]' PASS segments('http://2001::1]') is '[":","","0","","",""]' PASS segments('http://2001::1]:80') is '[":","","0","","",""]' PASS segments('http://[2001::1]') is '["http:","[2001::1]","0","/","",""]' -FAIL segments('http://[2001::1]:80') should be ["http:","[2001::1]","0","/","",""]. Was ["http:","[2001::1]","80","/","",""]. +PASS segments('http://[2001::1]:80') is '["http:","[2001::1]","0","/","",""]' PASS segments('http://[[::]]') is '[":","","0","","",""]' PASS successfullyParsed is true diff --git a/LayoutTests/fast/url/standard-url-expected.txt b/LayoutTests/fast/url/standard-url-expected.txt index 18a5117..5312e07 100644 --- a/LayoutTests/fast/url/standard-url-expected.txt +++ b/LayoutTests/fast/url/standard-url-expected.txt @@ -12,23 +12,23 @@ PASS canonicalize('http://user:pass@/') is 'http://user:pass@/' PASS canonicalize('http://%25DOMAIN:foobar@foodomain.com/') is 'http://%25DOMAIN:foobar@foodomain.com/' PASS canonicalize('http:\\\\www.google.com\\foo') is 'http://www.google.com/foo' FAIL canonicalize('http://www.google.com/asdf#\ud800') should be http://www.google.com/asdf#�. Was http://www.google.com/asdf#%26%2355296%3B. -FAIL canonicalize('http://foo:80/') should be http://foo/. Was http://foo:80/. +PASS canonicalize('http://foo:80/') is 'http://foo/' PASS canonicalize('http://foo:81/') is 'http://foo:81/' PASS canonicalize('httpa://foo:80/') is 'httpa://foo:80/' PASS canonicalize('http://foo:-80/') is 'http://foo:-80/' -FAIL canonicalize('https://foo:443/') should be https://foo/. Was https://foo:443/. +PASS canonicalize('https://foo:443/') is 'https://foo/' PASS canonicalize('https://foo:80/') is 'https://foo:80/' -FAIL canonicalize('ftp://foo:21/') should be ftp://foo/. Was ftp://foo:21/. +PASS canonicalize('ftp://foo:21/') is 'ftp://foo/' PASS canonicalize('ftp://foo:80/') is 'ftp://foo:80/' -FAIL canonicalize('gopher://foo:70/') should be gopher://foo/. Was gopher://foo:70/. +PASS canonicalize('gopher://foo:70/') is 'gopher://foo/' PASS canonicalize('gopher://foo:443/') is 'gopher://foo:443/' -FAIL canonicalize('ws://foo:80/') should be ws://foo/. Was ws://foo:80/. +PASS canonicalize('ws://foo:80/') is 'ws://foo/' PASS canonicalize('ws://foo:81/') is 'ws://foo:81/' PASS canonicalize('ws://foo:443/') is 'ws://foo:443/' PASS canonicalize('ws://foo:815/') is 'ws://foo:815/' PASS canonicalize('wss://foo:80/') is 'wss://foo:80/' PASS canonicalize('wss://foo:81/') is 'wss://foo:81/' -FAIL canonicalize('wss://foo:443/') should be wss://foo/. Was wss://foo:443/. +PASS canonicalize('wss://foo:443/') is 'wss://foo/' PASS canonicalize('wss://foo:815/') is 'wss://foo:815/' PASS successfullyParsed is true |