[Reading List iOS] Store distillation date and size.

components/reading_list/ios/reading_list_entry_unittest.cc

 // Copyright 2016 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/reading_list/ios/reading_list_entry.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/test/ios/wait_util.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "components/reading_list/ios/proto/reading_list.pb.h"
 #include "components/sync/protocol/reading_list_specifics.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 const int kFirstBackoff = 10;
 const int kSecondBackoff = 10;
 const int kThirdBackoff = 60;
 const int kFourthBackoff = 120;
 const int kFifthBackoff = 120;
+
+// Returns the number of microseconds since Jan 1st 1970.
+int64_t Now() {

[gambard, 2017/02/22 12:30:16]

Nit: I don't like this. I guess the "right" way to do it would be to use
dependency injection to pass a Test clock.

+  return (base::Time::Now() - base::Time::UnixEpoch()).InMicroseconds();
+}
 }  // namespace
 
 TEST(ReadingListEntry, CompareIgnoreTitle) {
   const ReadingListEntry e1(GURL("http://example.com"), "bar");
   const ReadingListEntry e2(GURL("http://example.com"), "foo");
 
   EXPECT_EQ(e1, e2);
 }
 
 TEST(ReadingListEntry, CompareFailureIgnoreTitle) {
@@ skipping 32 matching lines @@
   ASSERT_EQ("bar", e.Title());
   ASSERT_EQ(e.CreationTime(), e.UpdateTitleTime());
 
   base::test::ios::SpinRunLoopWithMinDelay(
       base::TimeDelta::FromMilliseconds(5));
   e.SetTitle("foo");
   EXPECT_GT(e.UpdateTitleTime(), e.CreationTime());
   EXPECT_EQ("foo", e.Title());
 }
 
-TEST(ReadingListEntry, DistilledPathAndURL) {
+TEST(ReadingListEntry, DistilledInfo) {
   ReadingListEntry e(GURL("http://example.com"), "bar");
 
   EXPECT_TRUE(e.DistilledPath().empty());
 
   const base::FilePath distilled_path("distilled/page.html");
   const GURL distilled_url("http://example.com/distilled");
-  e.SetDistilledInfo(distilled_path, distilled_url);
+  int64_t size = 50;
+  int64_t before = Now();
+  e.SetDistilledInfo(distilled_path, distilled_url, size);
+  int64_t after = Now();
   EXPECT_EQ(distilled_path, e.DistilledPath());
   EXPECT_EQ(distilled_url, e.DistilledURL());
+  EXPECT_EQ(size, e.DistillationSize());
+  EXPECT_GE(e.DistillationTime(), before);
+  EXPECT_GE(after, e.DistillationTime());
 }
 
 TEST(ReadingListEntry, DistilledState) {
   ReadingListEntry e(GURL("http://example.com"), "bar");
 
   EXPECT_EQ(ReadingListEntry::WAITING, e.DistilledState());
 
   e.SetDistilledState(ReadingListEntry::ERROR);
   EXPECT_EQ(ReadingListEntry::ERROR, e.DistilledState());
 
   const base::FilePath distilled_path("distilled/page.html");
   const GURL distilled_url("http://example.com/distilled");
-  e.SetDistilledInfo(distilled_path, distilled_url);
+  e.SetDistilledInfo(distilled_path, distilled_url, 50);
   EXPECT_EQ(ReadingListEntry::PROCESSED, e.DistilledState());
 }
 
 // Tests that the the time until next try increase exponentially when the state
 // changes from non-error to error.
 TEST(ReadingListEntry, TimeUntilNextTry) {
   base::SimpleTestTickClock clock;
   std::unique_ptr<net::BackoffEntry> backoff =
       base::MakeUnique<net::BackoffEntry>(&ReadingListEntry::kBackoffPolicy,
                                           &clock);
@@ skipping 73 matching lines @@
   ReadingListEntry e(GURL("http://example.com"), "bar", std::move(backoff));
   double fuzzing = ReadingListEntry::kBackoffPolicy.jitter_factor;
 
   e.SetDistilledState(ReadingListEntry::ERROR);
   ASSERT_NEAR(kFirstBackoff, e.TimeUntilNextTry().InMinutes(),
               kFirstBackoff * fuzzing);
 
   // Action.
   const base::FilePath distilled_path("distilled/page.html");
   const GURL distilled_url("http://example.com/distilled");
-  e.SetDistilledInfo(distilled_path, distilled_url);
+  e.SetDistilledInfo(distilled_path, distilled_url, 50);
 
   // Test.
   EXPECT_EQ(0, e.TimeUntilNextTry().InSeconds());
   e.SetDistilledState(ReadingListEntry::ERROR);
   ASSERT_NEAR(kFirstBackoff, e.TimeUntilNextTry().InMinutes(),
               kFirstBackoff * fuzzing);
 }
 
 // Tests that the failed download counter is incremented when the state change
 // from non-error to error.
@@ skipping 82 matching lines @@
 
   entry.SetDistilledState(ReadingListEntry::WILL_RETRY);
   std::unique_ptr<reading_list::ReadingListLocal> will_retry_pb_entry(
       entry.AsReadingListLocal());
   EXPECT_EQ(will_retry_pb_entry->distillation_state(),
             reading_list::ReadingListLocal::WILL_RETRY);
   EXPECT_EQ(will_retry_pb_entry->failed_download_counter(), 1);
 
   const base::FilePath distilled_path("distilled/page.html");
   const GURL distilled_url("http://example.com/distilled");
-  entry.SetDistilledInfo(distilled_path, distilled_url);
+  int64_t size = 50;
+  entry.SetDistilledInfo(distilled_path, distilled_url, size);
+
   entry.SetRead(true);
   entry.MarkEntryUpdated();
   EXPECT_NE(entry.UpdateTime(), creation_time_us);
   std::unique_ptr<reading_list::ReadingListLocal> distilled_pb_entry(
       entry.AsReadingListLocal());
   EXPECT_EQ(distilled_pb_entry->creation_time_us(), creation_time_us);
   EXPECT_EQ(distilled_pb_entry->update_time_us(), entry.UpdateTime());
   EXPECT_NE(distilled_pb_entry->backoff(), "");
   EXPECT_EQ(distilled_pb_entry->status(), reading_list::ReadingListLocal::READ);
   EXPECT_EQ(distilled_pb_entry->distillation_state(),
             reading_list::ReadingListLocal::PROCESSED);
   EXPECT_EQ(distilled_pb_entry->distilled_path(), "distilled/page.html");
   EXPECT_EQ(distilled_pb_entry->failed_download_counter(), 0);
+  EXPECT_EQ(distilled_pb_entry->distillation_time_us(),
+            entry.DistillationTime());
+  EXPECT_EQ(distilled_pb_entry->distillation_size(), entry.DistillationSize());
 }
 
 // Tests that the reading list entry is correctly parsed from
 // sync_pb::ReadingListLocal.
 TEST(ReadingListEntry, FromReadingListLocal) {
   ReadingListEntry entry(GURL("http://example.com/"), "title");
   base::Time next_call = base::Time::Now() + entry.TimeUntilNextTry();
 
   std::unique_ptr<reading_list::ReadingListLocal> pb_entry(
       entry.AsReadingListLocal());
+  int64_t now = Now();
 
   pb_entry->set_entry_id("http://example.com/");
   pb_entry->set_url("http://example.com/");
   pb_entry->set_title("title");
   pb_entry->set_creation_time_us(1);
   pb_entry->set_update_time_us(2);
   pb_entry->set_status(reading_list::ReadingListLocal::UNREAD);
   pb_entry->set_distillation_state(reading_list::ReadingListLocal::WAITING);
   pb_entry->set_failed_download_counter(2);
+  pb_entry->set_distillation_time_us(now);
+  pb_entry->set_distillation_size(50);
 
   std::unique_ptr<ReadingListEntry> waiting_entry(
       ReadingListEntry::FromReadingListLocal(*pb_entry));
   EXPECT_EQ(waiting_entry->URL().spec(), "http://example.com/");
   EXPECT_EQ(waiting_entry->Title(), "title");
   EXPECT_EQ(waiting_entry->UpdateTime(), 2);
   EXPECT_EQ(waiting_entry->FailedDownloadCounter(), 2);
   EXPECT_EQ(waiting_entry->DistilledState(), ReadingListEntry::WAITING);
   EXPECT_EQ(waiting_entry->DistilledPath(), base::FilePath());
+  EXPECT_EQ(waiting_entry->DistillationSize(), 50);
+  EXPECT_EQ(waiting_entry->DistillationTime(), now);
   base::Time waiting_next_call =
       base::Time::Now() + waiting_entry->TimeUntilNextTry();
   base::TimeDelta delta = next_call - waiting_next_call;
   EXPECT_NEAR(delta.InMillisecondsRoundedUp(), 0, 10);
 }
 
 // Tests the merging of two ReadingListEntry.
 // Additional merging tests are done in
 // ReadingListStoreTest.CompareEntriesForSync
 TEST(ReadingListEntry, MergeWithEntry) {
@@ skipping 11 matching lines @@
   EXPECT_EQ(local_entry.Title(), "title2");
   EXPECT_FALSE(local_entry.HasBeenSeen());
   EXPECT_EQ(local_entry.UpdateTime(), sync_update_time_us);
   EXPECT_EQ(local_entry.FailedDownloadCounter(), 1);
   EXPECT_EQ(local_entry.DistilledState(), ReadingListEntry::ERROR);
   base::Time merge_next_call =
       base::Time::Now() + local_entry.TimeUntilNextTry();
   base::TimeDelta delta = merge_next_call - next_call;
   EXPECT_NEAR(delta.InMillisecondsRoundedUp(), 0, 10);
 }