Issue 4832 - remove API allowing changing of LogSystem after Initialization of JsEngine

test/WebRequest.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 13 matching lines @@
 using namespace AdblockPlus;
 
 namespace
 {
   class DefaultWebRequestTest : public ::testing::Test
   {
   protected:
     void SetUp()
     {
       JsEngineCreationParameters jsEngineParams;
+      jsEngineParams.logSystem = CreateLogSystem();
       jsEngineParams.timer.reset(new NoopTimer());
       jsEngineParams.fileSystem.reset(new LazyFileSystem());
       jsEngineParams.webRequest = CreateWebRequest();
       jsEngine = CreateJsEngine(std::move(jsEngineParams));
     }
 
     virtual WebRequestPtr CreateWebRequest()
     {
       return CreateDefaultWebRequest();
     }
 
+    virtual LogSystemPtr CreateLogSystem()
+    {
+      return LogSystemPtr(new ThrowingLogSystem());
+    }
+
     JsEnginePtr jsEngine;
   };
 
   class MockWebRequestTest : public DefaultWebRequestTest
   {
     virtual WebRequestPtr CreateWebRequest() override
     {
       return DelayedWebRequest::New(webRequestTasks);
     }
 
@@ skipping 183 matching lines @@
       lastMessage = message;
     }
 
     void clear()
     {
       lastLogLevel = AdblockPlus::LogSystem::LOG_LEVEL_TRACE;
       lastMessage.clear();
     }
   };
 
-  typedef std::shared_ptr<CatchLogSystem> CatchLogSystemPtr;
+  class MockWebRequestAndLogSystemTest : public MockWebRequestTest
+  {
+    LogSystemPtr CreateLogSystem() override
+    {
+      return LogSystemPtr(catchLogSystem = new CatchLogSystem());
+    }
+  protected:
+    CatchLogSystem* catchLogSystem;
+  };
 }
 
-TEST_F(MockWebRequestTest, RequestHeaderValidation)
+TEST_F(MockWebRequestAndLogSystemTest, RequestHeaderValidation)
 {
-  auto catchLogSystem = CatchLogSystemPtr(new CatchLogSystem());
-  jsEngine->SetLogSystem(catchLogSystem);
-
   auto filterEngine = AdblockPlus::FilterEngine::Create(jsEngine);
 
   const std::string msg = "Attempt to set a forbidden header was denied: ";
 
   // The test will check that console.warn has been called when the
   // header is rejected. While this is an implementation detail, we
   // have no other way to check this
 
   // test 'Accept-Encoding' is rejected
   catchLogSystem->clear();
@@ skipping 78 matching lines @@
   EXPECT_EQ(AdblockPlus::LogSystem::LOG_LEVEL_TRACE, catchLogSystem->lastLogLevel);
   EXPECT_EQ("", catchLogSystem->lastMessage);
   ProcessPendingWebRequests();
   {
     auto headersRequest = GetHeadersForRequest(url);
     EXPECT_TRUE(headersRequest.first);
     const auto& headers = headersRequest.second;
     EXPECT_FALSE(headers.cend() == headers.find("Security"));
   }
 }