[Offline pages] Updating the UpdateCallback in OPMStoreSQL

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 215 matching lines @@
   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 AddCallback(ItemActionStatus status);
+  void UpdateCallback(CalledCallback called_callback,
+                      std::unique_ptr<StoreUpdateResult> result);
+  void ResetCallback(bool status);
 
   void ClearResults();
 
   OfflinePageItem CheckThatStoreHasOneItem();
   void CheckThatOfflinePageCanBeSaved(
       std::unique_ptr<OfflinePageMetadataStore> store);
 
+  StoreUpdateResult* last_update_result() { return last_update_result_.get(); }
+
  protected:
   CalledCallback last_called_callback_;
   Status last_status_;
+  std::unique_ptr<StoreUpdateResult> last_update_result_;
   std::vector<OfflinePageItem> offline_pages_;
   OfflinePageMetadataStoreFactory factory_;
 
   base::ScopedTempDir temp_directory_;
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   base::ThreadTaskRunnerHandle task_runner_handle_;
 };
 
 OfflinePageMetadataStoreTest::OfflinePageMetadataStoreTest()
     : last_called_callback_(NONE),
@@ skipping 11 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) {
+void OfflinePageMetadataStoreTest::AddCallback(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;
+      status == ItemActionStatus::SUCCESS ? STATUS_TRUE : STATUS_FALSE;
 }
 
 void OfflinePageMetadataStoreTest::UpdateCallback(
     CalledCallback called_callback,
-    bool status) {
+    std::unique_ptr<StoreUpdateResult> result) {
   last_called_callback_ = called_callback;
+  last_status_ = result->updated_items.size() > 0 ? STATUS_TRUE : STATUS_FALSE;
+  last_update_result_ = std::move(result);
+}
+
+void OfflinePageMetadataStoreTest::ResetCallback(bool status) {
+  last_called_callback_ = RESET;
   last_status_ = status ? STATUS_TRUE : STATUS_FALSE;
 }
 
 void OfflinePageMetadataStoreTest::ClearResults() {
   last_called_callback_ = NONE;
   last_status_ = STATUS_NONE;
   offline_pages_.clear();
+  last_update_result_.reset(nullptr);
 }
 
 OfflinePageItem OfflinePageMetadataStoreTest::CheckThatStoreHasOneItem() {
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
   EXPECT_EQ(1U, offline_pages_.size());
 
   return offline_pages_[0];
 }
 
@@ skipping 19 matching lines @@
   store = BuildStore();
   PumpLoop();
 
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
   ASSERT_EQ(store_size + 1, offline_pages_.size());
   if (store_size > 0 &&
       offline_pages_[0].offline_id != offline_page.offline_id) {
     std::swap(offline_pages_[0], offline_pages_[1]);
   }
-  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.last_access_time, offline_pages_[0].last_access_time);
-  EXPECT_EQ(offline_page.expiration_time, offline_pages_[0].expiration_time);
-  EXPECT_EQ(offline_page.title, offline_pages_[0].title);
-  EXPECT_EQ(offline_page.client_id, offline_pages_[0].client_id);
-  EXPECT_EQ(1234LL, offline_pages_[0].offline_id);
-  EXPECT_EQ(kFileSize, offline_pages_[0].file_size);
-  EXPECT_EQ(kTestClientId1, offline_pages_[0].client_id);
+  EXPECT_EQ(offline_page, offline_pages_[0]);
 }
 
 std::unique_ptr<OfflinePageMetadataStore>
 OfflinePageMetadataStoreTest::BuildStore() {
   std::unique_ptr<OfflinePageMetadataStore> store(
       factory_.BuildStore(temp_directory_.GetPath()));
   PumpLoop();
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
@@ skipping 44 matching lines @@
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
   EXPECT_EQ(0U, offline_pages_.size());
 }
 
 TEST_F(OfflinePageMetadataStoreTest, GetOfflinePagesFromInvalidStore) {
   std::unique_ptr<OfflinePageMetadataStore> store(BuildStore());
   OfflinePageMetadataStoreSQL* sql_store =
       static_cast<OfflinePageMetadataStoreSQL*>(store.get());
 
-  sql_store->SetStateForTesting(OfflinePageMetadataStore::NOT_LOADED, false);
+  sql_store->SetStateForTesting(StoreState::NOT_LOADED, false);
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(0UL, offline_pages_.size());
   EXPECT_EQ(STATUS_FALSE, last_status_);
 
-  sql_store->SetStateForTesting(
-      OfflinePageMetadataStore::FAILED_INITIALIZATION, false);
+  sql_store->SetStateForTesting(StoreState::FAILED_LOADING, false);
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(0UL, offline_pages_.size());
   EXPECT_EQ(STATUS_FALSE, last_status_);
 
-  sql_store->SetStateForTesting(
-      OfflinePageMetadataStore::FAILED_RESET, false);
+  sql_store->SetStateForTesting(StoreState::FAILED_RESET, false);
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(0UL, offline_pages_.size());
   EXPECT_EQ(STATUS_FALSE, last_status_);
 
-  sql_store->SetStateForTesting(
-      OfflinePageMetadataStore::LOADED, true);
+  sql_store->SetStateForTesting(StoreState::LOADED, true);
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(0UL, offline_pages_.size());
   EXPECT_EQ(STATUS_FALSE, last_status_);
 
-  sql_store->SetStateForTesting(
-      OfflinePageMetadataStore::NOT_LOADED, true);
+  sql_store->SetStateForTesting(StoreState::NOT_LOADED, true);
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(0UL, offline_pages_.size());
   EXPECT_EQ(STATUS_FALSE, last_status_);
 
-  sql_store->SetStateForTesting(
-      OfflinePageMetadataStore::FAILED_INITIALIZATION, false);
+  sql_store->SetStateForTesting(StoreState::FAILED_LOADING, false);
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(0UL, offline_pages_.size());
   EXPECT_EQ(STATUS_FALSE, last_status_);
 
-  sql_store->SetStateForTesting(
-      OfflinePageMetadataStore::FAILED_RESET, false);
+  sql_store->SetStateForTesting(StoreState::FAILED_RESET, false);
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(0UL, offline_pages_.size());
   EXPECT_EQ(STATUS_FALSE, last_status_);
 
 }
 
@@ skipping 96 matching lines @@
 
   // Remove the offline page.
   std::vector<int64_t> ids_to_remove;
   ids_to_remove.push_back(offline_page.offline_id);
   store->RemoveOfflinePages(
       ids_to_remove, base::Bind(&OfflinePageMetadataStoreTest::UpdateCallback,
                                 base::Unretained(this), REMOVE));
   PumpLoop();
   EXPECT_EQ(REMOVE, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
+  ASSERT_TRUE(last_update_result() != nullptr);
+  EXPECT_EQ(1UL, last_update_result()->item_statuses.size());
+  EXPECT_EQ(ItemActionStatus::SUCCESS,
+            last_update_result()->item_statuses.begin()->second);
+  EXPECT_EQ(1UL, last_update_result()->updated_items.size());
+  EXPECT_EQ(offline_page, *(last_update_result()->updated_items.begin()));
 
   ClearResults();
 
   // Load the store.
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(0U, offline_pages_.size());
@@ skipping 52 matching lines @@
 
   // Remove the offline page.
   std::vector<int64_t> ids_to_remove;
   ids_to_remove.push_back(offline_page_1.offline_id);
   store->RemoveOfflinePages(
       ids_to_remove, base::Bind(&OfflinePageMetadataStoreTest::UpdateCallback,
                                 base::Unretained(this), REMOVE));
   PumpLoop();
   EXPECT_EQ(REMOVE, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
+  ASSERT_TRUE(last_update_result() != nullptr);
+  EXPECT_EQ(1UL, last_update_result()->item_statuses.size());
+  EXPECT_EQ(ItemActionStatus::SUCCESS,
+            last_update_result()->item_statuses.begin()->second);
+  EXPECT_EQ(1UL, last_update_result()->updated_items.size());
+  EXPECT_EQ(offline_page_1, *(last_update_result()->updated_items.begin()));
 
   ClearResults();
 
   // Close and reload the store.
   store.reset();
   store = BuildStore();
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
   PumpLoop();
@@ skipping 29 matching lines @@
 
   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);
+  EXPECT_EQ(offline_page, offline_pages_[0]);
 
   // Then update some data.
   offline_page.file_size = kFileSize + 1;
   offline_page.access_count++;
   offline_page.expiration_time = base::Time::Now();
   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(UPDATE, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
+  ASSERT_TRUE(last_update_result() != nullptr);
+  EXPECT_EQ(1UL, last_update_result()->item_statuses.size());
+  EXPECT_EQ(ItemActionStatus::SUCCESS,
+            last_update_result()->item_statuses.begin()->second);
+  EXPECT_EQ(1UL, last_update_result()->updated_items.size());
+  EXPECT_EQ(offline_page, *(last_update_result()->updated_items.begin()));
 
   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);
+  EXPECT_EQ(offline_page, offline_pages_[0]);
 }
 
 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->AddOfflinePage(offline_page,
                         base::Bind(&OfflinePageMetadataStoreTest::AddCallback,
@@ skipping 19 matching lines @@
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
   PumpLoop();
 
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
   EXPECT_EQ(2U, offline_pages_.size());
 
   // Clear all records from the store.
-  store->Reset(base::Bind(&OfflinePageMetadataStoreTest::UpdateCallback,
-                          base::Unretained(this), RESET));
+  store->Reset(base::Bind(&OfflinePageMetadataStoreTest::ResetCallback,
+                          base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(RESET, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
 
   // Load the store.
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  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