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

Side by Side Diff: chrome/browser/search_engines/template_url_unittest.cc

Issue 308053009: Add contextual search to the template url system (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to comments. Created 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/base_paths.h" 5 #include "base/base_paths.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after
1351 TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo")); 1351 TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo"));
1352 search_terms_args.session_token = "SESSIONTOKENGOESHERE"; 1352 search_terms_args.session_token = "SESSIONTOKENGOESHERE";
1353 std::string result = url.url_ref().ReplaceSearchTerms(search_terms_args); 1353 std::string result = url.url_ref().ReplaceSearchTerms(search_terms_args);
1354 EXPECT_EQ("http://bar/search?q=foo&psi=SESSIONTOKENGOESHERE&xssi=t", result); 1354 EXPECT_EQ("http://bar/search?q=foo&psi=SESSIONTOKENGOESHERE&xssi=t", result);
1355 1355
1356 TemplateURL url2(NULL, data); 1356 TemplateURL url2(NULL, data);
1357 search_terms_args.session_token = ""; 1357 search_terms_args.session_token = "";
1358 result = url.url_ref().ReplaceSearchTerms(search_terms_args); 1358 result = url.url_ref().ReplaceSearchTerms(search_terms_args);
1359 EXPECT_EQ("http://bar/search?q=foo&xssi=t", result); 1359 EXPECT_EQ("http://bar/search?q=foo&xssi=t", result);
1360 } 1360 }
1361
1362 TEST_F(TemplateURLTest, ContextualSearchParameters) {
1363 TemplateURLData data;
1364 UIThreadSearchTermsData::SetGoogleBaseURL("http://bar/");
1365 data.SetURL("http://bar/_/contextualsearch?"
1366 "{google:contextualSearchVersion}"
1367 "{google:contextualSearchStart}"
1368 "{google:contextualSearchEnd}"
1369 "{google:contextualSearchContent}"
1370 "{google:contextualSearchBasePageURL}"
1371 "{google:contextualSearchEncoding}");
1372
1373 TemplateURL url(NULL, data);
1374 TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo"));
1375 search_terms_args.contextual_search_version = 1;
1376 search_terms_args.contextual_search_start = 12;
1377 search_terms_args.contextual_search_end = 20;
1378 search_terms_args.contextual_search_content = "woody+allen+movies";
1379 search_terms_args.contextual_search_base_page_url = "www.wikipedia.org";
1380 search_terms_args.contextual_search_encoding = "utf-8";
1381 std::string result = url.url_ref().ReplaceSearchTerms(search_terms_args);
1382
1383 EXPECT_EQ("http://bar/_/contextualsearch?"
1384 "ctxs=1"
Peter Kasting 2014/06/03 21:47:09 Nit: Indent even
jeremycho 2014/06/04 00:22:11 Done.
1385 "&ctxs_start=12"
1386 "&ctxs_end=20"
1387 "&ctxs_content=woody+allen+movies"
1388 "&ctxs_url=www.wikipedia.org"
1389 "&ctxs_encoding=utf-8&", result);
1390
1391 TemplateURL url2(NULL, data);
1392 search_terms_args.contextual_search_version = -1;
1393 search_terms_args.contextual_search_start = -12;
1394 search_terms_args.contextual_search_end = -20;
1395 search_terms_args.contextual_search_content = "";
1396 search_terms_args.contextual_search_base_page_url = "";
1397 search_terms_args.contextual_search_encoding = "";
1398 result = url.url_ref().ReplaceSearchTerms(search_terms_args);
1399 EXPECT_EQ("http://bar/_/contextualsearch?", result);
1400 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698