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

Side by Side Diff: chrome/browser/autocomplete/autocomplete_unittest.cc

Issue 8510024: Force navigation to non-numeric hostnames with ports (e.g. "abc:81"). This restores the pre-Chro... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/autocomplete/autocomplete.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 { ASCIIToUTF16("foo/bar baz\\"), AutocompleteInput::URL }, 297 { ASCIIToUTF16("foo/bar baz\\"), AutocompleteInput::URL },
298 { ASCIIToUTF16("foo.com/bar"), AutocompleteInput::URL }, 298 { ASCIIToUTF16("foo.com/bar"), AutocompleteInput::URL },
299 { ASCIIToUTF16("foo;bar"), AutocompleteInput::QUERY }, 299 { ASCIIToUTF16("foo;bar"), AutocompleteInput::QUERY },
300 { ASCIIToUTF16("foo/bar baz"), AutocompleteInput::UNKNOWN }, 300 { ASCIIToUTF16("foo/bar baz"), AutocompleteInput::UNKNOWN },
301 { ASCIIToUTF16("foo bar.com"), AutocompleteInput::QUERY }, 301 { ASCIIToUTF16("foo bar.com"), AutocompleteInput::QUERY },
302 { ASCIIToUTF16("foo bar"), AutocompleteInput::QUERY }, 302 { ASCIIToUTF16("foo bar"), AutocompleteInput::QUERY },
303 { ASCIIToUTF16("foo+bar"), AutocompleteInput::QUERY }, 303 { ASCIIToUTF16("foo+bar"), AutocompleteInput::QUERY },
304 { ASCIIToUTF16("foo+bar.com"), AutocompleteInput::UNKNOWN }, 304 { ASCIIToUTF16("foo+bar.com"), AutocompleteInput::UNKNOWN },
305 { ASCIIToUTF16("\"foo:bar\""), AutocompleteInput::QUERY }, 305 { ASCIIToUTF16("\"foo:bar\""), AutocompleteInput::QUERY },
306 { ASCIIToUTF16("link:foo.com"), AutocompleteInput::UNKNOWN }, 306 { ASCIIToUTF16("link:foo.com"), AutocompleteInput::UNKNOWN },
307 { ASCIIToUTF16("foo:81"), AutocompleteInput::UNKNOWN }, 307 { ASCIIToUTF16("foo:81"), AutocompleteInput::URL },
308 { ASCIIToUTF16("localhost:8080"), AutocompleteInput::URL }, 308 { ASCIIToUTF16("localhost:8080"), AutocompleteInput::URL },
309 { ASCIIToUTF16("www.foo.com:81"), AutocompleteInput::URL }, 309 { ASCIIToUTF16("www.foo.com:81"), AutocompleteInput::URL },
310 { ASCIIToUTF16("foo.com:123456"), AutocompleteInput::QUERY }, 310 { ASCIIToUTF16("foo.com:123456"), AutocompleteInput::QUERY },
311 { ASCIIToUTF16("foo.com:abc"), AutocompleteInput::QUERY }, 311 { ASCIIToUTF16("foo.com:abc"), AutocompleteInput::QUERY },
312 { ASCIIToUTF16("1.2.3.4:abc"), AutocompleteInput::QUERY }, 312 { ASCIIToUTF16("1.2.3.4:abc"), AutocompleteInput::QUERY },
313 { ASCIIToUTF16("user@foo.com"), AutocompleteInput::UNKNOWN }, 313 { ASCIIToUTF16("user@foo.com"), AutocompleteInput::UNKNOWN },
314 { ASCIIToUTF16("user@foo/z"), AutocompleteInput::URL }, 314 { ASCIIToUTF16("user@foo/z"), AutocompleteInput::URL },
315 { ASCIIToUTF16("user@foo/z z"), AutocompleteInput::URL }, 315 { ASCIIToUTF16("user@foo/z z"), AutocompleteInput::URL },
316 { ASCIIToUTF16("user@foo.com/z"), AutocompleteInput::URL }, 316 { ASCIIToUTF16("user@foo.com/z"), AutocompleteInput::URL },
317 { ASCIIToUTF16("user:pass@"), AutocompleteInput::UNKNOWN }, 317 { ASCIIToUTF16("user:pass@"), AutocompleteInput::UNKNOWN },
318 { ASCIIToUTF16("user:pass@!foo.com"), AutocompleteInput::UNKNOWN }, 318 { ASCIIToUTF16("user:pass@!foo.com"), AutocompleteInput::UNKNOWN },
319 { ASCIIToUTF16("user:pass@foo"), AutocompleteInput::URL }, 319 { ASCIIToUTF16("user:pass@foo"), AutocompleteInput::URL },
320 { ASCIIToUTF16("user:pass@foo.c"), AutocompleteInput::URL }, 320 { ASCIIToUTF16("user:pass@foo.c"), AutocompleteInput::URL },
321 { ASCIIToUTF16("user:pass@foo.com"), AutocompleteInput::URL }, 321 { ASCIIToUTF16("user:pass@foo.com"), AutocompleteInput::URL },
322 { ASCIIToUTF16("user:pass@foo.com:81"), AutocompleteInput::URL }, 322 { ASCIIToUTF16("user:pass@foo.com:81"), AutocompleteInput::URL },
323 { ASCIIToUTF16("user:pass@foo:81"), AutocompleteInput::URL }, 323 { ASCIIToUTF16("user:pass@foo:81"), AutocompleteInput::URL },
324 { ASCIIToUTF16("1.2"), AutocompleteInput::UNKNOWN }, 324 { ASCIIToUTF16("1.2"), AutocompleteInput::UNKNOWN },
325 { ASCIIToUTF16("1.2/45"), AutocompleteInput::UNKNOWN }, 325 { ASCIIToUTF16("1.2/45"), AutocompleteInput::UNKNOWN },
326 { ASCIIToUTF16("1.2:45"), AutocompleteInput::UNKNOWN }, 326 { ASCIIToUTF16("1.2:45"), AutocompleteInput::UNKNOWN },
327 { ASCIIToUTF16("user@1.2:45"), AutocompleteInput::URL }, 327 { ASCIIToUTF16("user@1.2:45"), AutocompleteInput::URL },
328 { ASCIIToUTF16("user@foo:45"), AutocompleteInput::URL }, 328 { ASCIIToUTF16("user@foo:45"), AutocompleteInput::URL },
329 { ASCIIToUTF16("user:pass@1.2:45"), AutocompleteInput::URL }, 329 { ASCIIToUTF16("user:pass@1.2:45"), AutocompleteInput::URL },
330 { ASCIIToUTF16("host?query"), AutocompleteInput::UNKNOWN }, 330 { ASCIIToUTF16("host?query"), AutocompleteInput::UNKNOWN },
331 { ASCIIToUTF16("host#ref"), AutocompleteInput::UNKNOWN }, 331 { ASCIIToUTF16("host#ref"), AutocompleteInput::UNKNOWN },
332 { ASCIIToUTF16("host/path?query"), AutocompleteInput::URL }, 332 { ASCIIToUTF16("host/path?query"), AutocompleteInput::URL },
333 { ASCIIToUTF16("host/path#ref"), AutocompleteInput::URL }, 333 { ASCIIToUTF16("host/path#ref"), AutocompleteInput::URL },
334 { ASCIIToUTF16("en.wikipedia.org/wiki/James Bond"), 334 { ASCIIToUTF16("en.wikipedia.org/wiki/Jim Beam"), AutocompleteInput::URL },
335 AutocompleteInput::URL },
336 // In Chrome itself, mailto: will get handled by ShellExecute, but in 335 // In Chrome itself, mailto: will get handled by ShellExecute, but in
337 // unittest mode, we don't have the data loaded in the external protocol 336 // unittest mode, we don't have the data loaded in the external protocol
338 // handler to know this. 337 // handler to know this.
339 // { ASCIIToUTF16("mailto:abuse@foo.com"), AutocompleteInput::URL }, 338 // { ASCIIToUTF16("mailto:abuse@foo.com"), AutocompleteInput::URL },
340 { ASCIIToUTF16("view-source:http://www.foo.com/"), AutocompleteInput::URL }, 339 { ASCIIToUTF16("view-source:http://www.foo.com/"), AutocompleteInput::URL },
341 { ASCIIToUTF16("javascript:alert(\"Hey there!\");"), 340 { ASCIIToUTF16("javascript:alert(\"Hi there\");"), AutocompleteInput::URL },
342 AutocompleteInput::URL },
343 #if defined(OS_WIN) 341 #if defined(OS_WIN)
344 { ASCIIToUTF16("C:\\Program Files"), AutocompleteInput::URL }, 342 { ASCIIToUTF16("C:\\Program Files"), AutocompleteInput::URL },
345 { ASCIIToUTF16("\\\\Server\\Folder\\File"), AutocompleteInput::URL }, 343 { ASCIIToUTF16("\\\\Server\\Folder\\File"), AutocompleteInput::URL },
346 #endif // defined(OS_WIN) 344 #endif // defined(OS_WIN)
347 { ASCIIToUTF16("http:foo"), AutocompleteInput::URL }, 345 { ASCIIToUTF16("http:foo"), AutocompleteInput::URL },
348 { ASCIIToUTF16("http://foo"), AutocompleteInput::URL }, 346 { ASCIIToUTF16("http://foo"), AutocompleteInput::URL },
349 { ASCIIToUTF16("http://foo.c"), AutocompleteInput::URL }, 347 { ASCIIToUTF16("http://foo.c"), AutocompleteInput::URL },
350 { ASCIIToUTF16("http://foo.com"), AutocompleteInput::URL }, 348 { ASCIIToUTF16("http://foo.com"), AutocompleteInput::URL },
351 { ASCIIToUTF16("http://foo_bar.com"), AutocompleteInput::URL }, 349 { ASCIIToUTF16("http://foo_bar.com"), AutocompleteInput::URL },
352 { ASCIIToUTF16("http://foo/bar baz"), AutocompleteInput::URL }, 350 { ASCIIToUTF16("http://foo/bar baz"), AutocompleteInput::URL },
(...skipping 10 matching lines...) Expand all
363 { ASCIIToUTF16("http://user:pass@foo.com"), AutocompleteInput::URL }, 361 { ASCIIToUTF16("http://user:pass@foo.com"), AutocompleteInput::URL },
364 { ASCIIToUTF16("http://1.2"), AutocompleteInput::URL }, 362 { ASCIIToUTF16("http://1.2"), AutocompleteInput::URL },
365 { ASCIIToUTF16("http://1.2/45"), AutocompleteInput::URL }, 363 { ASCIIToUTF16("http://1.2/45"), AutocompleteInput::URL },
366 { ASCIIToUTF16("http:ps/2 games"), AutocompleteInput::URL }, 364 { ASCIIToUTF16("http:ps/2 games"), AutocompleteInput::URL },
367 { ASCIIToUTF16("https://foo.com"), AutocompleteInput::URL }, 365 { ASCIIToUTF16("https://foo.com"), AutocompleteInput::URL },
368 { ASCIIToUTF16("127.0.0.1"), AutocompleteInput::URL }, 366 { ASCIIToUTF16("127.0.0.1"), AutocompleteInput::URL },
369 { ASCIIToUTF16("127.0.1"), AutocompleteInput::UNKNOWN }, 367 { ASCIIToUTF16("127.0.1"), AutocompleteInput::UNKNOWN },
370 { ASCIIToUTF16("127.0.1/"), AutocompleteInput::URL }, 368 { ASCIIToUTF16("127.0.1/"), AutocompleteInput::URL },
371 { ASCIIToUTF16("browser.tabs.closeButtons"), AutocompleteInput::UNKNOWN }, 369 { ASCIIToUTF16("browser.tabs.closeButtons"), AutocompleteInput::UNKNOWN },
372 { WideToUTF16(L"\u6d4b\u8bd5"), AutocompleteInput::UNKNOWN }, 370 { WideToUTF16(L"\u6d4b\u8bd5"), AutocompleteInput::UNKNOWN },
373 { ASCIIToUTF16("[2001:]"), AutocompleteInput::QUERY }, // Not a valid IP 371 { ASCIIToUTF16("[2001:]"), AutocompleteInput::QUERY },
374 { ASCIIToUTF16("[2001:dB8::1]"), AutocompleteInput::URL }, 372 { ASCIIToUTF16("[2001:dB8::1]"), AutocompleteInput::URL },
375 { ASCIIToUTF16("192.168.0.256"), 373 { ASCIIToUTF16("192.168.0.256"), AutocompleteInput::QUERY },
376 AutocompleteInput::QUERY }, // Invalid IPv4 literal. 374 { ASCIIToUTF16("[foo.com]"), AutocompleteInput::QUERY },
377 { ASCIIToUTF16("[foo.com]"),
378 AutocompleteInput::QUERY }, // Invalid IPv6 literal.
379 }; 375 };
380 376
381 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(input_cases); ++i) { 377 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(input_cases); ++i) {
382 SCOPED_TRACE(input_cases[i].input); 378 SCOPED_TRACE(input_cases[i].input);
383 AutocompleteInput input(input_cases[i].input, string16(), true, false, 379 AutocompleteInput input(input_cases[i].input, string16(), true, false,
384 true, AutocompleteInput::ALL_MATCHES); 380 true, AutocompleteInput::ALL_MATCHES);
385 EXPECT_EQ(input_cases[i].type, input.type()); 381 EXPECT_EQ(input_cases[i].type, input.type());
386 } 382 }
387 } 383 }
388 384
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 AutocompleteInput input(input_cases[i].input, string16(), true, false, 478 AutocompleteInput input(input_cases[i].input, string16(), true, false,
483 true, AutocompleteInput::ALL_MATCHES); 479 true, AutocompleteInput::ALL_MATCHES);
484 EXPECT_EQ(input_cases[i].scheme.begin, scheme.begin); 480 EXPECT_EQ(input_cases[i].scheme.begin, scheme.begin);
485 EXPECT_EQ(input_cases[i].scheme.len, scheme.len); 481 EXPECT_EQ(input_cases[i].scheme.len, scheme.len);
486 EXPECT_EQ(input_cases[i].host.begin, host.begin); 482 EXPECT_EQ(input_cases[i].host.begin, host.begin);
487 EXPECT_EQ(input_cases[i].host.len, host.len); 483 EXPECT_EQ(input_cases[i].host.len, host.len);
488 } 484 }
489 } 485 }
490 486
491 } // namespace 487 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/autocomplete.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698