Prefetch cache pt1 - MRU

chrome/browser/autocomplete/search_provider_unittest.cc

 // Copyright 2012 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 <string>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 3212 matching lines @@
   provider_->GetSessionToken();
   base::TimeTicks expiration_time_1 = provider_->token_expiration_time_;
   base::PlatformThread::Sleep(kSmallDelta);
   provider_->GetSessionToken();
   base::TimeTicks expiration_time_2 = provider_->token_expiration_time_;
   EXPECT_GT(expiration_time_2, expiration_time_1);
   EXPECT_GE(expiration_time_2, expiration_time_1 + kSmallDelta);
 }
 
 TEST_F(SearchProviderTest, AnswersCache) {
-  // Initial condition: empty cache.
-  ASSERT_TRUE(provider_->last_answer_seen_.full_query_text.empty());
-
   AutocompleteResult result;
   ACMatches matches;
   AutocompleteMatch match1;
   match1.answer_contents = base::ASCIIToUTF16("m1");
   match1.answer_type = base::ASCIIToUTF16("2334");
   match1.fill_into_edit = base::ASCIIToUTF16("weather los angeles");
 
   AutocompleteMatch non_answer_match1;
   non_answer_match1.fill_into_edit = base::ASCIIToUTF16("weather laguna beach");
 
   // Test that an answer in the first slot populates the cache.
   matches.push_back(match1);
   matches.push_back(non_answer_match1);
   result.AppendMatches(matches);
   provider_->RegisterDisplayedAnswers(result);
-  EXPECT_EQ(base::ASCIIToUTF16("weather los angeles"),
-            provider_->last_answer_seen_.full_query_text);
-  EXPECT_EQ(base::ASCIIToUTF16("2334"),
-            provider_->last_answer_seen_.query_type);
+  ASSERT_FALSE(provider_->answers_cache_.IsEmpty());
 
   // Test that DoAnswersQuery retrieves data from cache.
   AutocompleteInput input(base::ASCIIToUTF16("weather l"),
                           base::string16::npos, base::string16(), GURL(),
                           metrics::OmniboxEventProto::INVALID_SPEC, false,
                           false, true, true,
                           ChromeAutocompleteSchemeClassifier(&profile_));
   provider_->DoAnswersQuery(input);
   EXPECT_EQ(base::ASCIIToUTF16("weather los angeles"),
             provider_->prefetch_data_.full_query_text);
   EXPECT_EQ(base::ASCIIToUTF16("2334"), provider_->prefetch_data_.query_type);
-
-  // Mismatching input will return empty prefetch data.

[Peter Kasting, 2014/08/11 22:15:34]

I realize you mainly moved this test into the other unittest file, but is there
any part of it that should still be here, to test any other plumbing in
SearchProvider?

[groby-ooo-7-16, 2014/08/12 01:16:27]

This used to test the second branch of the ternary in DoAnswersQuery - at this
point, it'd only test that assigning an empty string results in an empty string
:)

So, no, I don't think this covers any logic.

-  AutocompleteInput input2(base::ASCIIToUTF16("weather n"),
-                           base::string16::npos, base::string16(), GURL(),
-                           metrics::OmniboxEventProto::INVALID_SPEC, false,
-                           false, true, true,
-                           ChromeAutocompleteSchemeClassifier(&profile_));
-  provider_->DoAnswersQuery(input2);
-  EXPECT_TRUE(provider_->prefetch_data_.full_query_text.empty());
-  EXPECT_TRUE(provider_->prefetch_data_.query_type.empty());
 }