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

Unified Diff: components/offline_pages/offline_page_model_unittest.cc

Issue 1902593006: [Offline pages] Removing undoing of deleting offline pages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bookmarks-out
Patch Set: Created 4 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
« no previous file with comments | « components/offline_pages/offline_page_model.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/offline_pages/offline_page_model_unittest.cc
diff --git a/components/offline_pages/offline_page_model_unittest.cc b/components/offline_pages/offline_page_model_unittest.cc
index 64adf44fef9ed1b66217cae6beca791a92fd1a84..a11b07fe3bae8cccfbcd34742a70733e76d542e8 100644
--- a/components/offline_pages/offline_page_model_unittest.cc
+++ b/components/offline_pages/offline_page_model_unittest.cc
@@ -468,92 +468,6 @@ TEST_F(OfflinePageModelTest, MarkPageAccessed) {
EXPECT_EQ(1, offline_pages[0].access_count);
}
-TEST_F(OfflinePageModelTest, MarkPageForDeletion) {
- SavePage(kTestUrl, kTestClientId1);
-
- GURL offline_url = GetAllPages().begin()->GetOfflineURL();
-
- // Delete the page with undo tiggerred.
- model()->MarkPageForDeletion(
- last_save_offline_id(),
- base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
- PumpLoop();
-
- // GetAllPages will not return the page that is marked for deletion.
- const std::vector<OfflinePageItem>& offline_pages = GetAllPages();
- EXPECT_EQ(0UL, offline_pages.size());
-
- EXPECT_FALSE(HasPages(kTestClientNamespace));
- EXPECT_EQ(nullptr, model()->GetPageByOnlineURL(kTestUrl));
- EXPECT_EQ(nullptr, model()->GetPageByOfflineId(last_save_offline_id()));
- EXPECT_EQ(nullptr, model()->GetPageByOfflineURL(offline_url));
-
- // Undo the deletion.
- model()->UndoPageDeletion(last_save_offline_id());
- PumpLoop();
-
- // GetAllPages will now return the restored page.
- const std::vector<OfflinePageItem>& offline_pages_after_undo = GetAllPages();
- EXPECT_EQ(1UL, offline_pages_after_undo.size());
-}
-
-TEST_F(OfflinePageModelTest, FinalizePageDeletion) {
- scoped_ptr<OfflinePageTestArchiver> archiver(BuildArchiver(
- kTestUrl, OfflinePageArchiver::ArchiverResult::SUCCESSFULLY_CREATED));
- model()->SavePage(
- kTestUrl, kTestClientId1, std::move(archiver),
- base::Bind(&OfflinePageModelTest::OnSavePageDone, AsWeakPtr()));
- PumpLoop();
-
- // Mark the page for deletion.
- model()->MarkPageForDeletion(
- last_save_offline_id(),
- base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
- PumpLoop();
-
- EXPECT_EQ(1UL, GetStore()->GetAllPages().size());
-
- // Fast forward to trigger the page deletion.
- FastForwardBy(OfflinePageModel::GetFinalDeletionDelayForTesting());
-
- EXPECT_EQ(0UL, GetStore()->GetAllPages().size());
-}
-
-TEST_F(OfflinePageModelTest, SavePageAfterMarkingPageForDeletion) {
- scoped_ptr<OfflinePageTestArchiver> archiver(BuildArchiver(
- kTestUrl, OfflinePageArchiver::ArchiverResult::SUCCESSFULLY_CREATED));
- model()->SavePage(
- kTestUrl, kTestClientId1, std::move(archiver),
- base::Bind(&OfflinePageModelTest::OnSavePageDone, AsWeakPtr()));
- PumpLoop();
-
- // Mark the page for deletion.
- model()->MarkPageForDeletion(
- last_save_offline_id(),
- base::Bind(&OfflinePageModelTest::OnDeletePageDone, AsWeakPtr()));
- PumpLoop();
-
- EXPECT_EQ(1UL, GetStore()->GetAllPages().size());
-
- // Re-save the same page.
- scoped_ptr<OfflinePageTestArchiver> archiver2(BuildArchiver(
- kTestUrl, OfflinePageArchiver::ArchiverResult::SUCCESSFULLY_CREATED));
- model()->SavePage(
- kTestUrl, kTestClientId1, std::move(archiver2),
- base::Bind(&OfflinePageModelTest::OnSavePageDone, AsWeakPtr()));
-
- // Fast forward to trigger the page cleanup.
- FastForwardBy(OfflinePageModel::GetFinalDeletionDelayForTesting());
-
- // The re-saved page should still exist.
- const std::vector<OfflinePageItem>& offline_pages = GetAllPages();
- ASSERT_EQ(1UL, offline_pages.size());
- EXPECT_EQ(kTestUrl, offline_pages[0].url);
- EXPECT_EQ(kTestClientId1, offline_pages[0].client_id);
- EXPECT_EQ(kTestFileSize, offline_pages[0].file_size);
- EXPECT_EQ(0, offline_pages[0].access_count);
-}
-
TEST_F(OfflinePageModelTest, GetAllPagesStoreEmpty) {
const std::vector<OfflinePageItem>& offline_pages = GetAllPages();
« no previous file with comments | « components/offline_pages/offline_page_model.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698