Issue 5180 - start to inject implementation of WebRequest into JsEngine::ctr

test/Notification.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "BaseJsTest.h"
 
 using namespace AdblockPlus;
 
 // This define enables NotificationMockWebRequestTest but to run it
 // one need to set INITIAL_DELAY to about 2000 msec in notification.js.
 //#define NotificationMockWebRequestTest_ENABLED
 
 namespace
 {
   typedef std::shared_ptr<FilterEngine> FilterEnginePtr;
 
-  class NotificationTest : public BaseJsTest
+  class NotificationTest : public ::testing::Test
   {
   protected:
     FilterEnginePtr filterEngine;
     void SetUp()
     {
-      BaseJsTest::SetUp();
-      jsEngine->SetFileSystem(FileSystemPtr(new LazyFileSystem()));
-      jsEngine->SetWebRequest(std::make_shared<LazyWebRequest>());
-      jsEngine->SetLogSystem(LogSystemPtr(new DefaultLogSystem()));
+      JsEngineCreationParameters jsEngineParams;
+      jsEngineParams.fileSystem.reset(new LazyFileSystem());
+      jsEngineParams.logSystem.reset(new DefaultLogSystem());
+      jsEngineParams.timer.reset(new NoopTimer());
+      jsEngineParams.webRequest.reset(new NoopWebRequest());
+      auto jsEngine = CreateJsEngine(std::move(jsEngineParams));
       filterEngine = FilterEngine::Create(jsEngine);
     }
 
     void AddNotification(const std::string& notification)
     {
-      jsEngine->Evaluate("(function()"
+      filterEngine->GetJsEngine()->Evaluate("(function()"
       "{"
         "require('notification').Notification.addNotification(" + notification + ");"
       "})();");
     }
 
     std::unique_ptr<Notification> PeekNotification(const std::string& url = std::string())
     {
       std::unique_ptr<Notification> retValue;
       filterEngine->SetShowNotificationCallback(
         [&retValue](Notification&& notification) {
@@ skipping 138 matching lines @@
 TEST_F(NotificationTest, Links)
 {
   AddNotification("{ id: 'id', links: ['link1', 'link2'] }");
   auto notification = PeekNotification();
   ASSERT_TRUE(notification);
   std::vector<std::string> notificationLinks = notification->GetLinks();
   ASSERT_EQ(2u, notificationLinks.size());
   EXPECT_EQ("link1", notificationLinks[0]);
   EXPECT_EQ("link2", notificationLinks[1]);
 }