ReadingListProvider handles dismissal

components/ntp_snippets/reading_list/reading_list_suggestions_provider_unittest.cc

Index: components/ntp_snippets/reading_list/reading_list_suggestions_provider_unittest.cc
diff --git a/components/ntp_snippets/reading_list/reading_list_suggestions_provider_unittest.cc b/components/ntp_snippets/reading_list/reading_list_suggestions_provider_unittest.cc
index 6f91ed2ef8b244c5c9aeea090885910f9dcf47db..a58008f2c031508c40126968ddef5630f1bdb6a3 100644
--- a/components/ntp_snippets/reading_list/reading_list_suggestions_provider_unittest.cc
+++ b/components/ntp_snippets/reading_list/reading_list_suggestions_provider_unittest.cc
@@ -15,6 +15,18 @@ namespace ntp_snippets {
 
 namespace {
 
+const GURL kUrlUnread1("http://www.foo1.bar");
+const GURL kUrlUnread2("http://www.foo2.bar");
+const GURL kUrlUnread3("http://www.foo3.bar");
+const GURL kUrlUnread4("http://www.foo4.bar");
+const GURL kUrlRead1("http://www.bar.foor");
+
+const std::string kTitleUnread1 = "title1";
+const std::string kTitleUnread2 = "title2";
+const std::string kTitleUnread3 = "title3";
+const std::string kTitleUnread4 = "title4";
+const std::string kTitleRead1 = "title_read1";

[Marc Treib, 2017/04/11 13:41:09]

I think this will introduce static initializers, which are banned. If you have
the constants here, you probably have to make them const char[].

[gambard, 2017/04/11 15:01:18]

Done.

[Marc Treib, 2017/04/11 15:28:15]

The URLs too :)

[gambard, 2017/04/12 07:50:43]

Moved to the class :)

+
 using ::testing::_;
 using ::testing::ElementsAre;
 using ::testing::IsEmpty;
@@ -46,6 +58,24 @@ class ReadingListSuggestionsProviderTest : public ::testing::Test {
     return Category::FromKnownCategory(KnownCategories::READING_LIST);
   }
 
+  void AddEntries() {
+    model_->AddEntry(kUrlUnread1, kTitleUnread1,
+                     reading_list::ADDED_VIA_CURRENT_APP);
+    clock_->Advance(base::TimeDelta::FromMilliseconds(10));
+    model_->AddEntry(kUrlUnread2, kTitleUnread2,
+                     reading_list::ADDED_VIA_CURRENT_APP);
+    clock_->Advance(base::TimeDelta::FromMilliseconds(10));
+    model_->AddEntry(kUrlRead1, kTitleRead1,
+                     reading_list::ADDED_VIA_CURRENT_APP);
+    model_->SetReadStatus(kUrlRead1, true);
+    clock_->Advance(base::TimeDelta::FromMilliseconds(10));
+    model_->AddEntry(kUrlUnread3, kTitleUnread3,
+                     reading_list::ADDED_VIA_CURRENT_APP);
+    clock_->Advance(base::TimeDelta::FromMilliseconds(10));
+    model_->AddEntry(kUrlUnread4, kTitleUnread4,
+                     reading_list::ADDED_VIA_CURRENT_APP);
+  }
+
  protected:
   base::SimpleTestClock* clock_;
   std::unique_ptr<ReadingListModelImpl> model_;
@@ -64,37 +94,14 @@ TEST_F(ReadingListSuggestionsProviderTest, CategoryInfo) {
 }
 
 TEST_F(ReadingListSuggestionsProviderTest, ReturnsThreeLatestUnreadSuggestion) {
-  GURL url_unread1 = GURL("http://www.foo1.bar");
-  GURL url_unread2 = GURL("http://www.foo2.bar");
-  GURL url_unread3 = GURL("http://www.foo3.bar");
-  GURL url_unread4 = GURL("http://www.foo4.bar");
-  GURL url_read1 = GURL("http://www.bar.foor");
-  std::string title_unread1 = "title1";
-  std::string title_unread2 = "title2";
-  std::string title_unread3 = "title3";
-  std::string title_unread4 = "title4";
-  std::string title_read1 = "title_read1";
-  model_->AddEntry(url_unread1, title_unread1,
-                   reading_list::ADDED_VIA_CURRENT_APP);
-  clock_->Advance(base::TimeDelta::FromMilliseconds(10));
-  model_->AddEntry(url_unread2, title_unread2,
-                   reading_list::ADDED_VIA_CURRENT_APP);
-  clock_->Advance(base::TimeDelta::FromMilliseconds(10));
-  model_->AddEntry(url_read1, title_read1, reading_list::ADDED_VIA_CURRENT_APP);
-  model_->SetReadStatus(url_read1, true);
-  clock_->Advance(base::TimeDelta::FromMilliseconds(10));
-  model_->AddEntry(url_unread3, title_unread3,
-                   reading_list::ADDED_VIA_CURRENT_APP);
-  clock_->Advance(base::TimeDelta::FromMilliseconds(10));
-  model_->AddEntry(url_unread4, title_unread4,
-                   reading_list::ADDED_VIA_CURRENT_APP);
+  AddEntries();
 
   EXPECT_CALL(observer_,
               OnNewSuggestions(
                   _, ReadingListCategory(),
-                  ElementsAre(Property(&ContentSuggestion::url, url_unread4),
-                              Property(&ContentSuggestion::url, url_unread3),
-                              Property(&ContentSuggestion::url, url_unread2))));
+                  ElementsAre(Property(&ContentSuggestion::url, kUrlUnread4),
+                              Property(&ContentSuggestion::url, kUrlUnread3),
+                              Property(&ContentSuggestion::url, kUrlUnread2))));
 
   CreateProvider();
 }
@@ -120,6 +127,30 @@ TEST_F(ReadingListSuggestionsProviderTest, ReturnsOnlyUnreadSuggestion) {
   CreateProvider();
 }
 
+TEST_F(ReadingListSuggestionsProviderTest, DismissesEntry) {
+  AddEntries();
+
+  EXPECT_CALL(observer_,
+              OnNewSuggestions(
+                  _, ReadingListCategory(),
+                  ElementsAre(Property(&ContentSuggestion::url, kUrlUnread4),
+                              Property(&ContentSuggestion::url, kUrlUnread3),
+                              Property(&ContentSuggestion::url, kUrlUnread2))));
+
+  CreateProvider();
+
+  EXPECT_CALL(observer_,
+              OnNewSuggestions(
+                  _, ReadingListCategory(),
+                  ElementsAre(Property(&ContentSuggestion::url, kUrlUnread4),
+                              Property(&ContentSuggestion::url, kUrlUnread2),
+                              Property(&ContentSuggestion::url, kUrlUnread1))));
+
+  provider_->DismissSuggestion(ContentSuggestion::ID(
+      Category::FromKnownCategory(KnownCategories::READING_LIST),

[Marc Treib, 2017/04/11 13:41:09]

ReadingListCategory()

[gambard, 2017/04/11 15:01:18]

Done.

+      kUrlUnread3.spec()));
+}
+
 }  // namespace
 
 }  // namespace ntp_snippets