Noissue - optimize UpdateCheck tests

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 32 matching lines @@
 
     bool eventCallbackCalled;
     AdblockPlus::JsValueList eventCallbackParams;
     bool updateCallbackCalled;
     std::string updateError;
 
     void SetUp()
     {
       eventCallbackCalled = false;
       updateCallbackCalled = false;
-      Reset();
     }
 
-    void Reset()
+    void CreateFilterEngine()
     {
       JsEngineCreationParameters jsEngineParams;
       jsEngineParams.appInfo = appInfo;
       jsEngineParams.logSystem.reset(new LazyLogSystem());
       jsEngineParams.fileSystem.reset(new LazyFileSystem());
       jsEngineParams.timer = DelayedTimer::New(timerTasks);
       jsEngineParams.webRequest = DelayedWebRequest::New(webRequestTasks);
       jsEngine = CreateJsEngine(std::move(jsEngineParams));
       jsEngine->SetEventCallback("updateAvailable", [this](JsValueList&& params)
       {
@@ skipping 37 matching lines @@
 TEST_F(UpdateCheckTest, RequestFailure)
 {
   webRequestResponse.status = IWebRequest::NS_ERROR_FAILURE;
 
   appInfo.name = "1";
   appInfo.version = "3";
   appInfo.application = "4";
   appInfo.applicationVersion = "2";
   appInfo.developmentBuild = false;
 
-  Reset();
+  CreateFilterEngine();
   ForceUpdateCheck();
 
   auto requestUrl = ProcessPendingUpdateWebRequest();
 
   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();
@@ skipping 16 matching lines @@
   webRequestResponse.status = IWebRequest::NS_OK;
   webRequestResponse.responseStatus = 200;
   webRequestResponse.responseText = "{\"1\": {\"version\":\"3.1\",\"url\":\"https://foo.bar/\"}}";
 
   appInfo.name = "1";
   appInfo.version = "3";
   appInfo.application = "4";
   appInfo.applicationVersion = "2";
   appInfo.developmentBuild = true;
 
-  Reset();
+  CreateFilterEngine();
   ForceUpdateCheck();
 
   auto requestUrl = ProcessPendingUpdateWebRequest();
 
   ASSERT_TRUE(eventCallbackCalled);
   ASSERT_EQ(1u, eventCallbackParams.size());
   ASSERT_EQ("https://foo.bar/", eventCallbackParams[0].AsString());
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_TRUE(updateError.empty());
 
@@ skipping 18 matching lines @@
   webRequestResponse.status = IWebRequest::NS_OK;
   webRequestResponse.responseStatus = 200;
   webRequestResponse.responseText = "{\"1/4\": {\"version\":\"3.1\",\"url\":\"https://foo.bar/\"}}";
 
   appInfo.name = "1";
   appInfo.version = "3";
   appInfo.application = "4";
   appInfo.applicationVersion = "2";
   appInfo.developmentBuild = true;
 
-  Reset();
+  CreateFilterEngine();
   ForceUpdateCheck();
 
   ProcessPendingUpdateWebRequest();
 
   ASSERT_TRUE(eventCallbackCalled);
   ASSERT_EQ(1u, eventCallbackParams.size());
   ASSERT_EQ("https://foo.bar/", eventCallbackParams[0].AsString());
   ASSERT_TRUE(updateError.empty());
 }
 
 TEST_F(UpdateCheckTest, WrongApplication)
 {
   webRequestResponse.status = IWebRequest::NS_OK;
   webRequestResponse.responseStatus = 200;
   webRequestResponse.responseText = "{\"1/3\": {\"version\":\"3.1\",\"url\":\"https://foo.bar/\"}}";
 
   appInfo.name = "1";
   appInfo.version = "3";
   appInfo.application = "4";
   appInfo.applicationVersion = "2";
   appInfo.developmentBuild = true;
 
-  Reset();
+  CreateFilterEngine();
   ForceUpdateCheck();
 
   ProcessPendingUpdateWebRequest();
 
   ASSERT_FALSE(eventCallbackCalled);
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_TRUE(updateError.empty());
 }
 
 TEST_F(UpdateCheckTest, WrongVersion)
 {
   webRequestResponse.status = IWebRequest::NS_OK;
   webRequestResponse.responseStatus = 200;
   webRequestResponse.responseText = "{\"1\": {\"version\":\"3\",\"url\":\"https://foo.bar/\"}}";
 
   appInfo.name = "1";
   appInfo.version = "3";
   appInfo.application = "4";
   appInfo.applicationVersion = "2";
   appInfo.developmentBuild = true;
 
-  Reset();
+  CreateFilterEngine();
   ForceUpdateCheck();
 
   ProcessPendingUpdateWebRequest();
 
   ASSERT_FALSE(eventCallbackCalled);
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_TRUE(updateError.empty());
 }
 
 TEST_F(UpdateCheckTest, WrongURL)
 {
   webRequestResponse.status = IWebRequest::NS_OK;
   webRequestResponse.responseStatus = 200;
   webRequestResponse.responseText = "{\"1\": {\"version\":\"3.1\",\"url\":\"http://insecure/\"}}";
 
   appInfo.name = "1";
   appInfo.version = "3";
   appInfo.application = "4";
   appInfo.applicationVersion = "2";
   appInfo.developmentBuild = true;
 
-  Reset();
+  CreateFilterEngine();
   ForceUpdateCheck();
 
   ProcessPendingUpdateWebRequest();
 
   ASSERT_FALSE(eventCallbackCalled);
   ASSERT_TRUE(updateCallbackCalled);
   ASSERT_FALSE(updateError.empty());
 }