Store original request URL in offline page metadata table

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 12 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace offline_pages {
 
 namespace {
 
 #define OFFLINE_PAGES_TABLE_V1 "offlinepages_v1"
 
 const char kTestClientNamespace[] = "CLIENT_NAMESPACE";
 const char kTestURL[] = "https://example.com";
+const char kOriginalTestURL[] = "https://example.com/foo";
 const ClientId kTestClientId1(kTestClientNamespace, "1234");
 const ClientId kTestClientId2(kTestClientNamespace, "5678");
 const base::FilePath::CharType kFilePath[] =
     FILE_PATH_LITERAL("/offline_pages/example_com.mhtml");
 int64_t kFileSize = 234567LL;
 int64_t kOfflineId = 12345LL;
 
 // Build a store with outdated schema to simulate the upgrading process.
 // TODO(romax): move it to sql_unittests.
 void BuildTestStoreWithSchemaFromM52(const base::FilePath& file) {
@@ skipping 130 matching lines @@
   ASSERT_TRUE(statement.Run());
   ASSERT_TRUE(connection.DoesTableExist(OFFLINE_PAGES_TABLE_V1));
   ASSERT_TRUE(connection.DoesColumnExist(OFFLINE_PAGES_TABLE_V1, "version"));
   ASSERT_TRUE(connection.DoesColumnExist(OFFLINE_PAGES_TABLE_V1, "status"));
   ASSERT_TRUE(
       connection.DoesColumnExist(OFFLINE_PAGES_TABLE_V1, "user_initiated"));
   ASSERT_TRUE(
       connection.DoesColumnExist(OFFLINE_PAGES_TABLE_V1, "offline_url"));
 }
 
+void BuildTestStoreWithSchemaFromM55(const base::FilePath& file) {
+  sql::Connection connection;
+  ASSERT_TRUE(
+      connection.Open(file.Append(FILE_PATH_LITERAL("OfflinePages.db"))));
+  ASSERT_TRUE(connection.is_open());
+  ASSERT_TRUE(connection.BeginTransaction());
+  ASSERT_TRUE(connection.Execute("CREATE TABLE " OFFLINE_PAGES_TABLE_V1
+                                 "(offline_id INTEGER PRIMARY KEY NOT NULL, "
+                                 "creation_time INTEGER NOT NULL, "
+                                 "file_size INTEGER NOT NULL, "
+                                 "last_access_time INTEGER NOT NULL, "
+                                 "access_count INTEGER NOT NULL, "
+                                 "expiration_time INTEGER NOT NULL DEFAULT 0, "
+                                 "client_namespace VARCHAR NOT NULL, "
+                                 "client_id VARCHAR NOT NULL, "
+                                 "online_url VARCHAR NOT NULL, "
+                                 "file_path VARCHAR NOT NULL, "
+                                 "title VARCHAR NOT NULL DEFAULT ''"
+                                 ")"));
+  ASSERT_TRUE(connection.CommitTransaction());
+  sql::Statement statement(connection.GetUniqueStatement(
+      "INSERT INTO " OFFLINE_PAGES_TABLE_V1
+      "(offline_id, creation_time, file_size, "
+      "last_access_time, access_count, client_namespace, "
+      "client_id, online_url, file_path, expiration_time, title) "
+      "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"));
+  statement.BindInt64(0, kOfflineId);
+  statement.BindInt(1, 0);
+  statement.BindInt64(2, kFileSize);
+  statement.BindInt(3, 0);
+  statement.BindInt(4, 1);
+  statement.BindCString(5, kTestClientNamespace);
+  statement.BindString(6, kTestClientId2.id);
+  statement.BindCString(7, kTestURL);
+  statement.BindString(8, base::FilePath(kFilePath).MaybeAsASCII());
+  statement.BindInt64(9, base::Time::Now().ToInternalValue());
+  statement.BindString16(10, base::UTF8ToUTF16("Test title"));
+  ASSERT_TRUE(statement.Run());
+  ASSERT_TRUE(connection.DoesTableExist(OFFLINE_PAGES_TABLE_V1));
+  ASSERT_TRUE(connection.DoesColumnExist(OFFLINE_PAGES_TABLE_V1, "title"));

[fgorski, 2016/11/10 23:56:13]

this needs updating to check for the new column.

[jianli, 2016/11/16 01:25:39]

I think this is used to build the old store which did not contain the new
column.

[fgorski, 2016/11/16 05:20:25]

Exactly, that is why you assert false, as in line 129, where the title column
was missing.
ASSERT_FALSE(connection.DoesColumnExist(OFFLINE_PAGES_TABLE_V1, "new_column"));

[jianli, 2016/11/16 21:58:11]

I applied the change to the wrong branch. I will include this change in my next
patch you're currently reviewing.

+}
+
 class OfflinePageMetadataStoreFactory {
  public:
   OfflinePageMetadataStore* BuildStore(const base::FilePath& file_path) {
     OfflinePageMetadataStoreSQL* store = new OfflinePageMetadataStoreSQL(
         base::ThreadTaskRunnerHandle::Get(), file_path);
     return store;
   }
 
   OfflinePageMetadataStore* BuildStoreM52(const base::FilePath& file_path) {
     BuildTestStoreWithSchemaFromM52(file_path);
     OfflinePageMetadataStoreSQL* store = new OfflinePageMetadataStoreSQL(
         base::ThreadTaskRunnerHandle::Get(), file_path);
     return store;
   }
 
   OfflinePageMetadataStore* BuildStoreM53(const base::FilePath& file_path) {
     BuildTestStoreWithSchemaFromM53(file_path);
     OfflinePageMetadataStoreSQL* store = new OfflinePageMetadataStoreSQL(
         base::ThreadTaskRunnerHandle::Get(), file_path);
     return store;
   }
 
   OfflinePageMetadataStore* BuildStoreM54(const base::FilePath& file_path) {
     BuildTestStoreWithSchemaFromM54(file_path);
     OfflinePageMetadataStoreSQL* store = new OfflinePageMetadataStoreSQL(
         base::ThreadTaskRunnerHandle::Get(), file_path);
     return store;
   }
+
+  OfflinePageMetadataStore* BuildStoreM55(const base::FilePath& file_path) {
+    BuildTestStoreWithSchemaFromM55(file_path);
+    OfflinePageMetadataStoreSQL* store = new OfflinePageMetadataStoreSQL(
+        base::ThreadTaskRunnerHandle::Get(), file_path);
+    return store;
+  }
 };
 
 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();
+  std::unique_ptr<OfflinePageMetadataStore> BuildStoreWithSchemaFromM55();
 
   void PumpLoop();
 
   void GetOfflinePagesCallback(
       OfflinePageMetadataStore::LoadStatus load_status,
       const std::vector<OfflinePageItem>& offline_pages);
   void AddCallback(ItemActionStatus status);
   void UpdateCallback(CalledCallback called_callback,
                       std::unique_ptr<OfflinePagesUpdateResult> result);
   void ResetCallback(bool status);
@@ skipping 80 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;
+  offline_page.original_url = GURL(kOriginalTestURL);
 
   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.
@@ skipping 52 matching lines @@
   std::unique_ptr<OfflinePageMetadataStore> store(
       factory_.BuildStoreM53(temp_directory_.GetPath()));
   PumpLoop();
   store->GetOfflinePages(
       base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
                  base::Unretained(this)));
   PumpLoop();
   return store;
 }
 
+std::unique_ptr<OfflinePageMetadataStore>
+OfflinePageMetadataStoreTest::BuildStoreWithSchemaFromM55() {
+  std::unique_ptr<OfflinePageMetadataStore> store(
+      factory_.BuildStoreM55(temp_directory_.GetPath()));
+  PumpLoop();
+  store->GetOfflinePages(
+      base::Bind(&OfflinePageMetadataStoreTest::GetOfflinePagesCallback,
+                 base::Unretained(this)));
+  PumpLoop();
+  return store;
+}
+
 // Loads empty store and makes sure that there are no offline pages stored in
 // it.
 TEST_F(OfflinePageMetadataStoreTest, LoadEmptyStore) {
   std::unique_ptr<OfflinePageMetadataStore> store(BuildStore());
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
   EXPECT_EQ(0U, offline_pages_.size());
 }
 
 TEST_F(OfflinePageMetadataStoreTest, GetOfflinePagesFromInvalidStore) {
@@ skipping 100 matching lines @@
 // TODO(romax): Move this to sql_unittest.
 TEST_F(OfflinePageMetadataStoreTest, LoadVersion54Store) {
   std::unique_ptr<OfflinePageMetadataStore> store(
       BuildStoreWithSchemaFromM54());
 
   OfflinePageItem item = CheckThatStoreHasOneItem();
 
   CheckThatOfflinePageCanBeSaved(std::move(store));
 }
 
+// Loads a string with schema from M54.

[fgorski, 2016/11/10 23:56:13]

M55

[jianli, 2016/11/16 01:25:39]

Done.

+// Because for now we only reduce the number of fields it just makes sure there
+// are no crashes in the process.
+// TODO(romax): Move this to sql_unittest.
+TEST_F(OfflinePageMetadataStoreTest, LoadVersion55Store) {
+  std::unique_ptr<OfflinePageMetadataStore> store(
+      BuildStoreWithSchemaFromM55());
+
+  OfflinePageItem item = CheckThatStoreHasOneItem();
+
+  CheckThatOfflinePageCanBeSaved(std::move(store));
+}
+
 // Adds metadata of an offline page into a store and then opens the store
 // again to make sure that stored metadata survives store restarts.
 TEST_F(OfflinePageMetadataStoreTest, AddOfflinePage) {
   CheckThatOfflinePageCanBeSaved(BuildStore());
 }
 
 TEST_F(OfflinePageMetadataStoreTest, AddSameOfflinePageTwice) {
   std::unique_ptr<OfflinePageMetadataStore> store(BuildStore());
 
   OfflinePageItem offline_page(GURL(kTestURL), 1234LL, kTestClientId1,
@@ skipping 184 matching lines @@
 
   EXPECT_EQ(LOAD, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);
   ASSERT_EQ(1U, offline_pages_.size());
   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();
+  offline_page.original_url = GURL("https://example.com/bar");

[fgorski, 2016/11/10 23:56:13]

please make a similar update to one of the add* tests.

[jianli, 2016/11/16 01:25:39]

Done.

   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());
@@ skipping 63 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