Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: Source/platform/weborigin/KURLTest.cpp

Issue 1184673003: Fix unit test style in Source/platform/, part 2. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 21 matching lines...) Expand all
32 // original KURL's. 32 // original KURL's.
33 33
34 #include "config.h" 34 #include "config.h"
35 #include "platform/weborigin/KURL.h" 35 #include "platform/weborigin/KURL.h"
36 36
37 #include "wtf/testing/WTFTestHelpers.h" 37 #include "wtf/testing/WTFTestHelpers.h"
38 #include "wtf/text/CString.h" 38 #include "wtf/text/CString.h"
39 #include "wtf/text/WTFString.h" 39 #include "wtf/text/WTFString.h"
40 #include <gtest/gtest.h> 40 #include <gtest/gtest.h>
41 41
42 namespace { 42 namespace blink {
43 43
44 struct ComponentCase { 44 struct ComponentCase {
45 const char* url; 45 const char* url;
46 const char* protocol; 46 const char* protocol;
47 const char* host; 47 const char* host;
48 const int port; 48 const int port;
49 const char* user; 49 const char* user;
50 const char* pass; 50 const char* pass;
51 const char* lastPath; 51 const char* lastPath;
52 const char* query; 52 const char* query;
(...skipping 17 matching lines...) Expand all
70 } cases[] = { 70 } cases[] = {
71 {"http://www.google.com/foo/blah?bar=baz#ref", "http", "www.google.com", 0, "", 0, "blah", "bar=baz", "ref", true}, 71 {"http://www.google.com/foo/blah?bar=baz#ref", "http", "www.google.com", 0, "", 0, "blah", "bar=baz", "ref", true},
72 {"http://foo.com:1234/foo/bar/", "http", "foo.com", 1234, "", 0, "bar", 0, 0, false}, 72 {"http://foo.com:1234/foo/bar/", "http", "foo.com", 1234, "", 0, "bar", 0, 0, false},
73 {"http://www.google.com?#", "http", "www.google.com", 0, "", 0, 0, "", " ", true}, 73 {"http://www.google.com?#", "http", "www.google.com", 0, "", 0, 0, "", " ", true},
74 {"https://me:pass@google.com:23#foo", "https", "google.com", 23, "me", " pass", 0, 0, "foo", true}, 74 {"https://me:pass@google.com:23#foo", "https", "google.com", 23, "me", " pass", 0, 0, "foo", true},
75 {"javascript:hello!//world", "javascript", "", 0, "", 0, "world", 0, 0, false}, 75 {"javascript:hello!//world", "javascript", "", 0, "", 0, "world", 0, 0, false},
76 }; 76 };
77 77
78 for (size_t i = 0; i < arraysize(cases); i++) { 78 for (size_t i = 0; i < arraysize(cases); i++) {
79 // UTF-8 79 // UTF-8
80 blink::KURL kurl(blink::ParsedURLString, cases[i].url); 80 KURL kurl(ParsedURLString, cases[i].url);
81 81
82 EXPECT_EQ(cases[i].protocol, kurl.protocol()); 82 EXPECT_EQ(cases[i].protocol, kurl.protocol());
83 EXPECT_EQ(cases[i].host, kurl.host()); 83 EXPECT_EQ(cases[i].host, kurl.host());
84 EXPECT_EQ(cases[i].port, kurl.port()); 84 EXPECT_EQ(cases[i].port, kurl.port());
85 EXPECT_EQ(cases[i].user, kurl.user()); 85 EXPECT_EQ(cases[i].user, kurl.user());
86 EXPECT_EQ(cases[i].pass, kurl.pass()); 86 EXPECT_EQ(cases[i].pass, kurl.pass());
87 EXPECT_EQ(cases[i].lastPathComponent, kurl.lastPathComponent()); 87 EXPECT_EQ(cases[i].lastPathComponent, kurl.lastPathComponent());
88 EXPECT_EQ(cases[i].query, kurl.query()); 88 EXPECT_EQ(cases[i].query, kurl.query());
89 EXPECT_EQ(cases[i].ref, kurl.fragmentIdentifier()); 89 EXPECT_EQ(cases[i].ref, kurl.fragmentIdentifier());
90 EXPECT_EQ(cases[i].hasRef, kurl.hasFragmentIdentifier()); 90 EXPECT_EQ(cases[i].hasRef, kurl.hasFragmentIdentifier());
91 91
92 // UTF-16 92 // UTF-16
93 WTF::String utf16(cases[i].url); 93 String utf16(cases[i].url);
94 kurl = blink::KURL(blink::ParsedURLString, utf16); 94 kurl = KURL(ParsedURLString, utf16);
95 95
96 EXPECT_EQ(cases[i].protocol, kurl.protocol()); 96 EXPECT_EQ(cases[i].protocol, kurl.protocol());
97 EXPECT_EQ(cases[i].host, kurl.host()); 97 EXPECT_EQ(cases[i].host, kurl.host());
98 EXPECT_EQ(cases[i].port, kurl.port()); 98 EXPECT_EQ(cases[i].port, kurl.port());
99 EXPECT_EQ(cases[i].user, kurl.user()); 99 EXPECT_EQ(cases[i].user, kurl.user());
100 EXPECT_EQ(cases[i].pass, kurl.pass()); 100 EXPECT_EQ(cases[i].pass, kurl.pass());
101 EXPECT_EQ(cases[i].lastPathComponent, kurl.lastPathComponent()); 101 EXPECT_EQ(cases[i].lastPathComponent, kurl.lastPathComponent());
102 EXPECT_EQ(cases[i].query, kurl.query()); 102 EXPECT_EQ(cases[i].query, kurl.query());
103 EXPECT_EQ(cases[i].ref, kurl.fragmentIdentifier()); 103 EXPECT_EQ(cases[i].ref, kurl.fragmentIdentifier());
104 EXPECT_EQ(cases[i].hasRef, kurl.hasFragmentIdentifier()); 104 EXPECT_EQ(cases[i].hasRef, kurl.hasFragmentIdentifier());
(...skipping 16 matching lines...) Expand all
121 {"http://a.com/hello;world", "http", "a.com", 0, "", 0, "hello", 0, 0}, 121 {"http://a.com/hello;world", "http", "a.com", 0, "", 0, "hello", 0, 0},
122 122
123 // WebKit doesn't like UTF-8 or UTF-16 input. 123 // WebKit doesn't like UTF-8 or UTF-16 input.
124 {"http://\xe4\xbd\xa0\xe5\xa5\xbd\xe4\xbd\xa0\xe5\xa5\xbd/", "http", "xn --6qqa088eba", 0, "", 0, 0, 0, 0}, 124 {"http://\xe4\xbd\xa0\xe5\xa5\xbd\xe4\xbd\xa0\xe5\xa5\xbd/", "http", "xn --6qqa088eba", 0, "", 0, 0, 0, 0},
125 125
126 // WebKit %-escapes non-ASCII characters in reference, but we don't. 126 // WebKit %-escapes non-ASCII characters in reference, but we don't.
127 {"http://www.google.com/foo/blah?bar=baz#\xce\xb1\xce\xb2", "http", "www .google.com", 0, "", 0, "blah", "bar=baz", "\xce\xb1\xce\xb2"}, 127 {"http://www.google.com/foo/blah?bar=baz#\xce\xb1\xce\xb2", "http", "www .google.com", 0, "", 0, "blah", "bar=baz", "\xce\xb1\xce\xb2"},
128 }; 128 };
129 129
130 for (size_t i = 0; i < arraysize(cases); i++) { 130 for (size_t i = 0; i < arraysize(cases); i++) {
131 blink::KURL kurl(blink::ParsedURLString, cases[i].url); 131 KURL kurl(ParsedURLString, cases[i].url);
132 132
133 EXPECT_EQ(cases[i].protocol, kurl.protocol()); 133 EXPECT_EQ(cases[i].protocol, kurl.protocol());
134 EXPECT_EQ(cases[i].host, kurl.host()); 134 EXPECT_EQ(cases[i].host, kurl.host());
135 EXPECT_EQ(cases[i].port, kurl.port()); 135 EXPECT_EQ(cases[i].port, kurl.port());
136 EXPECT_EQ(cases[i].user, kurl.user()); 136 EXPECT_EQ(cases[i].user, kurl.user());
137 EXPECT_EQ(cases[i].pass, kurl.pass()); 137 EXPECT_EQ(cases[i].pass, kurl.pass());
138 EXPECT_EQ(cases[i].lastPath, kurl.lastPathComponent()); 138 EXPECT_EQ(cases[i].lastPath, kurl.lastPathComponent());
139 EXPECT_EQ(cases[i].query, kurl.query()); 139 EXPECT_EQ(cases[i].query, kurl.query());
140 // Want to compare UCS-16 refs (or to null). 140 // Want to compare UCS-16 refs (or to null).
141 if (cases[i].ref) 141 if (cases[i].ref)
142 EXPECT_EQ(WTF::String::fromUTF8(cases[i].ref), kurl.fragmentIdentifi er()); 142 EXPECT_EQ(String::fromUTF8(cases[i].ref), kurl.fragmentIdentifier()) ;
143 else 143 else
144 EXPECT_TRUE(kurl.fragmentIdentifier().isNull()); 144 EXPECT_TRUE(kurl.fragmentIdentifier().isNull());
145 } 145 }
146 } 146 }
147 147
148 // Ensures that both ASCII and UTF-8 canonical URLs are handled properly and we 148 // Ensures that both ASCII and UTF-8 canonical URLs are handled properly and we
149 // get the correct string object out. 149 // get the correct string object out.
150 TEST(KURLTest, DISABLED_UTF8) 150 TEST(KURLTest, DISABLED_UTF8)
151 { 151 {
152 const char asciiURL[] = "http://foo/bar#baz"; 152 const char asciiURL[] = "http://foo/bar#baz";
153 blink::KURL asciiKURL(blink::ParsedURLString, asciiURL); 153 KURL asciiKURL(ParsedURLString, asciiURL);
154 EXPECT_TRUE(asciiKURL.string() == WTF::String(asciiURL)); 154 EXPECT_TRUE(asciiKURL.string() == String(asciiURL));
155 155
156 // When the result is ASCII, we should get an ASCII String. Some 156 // When the result is ASCII, we should get an ASCII String. Some
157 // code depends on being able to compare the result of the .string() 157 // code depends on being able to compare the result of the .string()
158 // getter with another String, and the isASCIIness of the two 158 // getter with another String, and the isASCIIness of the two
159 // strings must match for these functions (like equalIgnoringCase). 159 // strings must match for these functions (like equalIgnoringCase).
160 EXPECT_TRUE(WTF::equalIgnoringCase(asciiKURL, WTF::String(asciiURL))); 160 EXPECT_TRUE(equalIgnoringCase(asciiKURL, String(asciiURL)));
161 161
162 // Reproduce code path in FrameLoader.cpp -- equalIgnoringCase implicitly 162 // Reproduce code path in FrameLoader.cpp -- equalIgnoringCase implicitly
163 // expects gkurl.protocol() to have been created as ascii. 163 // expects gkurl.protocol() to have been created as ascii.
164 blink::KURL mailto(blink::ParsedURLString, "mailto:foo@foo.com"); 164 KURL mailto(ParsedURLString, "mailto:foo@foo.com");
165 EXPECT_TRUE(WTF::equalIgnoringCase(mailto.protocol(), "mailto")); 165 EXPECT_TRUE(equalIgnoringCase(mailto.protocol(), "mailto"));
166 166
167 const char utf8URL[] = "http://foo/bar#\xe4\xbd\xa0\xe5\xa5\xbd"; 167 const char utf8URL[] = "http://foo/bar#\xe4\xbd\xa0\xe5\xa5\xbd";
168 blink::KURL utf8KURL(blink::ParsedURLString, utf8URL); 168 KURL utf8KURL(ParsedURLString, utf8URL);
169 169
170 EXPECT_TRUE(utf8KURL.string() == WTF::String::fromUTF8(utf8URL)); 170 EXPECT_TRUE(utf8KURL.string() == String::fromUTF8(utf8URL));
171 } 171 }
172 172
173 TEST(KURLTest, Setters) 173 TEST(KURLTest, Setters)
174 { 174 {
175 // Replace the starting URL with the given components one at a time and 175 // Replace the starting URL with the given components one at a time and
176 // verify that we're always the same as the old KURL. 176 // verify that we're always the same as the old KURL.
177 // 177 //
178 // Note that old KURL won't canonicalize the default port away, so we 178 // Note that old KURL won't canonicalize the default port away, so we
179 // can't set setting the http port to "80" (or even "0"). 179 // can't set setting the http port to "80" (or even "0").
180 // 180 //
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 // pass 232 // pass
233 "", "http://goo.com:92/a?f#b", 233 "", "http://goo.com:92/a?f#b",
234 // path 234 // path
235 "/", "http://goo.com:92/?f#b", 235 "/", "http://goo.com:92/?f#b",
236 // query 236 // query
237 0, "http://goo.com:92/#b" 237 0, "http://goo.com:92/#b"
238 }, 238 },
239 }; 239 };
240 240
241 for (size_t i = 0; i < arraysize(cases); i++) { 241 for (size_t i = 0; i < arraysize(cases); i++) {
242 blink::KURL kurl(blink::ParsedURLString, cases[i].url); 242 KURL kurl(ParsedURLString, cases[i].url);
243 243
244 kurl.setProtocol(cases[i].protocol); 244 kurl.setProtocol(cases[i].protocol);
245 EXPECT_STREQ(cases[i].expectedProtocol, kurl.string().utf8().data()); 245 EXPECT_STREQ(cases[i].expectedProtocol, kurl.string().utf8().data());
246 246
247 kurl.setHost(cases[i].host); 247 kurl.setHost(cases[i].host);
248 EXPECT_STREQ(cases[i].expectedHost, kurl.string().utf8().data()); 248 EXPECT_STREQ(cases[i].expectedHost, kurl.string().utf8().data());
249 249
250 kurl.setPort(cases[i].port); 250 kurl.setPort(cases[i].port);
251 EXPECT_STREQ(cases[i].expectedPort, kurl.string().utf8().data()); 251 EXPECT_STREQ(cases[i].expectedPort, kurl.string().utf8().data());
252 252
(...skipping 28 matching lines...) Expand all
281 {"%30%31%32%33%34%35%36%37%38%39%3a%3B%3C%3D%3e%3f/", "0123456789:;<=>?/ "}, 281 {"%30%31%32%33%34%35%36%37%38%39%3a%3B%3C%3D%3e%3f/", "0123456789:;<=>?/ "},
282 {"%40%41%42%43%44%45%46%47%48%49%4a%4B%4C%4D%4e%4f/", "@ABCDEFGHIJKLMNO/ "}, 282 {"%40%41%42%43%44%45%46%47%48%49%4a%4B%4C%4D%4e%4f/", "@ABCDEFGHIJKLMNO/ "},
283 {"%50%51%52%53%54%55%56%57%58%59%5a%5B%5C%5D%5e%5f/", "PQRSTUVWXYZ[\\]^_ /"}, 283 {"%50%51%52%53%54%55%56%57%58%59%5a%5B%5C%5D%5e%5f/", "PQRSTUVWXYZ[\\]^_ /"},
284 {"%60%61%62%63%64%65%66%67%68%69%6a%6B%6C%6D%6e%6f/", "`abcdefghijklmno/ "}, 284 {"%60%61%62%63%64%65%66%67%68%69%6a%6B%6C%6D%6e%6f/", "`abcdefghijklmno/ "},
285 {"%70%71%72%73%74%75%76%77%78%79%7a%7B%7C%7D%7e%7f/", "pqrstuvwxyz{|}~\x 7f/"}, 285 {"%70%71%72%73%74%75%76%77%78%79%7a%7B%7C%7D%7e%7f/", "pqrstuvwxyz{|}~\x 7f/"},
286 // Test un-UTF-8-ization. 286 // Test un-UTF-8-ization.
287 {"%e4%bd%a0%e5%a5%bd", "\xe4\xbd\xa0\xe5\xa5\xbd"}, 287 {"%e4%bd%a0%e5%a5%bd", "\xe4\xbd\xa0\xe5\xa5\xbd"},
288 }; 288 };
289 289
290 for (size_t i = 0; i < arraysize(decodeCases); i++) { 290 for (size_t i = 0; i < arraysize(decodeCases); i++) {
291 WTF::String input(decodeCases[i].input); 291 String input(decodeCases[i].input);
292 WTF::String str = blink::decodeURLEscapeSequences(input); 292 String str = decodeURLEscapeSequences(input);
293 EXPECT_STREQ(decodeCases[i].output, str.utf8().data()); 293 EXPECT_STREQ(decodeCases[i].output, str.utf8().data());
294 } 294 }
295 295
296 // Our decode should decode %00 296 // Our decode should decode %00
297 WTF::String zero = blink::decodeURLEscapeSequences("%00"); 297 String zero = decodeURLEscapeSequences("%00");
298 EXPECT_STRNE("%00", zero.utf8().data()); 298 EXPECT_STRNE("%00", zero.utf8().data());
299 299
300 // Test the error behavior for invalid UTF-8 (we differ from WebKit here). 300 // Test the error behavior for invalid UTF-8 (we differ from WebKit here).
301 WTF::String invalid = blink::decodeURLEscapeSequences( 301 String invalid = decodeURLEscapeSequences("%e4%a0%e5%a5%bd");
302 "%e4%a0%e5%a5%bd");
303 UChar invalidExpectedHelper[4] = { 0x00e4, 0x00a0, 0x597d, 0 }; 302 UChar invalidExpectedHelper[4] = { 0x00e4, 0x00a0, 0x597d, 0 };
304 WTF::String invalidExpected( 303 String invalidExpected(
305 reinterpret_cast<const ::UChar*>(invalidExpectedHelper), 304 reinterpret_cast<const ::UChar*>(invalidExpectedHelper),
306 3); 305 3);
307 EXPECT_EQ(invalidExpected, invalid); 306 EXPECT_EQ(invalidExpected, invalid);
308 } 307 }
309 308
310 TEST(KURLTest, Encode) 309 TEST(KURLTest, Encode)
311 { 310 {
312 struct EncodeCase { 311 struct EncodeCase {
313 const char* input; 312 const char* input;
314 const char* output; 313 const char* output;
(...skipping 10 matching lines...) Expand all
325 "%40ABCDEFGHIJKLMNO"}, 324 "%40ABCDEFGHIJKLMNO"},
326 {"PQRSTUVWXYZ[\\]^_", 325 {"PQRSTUVWXYZ[\\]^_",
327 "PQRSTUVWXYZ%5B%5C%5D%5E_"}, 326 "PQRSTUVWXYZ%5B%5C%5D%5E_"},
328 {"`abcdefghijklmno", 327 {"`abcdefghijklmno",
329 "%60abcdefghijklmno"}, 328 "%60abcdefghijklmno"},
330 {"pqrstuvwxyz{|}~\x7f", 329 {"pqrstuvwxyz{|}~\x7f",
331 "pqrstuvwxyz%7B%7C%7D~%7F"}, 330 "pqrstuvwxyz%7B%7C%7D~%7F"},
332 }; 331 };
333 332
334 for (size_t i = 0; i < arraysize(encode_cases); i++) { 333 for (size_t i = 0; i < arraysize(encode_cases); i++) {
335 WTF::String input(encode_cases[i].input); 334 String input(encode_cases[i].input);
336 WTF::String expectedOutput(encode_cases[i].output); 335 String expectedOutput(encode_cases[i].output);
337 WTF::String output = blink::encodeWithURLEscapeSequences(input); 336 String output = encodeWithURLEscapeSequences(input);
338 EXPECT_EQ(expectedOutput, output); 337 EXPECT_EQ(expectedOutput, output);
339 } 338 }
340 339
341 // Our encode escapes NULLs for safety, so we need to check that too. 340 // Our encode escapes NULLs for safety, so we need to check that too.
342 WTF::String input("\x00\x01", 2); 341 String input("\x00\x01", 2);
343 WTF::String reference("%00%01"); 342 String reference("%00%01");
344 343
345 WTF::String output = blink::encodeWithURLEscapeSequences(input); 344 String output = encodeWithURLEscapeSequences(input);
346 EXPECT_EQ(reference, output); 345 EXPECT_EQ(reference, output);
347 346
348 // Also test that it gets converted to UTF-8 properly. 347 // Also test that it gets converted to UTF-8 properly.
349 UChar wideInputHelper[3] = { 0x4f60, 0x597d, 0 }; 348 UChar wideInputHelper[3] = { 0x4f60, 0x597d, 0 };
350 WTF::String wideInput( 349 String wideInput(reinterpret_cast<const ::UChar*>(wideInputHelper), 2);
351 reinterpret_cast<const ::UChar*>(wideInputHelper), 2); 350 String wideReference("%E4%BD%A0%E5%A5%BD");
352 WTF::String wideReference("%E4%BD%A0%E5%A5%BD"); 351 String wideOutput = encodeWithURLEscapeSequences(wideInput);
353 WTF::String wideOutput =
354 blink::encodeWithURLEscapeSequences(wideInput);
355 EXPECT_EQ(wideReference, wideOutput); 352 EXPECT_EQ(wideReference, wideOutput);
356 } 353 }
357 354
358 TEST(KURLTest, ResolveEmpty) 355 TEST(KURLTest, ResolveEmpty)
359 { 356 {
360 blink::KURL emptyBase; 357 KURL emptyBase;
361 358
362 // WebKit likes to be able to resolve absolute input agains empty base URLs, 359 // WebKit likes to be able to resolve absolute input agains empty base URLs,
363 // which would normally be invalid since the base URL is invalid. 360 // which would normally be invalid since the base URL is invalid.
364 const char abs[] = "http://www.google.com/"; 361 const char abs[] = "http://www.google.com/";
365 blink::KURL resolveAbs(emptyBase, abs); 362 KURL resolveAbs(emptyBase, abs);
366 EXPECT_TRUE(resolveAbs.isValid()); 363 EXPECT_TRUE(resolveAbs.isValid());
367 EXPECT_STREQ(abs, resolveAbs.string().utf8().data()); 364 EXPECT_STREQ(abs, resolveAbs.string().utf8().data());
368 365
369 // Resolving a non-relative URL agains the empty one should still error. 366 // Resolving a non-relative URL agains the empty one should still error.
370 const char rel[] = "foo.html"; 367 const char rel[] = "foo.html";
371 blink::KURL resolveErr(emptyBase, rel); 368 KURL resolveErr(emptyBase, rel);
372 EXPECT_FALSE(resolveErr.isValid()); 369 EXPECT_FALSE(resolveErr.isValid());
373 } 370 }
374 371
375 // WebKit will make empty URLs and set components on them. kurl doesn't allow 372 // WebKit will make empty URLs and set components on them. kurl doesn't allow
376 // replacements on invalid URLs, but here we do. 373 // replacements on invalid URLs, but here we do.
377 TEST(KURLTest, ReplaceInvalid) 374 TEST(KURLTest, ReplaceInvalid)
378 { 375 {
379 blink::KURL kurl; 376 KURL kurl;
380 377
381 EXPECT_FALSE(kurl.isValid()); 378 EXPECT_FALSE(kurl.isValid());
382 EXPECT_TRUE(kurl.isEmpty()); 379 EXPECT_TRUE(kurl.isEmpty());
383 EXPECT_STREQ("", kurl.string().utf8().data()); 380 EXPECT_STREQ("", kurl.string().utf8().data());
384 381
385 kurl.setProtocol("http"); 382 kurl.setProtocol("http");
386 // GKURL will say that a URL with just a scheme is invalid, KURL will not. 383 // GKURL will say that a URL with just a scheme is invalid, KURL will not.
387 EXPECT_FALSE(kurl.isValid()); 384 EXPECT_FALSE(kurl.isValid());
388 EXPECT_FALSE(kurl.isEmpty()); 385 EXPECT_FALSE(kurl.isEmpty());
389 // At this point, we do things slightly differently if there is only a schem e. 386 // At this point, we do things slightly differently if there is only a schem e.
(...skipping 18 matching lines...) Expand all
408 405
409 // Now let's test that giving an invalid replacement fails. Invalid 406 // Now let's test that giving an invalid replacement fails. Invalid
410 // protocols fail without modifying the URL, which should remain valid. 407 // protocols fail without modifying the URL, which should remain valid.
411 EXPECT_FALSE(kurl.setProtocol("f/sj#@")); 408 EXPECT_FALSE(kurl.setProtocol("f/sj#@"));
412 EXPECT_TRUE(kurl.isValid()); 409 EXPECT_TRUE(kurl.isValid());
413 } 410 }
414 411
415 TEST(KURLTest, Path) 412 TEST(KURLTest, Path)
416 { 413 {
417 const char initial[] = "http://www.google.com/path/foo"; 414 const char initial[] = "http://www.google.com/path/foo";
418 blink::KURL kurl(blink::ParsedURLString, initial); 415 KURL kurl(ParsedURLString, initial);
419 416
420 // Clear by setting a null string. 417 // Clear by setting a null string.
421 WTF::String nullString; 418 String nullString;
422 EXPECT_TRUE(nullString.isNull()); 419 EXPECT_TRUE(nullString.isNull());
423 kurl.setPath(nullString); 420 kurl.setPath(nullString);
424 EXPECT_STREQ("http://www.google.com/", kurl.string().utf8().data()); 421 EXPECT_STREQ("http://www.google.com/", kurl.string().utf8().data());
425 } 422 }
426 423
427 // Test that setting the query to different things works. Thq query is handled 424 // Test that setting the query to different things works. Thq query is handled
428 // a littler differently than some of the other components. 425 // a littler differently than some of the other components.
429 TEST(KURLTest, Query) 426 TEST(KURLTest, Query)
430 { 427 {
431 const char initial[] = "http://www.google.com/search?q=awesome"; 428 const char initial[] = "http://www.google.com/search?q=awesome";
432 blink::KURL kurl(blink::ParsedURLString, initial); 429 KURL kurl(ParsedURLString, initial);
433 430
434 // Clear by setting a null string. 431 // Clear by setting a null string.
435 WTF::String nullString; 432 String nullString;
436 EXPECT_TRUE(nullString.isNull()); 433 EXPECT_TRUE(nullString.isNull());
437 kurl.setQuery(nullString); 434 kurl.setQuery(nullString);
438 EXPECT_STREQ("http://www.google.com/search", kurl.string().utf8().data()); 435 EXPECT_STREQ("http://www.google.com/search", kurl.string().utf8().data());
439 436
440 // Clear by setting an empty string. 437 // Clear by setting an empty string.
441 kurl = blink::KURL(blink::ParsedURLString, initial); 438 kurl = KURL(ParsedURLString, initial);
442 WTF::String emptyString(""); 439 String emptyString("");
443 EXPECT_FALSE(emptyString.isNull()); 440 EXPECT_FALSE(emptyString.isNull());
444 kurl.setQuery(emptyString); 441 kurl.setQuery(emptyString);
445 EXPECT_STREQ("http://www.google.com/search?", kurl.string().utf8().data()); 442 EXPECT_STREQ("http://www.google.com/search?", kurl.string().utf8().data());
446 443
447 // Set with something that begins in a question mark. 444 // Set with something that begins in a question mark.
448 const char question[] = "?foo=bar"; 445 const char question[] = "?foo=bar";
449 kurl.setQuery(question); 446 kurl.setQuery(question);
450 EXPECT_STREQ("http://www.google.com/search?foo=bar", 447 EXPECT_STREQ("http://www.google.com/search?foo=bar",
451 kurl.string().utf8().data()); 448 kurl.string().utf8().data());
452 449
453 // Set with something that doesn't begin in a question mark. 450 // Set with something that doesn't begin in a question mark.
454 const char query[] = "foo=bar"; 451 const char query[] = "foo=bar";
455 kurl.setQuery(query); 452 kurl.setQuery(query);
456 EXPECT_STREQ("http://www.google.com/search?foo=bar", 453 EXPECT_STREQ("http://www.google.com/search?foo=bar",
457 kurl.string().utf8().data()); 454 kurl.string().utf8().data());
458 } 455 }
459 456
460 TEST(KURLTest, Ref) 457 TEST(KURLTest, Ref)
461 { 458 {
462 blink::KURL kurl(blink::ParsedURLString, "http://foo/bar#baz"); 459 KURL kurl(ParsedURLString, "http://foo/bar#baz");
463 460
464 // Basic ref setting. 461 // Basic ref setting.
465 blink::KURL cur(blink::ParsedURLString, "http://foo/bar"); 462 KURL cur(ParsedURLString, "http://foo/bar");
466 cur.setFragmentIdentifier("asdf"); 463 cur.setFragmentIdentifier("asdf");
467 EXPECT_STREQ("http://foo/bar#asdf", cur.string().utf8().data()); 464 EXPECT_STREQ("http://foo/bar#asdf", cur.string().utf8().data());
468 cur = kurl; 465 cur = kurl;
469 cur.setFragmentIdentifier("asdf"); 466 cur.setFragmentIdentifier("asdf");
470 EXPECT_STREQ("http://foo/bar#asdf", cur.string().utf8().data()); 467 EXPECT_STREQ("http://foo/bar#asdf", cur.string().utf8().data());
471 468
472 // Setting a ref to the empty string will set it to "#". 469 // Setting a ref to the empty string will set it to "#".
473 cur = blink::KURL(blink::ParsedURLString, "http://foo/bar"); 470 cur = KURL(ParsedURLString, "http://foo/bar");
474 cur.setFragmentIdentifier(""); 471 cur.setFragmentIdentifier("");
475 EXPECT_STREQ("http://foo/bar#", cur.string().utf8().data()); 472 EXPECT_STREQ("http://foo/bar#", cur.string().utf8().data());
476 cur = kurl; 473 cur = kurl;
477 cur.setFragmentIdentifier(""); 474 cur.setFragmentIdentifier("");
478 EXPECT_STREQ("http://foo/bar#", cur.string().utf8().data()); 475 EXPECT_STREQ("http://foo/bar#", cur.string().utf8().data());
479 476
480 // Setting the ref to the null string will clear it altogether. 477 // Setting the ref to the null string will clear it altogether.
481 cur = blink::KURL(blink::ParsedURLString, "http://foo/bar"); 478 cur = KURL(ParsedURLString, "http://foo/bar");
482 cur.setFragmentIdentifier(WTF::String()); 479 cur.setFragmentIdentifier(String());
483 EXPECT_STREQ("http://foo/bar", cur.string().utf8().data()); 480 EXPECT_STREQ("http://foo/bar", cur.string().utf8().data());
484 cur = kurl; 481 cur = kurl;
485 cur.setFragmentIdentifier(WTF::String()); 482 cur.setFragmentIdentifier(String());
486 EXPECT_STREQ("http://foo/bar", cur.string().utf8().data()); 483 EXPECT_STREQ("http://foo/bar", cur.string().utf8().data());
487 } 484 }
488 485
489 TEST(KURLTest, Empty) 486 TEST(KURLTest, Empty)
490 { 487 {
491 blink::KURL kurl; 488 KURL kurl;
492 489
493 // First test that regular empty URLs are the same. 490 // First test that regular empty URLs are the same.
494 EXPECT_TRUE(kurl.isEmpty()); 491 EXPECT_TRUE(kurl.isEmpty());
495 EXPECT_FALSE(kurl.isValid()); 492 EXPECT_FALSE(kurl.isValid());
496 EXPECT_TRUE(kurl.isNull()); 493 EXPECT_TRUE(kurl.isNull());
497 EXPECT_TRUE(kurl.string().isNull()); 494 EXPECT_TRUE(kurl.string().isNull());
498 EXPECT_TRUE(kurl.string().isEmpty()); 495 EXPECT_TRUE(kurl.string().isEmpty());
499 496
500 // Test resolving a null URL on an empty string. 497 // Test resolving a null URL on an empty string.
501 blink::KURL kurl2(kurl, ""); 498 KURL kurl2(kurl, "");
502 EXPECT_FALSE(kurl2.isNull()); 499 EXPECT_FALSE(kurl2.isNull());
503 EXPECT_TRUE(kurl2.isEmpty()); 500 EXPECT_TRUE(kurl2.isEmpty());
504 EXPECT_FALSE(kurl2.isValid()); 501 EXPECT_FALSE(kurl2.isValid());
505 EXPECT_FALSE(kurl2.string().isNull()); 502 EXPECT_FALSE(kurl2.string().isNull());
506 EXPECT_TRUE(kurl2.string().isEmpty()); 503 EXPECT_TRUE(kurl2.string().isEmpty());
507 EXPECT_FALSE(kurl2.string().isNull()); 504 EXPECT_FALSE(kurl2.string().isNull());
508 EXPECT_TRUE(kurl2.string().isEmpty()); 505 EXPECT_TRUE(kurl2.string().isEmpty());
509 506
510 // Resolve the null URL on a null string. 507 // Resolve the null URL on a null string.
511 blink::KURL kurl22(kurl, WTF::String()); 508 KURL kurl22(kurl, String());
512 EXPECT_FALSE(kurl22.isNull()); 509 EXPECT_FALSE(kurl22.isNull());
513 EXPECT_TRUE(kurl22.isEmpty()); 510 EXPECT_TRUE(kurl22.isEmpty());
514 EXPECT_FALSE(kurl22.isValid()); 511 EXPECT_FALSE(kurl22.isValid());
515 EXPECT_FALSE(kurl22.string().isNull()); 512 EXPECT_FALSE(kurl22.string().isNull());
516 EXPECT_TRUE(kurl22.string().isEmpty()); 513 EXPECT_TRUE(kurl22.string().isEmpty());
517 EXPECT_FALSE(kurl22.string().isNull()); 514 EXPECT_FALSE(kurl22.string().isNull());
518 EXPECT_TRUE(kurl22.string().isEmpty()); 515 EXPECT_TRUE(kurl22.string().isEmpty());
519 516
520 // Test non-hierarchical schemes resolving. The actual URLs will be differen t. 517 // Test non-hierarchical schemes resolving. The actual URLs will be differen t.
521 // WebKit's one will set the string to "something.gif" and we'll set it to a n 518 // WebKit's one will set the string to "something.gif" and we'll set it to a n
522 // empty string. I think either is OK, so we just check our behavior. 519 // empty string. I think either is OK, so we just check our behavior.
523 blink::KURL kurl3(blink::KURL(blink::ParsedURLString, "data:foo"), 520 KURL kurl3(KURL(ParsedURLString, "data:foo"), "something.gif");
524 "something.gif");
525 EXPECT_TRUE(kurl3.isEmpty()); 521 EXPECT_TRUE(kurl3.isEmpty());
526 EXPECT_FALSE(kurl3.isValid()); 522 EXPECT_FALSE(kurl3.isValid());
527 523
528 // Test for weird isNull string input, 524 // Test for weird isNull string input,
529 // see: http://bugs.webkit.org/show_bug.cgi?id=16487 525 // see: http://bugs.webkit.org/show_bug.cgi?id=16487
530 blink::KURL kurl4(blink::ParsedURLString, kurl.string()); 526 KURL kurl4(ParsedURLString, kurl.string());
531 EXPECT_TRUE(kurl4.isEmpty()); 527 EXPECT_TRUE(kurl4.isEmpty());
532 EXPECT_FALSE(kurl4.isValid()); 528 EXPECT_FALSE(kurl4.isValid());
533 EXPECT_TRUE(kurl4.string().isNull()); 529 EXPECT_TRUE(kurl4.string().isNull());
534 EXPECT_TRUE(kurl4.string().isEmpty()); 530 EXPECT_TRUE(kurl4.string().isEmpty());
535 531
536 // Resolving an empty URL on an invalid string. 532 // Resolving an empty URL on an invalid string.
537 blink::KURL kurl5(blink::KURL(), "foo.js"); 533 KURL kurl5(KURL(), "foo.js");
538 // We'll be empty in this case, but KURL won't be. Should be OK. 534 // We'll be empty in this case, but KURL won't be. Should be OK.
539 // EXPECT_EQ(kurl5.isEmpty(), kurl5.isEmpty()); 535 // EXPECT_EQ(kurl5.isEmpty(), kurl5.isEmpty());
540 // EXPECT_EQ(kurl5.string().isEmpty(), kurl5.string().isEmpty()); 536 // EXPECT_EQ(kurl5.string().isEmpty(), kurl5.string().isEmpty());
541 EXPECT_FALSE(kurl5.isValid()); 537 EXPECT_FALSE(kurl5.isValid());
542 EXPECT_FALSE(kurl5.string().isNull()); 538 EXPECT_FALSE(kurl5.string().isNull());
543 539
544 // Empty string as input 540 // Empty string as input
545 blink::KURL kurl6(blink::ParsedURLString, ""); 541 KURL kurl6(ParsedURLString, "");
546 EXPECT_TRUE(kurl6.isEmpty()); 542 EXPECT_TRUE(kurl6.isEmpty());
547 EXPECT_FALSE(kurl6.isValid()); 543 EXPECT_FALSE(kurl6.isValid());
548 EXPECT_FALSE(kurl6.string().isNull()); 544 EXPECT_FALSE(kurl6.string().isNull());
549 EXPECT_TRUE(kurl6.string().isEmpty()); 545 EXPECT_TRUE(kurl6.string().isEmpty());
550 546
551 // Non-empty but invalid C string as input. 547 // Non-empty but invalid C string as input.
552 blink::KURL kurl7(blink::ParsedURLString, "foo.js"); 548 KURL kurl7(ParsedURLString, "foo.js");
553 // WebKit will actually say this URL has the string "foo.js" but is invalid. 549 // WebKit will actually say this URL has the string "foo.js" but is invalid.
554 // We don't do that. 550 // We don't do that.
555 // EXPECT_EQ(kurl7.isEmpty(), kurl7.isEmpty()); 551 // EXPECT_EQ(kurl7.isEmpty(), kurl7.isEmpty());
556 EXPECT_FALSE(kurl7.isValid()); 552 EXPECT_FALSE(kurl7.isValid());
557 EXPECT_FALSE(kurl7.string().isNull()); 553 EXPECT_FALSE(kurl7.string().isNull());
558 } 554 }
559 555
560 TEST(KURLTest, UserPass) 556 TEST(KURLTest, UserPass)
561 { 557 {
562 const char* src = "http://user:pass@google.com/"; 558 const char* src = "http://user:pass@google.com/";
563 blink::KURL kurl(blink::ParsedURLString, src); 559 KURL kurl(ParsedURLString, src);
564 560
565 // Clear just the username. 561 // Clear just the username.
566 kurl.setUser(""); 562 kurl.setUser("");
567 EXPECT_EQ("http://:pass@google.com/", kurl.string()); 563 EXPECT_EQ("http://:pass@google.com/", kurl.string());
568 564
569 // Clear just the password. 565 // Clear just the password.
570 kurl = blink::KURL(blink::ParsedURLString, src); 566 kurl = KURL(ParsedURLString, src);
571 kurl.setPass(""); 567 kurl.setPass("");
572 EXPECT_EQ("http://user@google.com/", kurl.string()); 568 EXPECT_EQ("http://user@google.com/", kurl.string());
573 569
574 // Now clear both. 570 // Now clear both.
575 kurl.setUser(""); 571 kurl.setUser("");
576 EXPECT_EQ("http://google.com/", kurl.string()); 572 EXPECT_EQ("http://google.com/", kurl.string());
577 } 573 }
578 574
579 TEST(KURLTest, Offsets) 575 TEST(KURLTest, Offsets)
580 { 576 {
581 const char* src1 = "http://user:pass@google.com/foo/bar.html?baz=query#ref"; 577 const char* src1 = "http://user:pass@google.com/foo/bar.html?baz=query#ref";
582 blink::KURL kurl1(blink::ParsedURLString, src1); 578 KURL kurl1(ParsedURLString, src1);
583 579
584 EXPECT_EQ(17u, kurl1.hostStart()); 580 EXPECT_EQ(17u, kurl1.hostStart());
585 EXPECT_EQ(27u, kurl1.hostEnd()); 581 EXPECT_EQ(27u, kurl1.hostEnd());
586 EXPECT_EQ(27u, kurl1.pathStart()); 582 EXPECT_EQ(27u, kurl1.pathStart());
587 EXPECT_EQ(40u, kurl1.pathEnd()); 583 EXPECT_EQ(40u, kurl1.pathEnd());
588 EXPECT_EQ(32u, kurl1.pathAfterLastSlash()); 584 EXPECT_EQ(32u, kurl1.pathAfterLastSlash());
589 585
590 const char* src2 = "http://google.com/foo/"; 586 const char* src2 = "http://google.com/foo/";
591 blink::KURL kurl2(blink::ParsedURLString, src2); 587 KURL kurl2(ParsedURLString, src2);
592 588
593 EXPECT_EQ(7u, kurl2.hostStart()); 589 EXPECT_EQ(7u, kurl2.hostStart());
594 EXPECT_EQ(17u, kurl2.hostEnd()); 590 EXPECT_EQ(17u, kurl2.hostEnd());
595 EXPECT_EQ(17u, kurl2.pathStart()); 591 EXPECT_EQ(17u, kurl2.pathStart());
596 EXPECT_EQ(22u, kurl2.pathEnd()); 592 EXPECT_EQ(22u, kurl2.pathEnd());
597 EXPECT_EQ(22u, kurl2.pathAfterLastSlash()); 593 EXPECT_EQ(22u, kurl2.pathAfterLastSlash());
598 594
599 const char* src3 = "javascript:foobar"; 595 const char* src3 = "javascript:foobar";
600 blink::KURL kurl3(blink::ParsedURLString, src3); 596 KURL kurl3(ParsedURLString, src3);
601 597
602 EXPECT_EQ(11u, kurl3.hostStart()); 598 EXPECT_EQ(11u, kurl3.hostStart());
603 EXPECT_EQ(11u, kurl3.hostEnd()); 599 EXPECT_EQ(11u, kurl3.hostEnd());
604 EXPECT_EQ(11u, kurl3.pathStart()); 600 EXPECT_EQ(11u, kurl3.pathStart());
605 EXPECT_EQ(17u, kurl3.pathEnd()); 601 EXPECT_EQ(17u, kurl3.pathEnd());
606 EXPECT_EQ(11u, kurl3.pathAfterLastSlash()); 602 EXPECT_EQ(11u, kurl3.pathAfterLastSlash());
607 } 603 }
608 604
609 TEST(KURLTest, DeepCopy) 605 TEST(KURLTest, DeepCopy)
610 { 606 {
611 const char url[] = "http://www.google.com/"; 607 const char url[] = "http://www.google.com/";
612 blink::KURL src(blink::ParsedURLString, url); 608 KURL src(ParsedURLString, url);
613 EXPECT_TRUE(src.string() == url); // This really just initializes the cache. 609 EXPECT_TRUE(src.string() == url); // This really just initializes the cache.
614 blink::KURL dest = src.copy(); 610 KURL dest = src.copy();
615 EXPECT_TRUE(dest.string() == url); // This really just initializes the cache . 611 EXPECT_TRUE(dest.string() == url); // This really just initializes the cache .
616 612
617 // The pointers should be different for both UTF-8 and UTF-16. 613 // The pointers should be different for both UTF-8 and UTF-16.
618 EXPECT_NE(dest.string().impl(), src.string().impl()); 614 EXPECT_NE(dest.string().impl(), src.string().impl());
619 } 615 }
620 616
621 TEST(KURLTest, DeepCopyInnerURL) 617 TEST(KURLTest, DeepCopyInnerURL)
622 { 618 {
623 const char url[] = "filesystem:http://www.google.com/temporary/test.txt"; 619 const char url[] = "filesystem:http://www.google.com/temporary/test.txt";
624 const char innerURL[] = "http://www.google.com/temporary"; 620 const char innerURL[] = "http://www.google.com/temporary";
625 blink::KURL src(blink::ParsedURLString, url); 621 KURL src(ParsedURLString, url);
626 EXPECT_TRUE(src.string() == url); 622 EXPECT_TRUE(src.string() == url);
627 EXPECT_TRUE(src.innerURL()->string() == innerURL); 623 EXPECT_TRUE(src.innerURL()->string() == innerURL);
628 blink::KURL dest = src.copy(); 624 KURL dest = src.copy();
629 EXPECT_TRUE(dest.string() == url); 625 EXPECT_TRUE(dest.string() == url);
630 EXPECT_TRUE(dest.innerURL()->string() == innerURL); 626 EXPECT_TRUE(dest.innerURL()->string() == innerURL);
631 } 627 }
632 628
633 TEST(KURLTest, LastPathComponent) 629 TEST(KURLTest, LastPathComponent)
634 { 630 {
635 blink::KURL url1(blink::ParsedURLString, "http://host/path/to/file.txt"); 631 KURL url1(ParsedURLString, "http://host/path/to/file.txt");
636 EXPECT_EQ("file.txt", url1.lastPathComponent()); 632 EXPECT_EQ("file.txt", url1.lastPathComponent());
637 633
638 blink::KURL invalidUTF8(blink::ParsedURLString, "http://a@9%aa%:/path/to/fil e.txt"); 634 KURL invalidUTF8(ParsedURLString, "http://a@9%aa%:/path/to/file.txt");
639 EXPECT_EQ(String(), invalidUTF8.lastPathComponent()); 635 EXPECT_EQ(String(), invalidUTF8.lastPathComponent());
640 } 636 }
641 637
642 TEST(KURLTest, IsHierarchical) 638 TEST(KURLTest, IsHierarchical)
643 { 639 {
644 blink::KURL url1(blink::ParsedURLString, "http://host/path/to/file.txt"); 640 KURL url1(ParsedURLString, "http://host/path/to/file.txt");
645 EXPECT_TRUE(url1.isHierarchical()); 641 EXPECT_TRUE(url1.isHierarchical());
646 642
647 blink::KURL invalidUTF8(blink::ParsedURLString, "http://a@9%aa%:/path/to/fil e.txt"); 643 KURL invalidUTF8(ParsedURLString, "http://a@9%aa%:/path/to/file.txt");
648 EXPECT_FALSE(invalidUTF8.isHierarchical()); 644 EXPECT_FALSE(invalidUTF8.isHierarchical());
649 } 645 }
650 646
651 TEST(KURLTest, PathAfterLastSlash) 647 TEST(KURLTest, PathAfterLastSlash)
652 { 648 {
653 blink::KURL url1(blink::ParsedURLString, "http://host/path/to/file.txt"); 649 KURL url1(ParsedURLString, "http://host/path/to/file.txt");
654 EXPECT_EQ(20u, url1.pathAfterLastSlash()); 650 EXPECT_EQ(20u, url1.pathAfterLastSlash());
655 651
656 blink::KURL invalidUTF8(blink::ParsedURLString, "http://a@9%aa%:/path/to/fil e.txt"); 652 KURL invalidUTF8(ParsedURLString, "http://a@9%aa%:/path/to/file.txt");
657 EXPECT_EQ(0u, invalidUTF8.pathAfterLastSlash()); 653 EXPECT_EQ(0u, invalidUTF8.pathAfterLastSlash());
658 } 654 }
659 655
660 TEST(KURLTest, ProtocolIsInHTTPFamily) 656 TEST(KURLTest, ProtocolIsInHTTPFamily)
661 { 657 {
662 blink::KURL url1(blink::ParsedURLString, "http://host/path/to/file.txt"); 658 KURL url1(ParsedURLString, "http://host/path/to/file.txt");
663 EXPECT_TRUE(url1.protocolIsInHTTPFamily()); 659 EXPECT_TRUE(url1.protocolIsInHTTPFamily());
664 660
665 blink::KURL invalidUTF8(blink::ParsedURLString, "http://a@9%aa%:/path/to/fil e.txt"); 661 KURL invalidUTF8(ParsedURLString, "http://a@9%aa%:/path/to/file.txt");
666 EXPECT_FALSE(invalidUTF8.protocolIsInHTTPFamily()); 662 EXPECT_FALSE(invalidUTF8.protocolIsInHTTPFamily());
667 } 663 }
668 664
669 TEST(KURLTest, ProtocolIs) 665 TEST(KURLTest, ProtocolIs)
670 { 666 {
671 blink::KURL url1(blink::ParsedURLString, "foo://bar"); 667 KURL url1(ParsedURLString, "foo://bar");
672 EXPECT_TRUE(url1.protocolIs("foo")); 668 EXPECT_TRUE(url1.protocolIs("foo"));
673 EXPECT_FALSE(url1.protocolIs("foo-bar")); 669 EXPECT_FALSE(url1.protocolIs("foo-bar"));
674 670
675 blink::KURL url2(blink::ParsedURLString, "foo-bar:"); 671 KURL url2(ParsedURLString, "foo-bar:");
676 EXPECT_TRUE(url2.protocolIs("foo-bar")); 672 EXPECT_TRUE(url2.protocolIs("foo-bar"));
677 EXPECT_FALSE(url2.protocolIs("foo")); 673 EXPECT_FALSE(url2.protocolIs("foo"));
678 674
679 blink::KURL invalidUTF8(blink::ParsedURLString, "http://a@9%aa%:"); 675 KURL invalidUTF8(ParsedURLString, "http://a@9%aa%:");
680 EXPECT_FALSE(invalidUTF8.protocolIs("http")); 676 EXPECT_FALSE(invalidUTF8.protocolIs("http"));
681 EXPECT_TRUE(invalidUTF8.protocolIs("")); 677 EXPECT_TRUE(invalidUTF8.protocolIs(""));
682 } 678 }
683 679
684 TEST(KURLTest, strippedForUseAsReferrer) 680 TEST(KURLTest, strippedForUseAsReferrer)
685 { 681 {
686 struct ReferrerCase { 682 struct ReferrerCase {
687 const char* input; 683 const char* input;
688 const char* output; 684 const char* output;
689 } referrerCases[] = { 685 } referrerCases[] = {
690 {"data:text/html;charset=utf-8,<html></html>", ""}, 686 {"data:text/html;charset=utf-8,<html></html>", ""},
691 {"javascript:void(0);", ""}, 687 {"javascript:void(0);", ""},
692 {"about:config", ""}, 688 {"about:config", ""},
693 {"https://www.google.com/", "https://www.google.com/"}, 689 {"https://www.google.com/", "https://www.google.com/"},
694 {"http://me@news.google.com:8888/", "http://news.google.com:8888/"}, 690 {"http://me@news.google.com:8888/", "http://news.google.com:8888/"},
695 {"http://:pass@news.google.com:8888/foo", "http://news.google.com:8888/f oo"}, 691 {"http://:pass@news.google.com:8888/foo", "http://news.google.com:8888/f oo"},
696 {"http://me:pass@news.google.com:8888/", "http://news.google.com:8888/"} , 692 {"http://me:pass@news.google.com:8888/", "http://news.google.com:8888/"} ,
697 {"https://www.google.com/a?f#b", "https://www.google.com/a?f"}, 693 {"https://www.google.com/a?f#b", "https://www.google.com/a?f"},
698 {"file:///tmp/test.html", ""}, 694 {"file:///tmp/test.html", ""},
699 {"https://www.google.com/#", "https://www.google.com/"}, 695 {"https://www.google.com/#", "https://www.google.com/"},
700 }; 696 };
701 697
702 for (size_t i = 0; i < arraysize(referrerCases); i++) { 698 for (size_t i = 0; i < arraysize(referrerCases); i++) {
703 blink::KURL kurl(blink::ParsedURLString, referrerCases[i].input); 699 KURL kurl(ParsedURLString, referrerCases[i].input);
704 WTF::String referrer = kurl.strippedForUseAsReferrer(); 700 String referrer = kurl.strippedForUseAsReferrer();
705 EXPECT_STREQ(referrerCases[i].output, referrer.utf8().data()); 701 EXPECT_STREQ(referrerCases[i].output, referrer.utf8().data());
706 } 702 }
707 } 703 }
708 704
709 } // namespace 705 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698