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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/history/history_backend_unittest.cc

Issue 10115001: Added page score to the ntp suggestions tab. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 8 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
« chrome/browser/history/history_backend.cc ('K') | « chrome/browser/history/history_backend.cc ('k') | chrome/browser/history/history_marshaling.h » ('j') | chrome/browser/ui/webui/ntp/suggestions_page_handler.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/history_backend_unittest.cc
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
index c8622e2ff785ce4c46fb3f191e1571ddb73d1a03..e025fbbfa6354268b2f68b55905eea4d1a1cf4ed 100644
--- a/chrome/browser/history/history_backend_unittest.cc
+++ b/chrome/browser/history/history_backend_unittest.cc
@@ -111,10 +111,20 @@ class HistoryBackendTest : public testing::Test {
most_visited_list_.swap(data);
}
+ // Callback for QueryFiltered.
+ void OnQueryFiltered(CancelableRequestProvider::Handle handle,
+ history::FilteredURLList data) {
+ filtered_list_.swap(data);
+ }
+
const history::MostVisitedURLList& get_most_visited_list() const {
return most_visited_list_;
}
+ const history::FilteredURLList& get_filtered_list() const {
+ return filtered_list_;
+ }
+
protected:
scoped_refptr<HistoryBackend> backend_; // Will be NULL on init failure.
scoped_ptr<InMemoryHistoryBackend> mem_backend_;
@@ -238,6 +248,7 @@ class HistoryBackendTest : public testing::Test {
MessageLoop message_loop_;
FilePath test_dir_;
history::MostVisitedURLList most_visited_list_;
+ history::FilteredURLList filtered_list_;
};
void HistoryBackendTestDelegate::SetInMemoryBackend(int backend_id,
@@ -1293,12 +1304,12 @@ TEST_F(HistoryBackendTest, QueryFilteredURLs) {
tested_time - half_an_hour);
backend_->Commit();
- scoped_refptr<QueryMostVisitedURLsRequest> request1 =
- new history::QueryMostVisitedURLsRequest(
- base::Bind(&HistoryBackendTest::OnQueryMostVisited,
+ scoped_refptr<QueryFilteredURLsRequest> request1 =
+ new history::QueryFilteredURLsRequest(
+ base::Bind(&HistoryBackendTest::OnQueryFiltered,
base::Unretained(static_cast<HistoryBackendTest*>(this))));
HistoryBackendCancelableRequest cancellable_request;
- cancellable_request.MockScheduleOfRequest<QueryMostVisitedURLsRequest>(
+ cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
request1);
VisitFilter filter;
@@ -1308,81 +1319,81 @@ TEST_F(HistoryBackendTest, QueryFilteredURLs) {
tested_time + three_quarters_of_an_hour);
backend_->QueryFilteredURLs(request1, 100, filter);
- ASSERT_EQ(4U, get_most_visited_list().size());
- EXPECT_EQ(std::string(google), get_most_visited_list()[0].url.spec());
+ ASSERT_EQ(4U, get_filtered_list().size());
+ EXPECT_EQ(std::string(google), get_filtered_list()[0].url.spec());
EXPECT_EQ(std::string(yahoo_sports_soccer),
- get_most_visited_list()[1].url.spec());
- EXPECT_EQ(std::string(yahoo), get_most_visited_list()[2].url.spec());
+ get_filtered_list()[1].url.spec());
+ EXPECT_EQ(std::string(yahoo), get_filtered_list()[2].url.spec());
EXPECT_EQ(std::string(yahoo_sports),
- get_most_visited_list()[3].url.spec());
+ get_filtered_list()[3].url.spec());
// Time limit is between |tested_time| and |tested_time| + 2 hours.
- scoped_refptr<QueryMostVisitedURLsRequest> request2 =
- new history::QueryMostVisitedURLsRequest(
- base::Bind(&HistoryBackendTest::OnQueryMostVisited,
+ scoped_refptr<QueryFilteredURLsRequest> request2 =
+ new history::QueryFilteredURLsRequest(
+ base::Bind(&HistoryBackendTest::OnQueryFiltered,
base::Unretained(static_cast<HistoryBackendTest*>(this))));
- cancellable_request.MockScheduleOfRequest<QueryMostVisitedURLsRequest>(
+ cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
request2);
filter.SetTimeInRangeFilter(tested_time,
tested_time + base::TimeDelta::FromHours(2));
backend_->QueryFilteredURLs(request2, 100, filter);
- ASSERT_EQ(3U, get_most_visited_list().size());
- EXPECT_EQ(std::string(google), get_most_visited_list()[0].url.spec());
- EXPECT_EQ(std::string(yahoo), get_most_visited_list()[1].url.spec());
- EXPECT_EQ(std::string(yahoo_sports), get_most_visited_list()[2].url.spec());
+ ASSERT_EQ(3U, get_filtered_list().size());
+ EXPECT_EQ(std::string(google), get_filtered_list()[0].url.spec());
+ EXPECT_EQ(std::string(yahoo), get_filtered_list()[1].url.spec());
+ EXPECT_EQ(std::string(yahoo_sports), get_filtered_list()[2].url.spec());
// Time limit is between |tested_time| - 2 hours and |tested_time|.
- scoped_refptr<QueryMostVisitedURLsRequest> request3 =
- new history::QueryMostVisitedURLsRequest(
- base::Bind(&HistoryBackendTest::OnQueryMostVisited,
+ scoped_refptr<QueryFilteredURLsRequest> request3 =
+ new history::QueryFilteredURLsRequest(
+ base::Bind(&HistoryBackendTest::OnQueryFiltered,
base::Unretained(static_cast<HistoryBackendTest*>(this))));
- cancellable_request.MockScheduleOfRequest<QueryMostVisitedURLsRequest>(
+ cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
request3);
filter.SetTimeInRangeFilter(tested_time - base::TimeDelta::FromHours(2),
tested_time);
backend_->QueryFilteredURLs(request3, 100, filter);
- ASSERT_EQ(3U, get_most_visited_list().size());
- EXPECT_EQ(std::string(google), get_most_visited_list()[0].url.spec());
+ ASSERT_EQ(3U, get_filtered_list().size());
+ EXPECT_EQ(std::string(google), get_filtered_list()[0].url.spec());
EXPECT_EQ(std::string(yahoo_sports_soccer),
- get_most_visited_list()[1].url.spec());
- EXPECT_EQ(std::string(yahoo_sports), get_most_visited_list()[2].url.spec());
+ get_filtered_list()[1].url.spec());
+ EXPECT_EQ(std::string(yahoo_sports), get_filtered_list()[2].url.spec());
filter.ClearFilters();
base::Time::Exploded exploded_time;
tested_time.LocalExplode(&exploded_time);
// Today.
- scoped_refptr<QueryMostVisitedURLsRequest> request4 =
- new history::QueryMostVisitedURLsRequest(
- base::Bind(&HistoryBackendTest::OnQueryMostVisited,
+ scoped_refptr<QueryFilteredURLsRequest> request4 =
+ new history::QueryFilteredURLsRequest(
+ base::Bind(&HistoryBackendTest::OnQueryFiltered,
base::Unretained(static_cast<HistoryBackendTest*>(this))));
- cancellable_request.MockScheduleOfRequest<QueryMostVisitedURLsRequest>(
+ cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
request4);
filter.SetDayOfTheWeekFilter(static_cast<int>(exploded_time.day_of_week),
tested_time);
backend_->QueryFilteredURLs(request4, 100, filter);
- ASSERT_EQ(2U, get_most_visited_list().size());
- EXPECT_EQ(std::string(google), get_most_visited_list()[0].url.spec());
+ ASSERT_EQ(2U, get_filtered_list().size());
+ EXPECT_EQ(std::string(google), get_filtered_list()[0].url.spec());
EXPECT_EQ(std::string(yahoo_sports_soccer),
- get_most_visited_list()[1].url.spec());
+ get_filtered_list()[1].url.spec());
// Today + time limit - only yahoo_sports_soccer should fit.
- scoped_refptr<QueryMostVisitedURLsRequest> request5 =
- new history::QueryMostVisitedURLsRequest(
- base::Bind(&HistoryBackendTest::OnQueryMostVisited,
+ scoped_refptr<QueryFilteredURLsRequest> request5 =
+ new history::QueryFilteredURLsRequest(
+ base::Bind(&HistoryBackendTest::OnQueryFiltered,
base::Unretained(static_cast<HistoryBackendTest*>(this))));
- cancellable_request.MockScheduleOfRequest<QueryMostVisitedURLsRequest>(
+ cancellable_request.MockScheduleOfRequest<QueryFilteredURLsRequest>(
request5);
filter.SetTimeInRangeFilter(tested_time - base::TimeDelta::FromHours(1),
tested_time - base::TimeDelta::FromMinutes(20));
backend_->QueryFilteredURLs(request5, 100, filter);
- ASSERT_EQ(1U, get_most_visited_list().size());
+ ASSERT_EQ(1U, get_filtered_list().size());
EXPECT_EQ(std::string(yahoo_sports_soccer),
- get_most_visited_list()[0].url.spec());
+ get_filtered_list()[0].url.spec());
}
TEST_F(HistoryBackendTest, UpdateVisitDuration) {
« chrome/browser/history/history_backend.cc ('K') | « chrome/browser/history/history_backend.cc ('k') | chrome/browser/history/history_marshaling.h » ('j') | chrome/browser/ui/webui/ntp/suggestions_page_handler.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698