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

test/Prefs.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 <sstream>
 
 #include "BaseJsTest.h"
+#include "../src/JsEngineTransition.h"
 
 namespace
 {
   typedef std::shared_ptr<AdblockPlus::FilterEngine> FilterEnginePtr;
 
   class TestFileSystem : public LazyFileSystem
   {
   public:
     std::string prefsContents;
 
@@ skipping 33 matching lines @@
   class PrefsTest : public ::testing::Test
   {
   protected:
     std::shared_ptr<TestFileSystem> fileSystem;
     AdblockPlus::JsEnginePtr jsEngine;
     FilterEnginePtr filterEngine;
 
     void SetUp()
     {
       fileSystem = std::make_shared<TestFileSystem>();
-      Reset();
+      Construct(boolPrefsInitializer());
     }
 
-    void Reset(const AdblockPlus::FilterEngine::Prefs& preconfiguredPrefs =
-               AdblockPlus::FilterEngine::Prefs())
+    void TearDown()
     {
+      Destroy();
+      fileSystem.reset();
+    }
+
+    // Type of initializer values for C++ boolean preferences
+    typedef std::map<std::string, bool> boolPrefsInitializer;
+
+    void Reset(const boolPrefsInitializer& boolPrefs = boolPrefsInitializer())
+    {
+      Destroy();
+      Construct(boolPrefs);
+    }
+
+  private:
+    void Construct(const boolPrefsInitializer& boolPrefs)
+    {
+      // New JS engine and its resources
       jsEngine = CreateJsEngine();
-      jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new LazyLogSystem));
+      jsEngine->SetLogSystem(std::make_shared<LazyLogSystem>());
       jsEngine->SetFileSystem(fileSystem);
-      jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(new LazyWebRequest));
+      jsEngine->SetWebRequest(std::make_shared<LazyWebRequest>());
+      /*
+       * Create preference values under the new JS engine.
+       */
+      AdblockPlus::FilterEngine::Prefs jsValuePrefs;
+      for (boolPrefsInitializer::const_iterator entry = boolPrefs.begin();
+        entry != boolPrefs.end(); ++entry)
+      {
+        jsValuePrefs[entry->first] = jsEngine->NewValue(entry->second);
+      }
+      // Use a new filter engine
+      filterEngine = std::make_shared<AdblockPlus::FilterEngine>(jsEngine, jsValuePrefs);
+    }
 
-      filterEngine.reset(
-        new AdblockPlus::FilterEngine(jsEngine, preconfiguredPrefs));
+    void Destroy()
+    {
+      filterEngine.reset();
+      ToInternal(jsEngine)->WaitForQuietScheduler();
+      jsEngine.reset();
+      EXPECT_EQ(0, jsEngine.use_count());
     }
   };
 }
 
 TEST_F(PrefsTest, PrefsGetSet)
 {
   ASSERT_EQ("patterns.ini", filterEngine->GetPref("patternsfile")->AsString());
   ASSERT_EQ(24, filterEngine->GetPref("patternsbackupinterval")->AsInt());
   ASSERT_TRUE(filterEngine->GetPref("subscriptions_autoupdate")->AsBool());
   ASSERT_TRUE(filterEngine->GetPref("foobar")->IsUndefined());
@@ skipping 44 matching lines @@
 TEST_F(PrefsTest, SyntaxFailure)
 {
   fileSystem->prefsContents = "{\"patternsbackupinterval\": 6, \"foo\"}";
   Reset();
 
   ASSERT_EQ(24, filterEngine->GetPref("patternsbackupinterval")->AsInt());
 }
 
 TEST_F(PrefsTest, PreconfiguredPrefsPreconfigured)
 {
-  AdblockPlus::FilterEngine::Prefs preconfiguredPrefs;
-  preconfiguredPrefs["disable_auto_updates"] = jsEngine->NewValue(false);
-  preconfiguredPrefs["suppress_first_run_page"] = jsEngine->NewValue(true);
+  boolPrefsInitializer preconfiguredPrefs;
+  preconfiguredPrefs["disable_auto_updates"] = false;
+  preconfiguredPrefs["suppress_first_run_page"] = true;
   Reset(preconfiguredPrefs);
 
   ASSERT_TRUE(filterEngine->GetPref("disable_auto_updates")->IsBool());
   ASSERT_FALSE(filterEngine->GetPref("disable_auto_updates")->AsBool());
   ASSERT_TRUE(filterEngine->GetPref("suppress_first_run_page")->IsBool());
   ASSERT_TRUE(filterEngine->GetPref("suppress_first_run_page")->AsBool());
 }
 
 TEST_F(PrefsTest, PreconfiguredPrefsUnsupported)
 {
-  AdblockPlus::FilterEngine::Prefs preconfiguredPrefs;
-  preconfiguredPrefs["unsupported_preconfig"] = jsEngine->NewValue(true);
+  boolPrefsInitializer preconfiguredPrefs;
+  preconfiguredPrefs["unsupported_preconfig"] = true;
   Reset(preconfiguredPrefs);
 
   ASSERT_TRUE(filterEngine->GetPref("unsupported_preconfig")->IsUndefined());
 }
 
 TEST_F(PrefsTest, PreconfiguredPrefsOverride)
 {
-  AdblockPlus::FilterEngine::Prefs preconfiguredPrefs;
-  preconfiguredPrefs["suppress_first_run_page"] = jsEngine->NewValue(true);
+  boolPrefsInitializer preconfiguredPrefs;
+  preconfiguredPrefs["suppress_first_run_page"] = true;
   Reset(preconfiguredPrefs);
 
   filterEngine->SetPref("suppress_first_run_page", jsEngine->NewValue(false));
   ASSERT_TRUE(filterEngine->GetPref("suppress_first_run_page")->IsBool());
   ASSERT_FALSE(filterEngine->GetPref("suppress_first_run_page")->AsBool());
 }
 
 TEST_F(PrefsTest, PrefsPersistWhenPreconfigured)
 {
-  AdblockPlus::FilterEngine::Prefs preconfiguredPrefs;
-  preconfiguredPrefs["suppress_first_run_page"] = jsEngine->NewValue(true);
+  boolPrefsInitializer preconfiguredPrefs;
+  preconfiguredPrefs["suppress_first_run_page"] = true;
   Reset(preconfiguredPrefs);
 
   ASSERT_TRUE(filterEngine->GetPref("suppress_first_run_page")->IsBool());
   ASSERT_TRUE(filterEngine->GetPref("suppress_first_run_page")->AsBool());
   filterEngine->SetPref("suppress_first_run_page", jsEngine->NewValue(false));
 
   std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
   ASSERT_FALSE(fileSystem->prefsContents.empty());
 
   Reset(preconfiguredPrefs);
 
   ASSERT_TRUE(filterEngine->GetPref("suppress_first_run_page")->IsBool());
   ASSERT_FALSE(filterEngine->GetPref("suppress_first_run_page")->AsBool());
 }