OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/file_path.h" | 5 #include "base/file_path.h" |
6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/scoped_temp_dir.h" | 8 #include "base/scoped_temp_dir.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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
205 content::PAGE_TRANSITION_AUTO_SUBFRAME | | 205 content::PAGE_TRANSITION_AUTO_SUBFRAME | |
206 content::PAGE_TRANSITION_CHAIN_START | | 206 content::PAGE_TRANSITION_CHAIN_START | |
207 content::PAGE_TRANSITION_CHAIN_END), | 207 content::PAGE_TRANSITION_CHAIN_END), |
208 0); | 208 0); |
209 visit_info5.visit_id = 5; | 209 visit_info5.visit_id = 5; |
210 EXPECT_TRUE(AddVisit(&visit_info5, SOURCE_BROWSED)); | 210 EXPECT_TRUE(AddVisit(&visit_info5, SOURCE_BROWSED)); |
211 | 211 |
212 // Query the visits for all time, we should not get the first (duplicate of | 212 // Query the visits for all time, we should not get the first (duplicate of |
213 // the second) or the redirect or subframe visits. | 213 // the second) or the redirect or subframe visits. |
214 VisitVector results; | 214 VisitVector results; |
215 GetVisibleVisitsInRange(Time(), Time(), 0, &results); | 215 GetVisibleVisitsInRange(Time(), Time(), 0, &results, true); |
216 ASSERT_EQ(static_cast<size_t>(2), results.size()); | 216 ASSERT_EQ(static_cast<size_t>(2), results.size()); |
217 EXPECT_TRUE(IsVisitInfoEqual(results[0], visit_info4) && | 217 EXPECT_TRUE(IsVisitInfoEqual(results[0], visit_info4) && |
218 IsVisitInfoEqual(results[1], visit_info2)); | 218 IsVisitInfoEqual(results[1], visit_info2)); |
219 | 219 |
220 // Query a time range and make sure beginning is inclusive and ending is | 220 // Query a time range and make sure beginning is inclusive and ending is |
221 // exclusive. | 221 // exclusive. |
222 GetVisibleVisitsInRange(visit_info2.visit_time, visit_info4.visit_time, 0, | 222 GetVisibleVisitsInRange(visit_info2.visit_time, visit_info4.visit_time, 0, |
223 &results); | 223 &results, true); |
224 ASSERT_EQ(static_cast<size_t>(1), results.size()); | 224 ASSERT_EQ(static_cast<size_t>(1), results.size()); |
225 EXPECT_TRUE(IsVisitInfoEqual(results[0], visit_info2)); | 225 EXPECT_TRUE(IsVisitInfoEqual(results[0], visit_info2)); |
226 | 226 |
227 // Query for a max count and make sure we get only that number. | 227 // Query for a max count and make sure we get only that number. |
228 GetVisibleVisitsInRange(Time(), Time(), 1, &results); | 228 GetVisibleVisitsInRange(Time(), Time(), 1, &results, true); |
229 ASSERT_EQ(static_cast<size_t>(1), results.size()); | 229 ASSERT_EQ(static_cast<size_t>(1), results.size()); |
230 EXPECT_TRUE(IsVisitInfoEqual(results[0], visit_info4)); | 230 EXPECT_TRUE(IsVisitInfoEqual(results[0], visit_info4)); |
231 } | 231 } |
232 | 232 |
233 TEST_F(VisitDatabaseTest, VisitSource) { | 233 TEST_F(VisitDatabaseTest, VisitSource) { |
234 // Add visits. | 234 // Add visits. |
235 VisitRow visit_info1(111, Time::Now(), 0, content::PAGE_TRANSITION_LINK, 0); | 235 VisitRow visit_info1(111, Time::Now(), 0, content::PAGE_TRANSITION_LINK, 0); |
236 ASSERT_TRUE(AddVisit(&visit_info1, SOURCE_BROWSED)); | 236 ASSERT_TRUE(AddVisit(&visit_info1, SOURCE_BROWSED)); |
237 | 237 |
238 VisitRow visit_info2(112, Time::Now(), 1, content::PAGE_TRANSITION_TYPED, 0); | 238 VisitRow visit_info2(112, Time::Now(), 1, content::PAGE_TRANSITION_TYPED, 0); |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
283 url_id, Time::Now(), 2, content::PAGE_TRANSITION_TYPED, 0); | 283 url_id, Time::Now(), 2, content::PAGE_TRANSITION_TYPED, 0); |
284 visit_info3.is_indexed = true; | 284 visit_info3.is_indexed = true; |
285 ASSERT_TRUE(AddVisit(&visit_info3, SOURCE_SYNCED)); | 285 ASSERT_TRUE(AddVisit(&visit_info3, SOURCE_SYNCED)); |
286 EXPECT_TRUE(GetVisitsForURL(url_id, &visits)); | 286 EXPECT_TRUE(GetVisitsForURL(url_id, &visits)); |
287 EXPECT_EQ(static_cast<size_t>(3), visits.size()); | 287 EXPECT_EQ(static_cast<size_t>(3), visits.size()); |
288 EXPECT_TRUE(GetIndexedVisitsForURL(url_id, &visits)); | 288 EXPECT_TRUE(GetIndexedVisitsForURL(url_id, &visits)); |
289 EXPECT_EQ(static_cast<size_t>(1), visits.size()); | 289 EXPECT_EQ(static_cast<size_t>(1), visits.size()); |
290 } | 290 } |
291 | 291 |
292 } // namespace history | 292 } // namespace history |
OLD | NEW |