Issue #4826 - Use latch to replace thread-sleeping in tests

test/FilterEngine.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 "BaseJsTest.h"
+#include "JsLatch.h"
 #include <thread>
 #include "../src/JsEngineTransition.h"
 
 using namespace AdblockPlus;
 
 namespace
 {
   typedef std::shared_ptr<AdblockPlus::FilterEngine> FilterEnginePtr;
 
   class VeryLazyFileSystem : public LazyFileSystem
@@ skipping 100 matching lines @@
     {
       timesCalled++;
     }
 
   private:
     // We currently cannot store timesCalled in the functor, see:
     // https://issues.adblockplus.org/ticket/1378.
     int& timesCalled;
   };
 
-  // Workaround for https://issues.adblockplus.org/ticket/1397.
-  void NoOpUpdaterCallback(const std::string&) {}
-
   class FilterEngineWithFreshFolder : public ::testing::Test
   {
   protected:
     FileSystemPtr fileSystem;
     std::shared_ptr<LazyWebRequest> webRequest;
     AdblockPlus::JsEnginePtr jsEngine;
 
     void SetUp() override
     {
       fileSystem = std::make_shared<DefaultFileSystem>();
@@ skipping 397 matching lines @@
   \"test\": {\
     \"version\": \"1.0.2\",\
     \"url\": \"https://downloads.adblockplus.org/test-1.0.2.tar.gz?update\"\
   }\
 }";
 
   int timesCalled = 0;
   MockUpdateAvailableCallback mockUpdateAvailableCallback(timesCalled);
 
   filterEngine->SetUpdateAvailableCallback(mockUpdateAvailableCallback);
-  filterEngine->ForceUpdateCheck(&NoOpUpdaterCallback);
-  std::this_thread::sleep_for(std::chrono::milliseconds(100));
+  Latch latchA(1);
+  filterEngine->ForceUpdateCheck([&](const std::string&) {latchA.Arrive(); });
+  latchA.Wait();
   ASSERT_EQ(1, timesCalled);
 
   filterEngine->RemoveUpdateAvailableCallback();
-  filterEngine->ForceUpdateCheck(&NoOpUpdaterCallback);
-  std::this_thread::sleep_for(std::chrono::milliseconds(100));
+  Latch latchB(1);
+  filterEngine->ForceUpdateCheck([&](const std::string&) {latchB.Arrive(); });
+  latchB.Wait();
   ASSERT_EQ(1, timesCalled);
 }
 
 TEST_F(FilterEngineTest, DocumentWhitelisting)
 {
   filterEngine->GetFilter("@@||example.org^$document")->AddToList();
   filterEngine->GetFilter("@@||example.com^$document,domain=example.de")->AddToList();
 
   ASSERT_TRUE(filterEngine->IsDocumentWhitelisted(
       "http://example.org",
@@ skipping 78 matching lines @@
 
 TEST_F(FilterEngineWithFreshFolder, DisableSubscriptionsAutoSelectOnFirstRun)
 {
   createJsEngine();
   FilterEngine::Prefs preSettings;
   preSettings["first_run_subscription_auto_select"] = jsEngine->NewValue(false);
   auto filterEngine = std::make_shared<AdblockPlus::FilterEngine>(jsEngine, preSettings);
   const auto subscriptions = filterEngine->GetListedSubscriptions();
   EXPECT_EQ(0u, subscriptions.size());
 }