Issue #3593 - Make isolate a fully internal member of the engine

test/Notification.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 16 matching lines @@
 {
   typedef std::shared_ptr<FilterEngine> FilterEnginePtr;
 
   class NotificationTest : public BaseJsTest
   {
   protected:
     FilterEnginePtr filterEngine;
     void SetUp()
     {
       BaseJsTest::SetUp();
-      jsEngine->SetFileSystem(FileSystemPtr(new LazyFileSystem()));
-      jsEngine->SetWebRequest(WebRequestPtr(new LazyWebRequest()));
-      jsEngine->SetLogSystem(LogSystemPtr(new DefaultLogSystem()));
-      filterEngine.reset(new FilterEngine(jsEngine));
+      jsEngine->SetFileSystem(std::make_shared<LazyFileSystem>());
+      jsEngine->SetWebRequest(std::make_shared<LazyWebRequest>());
+      jsEngine->SetLogSystem(std::make_shared<DefaultLogSystem>());
+      filterEngine = std::make_shared<FilterEngine>(jsEngine);
+    }
+
+    void TearDown()
+    {
+      filterEngine.reset();
+      BaseJsTest::TearDown();
     }
 
     void AddNotification(const std::string& notification)
     {
       jsEngine->Evaluate("(function()"
       "{"
         "require('notification').Notification.addNotification(" + notification + ");"
       "})();");
     }
 
@@ skipping 41 matching lines @@
 #ifdef NotificationMockWebRequestTest_ENABLED
   class NotificationMockWebRequestTest : public BaseJsTest
   {
   protected:
     FilterEnginePtr filterEngine;
     bool isNotificationCallbackCalled;
     void SetUp()
     {
       BaseJsTest::SetUp();
       isNotificationCallbackCalled = false;
-      jsEngine->SetFileSystem(
-        std::shared_ptr<LazyFileSystem>(new LazyFileSystem()));
+      jsEngine->SetFileSystem(std::shared_ptr<LazyFileSystem>());
       const char* responseJsonText = "{"
         "\"notifications\": [{"
           "\"id\": \"some id\","
           "\"type\": \"information\","
           "\"message\": {"
              "\"en-US\": \"message\""
           "},"
           "\"title\": \"Title\""
         "}]"
         "}";
-      jsEngine->SetWebRequest(std::shared_ptr<MockWebRequest>(
-        new MockWebRequest(responseJsonText)));
-      jsEngine->SetLogSystem(LogSystemPtr(new DefaultLogSystem()));
-      filterEngine.reset(new FilterEngine(jsEngine));
+      jsEngine->SetWebRequest(std::make_shared<MockWebRequest>(responseJsonText));
+      jsEngine->SetLogSystem(std::make_shared<DefaultLogSystem>());
+      filterEngine = std::make_shared<FilterEngine>(jsEngine);
       filterEngine->SetShowNotificationCallback(
         std::bind(&NotificationMockWebRequestTest::OnNotification,
         this, std::placeholders::_1));
     }
 
+    void TearDown()
+    {
+      filterEngine.reset();
+      BaseJsTest::TearDown();
+    }
+
     void OnNotification(const NotificationPtr& notification)
     {
       isNotificationCallbackCalled = true;
       ASSERT_TRUE(notification);
       EXPECT_EQ(NotificationType::NOTIFICATION_TYPE_INFORMATION, notification->GetType());
       EXPECT_EQ("Title", notification->GetTexts().title);
       EXPECT_EQ("message", notification->GetTexts().message);
       notification->MarkAsShown();
     }
   };
@@ skipping 71 matching lines @@
 TEST_F(NotificationTest, Links)
 {
   AddNotification("{ id: 'id', links: ['link1', 'link2'] }");
   NotificationPtr notification = PeekNotification();
   ASSERT_TRUE(notification);
   std::vector<std::string> notificationLinks = notification->GetLinks();
   ASSERT_EQ(2, notificationLinks.size());
   EXPECT_EQ("link1", notificationLinks[0]);
   EXPECT_EQ("link2", notificationLinks[1]);
 }