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

Side by Side Diff: chrome/browser/history/visit_database_unittest.cc

Issue 341087: Eliminate QueryOptions::most_recent_visit_only. All non-unittest consumers o... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/history/visit_database.cc ('k') | chrome/browser/possible_url_model.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "app/sql/connection.h" 5 #include "app/sql/connection.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "chrome/browser/history/url_database.h" 10 #include "chrome/browser/history/url_database.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 // Add a subframe visit. 200 // Add a subframe visit.
201 VisitRow visit_info5(4, 201 VisitRow visit_info5(4,
202 visit_info1.visit_time + TimeDelta::FromSeconds(4), visit_info4.visit_id, 202 visit_info1.visit_time + TimeDelta::FromSeconds(4), visit_info4.visit_id,
203 static_cast<PageTransition::Type>(PageTransition::AUTO_SUBFRAME | 203 static_cast<PageTransition::Type>(PageTransition::AUTO_SUBFRAME |
204 PageTransition::CHAIN_START | 204 PageTransition::CHAIN_START |
205 PageTransition::CHAIN_END), 205 PageTransition::CHAIN_END),
206 0); 206 0);
207 visit_info5.visit_id = 5; 207 visit_info5.visit_id = 5;
208 EXPECT_TRUE(AddVisit(&visit_info5)); 208 EXPECT_TRUE(AddVisit(&visit_info5));
209 209
210 // Query the visits for all time, we should get the first 3 in descending 210 // Query the visits for all time, we should not get the first (duplicate of
211 // order, but not the redirect & subframe ones later. 211 // the second) or the redirect or subframe visits.
212 VisitVector results; 212 VisitVector results;
213 GetVisibleVisitsInRange(Time(), Time(), false, 0, &results); 213 GetVisibleVisitsInRange(Time(), Time(), 0, &results);
214 ASSERT_EQ(static_cast<size_t>(3), results.size());
215 EXPECT_TRUE(IsVisitInfoEqual(results[0], visit_info4) &&
216 IsVisitInfoEqual(results[1], visit_info2) &&
217 IsVisitInfoEqual(results[2], visit_info1));
218
219 // If we want only the most recent one, it should give us the same results
220 // minus the first (duplicate of the second) one.
221 GetVisibleVisitsInRange(Time(), Time(), true, 0, &results);
222 ASSERT_EQ(static_cast<size_t>(2), results.size()); 214 ASSERT_EQ(static_cast<size_t>(2), results.size());
223 EXPECT_TRUE(IsVisitInfoEqual(results[0], visit_info4) && 215 EXPECT_TRUE(IsVisitInfoEqual(results[0], visit_info4) &&
224 IsVisitInfoEqual(results[1], visit_info2)); 216 IsVisitInfoEqual(results[1], visit_info2));
225 217
226 // Query a time range and make sure beginning is inclusive and ending is 218 // Query a time range and make sure beginning is inclusive and ending is
227 // exclusive. 219 // exclusive.
228 GetVisibleVisitsInRange(visit_info2.visit_time, visit_info4.visit_time, 220 GetVisibleVisitsInRange(visit_info2.visit_time, visit_info4.visit_time, 0,
229 false, 0, &results); 221 &results);
230 ASSERT_EQ(static_cast<size_t>(1), results.size()); 222 ASSERT_EQ(static_cast<size_t>(1), results.size());
231 EXPECT_TRUE(IsVisitInfoEqual(results[0], visit_info2)); 223 EXPECT_TRUE(IsVisitInfoEqual(results[0], visit_info2));
232 224
233 // Query for a max count and make sure we get only that number. 225 // Query for a max count and make sure we get only that number.
234 GetVisibleVisitsInRange(Time(), Time(), false, 2, &results); 226 GetVisibleVisitsInRange(Time(), Time(), 1, &results);
235 ASSERT_EQ(static_cast<size_t>(2), results.size()); 227 ASSERT_EQ(static_cast<size_t>(1), results.size());
236 EXPECT_TRUE(IsVisitInfoEqual(results[0], visit_info4) && 228 EXPECT_TRUE(IsVisitInfoEqual(results[0], visit_info4));
237 IsVisitInfoEqual(results[1], visit_info2));
238 } 229 }
239 } // namespace history 230 } // namespace history
OLDNEW
« no previous file with comments | « chrome/browser/history/visit_database.cc ('k') | chrome/browser/possible_url_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698