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

test/Prefs.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 142 matching lines @@
 {
   fileSystem->prefsContents = "{\"patternsbackupinterval\": 6, \"foo\"}";
   auto filterEngine = CreateFilterEngine();
 
   ASSERT_EQ(24, filterEngine->GetPref("patternsbackupinterval").AsInt());
 }
 
 TEST_F(PrefsTest, PreconfiguredPrefsPreconfigured)
 {
   AdblockPlus::FilterEngine::Prefs preconfiguredPrefs;
-  preconfiguredPrefs.insert(std::make_pair("disable_auto_updates", jsEngine->NewValue(false)));

[sergei, 2017/04/19 18:56:52]

emplace in this file could also a bit reduce the code.

[hub, 2017/04/19 21:56:49]

Done.

-  preconfiguredPrefs.insert(std::make_pair("suppress_first_run_page", jsEngine->NewValue(true)));
+  preconfiguredPrefs.emplace("disable_auto_updates", jsEngine->NewValue(false));
+  preconfiguredPrefs.emplace("suppress_first_run_page", jsEngine->NewValue(true));
   auto filterEngine = CreateFilterEngine(preconfiguredPrefs);
 
   ASSERT_TRUE(filterEngine->GetPref("disable_auto_updates").IsBool());
   ASSERT_FALSE(filterEngine->GetPref("disable_auto_updates").AsBool());
   ASSERT_TRUE(filterEngine->GetPref("suppress_first_run_page").IsBool());
   ASSERT_TRUE(filterEngine->GetPref("suppress_first_run_page").AsBool());
 }
 
 TEST_F(PrefsTest, PreconfiguredPrefsUnsupported)
 {
   AdblockPlus::FilterEngine::Prefs preconfiguredPrefs;
-  preconfiguredPrefs.insert(std::make_pair("unsupported_preconfig", jsEngine->NewValue(true)));
+  preconfiguredPrefs.emplace("unsupported_preconfig", jsEngine->NewValue(true));
   auto filterEngine = CreateFilterEngine(preconfiguredPrefs);
 
   ASSERT_TRUE(filterEngine->GetPref("unsupported_preconfig").IsUndefined());
 }
 
 TEST_F(PrefsTest, PreconfiguredPrefsOverride)
 {
   AdblockPlus::FilterEngine::Prefs preconfiguredPrefs;
-  preconfiguredPrefs.insert(std::make_pair("suppress_first_run_page", jsEngine->NewValue(true)));
+  preconfiguredPrefs.emplace("suppress_first_run_page", jsEngine->NewValue(true));
   auto filterEngine = CreateFilterEngine(preconfiguredPrefs);
 
   filterEngine->SetPref("suppress_first_run_page", jsEngine->NewValue(false));
   ASSERT_TRUE(filterEngine->GetPref("suppress_first_run_page").IsBool());
   ASSERT_FALSE(filterEngine->GetPref("suppress_first_run_page").AsBool());
 }
 
 TEST_F(PrefsTest, PrefsPersistWhenPreconfigured)
 {
   {
     AdblockPlus::FilterEngine::Prefs preconfiguredPrefs;
-    preconfiguredPrefs.insert(std::make_pair("suppress_first_run_page", jsEngine->NewValue(true)));
+    preconfiguredPrefs.emplace("suppress_first_run_page", jsEngine->NewValue(true));
     auto filterEngine = CreateFilterEngine(preconfiguredPrefs);
 
     ASSERT_TRUE(filterEngine->GetPref("suppress_first_run_page").IsBool());
     ASSERT_TRUE(filterEngine->GetPref("suppress_first_run_page").AsBool());
     filterEngine->SetPref("suppress_first_run_page", jsEngine->NewValue(false));
 
     AdblockPlus::Sleep(100);
   }
   ASSERT_FALSE(fileSystem->prefsContents.empty());
 
   {
     ResetJsEngine();
     AdblockPlus::FilterEngine::Prefs preconfiguredPrefs;
-    preconfiguredPrefs.insert(std::make_pair("suppress_first_run_page", jsEngine->NewValue(true)));
+    preconfiguredPrefs.emplace("suppress_first_run_page", jsEngine->NewValue(true));
     auto filterEngine = CreateFilterEngine(preconfiguredPrefs);
 
     ASSERT_TRUE(filterEngine->GetPref("suppress_first_run_page").IsBool());
     ASSERT_FALSE(filterEngine->GetPref("suppress_first_run_page").AsBool());
   }
 }