Changes SearchProvider to set the description of the first consecutive

chrome/browser/autocomplete/search_provider_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/autocomplete/search_provider.h"
+
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
+#include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
-#include "chrome/browser/autocomplete/search_provider.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_browser_process.h"
 #include "chrome/test/testing_browser_process_test.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
@@ skipping 80 matching lines @@
 void SearchProviderTest::SetUp() {
   SearchProvider::set_query_suggest_immediately(true);
 
   // We need both the history service and template url model loaded.
   profile_.CreateHistoryService(true, false);
   profile_.CreateTemplateURLService();
 
   TemplateURLService* turl_model =
       TemplateURLServiceFactory::GetForProfile(&profile_);
 
+  turl_model->Load();
+
   // Reset the default TemplateURL.
   default_t_url_ = new TemplateURL();
   default_t_url_->SetURL("http://defaultturl/{searchTerms}", 0, 0);
   default_t_url_->SetSuggestionsURL("http://defaultturl2/{searchTerms}", 0, 0);
+  default_t_url_->set_short_name(ASCIIToUTF16("t"));
   turl_model->Add(default_t_url_);
   turl_model->SetDefaultSearchProvider(default_t_url_);
   TemplateURLID default_provider_id = default_t_url_->id();
   ASSERT_NE(0, default_provider_id);
 
   // Add url1, with search term term1_.
   HistoryService* history =
       profile_.GetHistoryService(Profile::EXPLICIT_ACCESS);
   term1_url_ = GURL(default_t_url_->url()->ReplaceSearchTerms(
       *default_t_url_, term1_, 0, string16()));
   history->AddPageWithDetails(term1_url_, string16(), 1, 1,
                               base::Time::Now(), false,
                               history::SOURCE_BROWSED);
   history->SetKeywordSearchTermsForURL(term1_url_, default_t_url_->id(),
                                        term1_);
 
   // Create another TemplateURL.
   keyword_t_url_ = new TemplateURL();
   keyword_t_url_->set_keyword(ASCIIToUTF16("k"));
+  keyword_t_url_->set_short_name(ASCIIToUTF16("k"));
   keyword_t_url_->SetURL("http://keyword/{searchTerms}", 0, 0);
   keyword_t_url_->SetSuggestionsURL("http://suggest_keyword/{searchTerms}", 0,
                                     0);
   turl_model->Add(keyword_t_url_);
   ASSERT_NE(0, keyword_t_url_->id());
 
   // Add a page and search term for keyword_t_url_.
   keyword_url_ = GURL(keyword_t_url_->url()->ReplaceSearchTerms(
       *keyword_t_url_, keyword_term_, 0, string16()));
   history->AddPageWithDetails(keyword_url_, string16(), 1, 1,
@@ skipping 98 matching lines @@
       std::string());
   fetcher = NULL;
 
   // Run till the history results complete.
   RunTillProviderDone();
 
   // The SearchProvider is done. Make sure it has a result for the history
   // term term1.
   AutocompleteMatch term1_match = FindMatchWithDestination(term1_url_);
   EXPECT_TRUE(!term1_match.destination_url.is_empty());
-  // Term1 should have a description.
-  EXPECT_FALSE(term1_match.description.empty());
+  // Term1 should not have a description, it's set later.
+  EXPECT_TRUE(term1_match.description.empty());
 
   GURL what_you_typed_url = GURL(default_t_url_->url()->ReplaceSearchTerms(
       *default_t_url_, term, 0, string16()));
   AutocompleteMatch what_you_typed_match =
       FindMatchWithDestination(what_you_typed_url);
   EXPECT_TRUE(!what_you_typed_match.destination_url.is_empty());
   EXPECT_TRUE(what_you_typed_match.description.empty());
 
   // The match for term1 should be more relevant than the what you typed result.
   EXPECT_GT(term1_match.relevance, what_you_typed_match.relevance);
@@ skipping 107 matching lines @@
   EXPECT_TRUE(provider_->done());
 
   // There should be two matches, one for what you typed, the other for
   // 'foobar'.
   EXPECT_EQ(2u, provider_->matches().size());
   GURL instant_url = GURL(default_t_url_->url()->ReplaceSearchTerms(
       *default_t_url_, ASCIIToUTF16("foobar"), 0, string16()));
   AutocompleteMatch instant_match = FindMatchWithDestination(instant_url);
   EXPECT_TRUE(!instant_match.destination_url.is_empty());
 
-  // And the 'foobar' match should have a description.
-  EXPECT_FALSE(instant_match.description.empty());
+  // And the 'foobar' match should not have a description, it'll be set later.
+  EXPECT_TRUE(instant_match.description.empty());
 
   // Make sure the what you typed match has no description.
   GURL what_you_typed_url = GURL(default_t_url_->url()->ReplaceSearchTerms(
       *default_t_url_, ASCIIToUTF16("foo"), 0, string16()));
   AutocompleteMatch what_you_typed_match =
       FindMatchWithDestination(what_you_typed_url);
   EXPECT_TRUE(!what_you_typed_match.destination_url.is_empty());
   EXPECT_TRUE(what_you_typed_match.description.empty());
 
   // The instant search should be more relevant.
@@ skipping 25 matching lines @@
 
   // Provider should be done.
   EXPECT_TRUE(provider_->done());
 
   // There should be two matches, one for what you typed, the other for
   // 'foobar'.
   EXPECT_EQ(2u, provider_->matches().size());
   instant_match = FindMatchWithDestination(instant_url);
   EXPECT_FALSE(instant_match.destination_url.is_empty());
 
-  // And the 'foobar' match should have a description.
-  EXPECT_FALSE(instant_match.description.empty());
+  // And the 'foobar' match should not have a description, it'll be set later.
+  EXPECT_TRUE(instant_match.description.empty());
 }
 
 // Make sure that if trailing whitespace is added to the text supplied to
 // AutocompleteInput the default suggest text is cleared.
 TEST_F(SearchProviderTest, DifferingText) {
   PrefService* service = profile_.GetPrefs();
   service->SetBoolean(prefs::kInstantEnabled, true);
 
   QueryForInput(ASCIIToUTF16("foo"), false, false);
 
@@ skipping 86 matching lines @@
   GURL what_you_typed_url = GURL(default_t_url_->url()->ReplaceSearchTerms(
       *default_t_url_, ASCIIToUTF16("two "), 0, string16()));
   AutocompleteMatch what_you_typed_match =
       FindMatchWithDestination(what_you_typed_url);
   EXPECT_FALSE(what_you_typed_match.destination_url.is_empty());
   // term_match should be autocompleted.
   EXPECT_GT(term_match.relevance, what_you_typed_match.relevance);
   // And the offset should be at 4.
   EXPECT_EQ(4u, term_match.inline_autocomplete_offset);
 }
+
+// Verifies the SearchProvider sets descriptions for results correctly.
+TEST_F(SearchProviderTest, PostProcessResults) {
+  // Add an entry that corresponds to a keyword search with 'term2'.
+  string16 term(ASCIIToUTF16("term2"));
+  HistoryService* history =
+      profile_.GetHistoryService(Profile::EXPLICIT_ACCESS);
+  GURL term_url(keyword_t_url_->url()->ReplaceSearchTerms(
+      *keyword_t_url_, term, 0, string16()));
+  history->AddPageWithDetails(term_url, string16(), 1, 1,
+                              base::Time::Now(), false,
+                              history::SOURCE_BROWSED);
+  history->SetKeywordSearchTermsForURL(term_url, keyword_t_url_->id(), term);
+
+  profile_.BlockUntilHistoryProcessesPendingRequests();
+
+  ACProviders providers;
+  SearchProvider* provider = provider_.release();
+  providers.push_back(provider);
+  AutocompleteController controller(providers);
+  provider->set_listener(&controller);
+  controller.Start(ASCIIToUTF16("k t"), string16(), false, false, true,
+                   AutocompleteInput::ALL_MATCHES);
+  const AutocompleteResult& result = controller.result();
+
+  // There should be two matches, one for the keyword one for what you typed.
+  ASSERT_EQ(2u, result.size());
+
+  EXPECT_TRUE(result.match_at(0).template_url != NULL);
+  EXPECT_TRUE(result.match_at(1).template_url != NULL);
+  EXPECT_NE(result.match_at(0).template_url,
+            result.match_at(1).template_url);
+
+  EXPECT_FALSE(result.match_at(0).description.empty());
+  EXPECT_FALSE(result.match_at(1).description.empty());
+  EXPECT_NE(result.match_at(0).description,
+            result.match_at(1).description);
+}