Issue 1551 - Move global callbackParams and stuff around it into the scope of particular test

test/JsEngine.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 <stdexcept>
 #include "BaseJsTest.h"
 
 namespace
 {
   class JsEngineTest : public BaseJsTest
   {
   };
-
-  bool callbackCalled = false;
-  AdblockPlus::JsValueList callbackParams;
-  void Callback(AdblockPlus::JsValueList& params)
-  {
-    callbackCalled = true;
-    callbackParams = params;
-  }
 }
 
 TEST_F(JsEngineTest, Evaluate)
 {
   jsEngine->Evaluate("function hello() { return 'Hello'; }");
   AdblockPlus::JsValuePtr result = jsEngine->Evaluate("hello()");
   ASSERT_TRUE(result->IsString());
   ASSERT_EQ("Hello", result->AsString());
 }
 
@@ skipping 23 matching lines @@
   ASSERT_TRUE(value->IsBool());
   ASSERT_TRUE(value->AsBool());
 
   value = jsEngine->NewObject();
   ASSERT_TRUE(value->IsObject());
   ASSERT_EQ(0u, value->GetOwnPropertyNames().size());
 }
 
 TEST_F(JsEngineTest, EventCallbacks)
 {
+  bool callbackCalled = false;
+  AdblockPlus::JsValueList callbackParams;
+  auto Callback = [&callbackCalled, & callbackParams](
+    const AdblockPlus::JsValueList& params)
+  {
+    callbackCalled = true;
+    callbackParams = params;
+  };
+
   // Trigger event without a callback
   callbackCalled = false;
   jsEngine->Evaluate("_triggerEvent('foobar')");
   ASSERT_FALSE(callbackCalled);
 
   // Set callback
   jsEngine->SetEventCallback("foobar", Callback);
   callbackCalled = false;
   jsEngine->Evaluate("_triggerEvent('foobar', 1, 'x', true)");
   ASSERT_TRUE(callbackCalled);
@@ skipping 29 matching lines @@
   AdblockPlus::FileSystemPtr fileSystem(new AdblockPlus::DefaultFileSystem());
   jsEngine->SetFileSystem(fileSystem);
   ASSERT_EQ(fileSystem, jsEngine->GetFileSystem());
 
   ASSERT_TRUE(jsEngine->GetWebRequest());
   ASSERT_ANY_THROW(jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr()));
   AdblockPlus::WebRequestPtr webRequest(new AdblockPlus::DefaultWebRequest());
   jsEngine->SetWebRequest(webRequest);
   ASSERT_EQ(webRequest, jsEngine->GetWebRequest());
 }