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

test/JsEngine.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 11 matching lines @@
 namespace
 {
   class JsEngineTest : public BaseJsTest
   {
   };
 }
 
 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());
+  auto result = jsEngine->Evaluate("hello()");
+  ASSERT_TRUE(result.IsString());
+  ASSERT_EQ("Hello", result.AsString());
 }
 
 TEST_F(JsEngineTest, RuntimeExceptionIsThrown)
 {
   ASSERT_THROW(jsEngine->Evaluate("doesnotexist()"), std::runtime_error);
 }
 
 TEST_F(JsEngineTest, CompileTimeExceptionIsThrown)
 {
   ASSERT_THROW(jsEngine->Evaluate("'foo'bar'"), std::runtime_error);
@@ skipping 19 matching lines @@
 }
 
 namespace {
 
   bool IsSame(const AdblockPlus::JsEnginePtr& jsEngine,
               const AdblockPlus::JsValue& v1, const AdblockPlus::JsValue& v2)
   {
     AdblockPlus::JsValueList params;
     params.push_back(v1);
     params.push_back(v2);
-    return jsEngine->Evaluate("f = function(a, b) { return a == b };")->Call(params).AsBool();
+    return jsEngine->Evaluate("f = function(a, b) { return a == b };").Call(params).AsBool();
   }
 
 }
 
 TEST_F(JsEngineTest, ValueCopy)
 {
   {
     auto value = jsEngine->NewValue("foo");
     ASSERT_TRUE(value.IsString());
     ASSERT_EQ("foo", value.AsString());
@@ skipping 97 matching lines @@
   ASSERT_ANY_THROW(jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr()));
   AdblockPlus::WebRequestPtr webRequest(new AdblockPlus::DefaultWebRequest());
   jsEngine->SetWebRequest(webRequest);
   ASSERT_EQ(webRequest, jsEngine->GetWebRequest());
 }
 
 TEST(NewJsEngineTest, GlobalPropertyTest)
 {
   AdblockPlus::JsEnginePtr jsEngine(AdblockPlus::JsEngine::New());
   jsEngine->SetGlobalProperty("foo", jsEngine->NewValue("bar"));
-  AdblockPlus::JsValuePtr foo = jsEngine->Evaluate("foo");
-  ASSERT_TRUE(foo->IsString());
-  ASSERT_EQ(foo->AsString(), "bar");
+  auto foo = jsEngine->Evaluate("foo");
+  ASSERT_TRUE(foo.IsString());
+  ASSERT_EQ(foo.AsString(), "bar");
 }