📰 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 {
+    RegisterPrefs();
     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 51 matching lines @@
     std::unique_ptr<MockProvider> provider = base::MakeUnique<MockProvider>(
         service(), category_factory(), provided_categories);
     MockProvider* result = provider.get();
     service()->RegisterProvider(std::move(provider));
     return result;
   }
 
   MOCK_METHOD1(OnImageFetched, void(const gfx::Image&));
 
  protected:
+  void RegisterPrefs() {
+    ContentSuggestionsService::RegisterProfilePrefs(pref_service_->registry());
+    UserClassifier::RegisterProfilePrefs(pref_service_->registry());
+  }
+
   void CreateContentSuggestionsService(
       ContentSuggestionsService::State enabled) {
     ASSERT_FALSE(service_);
-    service_.reset(new ContentSuggestionsService(enabled,
-                                                 nullptr /* history_service */,
-                                                 nullptr /* pref_service */));
+    service_.reset(new ContentSuggestionsService(
+        enabled, /*history_service=*/nullptr, pref_service_.get()));
+  }
+
+  void ResetService() {
+    service_->Shutdown();
+    service_.reset();
+    CreateContentSuggestionsService(ContentSuggestionsService::State::ENABLED);
   }
 
   ContentSuggestionsService* service() { return service_.get(); }
 
   // Returns a suggestion instance for testing.
   ContentSuggestion CreateSuggestion(Category category, int number) {
     return ContentSuggestion(
         category, base::IntToString(number),
         GURL("http://testsuggestion/" + base::IntToString(number)));
   }
 
   std::vector<ContentSuggestion> CreateSuggestions(
       Category category,
       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 {
+    RegisterPrefs();
     CreateContentSuggestionsService(ContentSuggestionsService::State::DISABLED);
   }
 };
 
 TEST_F(ContentSuggestionsServiceTest, ShouldRegisterProviders) {
   EXPECT_THAT(service()->state(),
               Eq(ContentSuggestionsService::State::ENABLED));
   Category articles_category = FromKnownCategory(KnownCategories::ARTICLES);
   Category offline_pages_category =
       FromKnownCategory(KnownCategories::DOWNLOADS);
@@ skipping 390 matching lines @@
   service()->RestoreDismissedCategories();
 
   EXPECT_THAT(service()->GetCategories(), ElementsAre(category));
   EXPECT_THAT(service()->GetCategoryStatus(category),
               Eq(CategoryStatus::AVAILABLE));
   EXPECT_THAT(service()->GetSuggestionsForCategory(category), IsEmpty());
   EXPECT_THAT(providers().count(category), Eq(1ul));
   EXPECT_THAT(dismissed_providers(), IsEmpty());
 }
 
+TEST_F(ContentSuggestionsServiceTest, ShouldRestoreDismissedCategories) {
+  // Create and register provider
+  Category category1 = service()->category_factory()->FromIDValue(1);
+  Category category2 = service()->category_factory()->FromIDValue(2);
+
+  // Setup and verify initial state
+  MockProvider* provider = RegisterProvider({category1, category2});
+  provider->FireCategoryStatusChangedWithCurrentStatus(category1);
+  provider->FireCategoryStatusChangedWithCurrentStatus(category2);
+
+  ASSERT_THAT(service()->GetCategoryStatus(category1),
+              Eq(CategoryStatus::AVAILABLE));
+  ASSERT_THAT(service()->GetCategoryStatus(category2),
+              Eq(CategoryStatus::AVAILABLE));
+
+  // Dismiss all the categories. None should be provided now.
+  service()->DismissCategory(category1);
+  service()->DismissCategory(category2);
+
+  ASSERT_THAT(service()->GetCategoryStatus(category1),
+              Eq(CategoryStatus::NOT_PROVIDED));
+  ASSERT_THAT(service()->GetCategoryStatus(category2),
+              Eq(CategoryStatus::NOT_PROVIDED));
+
+  // Receiving a status change notification should not change anything.
+  provider->FireCategoryStatusChanged(category1, CategoryStatus::AVAILABLE);
+
+  EXPECT_THAT(service()->GetCategoryStatus(category1),
+              Eq(CategoryStatus::NOT_PROVIDED));
+  EXPECT_THAT(service()->GetCategoryStatus(category2),
+              Eq(CategoryStatus::NOT_PROVIDED));
+
+  // Receiving a notification without suggestions should not change anything.
+  provider->FireSuggestionsChanged(category1, std::vector<ContentSuggestion>());
+
+  EXPECT_THAT(service()->GetCategoryStatus(category1),
+              Eq(CategoryStatus::NOT_PROVIDED));
+  EXPECT_THAT(service()->GetCategoryStatus(category2),
+              Eq(CategoryStatus::NOT_PROVIDED));
+
+  // Receiving suggestions should make the notified category available.
+  provider->FireSuggestionsChanged(category1,
+                                   CreateSuggestions(category1, {1, 2}));
+
+  EXPECT_THAT(service()->GetCategoryStatus(category1),
+              Eq(CategoryStatus::AVAILABLE));
+  EXPECT_THAT(service()->GetCategoryStatus(category2),
+              Eq(CategoryStatus::NOT_PROVIDED));
+}
+
+TEST_F(ContentSuggestionsServiceTest, ShouldRestoreDismissalsFromPrefs) {
+  // Register a category with one suggestion.
+  Category category = FromKnownCategory(KnownCategories::ARTICLES);
+  MockProvider* provider = RegisterProvider(category);
+  provider->FireCategoryStatusChangedWithCurrentStatus(category);
+
+  // For a regular initialisation, the category is not disabled.

[Marc Treib, 2016/10/18 07:44:31]

s/disabled/dismissed/

[dgn, 2016/10/18 09:27:18]

Done.

+  ASSERT_FALSE(service()->IsCategoryDismissed(category));
+
+  // Dismiss the category.
+  service()->DismissCategory(category);
+  ASSERT_TRUE(service()->IsCategoryDismissed(category));
+
+  // Simulate a Chrome restart. The category should still be dismissed.
+  ResetService();
+  EXPECT_TRUE(service()->IsCategoryDismissed(category));
+
+  // Ensure that the provider registered at initialisation is used after
+  // restoration.
+  provider = RegisterProvider(category);
+  provider->FireCategoryStatusChangedWithCurrentStatus(category);
+  EXPECT_TRUE(service()->IsCategoryDismissed(category));
+
+  service()->RestoreDismissedCategories();
+  EXPECT_FALSE(service()->IsCategoryDismissed(category));
+  EXPECT_THAT(providers().find(category)->second, Eq(provider));
+}
+
 }  // namespace ntp_snippets