OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/offline_pages/offline_page_model.h" | 5 #include "components/offline_pages/offline_page_model.h" |
6 | 6 |
| 7 #include <stdint.h> |
| 8 |
7 #include <algorithm> | 9 #include <algorithm> |
8 | 10 |
9 #include "base/bind.h" | 11 #include "base/bind.h" |
10 #include "base/files/file_util.h" | 12 #include "base/files/file_util.h" |
11 #include "base/files/scoped_temp_dir.h" | 13 #include "base/files/scoped_temp_dir.h" |
12 #include "base/run_loop.h" | 14 #include "base/run_loop.h" |
13 #include "base/single_thread_task_runner.h" | 15 #include "base/single_thread_task_runner.h" |
14 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
15 #include "base/test/test_mock_time_task_runner.h" | 17 #include "base/test/test_mock_time_task_runner.h" |
16 #include "base/thread_task_runner_handle.h" | 18 #include "base/thread_task_runner_handle.h" |
(...skipping 11 matching lines...) Expand all Loading... |
28 #include "testing/gtest/include/gtest/gtest.h" | 30 #include "testing/gtest/include/gtest/gtest.h" |
29 #include "url/gurl.h" | 31 #include "url/gurl.h" |
30 | 32 |
31 using SavePageResult = offline_pages::OfflinePageModel::SavePageResult; | 33 using SavePageResult = offline_pages::OfflinePageModel::SavePageResult; |
32 using DeletePageResult = offline_pages::OfflinePageModel::DeletePageResult; | 34 using DeletePageResult = offline_pages::OfflinePageModel::DeletePageResult; |
33 | 35 |
34 namespace offline_pages { | 36 namespace offline_pages { |
35 | 37 |
36 namespace { | 38 namespace { |
37 const GURL kTestUrl("http://example.com"); | 39 const GURL kTestUrl("http://example.com"); |
38 const int64 kTestPageBookmarkId1 = 1234LL; | 40 const int64_t kTestPageBookmarkId1 = 1234LL; |
39 const GURL kTestUrl2("http://other.page.com"); | 41 const GURL kTestUrl2("http://other.page.com"); |
40 const GURL kTestUrl3("http://test.xyz"); | 42 const GURL kTestUrl3("http://test.xyz"); |
41 const GURL kFileUrl("file:///foo"); | 43 const GURL kFileUrl("file:///foo"); |
42 const int64 kTestPageBookmarkId2 = 5678LL; | 44 const int64_t kTestPageBookmarkId2 = 5678LL; |
43 const int64 kTestPageBookmarkId3 = 42LL; | 45 const int64_t kTestPageBookmarkId3 = 42LL; |
44 const int64 kTestFileSize = 876543LL; | 46 const int64_t kTestFileSize = 876543LL; |
45 | 47 |
46 } // namespace | 48 } // namespace |
47 | 49 |
48 class OfflinePageModelTest | 50 class OfflinePageModelTest |
49 : public testing::Test, | 51 : public testing::Test, |
50 public OfflinePageModel::Observer, | 52 public OfflinePageModel::Observer, |
51 public OfflinePageTestArchiver::Observer, | 53 public OfflinePageTestArchiver::Observer, |
52 public base::SupportsWeakPtr<OfflinePageModelTest> { | 54 public base::SupportsWeakPtr<OfflinePageModelTest> { |
53 public: | 55 public: |
54 OfflinePageModelTest(); | 56 OfflinePageModelTest(); |
55 ~OfflinePageModelTest() override; | 57 ~OfflinePageModelTest() override; |
56 | 58 |
57 void SetUp() override; | 59 void SetUp() override; |
58 void TearDown() override; | 60 void TearDown() override; |
59 | 61 |
60 // OfflinePageModel::Observer implementation. | 62 // OfflinePageModel::Observer implementation. |
61 void OfflinePageModelLoaded(OfflinePageModel* model) override; | 63 void OfflinePageModelLoaded(OfflinePageModel* model) override; |
62 void OfflinePageModelChanged(OfflinePageModel* model) override; | 64 void OfflinePageModelChanged(OfflinePageModel* model) override; |
63 void OfflinePageDeleted(int64 bookmark_id) override; | 65 void OfflinePageDeleted(int64_t bookmark_id) override; |
64 | 66 |
65 // OfflinePageTestArchiver::Observer implementation. | 67 // OfflinePageTestArchiver::Observer implementation. |
66 void SetLastPathCreatedByArchiver(const base::FilePath& file_path) override; | 68 void SetLastPathCreatedByArchiver(const base::FilePath& file_path) override; |
67 | 69 |
68 // OfflinePageModel callbacks. | 70 // OfflinePageModel callbacks. |
69 void OnSavePageDone(SavePageResult result); | 71 void OnSavePageDone(SavePageResult result); |
70 void OnDeletePageDone(DeletePageResult result); | 72 void OnDeletePageDone(DeletePageResult result); |
71 void OnClearAllDone(); | 73 void OnClearAllDone(); |
72 | 74 |
73 // OfflinePageMetadataStore callbacks. | 75 // OfflinePageMetadataStore callbacks. |
(...skipping 11 matching lines...) Expand all Loading... |
85 // Runs until all of the tasks that are not delayed are gone from the task | 87 // Runs until all of the tasks that are not delayed are gone from the task |
86 // queue. | 88 // queue. |
87 void PumpLoop(); | 89 void PumpLoop(); |
88 // Fast-forwards virtual time by |delta|, causing tasks with a remaining | 90 // Fast-forwards virtual time by |delta|, causing tasks with a remaining |
89 // delay less than or equal to |delta| to be executed. | 91 // delay less than or equal to |delta| to be executed. |
90 void FastForwardBy(base::TimeDelta delta); | 92 void FastForwardBy(base::TimeDelta delta); |
91 void ResetResults(); | 93 void ResetResults(); |
92 | 94 |
93 OfflinePageTestStore* GetStore(); | 95 OfflinePageTestStore* GetStore(); |
94 | 96 |
95 void SavePage(const GURL& url, int64 bookmark_id); | 97 void SavePage(const GURL& url, int64_t bookmark_id); |
96 void SavePageWithArchiverResult( | 98 void SavePageWithArchiverResult(const GURL& url, |
97 const GURL& url, | 99 int64_t bookmark_id, |
98 int64 bookmark_id, | 100 OfflinePageArchiver::ArchiverResult result); |
99 OfflinePageArchiver::ArchiverResult result); | |
100 | 101 |
101 OfflinePageModel* model() { return model_.get(); } | 102 OfflinePageModel* model() { return model_.get(); } |
102 | 103 |
103 SavePageResult last_save_result() const { | 104 SavePageResult last_save_result() const { |
104 return last_save_result_; | 105 return last_save_result_; |
105 } | 106 } |
106 | 107 |
107 DeletePageResult last_delete_result() const { | 108 DeletePageResult last_delete_result() const { |
108 return last_delete_result_; | 109 return last_delete_result_; |
109 } | 110 } |
110 | 111 |
111 int64 last_deleted_bookmark_id() const { | 112 int64_t last_deleted_bookmark_id() const { return last_deleted_bookmark_id_; } |
112 return last_deleted_bookmark_id_; | |
113 } | |
114 | 113 |
115 const base::FilePath& last_archiver_path() { return last_archiver_path_; } | 114 const base::FilePath& last_archiver_path() { return last_archiver_path_; } |
116 | 115 |
117 private: | 116 private: |
118 scoped_refptr<base::TestMockTimeTaskRunner> task_runner_; | 117 scoped_refptr<base::TestMockTimeTaskRunner> task_runner_; |
119 base::ThreadTaskRunnerHandle task_runner_handle_; | 118 base::ThreadTaskRunnerHandle task_runner_handle_; |
120 base::ScopedTempDir temp_dir_; | 119 base::ScopedTempDir temp_dir_; |
121 | 120 |
122 scoped_ptr<OfflinePageModel> model_; | 121 scoped_ptr<OfflinePageModel> model_; |
123 SavePageResult last_save_result_; | 122 SavePageResult last_save_result_; |
124 DeletePageResult last_delete_result_; | 123 DeletePageResult last_delete_result_; |
125 base::FilePath last_archiver_path_; | 124 base::FilePath last_archiver_path_; |
126 int64 last_deleted_bookmark_id_; | 125 int64_t last_deleted_bookmark_id_; |
127 }; | 126 }; |
128 | 127 |
129 OfflinePageModelTest::OfflinePageModelTest() | 128 OfflinePageModelTest::OfflinePageModelTest() |
130 : task_runner_(new base::TestMockTimeTaskRunner), | 129 : task_runner_(new base::TestMockTimeTaskRunner), |
131 task_runner_handle_(task_runner_), | 130 task_runner_handle_(task_runner_), |
132 last_save_result_(SavePageResult::CANCELLED), | 131 last_save_result_(SavePageResult::CANCELLED), |
133 last_delete_result_(DeletePageResult::CANCELLED), | 132 last_delete_result_(DeletePageResult::CANCELLED), |
134 last_deleted_bookmark_id_(-1) { | 133 last_deleted_bookmark_id_(-1) { |
135 } | 134 } |
136 | 135 |
(...skipping 14 matching lines...) Expand all Loading... |
151 } | 150 } |
152 | 151 |
153 void OfflinePageModelTest::OfflinePageModelLoaded(OfflinePageModel* model) { | 152 void OfflinePageModelTest::OfflinePageModelLoaded(OfflinePageModel* model) { |
154 ASSERT_EQ(model_.get(), model); | 153 ASSERT_EQ(model_.get(), model); |
155 } | 154 } |
156 | 155 |
157 void OfflinePageModelTest::OfflinePageModelChanged(OfflinePageModel* model) { | 156 void OfflinePageModelTest::OfflinePageModelChanged(OfflinePageModel* model) { |
158 ASSERT_EQ(model_.get(), model); | 157 ASSERT_EQ(model_.get(), model); |
159 } | 158 } |
160 | 159 |
161 void OfflinePageModelTest::OfflinePageDeleted(int64 bookmark_id) { | 160 void OfflinePageModelTest::OfflinePageDeleted(int64_t bookmark_id) { |
162 last_deleted_bookmark_id_ = bookmark_id; | 161 last_deleted_bookmark_id_ = bookmark_id; |
163 } | 162 } |
164 | 163 |
165 void OfflinePageModelTest::SetLastPathCreatedByArchiver( | 164 void OfflinePageModelTest::SetLastPathCreatedByArchiver( |
166 const base::FilePath& file_path) { | 165 const base::FilePath& file_path) { |
167 last_archiver_path_ = file_path; | 166 last_archiver_path_ = file_path; |
168 } | 167 } |
169 | 168 |
170 void OfflinePageModelTest::OnSavePageDone( | 169 void OfflinePageModelTest::OnSavePageDone( |
171 OfflinePageModel::SavePageResult result) { | 170 OfflinePageModel::SavePageResult result) { |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 void OfflinePageModelTest::ResetResults() { | 221 void OfflinePageModelTest::ResetResults() { |
223 last_save_result_ = SavePageResult::CANCELLED; | 222 last_save_result_ = SavePageResult::CANCELLED; |
224 last_delete_result_ = DeletePageResult::CANCELLED; | 223 last_delete_result_ = DeletePageResult::CANCELLED; |
225 last_archiver_path_.clear(); | 224 last_archiver_path_.clear(); |
226 } | 225 } |
227 | 226 |
228 OfflinePageTestStore* OfflinePageModelTest::GetStore() { | 227 OfflinePageTestStore* OfflinePageModelTest::GetStore() { |
229 return static_cast<OfflinePageTestStore*>(model()->GetStoreForTesting()); | 228 return static_cast<OfflinePageTestStore*>(model()->GetStoreForTesting()); |
230 } | 229 } |
231 | 230 |
232 void OfflinePageModelTest::SavePage(const GURL& url, int64 bookmark_id) { | 231 void OfflinePageModelTest::SavePage(const GURL& url, int64_t bookmark_id) { |
233 SavePageWithArchiverResult( | 232 SavePageWithArchiverResult( |
234 url, | 233 url, |
235 bookmark_id, | 234 bookmark_id, |
236 OfflinePageArchiver::ArchiverResult::SUCCESSFULLY_CREATED); | 235 OfflinePageArchiver::ArchiverResult::SUCCESSFULLY_CREATED); |
237 } | 236 } |
238 | 237 |
239 void OfflinePageModelTest::SavePageWithArchiverResult( | 238 void OfflinePageModelTest::SavePageWithArchiverResult( |
240 const GURL& url, | 239 const GURL& url, |
241 int64 bookmark_id, | 240 int64_t bookmark_id, |
242 OfflinePageArchiver::ArchiverResult result) { | 241 OfflinePageArchiver::ArchiverResult result) { |
243 scoped_ptr<OfflinePageTestArchiver> archiver( | 242 scoped_ptr<OfflinePageTestArchiver> archiver( |
244 BuildArchiver(url, result).Pass()); | 243 BuildArchiver(url, result).Pass()); |
245 model()->SavePage( | 244 model()->SavePage( |
246 url, bookmark_id, archiver.Pass(), | 245 url, bookmark_id, archiver.Pass(), |
247 base::Bind(&OfflinePageModelTest::OnSavePageDone, AsWeakPtr())); | 246 base::Bind(&OfflinePageModelTest::OnSavePageDone, AsWeakPtr())); |
248 PumpLoop(); | 247 PumpLoop(); |
249 } | 248 } |
250 | 249 |
251 TEST_F(OfflinePageModelTest, SavePageSuccessful) { | 250 TEST_F(OfflinePageModelTest, SavePageSuccessful) { |
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
605 OfflinePageArchiver::ArchiverResult::SUCCESSFULLY_CREATED) | 604 OfflinePageArchiver::ArchiverResult::SUCCESSFULLY_CREATED) |
606 .Pass()); | 605 .Pass()); |
607 model()->SavePage( | 606 model()->SavePage( |
608 kTestUrl3, kTestPageBookmarkId3, archiver3.Pass(), | 607 kTestUrl3, kTestPageBookmarkId3, archiver3.Pass(), |
609 base::Bind(&OfflinePageModelTest::OnSavePageDone, AsWeakPtr())); | 608 base::Bind(&OfflinePageModelTest::OnSavePageDone, AsWeakPtr())); |
610 PumpLoop(); | 609 PumpLoop(); |
611 | 610 |
612 EXPECT_EQ(3u, store->GetAllPages().size()); | 611 EXPECT_EQ(3u, store->GetAllPages().size()); |
613 | 612 |
614 // Delete multiple pages. | 613 // Delete multiple pages. |
615 std::vector<int64> ids_to_delete; | 614 std::vector<int64_t> ids_to_delete; |
616 ids_to_delete.push_back(kTestPageBookmarkId2); | 615 ids_to_delete.push_back(kTestPageBookmarkId2); |
617 ids_to_delete.push_back(kTestPageBookmarkId1); | 616 ids_to_delete.push_back(kTestPageBookmarkId1); |
618 ids_to_delete.push_back(23434LL); // Non-existent ID. | 617 ids_to_delete.push_back(23434LL); // Non-existent ID. |
619 model()->DeletePagesByBookmarkId( | 618 model()->DeletePagesByBookmarkId( |
620 ids_to_delete, base::Bind(&OfflinePageModelTest::OnDeletePageDone, | 619 ids_to_delete, base::Bind(&OfflinePageModelTest::OnDeletePageDone, |
621 AsWeakPtr())); | 620 AsWeakPtr())); |
622 PumpLoop(); | 621 PumpLoop(); |
623 | 622 |
624 // Success is expected if at least one page is deleted successfully. | 623 // Success is expected if at least one page is deleted successfully. |
625 EXPECT_EQ(DeletePageResult::SUCCESS, last_delete_result()); | 624 EXPECT_EQ(DeletePageResult::SUCCESS, last_delete_result()); |
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
926 PumpLoop(); | 925 PumpLoop(); |
927 EXPECT_EQ(0UL, model()->GetAllPages().size()); | 926 EXPECT_EQ(0UL, model()->GetAllPages().size()); |
928 | 927 |
929 // The offline copy should be restored upon the bookmark restore. | 928 // The offline copy should be restored upon the bookmark restore. |
930 UndoBookmarkRemoval(); | 929 UndoBookmarkRemoval(); |
931 PumpLoop(); | 930 PumpLoop(); |
932 EXPECT_EQ(1UL, model()->GetAllPages().size()); | 931 EXPECT_EQ(1UL, model()->GetAllPages().size()); |
933 } | 932 } |
934 | 933 |
935 } // namespace offline_pages | 934 } // namespace offline_pages |
OLD | NEW |