Noissue - move (UpdaterTest, SetRemoveUpdateAvailableCallback) to UpdateCheck.cpp

test/FilterEngine.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 51 matching lines @@
     void TearDown() override
     {
       // Workaround for issue 5198
       std::this_thread::sleep_for(std::chrono::milliseconds(100));
     }
   };
 
   typedef FilterEngineTestGeneric<LazyFileSystem, AdblockPlus::DefaultLogSystem> FilterEngineTest;
   typedef FilterEngineTestGeneric<VeryLazyFileSystem, LazyLogSystem> FilterEngineTestNoData;
 
-  class UpdaterTest : public ::testing::Test
-  {
-  protected:
-    class MockWebRequest : public AdblockPlus::WebRequest
-    {
-    public:
-      AdblockPlus::ServerResponse response;
-
-      AdblockPlus::ServerResponse GET(const std::string& url,
-          const AdblockPlus::HeaderList& requestHeaders) const
-      {
-        return response;
-      }
-    };
-
-    std::shared_ptr<MockWebRequest> mockWebRequest;
-    FilterEnginePtr filterEngine;
-
-    void SetUp()
-    {
-      JsEngineCreationParameters jsEngineParams;
-      jsEngineParams.appInfo.name = "test";
-      jsEngineParams.appInfo.version = "1.0.1";
-      jsEngineParams.timer = CreateDefaultTimer();
-      jsEngineParams.fileSystem.reset(new LazyFileSystem());
-      AdblockPlus::JsEnginePtr jsEngine = CreateJsEngine(std::move(jsEngineParams));
-      jsEngine->SetWebRequest(mockWebRequest = std::make_shared<MockWebRequest>());
-      filterEngine = AdblockPlus::FilterEngine::Create(jsEngine);
-    }
-  };
-
   class FilterEngineWithFreshFolder : public ::testing::Test
   {
   protected:
     FileSystemPtr fileSystem;
     std::weak_ptr<JsEngine> weakJsEngine;
 
     void SetUp() override
     {
       fileSystem.reset(new DefaultFileSystem());
       // Since there is neither in memory FS nor functionality to work with
@@ skipping 501 matching lines @@
     timesCalled++;
   });
   filterEngine->GetFilter("foo").AddToList();
   EXPECT_EQ(1, timesCalled);
 
   filterEngine->RemoveFilterChangeCallback();
   filterEngine->GetFilter("foo").RemoveFromList();
   EXPECT_EQ(1, timesCalled);
 }
 
-TEST_F(UpdaterTest, SetRemoveUpdateAvailableCallback)
-{
-  mockWebRequest->response.status = 0;
-  mockWebRequest->response.responseStatus = 200;
-  mockWebRequest->response.responseText = "\
-{\
-  \"test\": {\
-    \"version\": \"1.0.2\",\
-    \"url\": \"https://downloads.adblockplus.org/test-1.0.2.tar.gz?update\"\
-  }\
-}";
-
-  int timesCalled = 0;
-  filterEngine->SetUpdateAvailableCallback([&timesCalled](const std::string&)->void
-  {
-    ++timesCalled;
-  });
-  filterEngine->ForceUpdateCheck();
-  AdblockPlus::Sleep(100);
-  EXPECT_EQ(1, timesCalled);
-
-  filterEngine->RemoveUpdateAvailableCallback();
-  filterEngine->ForceUpdateCheck();
-  AdblockPlus::Sleep(100);
-  EXPECT_EQ(1, timesCalled);
-}
-
-TEST_F(UpdaterTest, ForceUpdateCheck)
-{
-  mockWebRequest->response.status = 0;
-  mockWebRequest->response.responseStatus = 200;
-  mockWebRequest->response.responseText = "\
-{\
-  \"test\": {\
-    \"version\": \"1.0.2\",\
-    \"url\": \"https://downloads.adblockplus.org/test-1.0.2.tar.gz?update\"\
-  }\
-}";
-
-  int called = 0; // 0 - not  called; 1 - once, no error; 2 - error
-  filterEngine->ForceUpdateCheck([&called](const std::string& error)->void
-  {
-    called = error.empty() ? 1 : 2;
-  });
-  AdblockPlus::Sleep(100);
-  EXPECT_EQ(1, called);
-}
-
 TEST_F(FilterEngineTest, DocumentWhitelisting)
 {
   filterEngine->GetFilter("@@||example.org^$document").AddToList();
   filterEngine->GetFilter("@@||example.com^$document,domain=example.de").AddToList();
 
   ASSERT_TRUE(filterEngine->IsDocumentWhitelisted(
       "http://example.org",
       std::vector<std::string>()));
 
   ASSERT_FALSE(filterEngine->IsDocumentWhitelisted(
@@ skipping 407 matching lines @@
     std::string testConnection = "test connection";
     filterEngine->SetAllowedConnectionType(&testConnection);
     auto subscription = EnsureExampleSubscriptionAndForceUpdate("subB");
     EXPECT_EQ("synchronize_ok", subscription.GetProperty("downloadStatus").AsString());
     EXPECT_EQ(1u, subscription.GetProperty("filters").AsList().size());
     ASSERT_EQ(1u, capturedConnectionTypes.size());
     EXPECT_TRUE(capturedConnectionTypes[0].first);
     EXPECT_EQ(testConnection, capturedConnectionTypes[0].second);
   }
 }