Issue 4983 - Get rid of Sleep() in the WebRequest test

test/WebRequest.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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/Thread.h"
 #include <atomic>
 #include <mutex>
 
 using namespace AdblockPlus;
 
 namespace
 {
-  class DefaultWebRequestTest : public ::testing::Test
+  class BaseWebRequestTest : public ::testing::Test
   {
   protected:
     void SetUp()
     {
       JsEngineCreationParameters jsEngineParams;
       jsEngineParams.logSystem = CreateLogSystem();
       jsEngineParams.timer.reset(new NoopTimer());
       jsEngineParams.fileSystem.reset(fileSystem = new LazyFileSystem());
       jsEngineParams.webRequest = CreateWebRequest();
       jsEngine = CreateJsEngine(std::move(jsEngineParams));
     }
 
-    virtual WebRequestPtr CreateWebRequest()
-    {
-      return CreateDefaultWebRequest();
-    }
+    virtual WebRequestPtr CreateWebRequest() = 0;
 
     virtual LogSystemPtr CreateLogSystem()
     {
       return LogSystemPtr(new ThrowingLogSystem());
     }
 
     JsEnginePtr jsEngine;
     LazyFileSystem* fileSystem;
   };
 
-  class MockWebRequestTest : public DefaultWebRequestTest
+  class DefaultWebRequestTest : public BaseWebRequestTest
   {
-    virtual WebRequestPtr CreateWebRequest() override
+    WebRequestPtr CreateWebRequest() override
+    {
+      return CreateDefaultWebRequest([this](const SchedulerTask& task)
+      {
+        webRequestTasks.emplace_back(task);
+      });
+    }
+    std::list<SchedulerTask> webRequestTasks;
+  protected:
+    void WaitForVariable(const std::string& variable, const AdblockPlus::JsEnginePtr& jsEngine)
+    {
+      while (jsEngine->Evaluate(variable).IsUndefined() && !webRequestTasks.empty())
+      {
+        (*webRequestTasks.begin())();
+        webRequestTasks.pop_front();
+      }
+    }
+  };
+
+  class MockWebRequestTest : public BaseWebRequestTest
+  {
+    WebRequestPtr CreateWebRequest() override
     {
       return DelayedWebRequest::New(webRequestTasks);
     }
 
   protected:
     void ProcessPendingWebRequests()
     {
       for (auto iiWebTask = webRequestTasks->cbegin(); iiWebTask != webRequestTasks->cend();
       webRequestTasks->erase(iiWebTask++))
       {
@@ skipping 52 matching lines @@
     jsEngine->Evaluate(std::string("\
       var result;\
       var request = new XMLHttpRequest();\
       request.open('GET', '") + url + "'); \
       request.overrideMimeType('text/plain');\
       request.addEventListener('load', function() {result = request.responseText;}, false);\
       request.addEventListener('error', function() {result = 'error';}, false);\
     ");
     return url;
   }
-
-  void WaitForVariable(const std::string& variable, const AdblockPlus::JsEnginePtr& jsEngine)
-  {
-    do
-    {
-      AdblockPlus::Sleep(60);
-    } while (jsEngine->Evaluate(variable).IsUndefined());
-  }
-
 }
 
 TEST_F(MockWebRequestTest, BadCall)
 {
   ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET()"));
   ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET('', {}, function(){})"));
   ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET({toString: false}, {}, function(){})"));
   ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET('http://example.com/', null, function(){})"));
   ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET('http://example.com/', {}, null)"));
   ASSERT_ANY_THROW(jsEngine->Evaluate("_webRequest.GET('http://example.com/', {}, function(){}, 0)"));
@@ skipping 207 matching lines @@
   EXPECT_EQ(AdblockPlus::LogSystem::LOG_LEVEL_TRACE, catchLogSystem->lastLogLevel);
   EXPECT_EQ("", catchLogSystem->lastMessage);
   ProcessPendingWebRequests();
   {
     auto headersRequest = GetHeadersForRequest(url);
     EXPECT_TRUE(headersRequest.first);
     const auto& headers = headersRequest.second;
     EXPECT_FALSE(headers.cend() == headers.find("Security"));
   }
 }