Merge WebKit at r78450: Initial merge by git.

[android-x86/external-webkit.git] / LayoutTests / fast / url / standard-url-expected.txt

diff --git a/LayoutTests/fast/url/standard-url-expected.txt b/LayoutTests/fast/url/standard-url-expected.txt
index 18a5117..5312e07 100644 (file)
--- 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