Issue 5475 - Update adblockpluscore dependency to revision hg:b935a0402215

test/FilterEngine.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 20 matching lines @@
       return 0 == str.compare(0, beginning.size(), beginning);
     }
   }
 }
 
 namespace
 {
   class NoFilesFileSystem : public LazyFileSystem
   {
   public:
-    void Stat(const std::string& path, const StatCallback& callback) const override
+    void Stat(const std::string& fileName, const StatCallback& callback) const override
     {
       scheduler([callback]
       {
         callback(StatResult(), "");
       });
     }
   };
 
   template<class LazyFileSystemT, class LogSystem>
   class FilterEngineTestGeneric : public BaseJsTest
@@ skipping 63 matching lines @@
       return platform->GetFilterEngine();
     }
 
     void TearDown() override
     {
       removeFileIfExists("patterns.ini");
       removeFileIfExists("prefs.json");
       fileSystem.reset();
       BaseJsTest::TearDown();
     }
-    void removeFileIfExists(const std::string& path)
+    void removeFileIfExists(const std::string& fileName)
     {
       bool hasStatRun = false;
       bool doesFileExists;
-      fileSystem->Stat(path, [&hasStatRun, &doesFileExists](const IFileSystem::StatResult& stats, const std::string& error)
+      fileSystem->Stat(fileName, [&hasStatRun, &doesFileExists](const IFileSystem::StatResult& stats, const std::string& error)
       {
         EXPECT_TRUE(error.empty()) << error;
         doesFileExists = stats.exists;
         hasStatRun = true;
       });
       while (!hasStatRun && !fileSystemTasks.empty())
       {
         (*fileSystemTasks.begin())();
         fileSystemTasks.pop_front();
       }
 
       if (!doesFileExists)
         return;
 
       bool hasRemoveRun = false;
-      fileSystem->Remove(path, [&hasRemoveRun](const std::string& error)
+      fileSystem->Remove(fileName, [&hasRemoveRun](const std::string& error)
       {
         EXPECT_TRUE(error.empty()) << error;
         hasRemoveRun = true;
       });
       while (!hasStatRun && !fileSystemTasks.empty())
       {
         (*fileSystemTasks.begin())();
         fileSystemTasks.pop_front();
       }
     }
@@ skipping 908 matching lines @@
     std::string testConnection = "test connection";
     GetFilterEngine().SetAllowedConnectionType(&testConnection);
     auto subscription = EnsureExampleSubscriptionAndForceUpdate("subB");
     EXPECT_EQ("synchronize_ok", subscription.GetProperty("downloadStatus").AsString());
     EXPECT_EQ(1u, subscription.GetProperty("filters").AsList().size());
     ASSERT_EQ(1u, capturedConnectionTypes.size());
     EXPECT_TRUE(capturedConnectionTypes[0].first);
     EXPECT_EQ(testConnection, capturedConnectionTypes[0].second);
   }
 }