Issue 5034 - Part 3: Create plain JsValue instead of JsValuePtr

test/UpdateCheck.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 36 matching lines @@
   class UpdateCheckTest : public ::testing::Test
   {
   protected:
     AdblockPlus::AppInfo appInfo;
     TestWebRequest* webRequest;
     AdblockPlus::WebRequestPtr webRequestPtr;
     AdblockPlus::JsEnginePtr jsEngine;
     FilterEnginePtr filterEngine;
 
     bool eventCallbackCalled;
-    AdblockPlus::JsConstValueList eventCallbackParams;
+    AdblockPlus::JsValueList eventCallbackParams;
     bool updateCallbackCalled;
     std::string updateError;
 
     void SetUp()
     {
       webRequest = new TestWebRequest();
       webRequestPtr.reset(webRequest);
 
       eventCallbackCalled = false;
       updateCallbackCalled = false;
@@ skipping 11 matching lines @@
 
       filterEngine = AdblockPlus::FilterEngine::Create(jsEngine);
     }
 
     void ForceUpdateCheck()
     {
       filterEngine->ForceUpdateCheck(
           std::bind(&UpdateCheckTest::UpdateCallback, this, std::placeholders::_1));
     }
 
-    void EventCallback(const AdblockPlus::JsConstValueList& params)
+    void EventCallback(const AdblockPlus::JsValueList& params)
     {
       eventCallbackCalled = true;
       eventCallbackParams = params;
     }
 
     void UpdateCallback(const std::string& error)
     {
       updateCallbackCalled = true;
       updateError = error;
     }
@@ skipping 12 matching lines @@
 
   Reset();
   ForceUpdateCheck();
 
   AdblockPlus::Sleep(100);
 
   ASSERT_FALSE(eventCallbackCalled);
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_FALSE(updateError.empty());
 
-  std::string expectedUrl(filterEngine->GetPref("update_url_release")->AsString());
+  std::string expectedUrl(filterEngine->GetPref("update_url_release").AsString());
   std::string platform = jsEngine->Evaluate("require('info').platform")->AsString();
   std::string platformVersion = jsEngine->Evaluate("require('info').platformVersion")->AsString();
 
   FindAndReplace(expectedUrl, "%NAME%", appInfo.name);
   FindAndReplace(expectedUrl, "%TYPE%", "1");   // manual update
   expectedUrl += "&addonName=" + appInfo.name +
                  "&addonVersion=" + appInfo.version +
                  "&application=" + appInfo.application +
                  "&applicationVersion=" + appInfo.applicationVersion +
                  "&platform=" + platform +
@@ skipping 14 matching lines @@
   appInfo.applicationVersion = "2";
   appInfo.developmentBuild = true;
 
   Reset();
   ForceUpdateCheck();
 
   AdblockPlus::Sleep(100);
 
   ASSERT_TRUE(eventCallbackCalled);
   ASSERT_EQ(1u, eventCallbackParams.size());
-  ASSERT_EQ("https://foo.bar/", eventCallbackParams[0]->AsString());
+  ASSERT_EQ("https://foo.bar/", eventCallbackParams[0].AsString());
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_TRUE(updateError.empty());
 
-  std::string expectedUrl(filterEngine->GetPref("update_url_devbuild")->AsString());
+  std::string expectedUrl(filterEngine->GetPref("update_url_devbuild").AsString());
   std::string platform = jsEngine->Evaluate("require('info').platform")->AsString();
   std::string platformVersion = jsEngine->Evaluate("require('info').platformVersion")->AsString();
 
   FindAndReplace(expectedUrl, "%NAME%", appInfo.name);
   FindAndReplace(expectedUrl, "%TYPE%", "1");   // manual update
   expectedUrl += "&addonName=" + appInfo.name +
                  "&addonVersion=" + appInfo.version +
                  "&application=" + appInfo.application +
                  "&applicationVersion=" + appInfo.applicationVersion +
                  "&platform=" + platform +
@@ skipping 14 matching lines @@
   appInfo.applicationVersion = "2";
   appInfo.developmentBuild = true;
 
   Reset();
   ForceUpdateCheck();
 
   AdblockPlus::Sleep(100);
 
   ASSERT_TRUE(eventCallbackCalled);
   ASSERT_EQ(1u, eventCallbackParams.size());
-  ASSERT_EQ("https://foo.bar/", eventCallbackParams[0]->AsString());
+  ASSERT_EQ("https://foo.bar/", eventCallbackParams[0].AsString());
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_TRUE(updateError.empty());
 }
 
 TEST_F(UpdateCheckTest, WrongApplication)
 {
   webRequest->response.status = AdblockPlus::WebRequest::NS_OK;
   webRequest->response.responseStatus = 200;
   webRequest->response.responseText = "{\"1/3\": {\"version\":\"3.1\",\"url\":\"https://foo.bar/\"}}";
 
@@ skipping 49 matching lines @@
 
   Reset();
   ForceUpdateCheck();
 
   AdblockPlus::Sleep(100);
 
   ASSERT_FALSE(eventCallbackCalled);
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_FALSE(updateError.empty());
 }