[Offline pages] Adding expiration capability to OfflinePageModel

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_impl.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 176 matching lines @@
   EXPECT_EQ(STATUS_TRUE, this->last_status_);
   EXPECT_EQ(1U, this->offline_pages_.size());
   EXPECT_EQ(offline_page.url, this->offline_pages_[0].url);
   EXPECT_EQ(offline_page.offline_id, this->offline_pages_[0].offline_id);
   EXPECT_EQ(offline_page.version, this->offline_pages_[0].version);
   EXPECT_EQ(offline_page.file_path, this->offline_pages_[0].file_path);
   EXPECT_EQ(offline_page.file_size, this->offline_pages_[0].file_size);
   EXPECT_EQ(offline_page.creation_time, this->offline_pages_[0].creation_time);
   EXPECT_EQ(offline_page.last_access_time,
             this->offline_pages_[0].last_access_time);
+  EXPECT_EQ(offline_page.expiration_time,

[jianli, 2016/05/19 20:39:54]

Please set an expiration time before calling AddOrUpdateOfflinePage.

[fgorski, 2016/05/20 17:54:23]

I am testing for that below, in a different test.
This one uses a basic constructor.

+            this->offline_pages_[0].expiration_time);
   EXPECT_EQ(offline_page.access_count, this->offline_pages_[0].access_count);
   EXPECT_EQ(offline_page.client_id, this->offline_pages_[0].client_id);
 }
 
 // Tests removing offline page metadata from the store, for which it first adds
 // metadata of an offline page.
 TYPED_TEST(OfflinePageMetadataStoreTest, RemoveOfflinePage) {
   std::unique_ptr<OfflinePageMetadataStore> store(this->BuildStore());
 
   // Add an offline page.
@@ skipping 51 matching lines @@
   std::unique_ptr<OfflinePageMetadataStore> store(this->BuildStore());
 
   // 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(&OfflinePageMetadataStoreTestBase::UpdateCallback,
                  base::Unretained(this), ADD));
   this->PumpLoop();
   EXPECT_EQ(ADD, this->last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, this->last_status_);
 
   this->ClearResults();
 
@@ skipping 42 matching lines @@
   EXPECT_EQ(1U, this->offline_pages_.size());
   EXPECT_EQ(offline_page_2.url, this->offline_pages_[0].url);
   EXPECT_EQ(offline_page_2.offline_id, this->offline_pages_[0].offline_id);
   EXPECT_EQ(offline_page_2.version, this->offline_pages_[0].version);
   EXPECT_EQ(offline_page_2.file_path, this->offline_pages_[0].file_path);
   EXPECT_EQ(offline_page_2.file_size, this->offline_pages_[0].file_size);
   EXPECT_EQ(offline_page_2.creation_time,
             this->offline_pages_[0].creation_time);
   EXPECT_EQ(offline_page_2.last_access_time,
             this->offline_pages_[0].last_access_time);
+  EXPECT_EQ(offline_page_2.expiration_time,
+            this->offline_pages_[0].expiration_time);
   EXPECT_EQ(offline_page_2.access_count, this->offline_pages_[0].access_count);
   EXPECT_EQ(offline_page_2.client_id, this->offline_pages_[0].client_id);
 }
 
 // Tests updating offline page metadata from the store.
 TYPED_TEST(OfflinePageMetadataStoreTest, UpdateOfflinePage) {
   std::unique_ptr<OfflinePageMetadataStore> store(this->BuildStore());
 
   // First, adds a fresh page.
   OfflinePageItem offline_page(GURL(kTestURL), 1234LL, kTestClientId1,
@@ skipping 15 matching lines @@
   EXPECT_EQ(STATUS_TRUE, this->last_status_);
   EXPECT_EQ(1U, this->offline_pages_.size());
   EXPECT_EQ(offline_page.url, this->offline_pages_[0].url);
   EXPECT_EQ(offline_page.offline_id, this->offline_pages_[0].offline_id);
   EXPECT_EQ(offline_page.version, this->offline_pages_[0].version);
   EXPECT_EQ(offline_page.file_path, this->offline_pages_[0].file_path);
   EXPECT_EQ(offline_page.file_size, this->offline_pages_[0].file_size);
   EXPECT_EQ(offline_page.creation_time, this->offline_pages_[0].creation_time);
   EXPECT_EQ(offline_page.last_access_time,
             this->offline_pages_[0].last_access_time);
+  EXPECT_EQ(offline_page.expiration_time,
+            this->offline_pages_[0].expiration_time);
   EXPECT_EQ(offline_page.access_count, this->offline_pages_[0].access_count);
   EXPECT_EQ(offline_page.client_id, this->offline_pages_[0].client_id);
 
   // Then update some data.
   offline_page.file_size = kFileSize + 1;
   offline_page.access_count++;
   store->AddOrUpdateOfflinePage(
       offline_page,
       base::Bind(&OfflinePageMetadataStoreTestBase::UpdateCallback,
                  base::Unretained(this), ADD));
@@ skipping 10 matching lines @@
   EXPECT_EQ(STATUS_TRUE, this->last_status_);
   EXPECT_EQ(1U, this->offline_pages_.size());
   EXPECT_EQ(offline_page.url, this->offline_pages_[0].url);
   EXPECT_EQ(offline_page.offline_id, this->offline_pages_[0].offline_id);
   EXPECT_EQ(offline_page.version, this->offline_pages_[0].version);
   EXPECT_EQ(offline_page.file_path, this->offline_pages_[0].file_path);
   EXPECT_EQ(offline_page.file_size, this->offline_pages_[0].file_size);
   EXPECT_EQ(offline_page.creation_time, this->offline_pages_[0].creation_time);
   EXPECT_EQ(offline_page.last_access_time,
             this->offline_pages_[0].last_access_time);
+  EXPECT_EQ(offline_page.expiration_time,
+            this->offline_pages_[0].expiration_time);
   EXPECT_EQ(offline_page.access_count, this->offline_pages_[0].access_count);
   EXPECT_EQ(offline_page.client_id, this->offline_pages_[0].client_id);
 }
 
 }  // namespace
 
 class OfflinePageMetadataStoreImplTest
     : public OfflinePageMetadataStoreTest<OfflinePageMetadataStoreImplFactory> {
  public:
   void UpdateStoreEntries(
@@ skipping 59 matching lines @@
   EXPECT_EQ(STATUS_TRUE, this->last_status_);
   EXPECT_EQ(1U, this->offline_pages_.size());
   EXPECT_EQ(offline_page.url, this->offline_pages_[0].url);
   EXPECT_EQ(offline_page.offline_id, this->offline_pages_[0].offline_id);
   EXPECT_EQ(offline_page.version, this->offline_pages_[0].version);
   EXPECT_EQ(offline_page.file_path, this->offline_pages_[0].file_path);
   EXPECT_EQ(offline_page.file_size, this->offline_pages_[0].file_size);
   EXPECT_EQ(offline_page.creation_time, this->offline_pages_[0].creation_time);
   EXPECT_EQ(offline_page.last_access_time,
             this->offline_pages_[0].last_access_time);
+  EXPECT_EQ(offline_page.expiration_time,
+            this->offline_pages_[0].expiration_time);
   EXPECT_EQ(offline_page.access_count, this->offline_pages_[0].access_count);
 }
 
 // Test that loading a store with nothing but bad values errors.
 // Needs to be outside of the anonymous namespace in order for FRIEND_TEST
 // to work.
 TEST_F(OfflinePageMetadataStoreImplTest, LoadTotallyCorruptedStore) {
   std::unique_ptr<OfflinePageMetadataStore> store(this->BuildStore());
 
   // Manually write two broken pages (no id)
@@ skipping 65 matching lines @@
             offline_pages_[0].client_id.name_space);
   EXPECT_EQ(base::Int64ToString(offline_page_proto.deprecated_bookmark_id()),
             offline_pages_[0].client_id.id);
   EXPECT_EQ(GURL(kTestURL), offline_pages_[0].url);
   EXPECT_EQ(offline_page_proto.version(), offline_pages_[0].version);
   EXPECT_EQ(offline_page_proto.file_path(),
             offline_pages_[0].file_path.MaybeAsASCII());
 }
 
 }  // namespace offline_pages