Issue 5475 - Update adblockpluscore dependency to revision hg:b935a0402215

test/Prefs.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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 11 matching lines @@
 
 using namespace AdblockPlus;
 
 namespace
 {
   class TestFileSystem : public LazyFileSystem
   {
   public:
     IOBuffer prefsContents;
 
-    void Read(const std::string& path, const ReadCallback& callback) const override
+    void Read(const std::string& fileName, const ReadCallback& callback) const override
     {
-      scheduler([this, path, callback]
+      scheduler([this, fileName, callback]
       {
-        if (path == "prefs.json" && !prefsContents.empty())
+        if (fileName == "prefs.json" && !prefsContents.empty())
         {
           callback(IOBuffer(prefsContents.cbegin(), prefsContents.cend()), "");
           return;
         }
 
-        LazyFileSystem::Read(path, callback);
+        LazyFileSystem::Read(fileName, callback);
       });
     }
 
-    void Write(const std::string& path, const IOBuffer& content, const Callback& callback) override
+    void Write(const std::string& fileName, const IOBuffer& content, const Callback& callback) override
     {
-      scheduler([this, path, content, callback]
+      scheduler([this, fileName, content, callback]
       {
-        if (path == "prefs.json")
+        if (fileName == "prefs.json")
         {
           prefsContents = content;
           callback("");
         }
       });
     }
 
-    void Stat(const std::string& path, const StatCallback& callback) const override
+    void Stat(const std::string& fileName, const StatCallback& callback) const override
     {
-      scheduler([this, path, callback]
+      scheduler([this, fileName, callback]
       {
-        if (path == "prefs.json")
+        if (fileName == "prefs.json")
         {
           StatResult result;
-          result.exists = result.isFile = !prefsContents.empty();
+          result.exists = !prefsContents.empty();
           callback(result, "");
           return;
         }
 
-        LazyFileSystem::Stat(path, callback);
+        LazyFileSystem::Stat(fileName, callback);
       });
     }
   };
 
   class PrefsTest : public BaseJsTest
   {
   protected:
     std::shared_ptr<TestFileSystem> fileSystem;
 
     void SetUp()
@@ skipping 18 matching lines @@
       AdblockPlus::FilterEngine::CreationParameters createParams;
       createParams.preconfiguredPrefs = preconfiguredPrefs;
       return ::CreateFilterEngine(*fileSystem, *platform, createParams);
     }
   };
 }
 
 TEST_F(PrefsTest, PrefsGetSet)
 {
   auto& filterEngine = CreateFilterEngine();
-  ASSERT_EQ("patterns.ini", filterEngine.GetPref("patternsfile").AsString());
   ASSERT_EQ(24, filterEngine.GetPref("patternsbackupinterval").AsInt());
   ASSERT_TRUE(filterEngine.GetPref("subscriptions_autoupdate").AsBool());
   ASSERT_TRUE(filterEngine.GetPref("foobar").IsUndefined());
 
-  ASSERT_ANY_THROW(filterEngine.SetPref("patternsfile", GetJsEngine().NewValue(0)));
   ASSERT_ANY_THROW(filterEngine.SetPref("patternsbackupinterval", GetJsEngine().NewValue(true)));
   ASSERT_ANY_THROW(filterEngine.SetPref("subscriptions_autoupdate", GetJsEngine().NewValue("foo")));
 
-  filterEngine.SetPref("patternsfile", GetJsEngine().NewValue("filters.ini"));
   filterEngine.SetPref("patternsbackupinterval", GetJsEngine().NewValue(48));
   filterEngine.SetPref("subscriptions_autoupdate", GetJsEngine().NewValue(false));
 
-  ASSERT_EQ("filters.ini", filterEngine.GetPref("patternsfile").AsString());
   ASSERT_EQ(48, filterEngine.GetPref("patternsbackupinterval").AsInt());
   ASSERT_FALSE(filterEngine.GetPref("subscriptions_autoupdate").AsBool());
 }
 
 TEST_F(PrefsTest, PrefsPersist)
 {
   {
     auto& filterEngine = CreateFilterEngine();
-    ASSERT_EQ("patterns.ini", filterEngine.GetPref("patternsfile").AsString());
     ASSERT_EQ(24, filterEngine.GetPref("patternsbackupinterval").AsInt());
     ASSERT_TRUE(filterEngine.GetPref("subscriptions_autoupdate").AsBool());
 
-    filterEngine.SetPref("patternsfile", GetJsEngine().NewValue("filters.ini"));
     filterEngine.SetPref("patternsbackupinterval", GetJsEngine().NewValue(48));
     filterEngine.SetPref("subscriptions_autoupdate", GetJsEngine().NewValue(false));
   }
   ASSERT_FALSE(fileSystem->prefsContents.empty());
 
   {
     ResetPlatform();
     auto& filterEngine = CreateFilterEngine();
-    ASSERT_EQ("filters.ini", filterEngine.GetPref("patternsfile").AsString());
     ASSERT_EQ(48, filterEngine.GetPref("patternsbackupinterval").AsInt());
     ASSERT_FALSE(filterEngine.GetPref("subscriptions_autoupdate").AsBool());
   }
 }
 
 TEST_F(PrefsTest, UnknownPrefs)
 {
   using IOBuffer = AdblockPlus::IFileSystem::IOBuffer;
   std::string content = "{\"foobar\":2, \"patternsbackupinterval\": 12}";
   fileSystem->prefsContents = IOBuffer(content.cbegin(), content.cend());
@@ skipping 59 matching lines @@
   {
     ResetPlatform();
     AdblockPlus::FilterEngine::Prefs preconfiguredPrefs;
     preconfiguredPrefs.emplace("suppress_first_run_page", GetJsEngine().NewValue(true));
     auto& filterEngine = CreateFilterEngine(preconfiguredPrefs);
 
     ASSERT_TRUE(filterEngine.GetPref("suppress_first_run_page").IsBool());
     ASSERT_FALSE(filterEngine.GetPref("suppress_first_run_page").AsBool());
   }
 }