[Offline pages] Splitting Add and Update methods in OPMStore

components/offline_pages/offline_page_metadata_store_impl_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/offline_pages/offline_page_metadata_store.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 192 matching lines @@
   }
 
   OfflinePageMetadataStore* BuildStoreM54(const base::FilePath& file_path) {
     BuildTestStoreWithSchemaFromM54(file_path);
     OfflinePageMetadataStoreSQL* store = new OfflinePageMetadataStoreSQL(
         base::ThreadTaskRunnerHandle::Get(), file_path);
     return store;
   }
 };
 
-enum CalledCallback { NONE, LOAD, ADD, REMOVE, RESET };
+enum CalledCallback { NONE, LOAD, ADD, UPDATE, REMOVE, RESET };
 enum Status { STATUS_NONE, STATUS_TRUE, STATUS_FALSE };
 
 class OfflinePageMetadataStoreTest : public testing::Test {
  public:
   OfflinePageMetadataStoreTest();
   ~OfflinePageMetadataStoreTest() override;
 
   void TearDown() override {
     // Wait for all the pieces of the store to delete itself properly.
     PumpLoop();
   }
 
   std::unique_ptr<OfflinePageMetadataStore> BuildStore();
   std::unique_ptr<OfflinePageMetadataStore> BuildStoreWithSchemaFromM52();
   std::unique_ptr<OfflinePageMetadataStore> BuildStoreWithSchemaFromM53();
   std::unique_ptr<OfflinePageMetadataStore> BuildStoreWithSchemaFromM54();
 
   void PumpLoop();
 
   void GetOfflinePagesCallback(
       OfflinePageMetadataStore::LoadStatus load_status,
       const std::vector<OfflinePageItem>& offline_pages);
+  void AddCallback(OfflinePageMetadataStore::ItemActionStatus status);
   void UpdateCallback(CalledCallback called_callback, bool success);
 
   void ClearResults();
 
   OfflinePageItem CheckThatStoreHasOneItem();
   void CheckThatOfflinePageCanBeSaved(
       std::unique_ptr<OfflinePageMetadataStore> store);
 
  protected:
   CalledCallback last_called_callback_;
@@ skipping 22 matching lines @@
 
 void OfflinePageMetadataStoreTest::GetOfflinePagesCallback(
     OfflinePageMetadataStore::LoadStatus load_status,
     const std::vector<OfflinePageItem>& offline_pages) {
   last_called_callback_ = LOAD;
   last_status_ = load_status == OfflinePageMetadataStore::LOAD_SUCCEEDED ?
       STATUS_TRUE : STATUS_FALSE;
   offline_pages_.swap(const_cast<std::vector<OfflinePageItem>&>(offline_pages));
 }
 
+void OfflinePageMetadataStoreTest::AddCallback(
+    OfflinePageMetadataStore::ItemActionStatus status) {
+  last_called_callback_ = ADD;
+  // TODO(fgorski): Add specific add status.
+  // last_item_status_ = status;
+  last_status_ =
+      status == OfflinePageMetadataStore::SUCCESS ? STATUS_TRUE : STATUS_FALSE;
+}
+
 void OfflinePageMetadataStoreTest::UpdateCallback(
     CalledCallback called_callback,
     bool status) {
   last_called_callback_ = called_callback;
   last_status_ = status ? STATUS_TRUE : STATUS_FALSE;
 }
 
 void OfflinePageMetadataStoreTest::ClearResults() {
   last_called_callback_ = NONE;
   last_status_ = STATUS_NONE;
@@ skipping 10 matching lines @@
 
 void OfflinePageMetadataStoreTest::CheckThatOfflinePageCanBeSaved(
     std::unique_ptr<OfflinePageMetadataStore> store) {
   size_t store_size = offline_pages_.size();
   OfflinePageItem offline_page(GURL(kTestURL), 1234LL, kTestClientId1,
                                base::FilePath(kFilePath), kFileSize);
   offline_page.title = base::UTF8ToUTF16("a title");
   base::Time expiration_time = base::Time::Now();
   offline_page.expiration_time = expiration_time;
 
-  store->AddOrUpdateOfflinePage(
-      offline_page, base::Bind(&OfflinePageMetadataStoreTest::UpdateCallback,
-                               base::Unretained(this), ADD));
+  store->AddOfflinePage(offline_page,
+                        base::Bind(&OfflinePageMetadataStoreTest::AddCallback,
+                                   base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(ADD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
   ClearResults();
 
   // Close the store first to ensure file lock is removed.
   store.reset();
   store = BuildStore();
   PumpLoop();
 
@@ skipping 117 matching lines @@
 }
 
 // Tests removing offline page metadata from the store, for which it first adds
 // metadata of an offline page.
 TEST_F(OfflinePageMetadataStoreTest, RemoveOfflinePage) {
   std::unique_ptr<OfflinePageMetadataStore> store(BuildStore());
 
   // Add an offline page.
   OfflinePageItem offline_page(GURL(kTestURL), 1234LL, kTestClientId1,
                                base::FilePath(kFilePath), kFileSize);
-  store->AddOrUpdateOfflinePage(
-      offline_page, base::Bind(&OfflinePageMetadataStoreTest::UpdateCallback,
-                               base::Unretained(this), ADD));
+  store->AddOfflinePage(offline_page,
+                        base::Bind(&OfflinePageMetadataStoreTest::AddCallback,
+                                   base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(ADD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
 
   ClearResults();
 
   // Load the store.
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
@@ skipping 37 matching lines @@
 
   // Add an offline page.
   OfflinePageItem offline_page_1(GURL(kTestURL), 12345LL, kTestClientId1,
                                  base::FilePath(kFilePath), kFileSize);
   base::FilePath file_path_2 =
       base::FilePath(FILE_PATH_LITERAL("//other.page.com.mhtml"));
   OfflinePageItem offline_page_2(GURL("https://other.page.com"), 5678LL,
                                  kTestClientId2, file_path_2, 12345,
                                  base::Time::Now());
   offline_page_2.expiration_time = base::Time::Now();
-  store->AddOrUpdateOfflinePage(
-      offline_page_1, base::Bind(&OfflinePageMetadataStoreTest::UpdateCallback,
-                                 base::Unretained(this), ADD));
+  store->AddOfflinePage(offline_page_1,
+                        base::Bind(&OfflinePageMetadataStoreTest::AddCallback,
+                                   base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(ADD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
 
   ClearResults();
 
   // Add anther offline page.
-  store->AddOrUpdateOfflinePage(
-      offline_page_2, base::Bind(&OfflinePageMetadataStoreTest::UpdateCallback,
-                                 base::Unretained(this), ADD));
+  store->AddOfflinePage(offline_page_2,
+                        base::Bind(&OfflinePageMetadataStoreTest::AddCallback,
+                                   base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(ADD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
 
   ClearResults();
 
   // Load the store.
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
@@ skipping 38 matching lines @@
   EXPECT_EQ(offline_page_2.client_id, offline_pages_[0].client_id);
 }
 
 // Tests updating offline page metadata from the store.
 TEST_F(OfflinePageMetadataStoreTest, UpdateOfflinePage) {
   std::unique_ptr<OfflinePageMetadataStore> store(BuildStore());
 
   // First, adds a fresh page.
   OfflinePageItem offline_page(GURL(kTestURL), 1234LL, kTestClientId1,
                                base::FilePath(kFilePath), kFileSize);
-  store->AddOrUpdateOfflinePage(
-      offline_page, base::Bind(&OfflinePageMetadataStoreTest::UpdateCallback,
-                               base::Unretained(this), ADD));
+  store->AddOfflinePage(offline_page,
+                        base::Bind(&OfflinePageMetadataStoreTest::AddCallback,
+                                   base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(ADD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
 
   ClearResults();
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
   PumpLoop();
 
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
   ASSERT_EQ(1U, offline_pages_.size());
   EXPECT_EQ(offline_page.url, offline_pages_[0].url);
   EXPECT_EQ(offline_page.offline_id, offline_pages_[0].offline_id);
   EXPECT_EQ(offline_page.file_path, offline_pages_[0].file_path);
   EXPECT_EQ(offline_page.file_size, offline_pages_[0].file_size);
   EXPECT_EQ(offline_page.creation_time, offline_pages_[0].creation_time);
   EXPECT_EQ(offline_page.last_access_time, offline_pages_[0].last_access_time);
   EXPECT_EQ(offline_page.expiration_time, offline_pages_[0].expiration_time);
   EXPECT_EQ(offline_page.access_count, offline_pages_[0].access_count);
   EXPECT_EQ(offline_page.client_id, offline_pages_[0].client_id);
 
   // Then update some data.
   offline_page.file_size = kFileSize + 1;
   offline_page.access_count++;
   offline_page.expiration_time = base::Time::Now();
-  store->AddOrUpdateOfflinePage(
-      offline_page, base::Bind(&OfflinePageMetadataStoreTest::UpdateCallback,
-                               base::Unretained(this), ADD));
+  std::vector<OfflinePageItem> items_to_update;
+  items_to_update.push_back(offline_page);
+  store->UpdateOfflinePages(
+      items_to_update, base::Bind(&OfflinePageMetadataStoreTest::UpdateCallback,
+                                  base::Unretained(this), UPDATE));
   PumpLoop();
-  EXPECT_EQ(ADD, last_called_callback_);
+  EXPECT_EQ(UPDATE, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
 
   ClearResults();
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
   PumpLoop();
 
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
   ASSERT_EQ(1U, offline_pages_.size());
   EXPECT_EQ(offline_page.url, offline_pages_[0].url);
   EXPECT_EQ(offline_page.offline_id, offline_pages_[0].offline_id);
   EXPECT_EQ(offline_page.file_path, offline_pages_[0].file_path);
   EXPECT_EQ(offline_page.file_size, offline_pages_[0].file_size);
   EXPECT_EQ(offline_page.creation_time, offline_pages_[0].creation_time);
   EXPECT_EQ(offline_page.last_access_time, offline_pages_[0].last_access_time);
   EXPECT_EQ(offline_page.expiration_time, offline_pages_[0].expiration_time);
   EXPECT_EQ(offline_page.access_count, offline_pages_[0].access_count);
   EXPECT_EQ(offline_page.client_id, offline_pages_[0].client_id);
 }
 
 TEST_F(OfflinePageMetadataStoreTest, ClearAllOfflinePages) {
   std::unique_ptr<OfflinePageMetadataStore> store(BuildStore());
 
   // Add 2 offline pages.
   OfflinePageItem offline_page(GURL(kTestURL), 1234LL, kTestClientId1,
                                base::FilePath(kFilePath), kFileSize);
-  store->AddOrUpdateOfflinePage(
-      offline_page, base::Bind(&OfflinePageMetadataStoreTest::UpdateCallback,
-                               base::Unretained(this), ADD));
+  store->AddOfflinePage(offline_page,
+                        base::Bind(&OfflinePageMetadataStoreTest::AddCallback,
+                                   base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(ADD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
 
   ClearResults();
 
   OfflinePageItem offline_page2(GURL("http://test.com"), 5678LL, kTestClientId2,
                                 base::FilePath(kFilePath), kFileSize);
-  store->AddOrUpdateOfflinePage(
-      offline_page2, base::Bind(&OfflinePageMetadataStoreTest::UpdateCallback,
-                                base::Unretained(this), ADD));
+  store->AddOfflinePage(offline_page2,
+                        base::Bind(&OfflinePageMetadataStoreTest::AddCallback,
+                                   base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(ADD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
 
   ClearResults();
 
   // Load the store.
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
@@ skipping 16 matching lines @@
                  base::Unretained(this)));
   PumpLoop();
 
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
   ASSERT_EQ(0U, offline_pages_.size());
 }
 
 }  // namespace
 }  // namespace offline_pages