Issue 4657 - Add Acceptable Ads API

test/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 580 matching lines @@
 
 TEST_F(FilterEngineWithFreshFolder, LangAndAASubscriptionsAreChosenOnFirstRun)
 {
   AppInfo appInfo;
   appInfo.locale = "zh";
   const std::string langSubscriptionUrl = "https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt";
   auto jsEngine = createJsEngine(appInfo);
   auto filterEngine = FilterEnginePtr(new AdblockPlus::FilterEngine(jsEngine));
   const auto subscriptions = filterEngine->GetListedSubscriptions();
   ASSERT_EQ(2u, subscriptions.size());
-  const auto aaUrl = filterEngine->GetPref("subscriptions_exceptionsurl")->AsString();
   SubscriptionPtr aaSubscription;
   SubscriptionPtr langSubscription;
-  if (subscriptions[0]->GetProperty("url")->AsString() == aaUrl)
+  if (subscriptions[0]->IsAA())
   {
     aaSubscription = subscriptions[0];
     langSubscription = subscriptions[1];
-  }
-  else if (subscriptions[1]->GetProperty("url")->AsString() == aaUrl)
+  } else if (subscriptions[1]->IsAA())
   {
     aaSubscription = subscriptions[1];
     langSubscription = subscriptions[0];
   }
   ASSERT_NE(nullptr, aaSubscription);
   ASSERT_NE(nullptr, langSubscription);
-  EXPECT_EQ(aaUrl, aaSubscription->GetProperty("url")->AsString());
   EXPECT_EQ(langSubscriptionUrl, langSubscription->GetProperty("url")->AsString());
+  EXPECT_TRUE(filterEngine->IsAAEnabled());
 }
 
 TEST_F(FilterEngineWithFreshFolder, DisableSubscriptionsAutoSelectOnFirstRun)
 {
   auto jsEngine = createJsEngine();
   FilterEngine::Prefs preSettings;
   preSettings["first_run_subscription_auto_select"] = jsEngine->NewValue(false);
   auto filterEngine = FilterEnginePtr(new AdblockPlus::FilterEngine(jsEngine, preSettings));
   const auto subscriptions = filterEngine->GetListedSubscriptions();
   EXPECT_EQ(0u, subscriptions.size());
+  EXPECT_FALSE(filterEngine->IsAAEnabled());
 }
+
+TEST_F(FilterEngineTest, IsAAEnabled)
+{
+  // no subscription (because of preconfigured prefs.json and patterns.ini)
+  EXPECT_FALSE(filterEngine->IsAAEnabled());
+  // add subscription and enable
+  filterEngine->SetAAEnabled(true);
+  EXPECT_TRUE(filterEngine->IsAAEnabled());
+  // disable
+  filterEngine->SetAAEnabled(false);
+  EXPECT_FALSE(filterEngine->IsAAEnabled());
+  // only enable already existing disabled
+  filterEngine->SetAAEnabled(true);
+  EXPECT_TRUE(filterEngine->IsAAEnabled());
+  // remove
+  filterEngine->GetSubscription(filterEngine->GetAAURL())->RemoveFromList();
+  EXPECT_FALSE(filterEngine->IsAAEnabled());
+  // no subscription
+  EXPECT_FALSE(filterEngine->IsAAEnabled());
+}

[Eric, 2016/12/05 14:40:58]

This is a bunch of unit tests all combined into one. Tests are much more useful
if they test individual behaviors. Written this way, when there are failures
it's typical that some will fail and some will pass, and it's much quicker to
locate errors.

Not tested:
-- enable when already enabled
-- disable when already disabled
-- disable after initialization
-- enable after removing AA from subscriptions

Line 646 looks redundant.

[sergei, 2017/03/17 15:55:25]

Added more tests and they run in each separate test.