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

test/BaseJsTest.h

 /*
  * 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/>.
  */
 
 #ifndef MOCKS_H
 #define MOCKS_H
 
+#include <condition_variable>
+#include <mutex>
 #include <thread>
 
 #include <AdblockPlus.h>
 #include <gtest/gtest.h>
 
 class ThrowingLogSystem : public AdblockPlus::LogSystem
 {
 public:
   void operator()(LogLevel logLevel, const std::string& message,
         const std::string& source)
@@ skipping 81 matching lines @@
     }
     return result;
   }
 
   std::string Resolve(const std::string& path) const
   {
     return path;
   }
 };
 
+class LazyWaiter
+{
+  std::mutex m;
+  typedef std::unique_lock<std::mutex> UniqueLockType;
+  std::condition_variable cv;
+  bool running;
+
+public:
+  LazyWaiter()
+    : running(true)
+  {}
+
+  void WaitUntilCancelled()
+  {
+    UniqueLockType ul(m);
+    cv.wait(ul, [this]() -> bool { return !running; });
+  }
+
+  void Cancel()
+  {
+    UniqueLockType ul(m);
+    running = false;
+    cv.notify_all();
+  }
+};
+
 class LazyWebRequest : public AdblockPlus::WebRequest
 {
+  mutable LazyWaiter w;

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

Declared mutable because `GET()` is declared `const`. It's overriding a virtual
method, so we can't change the function declaration.

+
 public:
+  LazyWebRequest() {} // = default;
+
   AdblockPlus::ServerResponse GET(const std::string& url, const AdblockPlus::HeaderList& requestHeaders) const
   {
-    while (true)
-      std::this_thread::sleep_for(std::chrono::seconds(100));
+    w.WaitUntilCancelled();
     return AdblockPlus::ServerResponse();
   }
+
+  void Cancel()
+  {
+    w.Cancel();
+  }
 };
 
 class LazyLogSystem : public AdblockPlus::LogSystem
 {
 public:
   void operator()(LogLevel logLevel, const std::string& message,
           const std::string& source)
   {
   }
 };
 
 AdblockPlus::JsEnginePtr CreateJsEngine(const AdblockPlus::AppInfo& appInfo = AdblockPlus::AppInfo());
 
 class BaseJsTest : public ::testing::Test
 {
 protected:
   AdblockPlus::JsEnginePtr jsEngine;
   virtual void SetUp();
   virtual void TearDown();
 };
 
 #endif