Issue 5450 - introduce the Platform class

test/UpdateCheck.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 @@
       source.replace(pos, find.size(), replace);
   }
 
   class UpdateCheckTest : public ::testing::Test
   {
   protected:
     AdblockPlus::AppInfo appInfo;
     AdblockPlus::ServerResponse webRequestResponse;
     DelayedWebRequest::SharedTasks webRequestTasks;
     DelayedTimer::SharedTasks timerTasks;
+    std::unique_ptr<Platform> platform;
     FilterEnginePtr filterEngine;
 
     bool eventCallbackCalled;
     AdblockPlus::JsValueList eventCallbackParams;
     bool updateCallbackCalled;
     std::string updateError;
 
     void SetUp()
     {
       eventCallbackCalled = false;
       updateCallbackCalled = false;
     }
 
     void CreateFilterEngine()
     {
-      JsEngineCreationParameters jsEngineParams;
-      jsEngineParams.appInfo = appInfo;
       LazyFileSystem* fileSystem;
-      jsEngineParams.logSystem.reset(new LazyLogSystem());
-      jsEngineParams.fileSystem.reset(fileSystem = new LazyFileSystem());
-      jsEngineParams.timer = DelayedTimer::New(timerTasks);
-      jsEngineParams.webRequest = DelayedWebRequest::New(webRequestTasks);
-      auto jsEngine = CreateJsEngine(std::move(jsEngineParams));
-      jsEngine->SetEventCallback("updateAvailable", [this](JsValueList&& params)
+      ThrowingPlatformCreationParameters platformParams;
+      platformParams.logSystem.reset(new LazyLogSystem());
+      platformParams.timer = DelayedTimer::New(timerTasks);
+      platformParams.fileSystem.reset(fileSystem = new LazyFileSystem());
+      platformParams.webRequest = DelayedWebRequest::New(webRequestTasks);
+      platform.reset(new Platform(std::move(platformParams)));
+      platform->SetUpJsEngine(appInfo);
+      platform->GetJsEngine()->SetEventCallback("updateAvailable", [this](JsValueList&& params)
       {
         eventCallbackCalled = true;
         eventCallbackParams = std::move(params);
       });
 
-      filterEngine = ::CreateFilterEngine(*fileSystem, jsEngine);
+      filterEngine = ::CreateFilterEngine(*fileSystem, platform->GetJsEngine());
     }
 
     // Returns a URL or the empty string if there is no such request.
     std::string ProcessPendingUpdateWebRequest()
     {
       auto ii = webRequestTasks->begin();
       while (ii != webRequestTasks->end())
       {
         if (ii->url.find("update.json") != std::string::npos)
         {
@@ skipping 218 matching lines @@
   ForceUpdateCheck();
 
   // ensure that the was the corresponding request
   EXPECT_FALSE(ProcessPendingUpdateWebRequest().empty());
 
   EXPECT_FALSE(eventCallbackCalled);
   EXPECT_EQ(1, timesCalled);
 
   // previous handler is not restored
   EXPECT_FALSE(eventCallbackCalled);
-}
+}