Clean up chrome/browser/search_engines/:
* Remove the notion of SearchEngineType from TemplateURL. It's now solely the domain of the prepopulate data.
* Simplify TemplateURL IPC code.
* Remove TemplateURLRef::SetGoogleBaseURL(), which was an unnecessary passthrough to another public static function.
* Use "google.*"-like strings consistently for Google base URLs in tests; this will become important later when keyword autogeneration changes to depend on the host being a Google URL.
* Define base SearchTermsData::GetApplicationLocale() and GetRlzParameterValue() implementations and remove various similar definitions elsewhere.
* De-inline functions we don't normally inline (constructors, virtuals, etc.).
* Remove some unnecessary TemplateURLRef friend declarations.
* Remove TemplateURL::set_prepopulated() and add_image_ref() manipulators as all callers were already friends or are now. (First of a number of changes that move toward making TemplateURL more immutable so we can then remove "const" from the TemplateURLService APIs.)
* Make TemplateURLRef non-copyable. This required defining explicit copy/assignment operators for TemplateURL.
* Rename template_url_parser.cc:ParsingContext to TemplateURLParsingContext so it can be moved out of the anonymous namespace (necessary to make it a friend elsewhere).
* In template_url_service_sync_unittest.cc, add more CreateTestTemplateURL() overrides so that most creation and manipulation of TemplateURLs now happens in one function. Also rework some functions to create new TemplateURLs instead of modifying existing ones. This will make later refactoring much simpler.
* Fix silly pattern: "GURL x = GURL(...);" -> "GURL x(...);".
* Convert some ASSERTs to EXPECTs and vice-versa to try and match what conditions should really halt a test and what shouldn't.
* Remove other unnecessary passthrough functions, shorten code, rewrap, etc.
* Various other minor changes to reduce future diffs of TemplateURL refactoring patches.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9706087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127226 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc
index a08673b..a9f1307a 100644
--- a/chrome/browser/search_engines/template_url_unittest.cc
+++ b/chrome/browser/search_engines/template_url_unittest.cc
@@ -11,27 +11,14 @@
#include "chrome/browser/search_engines/template_url.h"
#include "testing/gtest/include/gtest/gtest.h"
+// TestSearchTermsData --------------------------------------------------------
+
// Simple implementation of SearchTermsData.
class TestSearchTermsData : public SearchTermsData {
public:
- explicit TestSearchTermsData(const char* google_base_url)
- : google_base_url_(google_base_url) {
- }
+ explicit TestSearchTermsData(const std::string& google_base_url);
- virtual std::string GoogleBaseURLValue() const {
- return google_base_url_;
- }
-
- virtual std::string GetApplicationLocale() const {
- return "yy";
- }
-
-#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
- // Returns the value for the Chrome Omnibox rlz.
- virtual string16 GetRlzParameterValue() const {
- return string16();
- }
-#endif
+ virtual std::string GoogleBaseURLValue() const OVERRIDE;
private:
std::string google_base_url_;
@@ -39,20 +26,33 @@
DISALLOW_COPY_AND_ASSIGN(TestSearchTermsData);
};
+TestSearchTermsData::TestSearchTermsData(const std::string& google_base_url)
+ : google_base_url_(google_base_url) {
+}
+
+std::string TestSearchTermsData::GoogleBaseURLValue() const {
+ return google_base_url_;
+}
+
+
+// TemplateURLTest ------------------------------------------------------------
+
class TemplateURLTest : public testing::Test {
public:
- virtual void TearDown() {
- TemplateURLRef::SetGoogleBaseURL(NULL);
- }
-
- void CheckSuggestBaseURL(const char* base_url,
- const char* base_suggest_url) const {
- TestSearchTermsData search_terms_data(base_url);
- EXPECT_STREQ(base_suggest_url,
- search_terms_data.GoogleBaseSuggestURLValue().c_str());
- }
+ void CheckSuggestBaseURL(const std::string& base_url,
+ const std::string& base_suggest_url) const;
};
+void TemplateURLTest::CheckSuggestBaseURL(
+ const std::string& base_url,
+ const std::string& base_suggest_url) const {
+ TestSearchTermsData search_terms_data(base_url);
+ EXPECT_EQ(base_suggest_url, search_terms_data.GoogleBaseSuggestURLValue());
+}
+
+
+// Actual tests ---------------------------------------------------------------
+
TEST_F(TemplateURLTest, Defaults) {
TemplateURL url;
ASSERT_FALSE(url.show_in_default_list());
@@ -91,7 +91,7 @@
std::string result = ref.ReplaceSearchTerms(t_url, value.terms,
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16());
ASSERT_EQ(value.output, result);
- GURL result_url = GURL(result);
+ GURL result_url(result);
ASSERT_EQ(value.valid_url, result_url.is_valid());
}
}
@@ -101,10 +101,10 @@
TemplateURLRef ref("http://foo{searchTerms}{count?}", 0, 0);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
+ GURL result(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
- ASSERT_EQ("http://foox/", result.spec());
+ EXPECT_EQ("http://foox/", result.spec());
}
TEST_F(TemplateURLTest, URLRefTestCount2) {
@@ -112,10 +112,10 @@
TemplateURLRef ref("http://foo{searchTerms}{count}", 0, 0);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
+ GURL result(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
- ASSERT_EQ("http://foox10/", result.spec());
+ EXPECT_EQ("http://foox10/", result.spec());
}
TEST_F(TemplateURLTest, URLRefTestIndices) {
@@ -124,10 +124,10 @@
1, 2);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
+ GURL result(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
- ASSERT_EQ("http://fooxxy/", result.spec());
+ EXPECT_EQ("http://fooxxy/", result.spec());
}
TEST_F(TemplateURLTest, URLRefTestIndices2) {
@@ -135,10 +135,10 @@
TemplateURLRef ref("http://foo{searchTerms}x{startIndex}y{startPage}", 1, 2);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
+ GURL result(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
- ASSERT_EQ("http://fooxx1y2/", result.spec());
+ EXPECT_EQ("http://fooxx1y2/", result.spec());
}
TEST_F(TemplateURLTest, URLRefTestEncoding) {
@@ -147,10 +147,10 @@
"http://foo{searchTerms}x{inputEncoding?}y{outputEncoding?}a", 1, 2);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
+ GURL result(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
- ASSERT_EQ("http://fooxxutf-8ya/", result.spec());
+ EXPECT_EQ("http://fooxxutf-8ya/", result.spec());
}
// Test that setting the prepopulate ID from TemplateURL causes the stored
@@ -160,20 +160,14 @@
t_url.SetURL("http://foo{fhqwhgads}", 0, 0);
TemplateURLRef::Replacements replacements;
bool valid = false;
-
- t_url.SetPrepopulateId(0);
EXPECT_EQ("http://foo{fhqwhgads}",
- t_url.url()->ParseURL("http://foo{fhqwhgads}",
- &replacements,
- &valid));
+ t_url.url()->ParseURL("http://foo{fhqwhgads}", &replacements, &valid));
EXPECT_TRUE(replacements.empty());
EXPECT_TRUE(valid);
t_url.SetPrepopulateId(123);
EXPECT_EQ("http://foo",
- t_url.url()->ParseURL("http://foo{fhqwhgads}",
- &replacements,
- &valid));
+ t_url.url()->ParseURL("http://foo{fhqwhgads}", &replacements, &valid));
EXPECT_TRUE(replacements.empty());
EXPECT_TRUE(valid);
}
@@ -184,10 +178,10 @@
"http://foox{inputEncoding?}a{searchTerms}y{outputEncoding?}b", 1, 2);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
+ GURL result(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
- ASSERT_EQ("http://fooxutf-8axyb/", result.spec());
+ EXPECT_EQ("http://fooxutf-8axyb/", result.spec());
}
TEST_F(TemplateURLTest, URLRefTestEncoding2) {
@@ -196,10 +190,10 @@
"http://foo{searchTerms}x{inputEncoding}y{outputEncoding}a", 1, 2);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
+ GURL result(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
- ASSERT_EQ("http://fooxxutf-8yutf-8a/", result.spec());
+ EXPECT_EQ("http://fooxxutf-8yutf-8a/", result.spec());
}
TEST_F(TemplateURLTest, URLRefTestSearchTermsUsingTermsData) {
@@ -209,25 +203,24 @@
const char* output;
} search_term_cases[] = {
{ "{google:baseURL}{language}{searchTerms}", string16(),
- "http://example.com/e/yy" },
+ "http://example.com/e/en" },
{ "{google:baseSuggestURL}{searchTerms}", string16(),
"http://example.com/complete/" }
};
TestSearchTermsData search_terms_data("http://example.com/e/");
+ TemplateURL t_url;
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(search_term_cases); ++i) {
const SearchTermsCase& value = search_term_cases[i];
- TemplateURL t_url;
TemplateURLRef ref(value.url, 0, 0);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result = GURL(ref.ReplaceSearchTermsUsingTermsData(
- t_url, value.terms,
+ GURL result(ref.ReplaceSearchTermsUsingTermsData(t_url, value.terms,
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16(),
search_terms_data));
ASSERT_TRUE(result.is_valid());
- ASSERT_EQ(value.output, result.spec());
+ EXPECT_EQ(value.output, result.spec());
}
}
@@ -251,9 +244,8 @@
{"C%252B", ASCIIToUTF16("C%2B")},
};
- TemplateURL t_url;
-
// Set one input encoding: big-5. This is so we can test fallback to UTF-8.
+ TemplateURL t_url;
std::vector<std::string> encodings;
encodings.push_back("big-5");
t_url.set_input_encodings(encodings);
@@ -271,23 +263,23 @@
}
TEST_F(TemplateURLTest, SetFavicon) {
- TemplateURL url;
GURL favicon_url("http://favicon.url");
+ TemplateURL url;
url.SetFaviconURL(favicon_url);
ASSERT_EQ(1U, url.image_refs().size());
ASSERT_TRUE(favicon_url == url.GetFaviconURL());
GURL favicon_url2("http://favicon2.url");
url.SetFaviconURL(favicon_url2);
- ASSERT_EQ(1U, url.image_refs().size());
- ASSERT_TRUE(favicon_url2 == url.GetFaviconURL());
+ EXPECT_EQ(1U, url.image_refs().size());
+ EXPECT_EQ(favicon_url2, url.GetFaviconURL());
}
TEST_F(TemplateURLTest, DisplayURLToURLRef) {
struct TestData {
const std::string url;
const string16 expected_result;
- } data[] = {
+ } test_data[] = {
{ "http://foo{searchTerms}x{inputEncoding}y{outputEncoding}a",
ASCIIToUTF16("http://foo%sx{inputEncoding}y{outputEncoding}a") },
{ "http://X",
@@ -297,10 +289,10 @@
{ "http://foo{searchTerms}{language}",
ASCIIToUTF16("http://foo%s{language}") },
};
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
- TemplateURLRef ref(data[i].url, 1, 2);
- EXPECT_EQ(data[i].expected_result, ref.DisplayURL());
- EXPECT_EQ(data[i].url,
+ for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+ TemplateURLRef ref(test_data[i].url, 1, 2);
+ EXPECT_EQ(test_data[i].expected_result, ref.DisplayURL());
+ EXPECT_EQ(test_data[i].url,
TemplateURLRef::DisplayURLToURLRef(ref.DisplayURL()));
}
}
@@ -309,7 +301,7 @@
struct TestData {
const std::string url;
const std::string expected_result;
- } data[] = {
+ } test_data[] = {
{ "http://foo/{language}{searchTerms}{inputEncoding}",
"http://foo/{language}XUTF-8" },
{ "http://foo/{language}{inputEncoding}{searchTerms}",
@@ -337,16 +329,16 @@
};
TemplateURL turl;
turl.add_input_encoding("UTF-8");
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
- TemplateURLRef ref(data[i].url, 1, 2);
+ for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+ TemplateURLRef ref(test_data[i].url, 1, 2);
EXPECT_TRUE(ref.IsValid());
EXPECT_TRUE(ref.SupportsReplacement());
- std::string expected_result = data[i].expected_result;
+ std::string expected_result = test_data[i].expected_result;
ReplaceSubstringsAfterOffset(&expected_result, 0, "{language}",
g_browser_process->GetApplicationLocale());
- GURL result = GURL(ref.ReplaceSearchTerms(turl, ASCIIToUTF16("X"),
+ GURL result(ref.ReplaceSearchTerms(turl, ASCIIToUTF16("X"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
- EXPECT_TRUE(result.is_valid());
+ ASSERT_TRUE(result.is_valid());
EXPECT_EQ(expected_result, result.spec());
}
}
@@ -360,7 +352,7 @@
const string16 search_term;
const std::string url;
const std::string expected_result;
- } data[] = {
+ } test_data[] = {
{ "BIG5", WideToUTF16(L"\x60BD"),
"http://foo/?{searchTerms}{inputEncoding}",
"http://foo/?%B1~BIG5" },
@@ -374,15 +366,14 @@
"http://foo/{searchTerms}/bar",
"http://foo/%82%A0%20%82%A2/bar"},
};
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
+ for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
TemplateURL turl;
- turl.add_input_encoding(data[i].encoding);
- TemplateURLRef ref(data[i].url, 1, 2);
- GURL result = GURL(ref.ReplaceSearchTerms(turl,
- data[i].search_term, TemplateURLRef::NO_SUGGESTIONS_AVAILABLE,
- string16()));
- EXPECT_TRUE(result.is_valid());
- EXPECT_EQ(data[i].expected_result, result.spec());
+ turl.add_input_encoding(test_data[i].encoding);
+ TemplateURLRef ref(test_data[i].url, 1, 2);
+ GURL result(ref.ReplaceSearchTerms(turl, test_data[i].search_term,
+ TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
+ ASSERT_TRUE(result.is_valid());
+ EXPECT_EQ(test_data[i].expected_result, result.spec());
}
}
@@ -391,7 +382,7 @@
const int accepted_suggestion;
const string16 original_query_for_suggestion;
const std::string expected_result;
- } data[] = {
+ } test_data[] = {
{ TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16(),
"http://bar/foo?q=foobar" },
{ TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, ASCIIToUTF16("foo"),
@@ -409,11 +400,12 @@
"{google:originalQueryForSuggestion}q={searchTerms}", 1, 2);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
- GURL result = GURL(ref.ReplaceSearchTerms(turl, ASCIIToUTF16("foobar"),
- data[i].accepted_suggestion, data[i].original_query_for_suggestion));
- EXPECT_TRUE(result.is_valid());
- EXPECT_EQ(data[i].expected_result, result.spec());
+ for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_data); ++i) {
+ GURL result(ref.ReplaceSearchTerms(turl, ASCIIToUTF16("foobar"),
+ test_data[i].accepted_suggestion,
+ test_data[i].original_query_for_suggestion));
+ ASSERT_TRUE(result.is_valid());
+ EXPECT_EQ(test_data[i].expected_result, result.spec());
}
}
@@ -432,11 +424,10 @@
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
std::string expected_url = "http://bar/?";
- if (!rlz_string.empty()) {
+ if (!rlz_string.empty())
expected_url += "rlz=" + WideToUTF8(rlz_string) + "&";
- }
expected_url += "x";
- ASSERT_EQ(expected_url, result.spec());
+ EXPECT_EQ(expected_url, result.spec());
}
#endif
@@ -467,8 +458,8 @@
{ "http://blah/?q=stock:{searchTerms}", "blah", "/", "q"},
};
- TemplateURL t_url;
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) {
+ TemplateURL t_url;
t_url.SetURL(data[i].url, 0, 0);
EXPECT_EQ(data[i].host, t_url.url()->GetHost());
EXPECT_EQ(data[i].path, t_url.url()->GetPath());
@@ -513,7 +504,7 @@
EXPECT_TRUE(url_ref.ParseParameter(0, 12, &parsed_url, &replacements));
EXPECT_EQ(std::string(), parsed_url);
ASSERT_EQ(1U, replacements.size());
- EXPECT_EQ(static_cast<size_t>(0), replacements[0].index);
+ EXPECT_EQ(0U, replacements[0].index);
EXPECT_EQ(TemplateURLRef::SEARCH_TERMS, replacements[0].type);
}
@@ -530,9 +521,9 @@
// If the TemplateURLRef is prepopulated, we should remove unknown parameters.
parsed_url = "{fhqwhgads}";
- url_ref.set_prepopulated(true);
+ url_ref.prepopulated_ = true;
EXPECT_FALSE(url_ref.ParseParameter(0, 10, &parsed_url, &replacements));
- EXPECT_EQ("", parsed_url);
+ EXPECT_EQ(std::string(), parsed_url);
EXPECT_TRUE(replacements.empty());
}
@@ -540,7 +531,8 @@
TemplateURLRef url_ref("", 0, 0);
TemplateURLRef::Replacements replacements;
bool valid = false;
- EXPECT_EQ(std::string(), url_ref.ParseURL("", &replacements, &valid));
+ EXPECT_EQ(std::string(),
+ url_ref.ParseURL(std::string(), &replacements, &valid));
EXPECT_TRUE(replacements.empty());
EXPECT_TRUE(valid);
}
@@ -570,7 +562,7 @@
EXPECT_EQ("{}{}",
url_ref.ParseURL("{}{{searchTerms}}", &replacements, &valid));
ASSERT_EQ(1U, replacements.size());
- EXPECT_EQ(static_cast<size_t>(3), replacements[0].index);
+ EXPECT_EQ(3U, replacements[0].index);
EXPECT_EQ(TemplateURLRef::SEARCH_TERMS, replacements[0].type);
EXPECT_TRUE(valid);
}
@@ -581,7 +573,7 @@
bool valid = false;
EXPECT_EQ("{", url_ref.ParseURL("{{searchTerms}", &replacements, &valid));
ASSERT_EQ(1U, replacements.size());
- EXPECT_EQ(static_cast<size_t>(1), replacements[0].index);
+ EXPECT_EQ(1U, replacements[0].index);
EXPECT_EQ(TemplateURLRef::SEARCH_TERMS, replacements[0].type);
EXPECT_TRUE(valid);
}
