Issue 5189 - use r-value references when objects should be transferred

test/FilterEngine.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
@@ skipping 44 matching lines @@
       jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new FileSystem));
       jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(new LazyWebRequest));
       jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new LogSystem));
       filterEngine = AdblockPlus::FilterEngine::Create(jsEngine);
     }
   };
 
   typedef FilterEngineTestGeneric<LazyFileSystem, AdblockPlus::DefaultLogSystem> FilterEngineTest;
   typedef FilterEngineTestGeneric<VeryLazyFileSystem, LazyLogSystem> FilterEngineTestNoData;
 
-  struct MockFilterChangeCallback
-  {
-    MockFilterChangeCallback(int& timesCalled) : timesCalled(timesCalled) {}
-
-    void operator()(const std::string&, const AdblockPlus::JsValue&)
-    {
-      timesCalled++;
-    }
-
-  private:
-    int& timesCalled;
-  };
-
   class UpdaterTest : public ::testing::Test
   {
   protected:
     class MockWebRequest : public AdblockPlus::WebRequest
     {
     public:
       AdblockPlus::ServerResponse response;
 
       AdblockPlus::ServerResponse GET(const std::string& url,
           const AdblockPlus::HeaderList& requestHeaders) const
@@ skipping 139 matching lines @@
       exampleSubscriptionResponse.responseStatus = 200;
       exampleSubscriptionResponse.status = WebRequest::NS_OK;
       exampleSubscriptionResponse.responseText = "[Adblock Plus 2.0]\n||example.com";
       webRequest->responses.emplace(subscriptionUrlPrefix, exampleSubscriptionResponse);
       createParams.preconfiguredPrefs.emplace("first_run_subscription_auto_select", jsEngine->NewValue(false));
       isConnectionAllowed = true;
       createParams.isConnectionAllowedCallback = [this](const std::string* allowedConnectionType)->bool{
         capturedConnectionTypes.Add(allowedConnectionType);
         return isConnectionAllowed;
       };
-      jsEngine->SetEventCallback("filterChange", [this](const JsValueList& params/*action, item*/)
+      jsEngine->SetEventCallback("filterChange", [this](JsValueList&& params/*action, item*/)
       {
         ASSERT_EQ(2u, params.size());
         if (params[0].AsString() == "subscription.downloadStatus")
         {
           {
             std::lock_guard<std::mutex> lock(downloadStatusChanged.mutex);
             downloadStatusChanged.url = params[1].GetProperty("url").AsString();
           }
           downloadStatusChanged.cv.notify_one();
         }
@@ skipping 347 matching lines @@
 }
 
 TEST_F(FilterEngineTestNoData, FirstRunFlag)
 {
   ASSERT_TRUE(filterEngine->IsFirstRun());
 }
 
 TEST_F(FilterEngineTest, SetRemoveFilterChangeCallback)
 {
   int timesCalled = 0;
-  MockFilterChangeCallback mockFilterChangeCallback(timesCalled);
   std::this_thread::sleep_for(std::chrono::milliseconds(200));
-  filterEngine->SetFilterChangeCallback(mockFilterChangeCallback);
+  filterEngine->SetFilterChangeCallback([&timesCalled](const std::string&, AdblockPlus::JsValue&&)
+  {
+    timesCalled++;
+  });
   filterEngine->GetFilter("foo").AddToList();
   EXPECT_EQ(1, timesCalled);
 
   filterEngine->RemoveFilterChangeCallback();
   filterEngine->GetFilter("foo").RemoveFromList();
   EXPECT_EQ(1, timesCalled);
 }
 
 TEST_F(UpdaterTest, SetRemoveUpdateAvailableCallback)
 {
@@ skipping 470 matching lines @@
     filterEngine->SetAllowedConnectionType(&testConnection);
     auto subscription = EnsureExampleSubscriptionAndForceUpdate("subB");
     EXPECT_EQ("synchronize_ok", subscription.GetProperty("downloadStatus").AsString());
     EXPECT_EQ(1u, subscription.GetProperty("filters").AsList().size());
     auto capturedConnectionTypes = this->capturedConnectionTypes.GetStrings();
     ASSERT_EQ(1u, capturedConnectionTypes.size());
     EXPECT_TRUE(capturedConnectionTypes[0].first);
     EXPECT_EQ(testConnection, capturedConnectionTypes[0].second);
   }
 }