Issue 5034 - Part 4: JsEngine::Evaluate() return a JsValue

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 102 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 platform = jsEngine->Evaluate("require('info').platform")->AsString();
-  std::string platformVersion = jsEngine->Evaluate("require('info').platformVersion")->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 +
                  "&platformVersion=" + platformVersion +
                  "&lastVersion=0&downloadCount=0";
@@ skipping 17 matching lines @@
 
   AdblockPlus::Sleep(100);
 
   ASSERT_TRUE(eventCallbackCalled);
   ASSERT_EQ(1u, eventCallbackParams.size());
   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 platform = jsEngine->Evaluate("require('info').platform")->AsString();
-  std::string platformVersion = jsEngine->Evaluate("require('info').platformVersion")->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 +
                  "&platformVersion=" + platformVersion +
                  "&lastVersion=0&downloadCount=0";
@@ skipping 82 matching lines @@
 
   Reset();
   ForceUpdateCheck();
 
   AdblockPlus::Sleep(100);
 
   ASSERT_FALSE(eventCallbackCalled);
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_FALSE(updateError.empty());
 }