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

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 47 matching lines @@
   ASSERT_TRUE(value.IsBool());
   ASSERT_TRUE(value.AsBool());
 
   value = jsEngine->NewObject();
   ASSERT_TRUE(value.IsObject());
   ASSERT_EQ(0u, value.GetOwnPropertyNames().size());
 }
 
 namespace {
 
-  bool IsSame(const AdblockPlus::JsEnginePtr& jsEngine,

[sergei, 2017/04/20 12:45:08]

Can be just `JsEngine&` (without pointer).

[hub, 2017/04/20 13:01:46]

ok

+  bool IsSame(AdblockPlus::JsEngine& 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());
 
     AdblockPlus::JsValue value2(value);
     ASSERT_TRUE(value2.IsString());
     ASSERT_EQ("foo", value2.AsString());
 
-    ASSERT_TRUE(IsSame(jsEngine, value, value2));

[sergei, 2017/04/20 12:45:08]

I think we should rather try to use EXPECT_ when it's possible. Though he it can
be considered as consistent with already existing code.

[hub, 2017/04/20 13:01:46]

I used ASSERT_ for consistency. EXPECT_ is fine too.

+    ASSERT_TRUE(IsSame(*jsEngine, value, value2));
   }
   {
     auto value = jsEngine->NewValue(12345678901234);
     ASSERT_TRUE(value.IsNumber());
     ASSERT_EQ(12345678901234, value.AsInt());
 
     AdblockPlus::JsValue value2(value);
     ASSERT_TRUE(value2.IsNumber());
     ASSERT_EQ(12345678901234, value2.AsInt());
 
-    ASSERT_TRUE(IsSame(jsEngine, value, value2));
+    ASSERT_TRUE(IsSame(*jsEngine, value, value2));
   }
   {
     auto value = jsEngine->NewValue(true);
     ASSERT_TRUE(value.IsBool());
     ASSERT_TRUE(value.AsBool());
 
     AdblockPlus::JsValue value2(value);
     ASSERT_TRUE(value2.IsBool());
     ASSERT_TRUE(value2.AsBool());
 
-    ASSERT_TRUE(IsSame(jsEngine, value, value2));
+    ASSERT_TRUE(IsSame(*jsEngine, value, value2));
   }
   {
     auto value = jsEngine->NewObject();
     ASSERT_TRUE(value.IsObject());
     ASSERT_EQ(0u, value.GetOwnPropertyNames().size());
 
     AdblockPlus::JsValue value2(value);
     ASSERT_TRUE(value2.IsObject());
     ASSERT_EQ(0u, value2.GetOwnPropertyNames().size());
 
-    ASSERT_TRUE(IsSame(jsEngine, value, value2));
+    ASSERT_TRUE(IsSame(*jsEngine, value, value2));
   }
 }
 
 TEST_F(JsEngineTest, EventCallbacks)
 {
   bool callbackCalled = false;
   AdblockPlus::JsValueList callbackParams;
   auto Callback = [&callbackCalled, & callbackParams](
     const AdblockPlus::JsValueList& params)
   {
@@ skipping 53 matching lines @@
 
 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");
 }