[remote suggestions] Attach the fetch time to RemoteSnippets, ContentSnippets and SnippetArticle

components/ntp_snippets/remote/remote_suggestion_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/ntp_snippets/remote/remote_suggestion.h"
 
 #include <utility>
 
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/time/time.h"
 #include "base/values.h"
 #include "components/ntp_snippets/remote/proto/ntp_snippets.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ntp_snippets {
 namespace {
 
 using ::testing::ElementsAre;
 using ::testing::Eq;
 using ::testing::IsNull;
 using ::testing::NotNull;
 
 std::unique_ptr<RemoteSuggestion> SnippetFromContentSuggestionJSON(
-    const std::string& json) {
+    const std::string& json,
+    const base::Time fetch_time) {
   auto json_value = base::JSONReader::Read(json);
   base::DictionaryValue* json_dict;
   if (!json_value->GetAsDictionary(&json_dict)) {
     return nullptr;
   }
   return RemoteSuggestion::CreateFromContentSuggestionsDictionary(
-      *json_dict, kArticlesRemoteId);
+      *json_dict, kArticlesRemoteId, fetch_time);
 }
 
 TEST(RemoteSuggestionTest, FromChromeContentSuggestionsDictionary) {
   const std::string kJsonStr =
       "{"
       "  \"ids\" : [\"http://localhost/foobar\"],"
       "  \"title\" : \"Foo Barred from Baz\","
       "  \"snippet\" : \"...\","
       "  \"fullPageUrl\" : \"http://localhost/foobar\","
       "  \"creationTime\" : \"2016-06-30T11:01:37.000Z\","
       "  \"expirationTime\" : \"2016-07-01T11:01:37.000Z\","
       "  \"attribution\" : \"Foo News\","
       "  \"imageUrl\" : \"http://localhost/foobar.jpg\","
       "  \"ampUrl\" : \"http://localhost/amp\","
       "  \"faviconUrl\" : \"http://localhost/favicon.ico\", "
       "  \"score\": 9001,\n"
       "  \"notificationInfo\": {\n"
       "    \"shouldNotify\": true,"
       "    \"deadline\": \"2016-06-30T13:01:37.000Z\"\n"
       "  }\n"
       "}";
-  auto snippet = SnippetFromContentSuggestionJSON(kJsonStr);
+  const base::Time fetch_time = base::Time::Now();
+  auto snippet = SnippetFromContentSuggestionJSON(kJsonStr, fetch_time);
   ASSERT_THAT(snippet, NotNull());
 
   EXPECT_EQ(snippet->id(), "http://localhost/foobar");
   EXPECT_EQ(snippet->title(), "Foo Barred from Baz");
   EXPECT_EQ(snippet->snippet(), "...");
   EXPECT_EQ(snippet->salient_image_url(), GURL("http://localhost/foobar.jpg"));
   EXPECT_EQ(snippet->score(), 9001);
   auto unix_publish_date = snippet->publish_date() - base::Time::UnixEpoch();
   auto expiry_duration = snippet->expiry_date() - snippet->publish_date();
   EXPECT_FLOAT_EQ(unix_publish_date.InSecondsF(), 1467284497.000000f);
   EXPECT_FLOAT_EQ(expiry_duration.InSecondsF(), 86400.000000f);
 
   EXPECT_EQ(snippet->publisher_name(), "Foo News");
   EXPECT_EQ(snippet->url(), GURL("http://localhost/foobar"));
   EXPECT_EQ(snippet->amp_url(), GURL("http://localhost/amp"));
 
   EXPECT_TRUE(snippet->should_notify());
   auto notification_duration =
       snippet->notification_deadline() - snippet->publish_date();
   EXPECT_EQ(7200.0f, notification_duration.InSecondsF());
 }
 
 std::unique_ptr<RemoteSuggestion> SnippetFromChromeReaderDict(
     std::unique_ptr<base::DictionaryValue> dict) {
   if (!dict) {
     return nullptr;
   }
-  return RemoteSuggestion::CreateFromChromeReaderDictionary(*dict);
+  // TODO
+  return RemoteSuggestion::CreateFromChromeReaderDictionary(*dict,
+                                                            base::Time::Now());
 }
 
 const char kChromeReaderCreationTimestamp[] = "1234567890";
 const char kChromeReaderExpiryTimestamp[] = "2345678901";
 
 // Old form, from chromereader-pa.googleapis.com. Two sources.
 std::unique_ptr<base::DictionaryValue> ChromeReaderSnippetWithTwoSources() {
   const std::string kJsonStr = base::StringPrintf(
       "{\n"
       "  \"contentInfo\": {\n"
@@ skipping 273 matching lines @@
       "  \"title\" : \"Foo Barred from Baz\","
       "  \"snippet\" : \"...\","
       "  \"fullPageUrl\" : \"http://localhost/foobar\","
       "  \"creationTime\" : \"2016-06-30T11:01:37.000Z\","
       "  \"expirationTime\" : \"2016-07-01T11:01:37.000Z\","
       "  \"attribution\" : \"Foo News\","
       "  \"imageUrl\" : \"http://localhost/foobar.jpg\","
       "  \"ampUrl\" : \"http://localhost/amp\","
       "  \"faviconUrl\" : \"http://localhost/favicon.ico\" "
       "}";
-  auto snippet = SnippetFromContentSuggestionJSON(kJsonStr);
+  const base::Time fetch_time = base::Time::Now();
+  auto snippet = SnippetFromContentSuggestionJSON(kJsonStr, fetch_time);
   ASSERT_THAT(snippet, NotNull());
 
   EXPECT_EQ(snippet->id(), "http://localhost/foobar");
   EXPECT_THAT(snippet->GetAllIDs(),
               ElementsAre("http://localhost/foobar", "012345"));
 }
 
 TEST(RemoteSuggestionTest, CreateFromProtoToProtoRoundtrip) {
   SnippetProto proto;
   proto.add_ids("foo");
@@ skipping 46 matching lines @@
   auto json_value = base::JSONReader::Read(kJsonStr);
   base::DictionaryValue* json_dict;
   CHECK(json_value->GetAsDictionary(&json_dict));
   return json_dict->CreateDeepCopy();
 }
 
 TEST(RemoteSuggestionTest, NotifcationInfoAllSpecified) {
   auto json = ContentSuggestionSnippet();
   json->SetBoolean("notificationInfo.shouldNotify", true);
   json->SetString("notificationInfo.deadline", "2016-06-30T13:01:37.000Z");
-  auto snippet =
-      RemoteSuggestion::CreateFromContentSuggestionsDictionary(*json, 0);
+  auto snippet = RemoteSuggestion::CreateFromContentSuggestionsDictionary(
+      *json, 0, base::Time::Now());
   EXPECT_TRUE(snippet->should_notify());
   EXPECT_EQ(7200.0f,
             (snippet->notification_deadline() - snippet->publish_date())
                 .InSecondsF());
 }
 
 TEST(RemoteSuggestionTest, NotificationInfoDeadlineInvalid) {
   auto json = ContentSuggestionSnippet();
   json->SetBoolean("notificationInfo.shouldNotify", true);
   json->SetInteger("notificationInfo.notificationDeadline", 0);
-  auto snippet =
-      RemoteSuggestion::CreateFromContentSuggestionsDictionary(*json, 0);
+  auto snippet = RemoteSuggestion::CreateFromContentSuggestionsDictionary(
+      *json, 0, base::Time::Now());
   EXPECT_TRUE(snippet->should_notify());
   EXPECT_EQ(base::Time::Max(), snippet->notification_deadline());
 }
 
 TEST(RemoteSuggestionTest, NotificationInfoDeadlineAbsent) {
   auto json = ContentSuggestionSnippet();
   json->SetBoolean("notificationInfo.shouldNotify", true);
-  auto snippet =
-      RemoteSuggestion::CreateFromContentSuggestionsDictionary(*json, 0);
+  auto snippet = RemoteSuggestion::CreateFromContentSuggestionsDictionary(
+      *json, 0, base::Time::Now());
   EXPECT_TRUE(snippet->should_notify());
   EXPECT_EQ(base::Time::Max(), snippet->notification_deadline());
 }
 
 TEST(RemoteSuggestionTest, NotificationInfoShouldNotifyInvalid) {
   auto json = ContentSuggestionSnippet();
   json->SetString("notificationInfo.shouldNotify", "non-bool");
-  auto snippet =
-      RemoteSuggestion::CreateFromContentSuggestionsDictionary(*json, 0);
+  auto snippet = RemoteSuggestion::CreateFromContentSuggestionsDictionary(
+      *json, 0, base::Time::Now());
   EXPECT_FALSE(snippet->should_notify());
 }
 
 TEST(RemoteSuggestionTest, NotificationInfoAbsent) {
   auto json = ContentSuggestionSnippet();
-  auto snippet =
-      RemoteSuggestion::CreateFromContentSuggestionsDictionary(*json, 0);
+  auto snippet = RemoteSuggestion::CreateFromContentSuggestionsDictionary(
+      *json, 0, base::Time::Now());
   EXPECT_FALSE(snippet->should_notify());
 }
 
 TEST(RemoteSuggestionTest, ToContentSuggestion) {
   auto json = ContentSuggestionSnippet();
-  auto snippet =
-      RemoteSuggestion::CreateFromContentSuggestionsDictionary(*json, 0);
+  auto snippet = RemoteSuggestion::CreateFromContentSuggestionsDictionary(
+      *json, 0, base::Time::Now());
   ASSERT_THAT(snippet, NotNull());
   ContentSuggestion sugg = snippet->ToContentSuggestion(
       Category::FromKnownCategory(KnownCategories::ARTICLES));
 
   EXPECT_THAT(sugg.id().category(),
               Eq(Category::FromKnownCategory(KnownCategories::ARTICLES)));
   EXPECT_THAT(sugg.id().id_within_category(), Eq("http://localhost/foobar"));
   EXPECT_THAT(sugg.url(), Eq(GURL("http://localhost/amp")));
   EXPECT_THAT(sugg.title(), Eq(base::UTF8ToUTF16("Foo Barred from Baz")));
   EXPECT_THAT(sugg.snippet_text(), Eq(base::UTF8ToUTF16("...")));
   EXPECT_THAT(sugg.publish_date().ToJavaTime(), Eq(1467284497000));
   EXPECT_THAT(sugg.publisher_name(), Eq(base::UTF8ToUTF16("Foo News")));
   EXPECT_THAT(sugg.score(), Eq(9001));
   EXPECT_THAT(sugg.download_suggestion_extra(), IsNull());
   EXPECT_THAT(sugg.recent_tab_suggestion_extra(), IsNull());
   EXPECT_THAT(sugg.notification_extra(), IsNull());
 }
 
 TEST(RemoteSuggestionTest, ToContentSuggestionWithNotificationInfo) {
   auto json = ContentSuggestionSnippet();
   json->SetBoolean("notificationInfo.shouldNotify", true);
   json->SetString("notificationInfo.deadline", "2016-06-30T13:01:37.000Z");
-  auto snippet =
-      RemoteSuggestion::CreateFromContentSuggestionsDictionary(*json, 0);
+  auto snippet = RemoteSuggestion::CreateFromContentSuggestionsDictionary(
+      *json, 0, base::Time::Now());
   ASSERT_THAT(snippet, NotNull());
   ContentSuggestion sugg = snippet->ToContentSuggestion(
       Category::FromKnownCategory(KnownCategories::ARTICLES));
 
   EXPECT_THAT(sugg.id().category(),
               Eq(Category::FromKnownCategory(KnownCategories::ARTICLES)));
   EXPECT_THAT(sugg.id().id_within_category(), Eq("http://localhost/foobar"));
   EXPECT_THAT(sugg.url(), Eq(GURL("http://localhost/amp")));
   EXPECT_THAT(sugg.title(), Eq(base::UTF8ToUTF16("Foo Barred from Baz")));
   EXPECT_THAT(sugg.snippet_text(), Eq(base::UTF8ToUTF16("...")));
   EXPECT_THAT(sugg.publish_date().ToJavaTime(), Eq(1467284497000));
   EXPECT_THAT(sugg.publisher_name(), Eq(base::UTF8ToUTF16("Foo News")));
   EXPECT_THAT(sugg.score(), Eq(9001));
   EXPECT_THAT(sugg.download_suggestion_extra(), IsNull());
   EXPECT_THAT(sugg.recent_tab_suggestion_extra(), IsNull());
   ASSERT_THAT(sugg.notification_extra(), NotNull());
   EXPECT_THAT(sugg.notification_extra()->deadline.ToJavaTime(),
               Eq(1467291697000));
 }
 
 }  // namespace
 }  // namespace ntp_snippets