📰 Persist category dismissals

components/ntp_snippets/content_suggestions_service_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/content_suggestions_service.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/ntp_snippets/category_info.h"
 #include "components/ntp_snippets/category_status.h"
 #include "components/ntp_snippets/content_suggestion.h"
 #include "components/ntp_snippets/content_suggestions_provider.h"
+#include "components/prefs/testing_pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/image/image.h"
 
 using testing::ElementsAre;
 using testing::Eq;
 using testing::InvokeWithoutArgs;
 using testing::IsEmpty;
 using testing::Mock;
 using testing::Property;
@@ skipping 82 matching lines @@
   MOCK_METHOD0(ContentSuggestionsServiceShutdown, void());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockServiceObserver);
 };
 
 }  // namespace
 
 class ContentSuggestionsServiceTest : public testing::Test {
  public:
-  ContentSuggestionsServiceTest() {}
+  ContentSuggestionsServiceTest()
+      : pref_service_(new TestingPrefServiceSimple()) {}
 
   void SetUp() override {
+    ContentSuggestionsService::RegisterProfilePrefs(pref_service_->registry());
     CreateContentSuggestionsService(ContentSuggestionsService::State::ENABLED);
   }
 
   void TearDown() override {
     service_->Shutdown();
     service_.reset();
   }
 
   // Verifies that exactly the suggestions with the given |numbers| are
   // returned by the service for the given |category|.
@@ skipping 75 matching lines @@
       const std::vector<int>& numbers) {
     std::vector<ContentSuggestion> result;
     for (int number : numbers) {
       result.push_back(CreateSuggestion(category, number));
     }
     return result;
   }
 
  private:
   std::unique_ptr<ContentSuggestionsService> service_;
+  std::unique_ptr<TestingPrefServiceSimple> pref_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSuggestionsServiceTest);
 };
 
 class ContentSuggestionsServiceDisabledTest
     : public ContentSuggestionsServiceTest {
  public:
   void SetUp() override {
     CreateContentSuggestionsService(ContentSuggestionsService::State::DISABLED);
   }
@@ skipping 362 matching lines @@
 TEST_F(ContentSuggestionsServiceTest, ShouldForwardClearHistory) {
   Category category = FromKnownCategory(KnownCategories::DOWNLOADS);
   MockProvider* provider = RegisterProvider(category);
   base::Time begin = base::Time::FromTimeT(123),
              end = base::Time::FromTimeT(456);
   EXPECT_CALL(*provider, ClearHistory(begin, end, _));
   base::Callback<bool(const GURL& url)> filter;
   service()->ClearHistory(begin, end, filter);
 }
 
+TEST_F(ContentSuggestionsServiceTest, ShouldNotReturnDismissedCategories) {
+  Category category = FromKnownCategory(KnownCategories::ARTICLES);
+
+  // Create and register providers
+  MockProvider* provider = RegisterProvider(category);
+  provider->FireCategoryStatusChangedWithCurrentStatus(category);
+  ASSERT_THAT(providers().count(category), Eq(1ul));
+  EXPECT_THAT(providers().at(category), Eq(provider));
+  ASSERT_THAT(service()->GetCategories(), ElementsAre(category));
+
+  // Create and register observer
+  MockServiceObserver observer;
+  service()->AddObserver(&observer);
+
+  ASSERT_THAT(service()->GetCategoryStatus(category),
+              Eq(CategoryStatus::AVAILABLE));
+  ASSERT_TRUE(service()->GetCategoryInfo(category));
+
+  service()->DismissCategory(category);
+  ASSERT_THAT(service()->GetCategories(), ElementsAre(category));
+  ASSERT_THAT(service()->GetCategoryStatus(category),
+              Eq(CategoryStatus::NOT_PROVIDED));
+  ASSERT_FALSE(service()->GetCategoryInfo(category));
+  ASSERT_TRUE(service()->GetSuggestionsForCategory(category).empty());
+
+  // OnCategoryStatusChanged
+  EXPECT_CALL(observer,
+              OnCategoryStatusChanged(
+                  category, CategoryStatus::CATEGORY_EXPLICITLY_DISABLED));
+  provider->FireCategoryStatusChanged(
+      category, CategoryStatus::CATEGORY_EXPLICITLY_DISABLED);
+  Mock::VerifyAndClearExpectations(&observer);
+
+  // OnNewSuggestions (empty)
+  EXPECT_CALL(observer, OnNewSuggestions(category));  // TODO or not?
+  provider->FireSuggestionsChanged(category, std::vector<ContentSuggestion>());
+  Mock::VerifyAndClearExpectations(&observer);
+
+  ASSERT_THAT(service()->GetCategoryStatus(category),
+              Eq(CategoryStatus::NOT_PROVIDED));
+  ASSERT_FALSE(service()->GetCategoryInfo(category));
+  ASSERT_TRUE(service()->GetSuggestionsForCategory(category).empty());
+
+  // OnNewSuggestions (with suggestions)
+  EXPECT_CALL(observer, OnNewSuggestions(category));
+  provider->FireSuggestionsChanged(category,
+                                   CreateSuggestions(category, {1, 2}));
+  ExpectThatSuggestionsAre(category, {1, 2});
+  Mock::VerifyAndClearExpectations(&observer);
+
+  ASSERT_THAT(service()->GetCategoryStatus(category),
+              Eq(CategoryStatus::AVAILABLE));
+  ASSERT_TRUE(service()->GetCategoryInfo(category));
+  ASSERT_FALSE(service()->GetSuggestionsForCategory(category).empty());
+
+  EXPECT_CALL(observer,
+              OnCategoryStatusChanged(
+                  category, CategoryStatus::CATEGORY_EXPLICITLY_DISABLED));
+  provider->FireCategoryStatusChanged(
+      category, CategoryStatus::CATEGORY_EXPLICITLY_DISABLED);
+  Mock::VerifyAndClearExpectations(&observer);
+}
+
 }  // namespace ntp_snippets