Issue #3593 - Stop sharing a single isolate amongst all unit tests

test/UpdateCheck.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
  * 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 <functional>
 
 #include "BaseJsTest.h"
+#include "../src/JsEngineTransition.h"
 
 namespace
 {
   typedef std::shared_ptr<AdblockPlus::FilterEngine> FilterEnginePtr;
 
   void FindAndReplace(std::string& source, const std::string& find, const std::string& replace)
   {
     for (size_t pos = 0; (pos = source.find(find), pos) != std::string::npos; pos += replace.size())
       source.replace(pos, find.size(), replace);
   }
 
   std::string previousRequestUrl;
   class TestWebRequest : public LazyWebRequest
   {
   public:
     AdblockPlus::ServerResponse response;
     AdblockPlus::ServerResponse GET(const std::string& url, const AdblockPlus::HeaderList& requestHeaders) const
     {
       if (url.find("easylist") != std::string::npos)
         return LazyWebRequest::GET(url, requestHeaders);
 
       previousRequestUrl = url;
       return response;
     }
   };
 
   class UpdateCheckTest : public ::testing::Test
   {
+    void Construct()
+    {
+      jsEngine = CreateJsEngine(appInfo);
+      jsEngine->SetLogSystem(std::make_shared<LazyLogSystem>());
+      jsEngine->SetFileSystem(std::make_shared<LazyFileSystem>());
+      jsEngine->SetWebRequest(webRequest);
+      jsEngine->SetEventCallback("updateAvailable",
+        std::bind(&UpdateCheckTest::EventCallback, this, std::placeholders::_1));
+
+      filterEngine = std::make_shared<AdblockPlus::FilterEngine>(jsEngine);
+    }
+
+    void Destroy()
+    {
+      webRequest->Cancel();
+      filterEngine.reset();
+      ToInternal(jsEngine)->WaitForQuietScheduler();
+      jsEngine.reset();
+      ASSERT_EQ(0, jsEngine.use_count());
+    }
+
   protected:
     AdblockPlus::AppInfo appInfo;
-    TestWebRequest* webRequest;
-    AdblockPlus::WebRequestPtr webRequestPtr;
+    std::shared_ptr<TestWebRequest> webRequest;
     AdblockPlus::JsEnginePtr jsEngine;
     FilterEnginePtr filterEngine;
 
     bool eventCallbackCalled;
     AdblockPlus::JsValueList eventCallbackParams;
     bool updateCallbackCalled;
     std::string updateError;
 
     void SetUp()
     {
-      webRequest = new TestWebRequest();
-      webRequestPtr.reset(webRequest);
-
+      webRequest = std::make_shared<TestWebRequest>();
       eventCallbackCalled = false;
       updateCallbackCalled = false;
-      Reset();
+      Construct();
     }
 
     void TearDown()
     {
-      webRequest->Cancel();
+      Destroy();
+      webRequest.reset();
     }
 
     void Reset()
     {
-      jsEngine = CreateJsEngine(appInfo);
-      jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new LazyLogSystem));
-      jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem));
-      jsEngine->SetWebRequest(webRequestPtr);
-      jsEngine->SetEventCallback("updateAvailable",
-          std::bind(&UpdateCheckTest::EventCallback, this, std::placeholders::_1));
-
-      filterEngine.reset(new AdblockPlus::FilterEngine(jsEngine));
+      Destroy();
+      Construct();
     }
 
     void ForceUpdateCheck()
     {
       filterEngine->ForceUpdateCheck(
           std::bind(&UpdateCheckTest::UpdateCallback, this, std::placeholders::_1));
     }
 
     void EventCallback(AdblockPlus::JsValueList& params)
     {
@@ skipping 165 matching lines @@
 
   Reset();
   ForceUpdateCheck();
 
   std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
   ASSERT_FALSE(eventCallbackCalled);
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_FALSE(updateError.empty());
 }