Issue 5475 - Update adblockpluscore dependency to revision hg:b935a0402215

test/BaseJsTest.h

 /*
  * 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 90 matching lines @@
   void operator()(LogLevel logLevel, const std::string& message,
         const std::string& source)
   {
     throw std::runtime_error("Unexpected error: " + message);
   }
 };
 
 class ThrowingFileSystem : public AdblockPlus::IFileSystem
 {
 public:
-  void Read(const std::string& path, const ReadCallback& callback) const override
+  void Read(const std::string& fileName, const ReadCallback& callback) const override
   {
     throw std::runtime_error("Not implemented");
   }
 
-  void Write(const std::string& path, const IOBuffer& data,
+  void Write(const std::string& fileName, const IOBuffer& data,
     const Callback& callback) override
   {
     throw std::runtime_error("Not implemented");
   }
 
-  void Move(const std::string& fromPath, const std::string& toPath,
+  void Move(const std::string& fromFileName, const std::string& toFileName,
             const Callback& callback) override
   {
     throw std::runtime_error("Not implemented");
   }
 
-  void Remove(const std::string& path, const Callback& callback) override
+  void Remove(const std::string& fileName, const Callback& callback) override
   {
     throw std::runtime_error("Not implemented");
   }
 
-  void Stat(const std::string& path, const StatCallback& callback) const override
+  void Stat(const std::string& fileName, const StatCallback& callback) const override
   {
     throw std::runtime_error("Not implemented");
   }
-
-  std::string Resolve(const std::string& path) const override
-  {
-    throw std::runtime_error("Not implemented");
-  }
 };
 
 class ThrowingWebRequest : public AdblockPlus::IWebRequest
 {
 public:
   void GET(const std::string& url, const AdblockPlus::HeaderList& requestHeaders, const GetCallback&) override
   {
     throw std::runtime_error("Unexpected GET: " + url);
   }
 };
 
 class LazyFileSystem : public AdblockPlus::IFileSystem
 {
 public:
   typedef std::function<void()> Task;
   typedef std::function<void(const Task& task)> Scheduler;
   static void ExecuteImmediately(const Task& task)
   {
     if (task)
       task();
   }
   explicit LazyFileSystem(const Scheduler& scheduler = LazyFileSystem::ExecuteImmediately)
     : scheduler(scheduler)
   {
   }
 
-  void Read(const std::string& path, const ReadCallback& callback) const override
+  void Read(const std::string& fileName, const ReadCallback& callback) const override
   {
-    scheduler([path, callback]
+    scheduler([fileName, callback]
     {
-      if (path == "patterns.ini")
+      if (fileName == "patterns.ini")
       {
-        std::string dummyData = "# Adblock Plus preferences\n[Subscription]\nurl=~fl~";
+        std::string dummyData = "# Adblock Plus preferences\n[Subscription]\nurl=~user~0000";
         callback(IOBuffer(dummyData.cbegin(), dummyData.cend()), "");
       }
-      else if (path == "prefs.json")
+      else if (fileName == "prefs.json")
       {
         std::string dummyData = "{}";
         callback(IOBuffer(dummyData.cbegin(), dummyData.cend()), "");
       }
     });
   }
 
-  void Write(const std::string& path, const IOBuffer& data,
+  void Write(const std::string& fileName, const IOBuffer& data,
              const Callback& callback) override
   {
   }
 
 
-  void Move(const std::string& fromPath, const std::string& toPath,
+  void Move(const std::string& fromFileName, const std::string& toFileName,
             const Callback& callback) override
   {
   }
 
-  void Remove(const std::string& path, const Callback& callback) override
+  void Remove(const std::string& fileName, const Callback& callback) override
   {
   }
 
-  void Stat(const std::string& path, const StatCallback& callback) const override
+  void Stat(const std::string& fileName, const StatCallback& callback) const override
   {
-    scheduler([path, callback]
+    scheduler([fileName, callback]
     {
       StatResult result;
-      if (path == "patterns.ini")
+      if (fileName == "patterns.ini")
       {
         result.exists = true;
-        result.isFile = true;
       }
       callback(result, "");
     });
   }
-
-  std::string Resolve(const std::string& path) const override
-  {
-    return path;
-  }
 public:
   Scheduler scheduler;
 };
 
 AdblockPlus::FilterEngine& CreateFilterEngine(LazyFileSystem& fileSystem,
   AdblockPlus::Platform& platform,
   const AdblockPlus::FilterEngine::CreationParameters& creationParams = AdblockPlus::FilterEngine::CreationParameters());
 
 class NoopWebRequest : public AdblockPlus::IWebRequest
 {
@@ skipping 52 matching lines @@
   }
 
   void TearDown() override
   {
     if (platform)
       platform.reset();
   }
 };
 
 #endif