Issue #4688, #3595 - Web request use scheduled threads; unit tests terminate

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 "../src/Thread.h"

[Eric, 2016/12/14 20:53:55]

Don't know how this snuck through previous compilations.

 #include "BaseJsTest.h"
 
 namespace
 {
   typedef std::shared_ptr<AdblockPlus::FilterEngine> FilterEnginePtr;
 
   class TestFileSystem : public LazyFileSystem
   {
   public:
     std::string prefsContents;
@@ skipping 27 matching lines @@
         return result;
       }
 
       return LazyFileSystem::Stat(path);
     }
   };
 
   class PrefsTest : public ::testing::Test
   {
   protected:
-    TestFileSystem* fileSystem;
-    AdblockPlus::FileSystemPtr fileSystemPtr;
+    std::shared_ptr<TestFileSystem> fileSystem;
     AdblockPlus::JsEnginePtr jsEngine;
     FilterEnginePtr filterEngine;
 
     void SetUp()
     {
-      fileSystem = new TestFileSystem();
-      fileSystemPtr.reset(fileSystem);
-
+      fileSystem = std::make_shared<TestFileSystem>();
       Reset();
     }
 
     void Reset(const AdblockPlus::FilterEngine::Prefs& preconfiguredPrefs =
                AdblockPlus::FilterEngine::Prefs())
     {
       jsEngine = CreateJsEngine();
       jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new LazyLogSystem));
-      jsEngine->SetFileSystem(fileSystemPtr);
+      jsEngine->SetFileSystem(fileSystem);
       jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(new LazyWebRequest));
 
       filterEngine.reset(
         new AdblockPlus::FilterEngine(jsEngine, preconfiguredPrefs));
     }
   };
 }
 
 TEST_F(PrefsTest, PrefsGetSet)
 {
@@ skipping 98 matching lines @@
 
   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());
 }