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

Unified 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 and make contextual search /search requests accessible from Java. Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/search_engines/template_url_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc
index 626b5eb2aabe7fcb3b2ed1604cf20c994098464b..f993fb5674b6f41ca7c4c79fb9f4474b7ea6c8a0 100644
--- a/chrome/browser/search_engines/template_url_unittest.cc
+++ b/chrome/browser/search_engines/template_url_unittest.cc
@@ -1358,3 +1358,44 @@ TEST_F(TemplateURLTest, SessionToken) {
result = url.url_ref().ReplaceSearchTerms(search_terms_args);
EXPECT_EQ("http://bar/search?q=foo&xssi=t", result);
}
+
+TEST_F(TemplateURLTest, ContextualSearchParameters) {
+ TemplateURLData data;
+ UIThreadSearchTermsData::SetGoogleBaseURL("http://bar/");
+ data.SetURL("http://bar/_/contextualsearch?"
+ "{google:contextualSearchVersion}"
+ "{google:contextualSearchStart}"
+ "{google:contextualSearchEnd}"
+ "{google:contextualSearchContent}"
+ "{google:contextualSearchBasePageURL}"
+ "{google:contextualSearchEncoding}");
+
+ TemplateURL url(NULL, data);
+ TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo"));
+ search_terms_args.contextual_search_params.version = 1;
+ search_terms_args.contextual_search_params.start = 12;
+ search_terms_args.contextual_search_params.end = 20;
+ search_terms_args.contextual_search_params.content = "woody+allen+movies";
+ search_terms_args.contextual_search_params.base_page_url =
+ "www.wikipedia.org";
+ search_terms_args.contextual_search_params.encoding = "utf-8";
+ std::string result = url.url_ref().ReplaceSearchTerms(search_terms_args);
+
+ EXPECT_EQ("http://bar/_/contextualsearch?"
+ "ctxs=1"
+ "&ctxs_start=12"
Peter Kasting 2014/06/04 00:40:49 Nit: Place ampersands on the ends of previous line
jeremycho 2014/06/04 21:49:35 Done.
+ "&ctxs_end=20"
+ "&ctxs_content=woody+allen+movies"
+ "&ctxs_url=www.wikipedia.org"
+ "&ctxs_encoding=utf-8&", result);
+
+ TemplateURL url2(NULL, data);
+ search_terms_args.contextual_search_params.version = -1;
+ search_terms_args.contextual_search_params.base_page_url = "";
+ search_terms_args.contextual_search_params.encoding = "";
+ result = url.url_ref().ReplaceSearchTerms(search_terms_args);
+ EXPECT_EQ("http://bar/_/contextualsearch?"
+ "ctxs_start=12"
+ "&ctxs_end=20"
+ "&ctxs_content=woody+allen+movies&", result);
+}

Powered by Google App Engine
This is Rietveld 408576698