Issue 768 - Switch from TR1 to C++11

test/FilterEngine.cpp

 /*
- * This file is part of Adblock Plus <http://adblockplus.org/>,
- * Copyright (C) 2006-2014 Eyeo GmbH
+ * This file is part of Adblock Plus <https://adblockplus.org/>,
+ * Copyright (C) 2006-2015 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
@@ skipping 27 matching lines @@
       BaseJsTest::SetUp();
       jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new FileSystem));
       jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(new LazyWebRequest));
       jsEngine->SetLogSystem(AdblockPlus::LogSystemPtr(new LogSystem));
       filterEngine = FilterEnginePtr(new AdblockPlus::FilterEngine(jsEngine));
     }
   };
 
   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;
+      }
+    };
+
+    MockWebRequest* mockWebRequest;
+    FilterEnginePtr filterEngine;
+
+    void SetUp()
+    {
+      AdblockPlus::AppInfo appInfo;
+      appInfo.name = "test";
+      appInfo.version = "1.0.1";
+      AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::New(appInfo);
+      jsEngine->SetFileSystem(AdblockPlus::FileSystemPtr(new LazyFileSystem));
+      mockWebRequest = new MockWebRequest;
+      jsEngine->SetWebRequest(AdblockPlus::WebRequestPtr(mockWebRequest));
+      filterEngine = FilterEnginePtr(new AdblockPlus::FilterEngine(jsEngine));
+    }
+  };
+
+  struct MockUpdateAvailableCallback
+  {
+    MockUpdateAvailableCallback(int& timesCalled) : timesCalled(timesCalled) {}
+
+    void operator()(const std::string&)
+    {
+      timesCalled++;
+    }
+
+  private:
+    // We currently cannot store timesCalled in the functor, see:
+    // https://issues.adblockplus.org/ticket/1378.
+    int& timesCalled;
+  };
+
+  // Workaround for https://issues.adblockplus.org/ticket/1397.
+  void NoOpUpdaterCallback(const std::string&) {}
 }
 
 TEST_F(FilterEngineTest, FilterCreation)
 {
   AdblockPlus::FilterPtr filter1 = filterEngine->GetFilter("foo");
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, filter1->GetType());
   AdblockPlus::FilterPtr filter2 = filterEngine->GetFilter("@@foo");
   ASSERT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, filter2->GetType());
   AdblockPlus::FilterPtr filter3 = filterEngine->GetFilter("example.com##foo");
   ASSERT_EQ(AdblockPlus::Filter::TYPE_ELEMHIDE, filter3->GetType());
@@ skipping 88 matching lines @@
 
 TEST_F(FilterEngineTest, Matches)
 {
   filterEngine->GetFilter("adbanner.gif")->AddToList();
   filterEngine->GetFilter("@@notbanner.gif")->AddToList();
   filterEngine->GetFilter("tpbanner.gif$third-party")->AddToList();
   filterEngine->GetFilter("fpbanner.gif$~third-party")->AddToList();
   filterEngine->GetFilter("combanner.gif$domain=example.com")->AddToList();
   filterEngine->GetFilter("orgbanner.gif$domain=~example.com")->AddToList();
 
-  AdblockPlus::FilterPtr match1 = filterEngine->Matches("http://example.org/foobar.gif", "IMAGE", "");
+  AdblockPlus::FilterPtr match1 = filterEngine->Matches("http://example.org/foobar.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE, "");
   ASSERT_FALSE(match1);
 
-  AdblockPlus::FilterPtr match2 = filterEngine->Matches("http://example.org/adbanner.gif", "IMAGE", "");
+  AdblockPlus::FilterPtr match2 = filterEngine->Matches("http://example.org/adbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE, "");
   ASSERT_TRUE(match2);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match2->GetType());
 
-  AdblockPlus::FilterPtr match3 = filterEngine->Matches("http://example.org/notbanner.gif", "IMAGE", "");
+  AdblockPlus::FilterPtr match3 = filterEngine->Matches("http://example.org/notbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE, "");
   ASSERT_TRUE(match3);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, match3->GetType());
 
-  AdblockPlus::FilterPtr match4 = filterEngine->Matches("http://example.org/notbanner.gif", "IMAGE", "");
+  AdblockPlus::FilterPtr match4 = filterEngine->Matches("http://example.org/notbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE, "");
   ASSERT_TRUE(match4);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, match4->GetType());
 
-  AdblockPlus::FilterPtr match5 = filterEngine->Matches("http://example.org/tpbanner.gif", "IMAGE", "http://example.org/");
+  AdblockPlus::FilterPtr match5 = filterEngine->Matches("http://example.org/tpbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE, "http://example.org/");
   ASSERT_FALSE(match5);
 
-  AdblockPlus::FilterPtr match6 = filterEngine->Matches("http://example.org/fpbanner.gif", "IMAGE", "http://example.org/");
+  AdblockPlus::FilterPtr match6 = filterEngine->Matches("http://example.org/fpbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE, "http://example.org/");
   ASSERT_TRUE(match6);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match6->GetType());
 
-  AdblockPlus::FilterPtr match7 = filterEngine->Matches("http://example.org/tpbanner.gif", "IMAGE", "http://example.com/");
+  AdblockPlus::FilterPtr match7 = filterEngine->Matches("http://example.org/tpbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE, "http://example.com/");
   ASSERT_TRUE(match7);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match7->GetType());
 
-  AdblockPlus::FilterPtr match8 = filterEngine->Matches("http://example.org/fpbanner.gif", "IMAGE", "http://example.com/");
+  AdblockPlus::FilterPtr match8 = filterEngine->Matches("http://example.org/fpbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE, "http://example.com/");
   ASSERT_FALSE(match8);
 
-  AdblockPlus::FilterPtr match9 = filterEngine->Matches("http://example.org/combanner.gif", "IMAGE", "http://example.com/");
+  AdblockPlus::FilterPtr match9 = filterEngine->Matches("http://example.org/combanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE, "http://example.com/");
   ASSERT_TRUE(match9);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match9->GetType());
 
-  AdblockPlus::FilterPtr match10 = filterEngine->Matches("http://example.org/combanner.gif", "IMAGE", "http://example.org/");
+  AdblockPlus::FilterPtr match10 = filterEngine->Matches("http://example.org/combanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE, "http://example.org/");
   ASSERT_FALSE(match10);
 
-  AdblockPlus::FilterPtr match11 = filterEngine->Matches("http://example.org/orgbanner.gif", "IMAGE", "http://example.com/");
+  AdblockPlus::FilterPtr match11 = filterEngine->Matches("http://example.org/orgbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE, "http://example.com/");
   ASSERT_FALSE(match11);
 
-  AdblockPlus::FilterPtr match12 = filterEngine->Matches("http://example.org/orgbanner.gif", "IMAGE", "http://example.org/");
+  AdblockPlus::FilterPtr match12 = filterEngine->Matches("http://example.org/orgbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE, "http://example.org/");
   ASSERT_TRUE(match12);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match12->GetType());
 }
 
 TEST_F(FilterEngineTest, MatchesOnWhitelistedDomain)
 {
   filterEngine->GetFilter("adbanner.gif")->AddToList();
   filterEngine->GetFilter("@@||example.org^$document")->AddToList();
 
   AdblockPlus::FilterPtr match1 =
-    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+    filterEngine->Matches("http://ads.com/adbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE,
                           "http://example.com/");
   ASSERT_TRUE(match1);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match1->GetType());
 
   AdblockPlus::FilterPtr match2 =
-    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+    filterEngine->Matches("http://ads.com/adbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE,
                           "http://example.org/");
   ASSERT_TRUE(match2);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, match2->GetType());
 }
 
 TEST_F(FilterEngineTest, MatchesNestedFrameRequest)
 {
   filterEngine->GetFilter("adbanner.gif")->AddToList();
   filterEngine->GetFilter("@@adbanner.gif$domain=example.org")->AddToList();
 
   std::vector<std::string> documentUrls1;
   documentUrls1.push_back("http://ads.com/frame/");
   documentUrls1.push_back("http://example.com/");
   AdblockPlus::FilterPtr match1 =
-    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+    filterEngine->Matches("http://ads.com/adbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE,
                           documentUrls1);
   ASSERT_TRUE(match1);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match1->GetType());
 
   std::vector<std::string> documentUrls2;
   documentUrls2.push_back("http://ads.com/frame/");
   documentUrls2.push_back("http://example.org/");
   AdblockPlus::FilterPtr match2 =
-    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+    filterEngine->Matches("http://ads.com/adbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE,
                           documentUrls2);
   ASSERT_TRUE(match2);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, match2->GetType());
 
   std::vector<std::string> documentUrls3;
   documentUrls3.push_back("http://example.org/");
   documentUrls3.push_back("http://ads.com/frame/");
   AdblockPlus::FilterPtr match3 =
-    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+    filterEngine->Matches("http://ads.com/adbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE,
                           documentUrls3);
   ASSERT_TRUE(match3);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match3->GetType());
 }
 
 TEST_F(FilterEngineTest, MatchesNestedFrameOnWhitelistedDomain)
 {
   filterEngine->GetFilter("adbanner.gif")->AddToList();
   filterEngine->GetFilter("@@||example.org^$document,domain=ads.com")->AddToList();
 
   std::vector<std::string> documentUrls1;
   documentUrls1.push_back("http://ads.com/frame/");
   documentUrls1.push_back("http://example.com/");
   AdblockPlus::FilterPtr match1 =
-    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+    filterEngine->Matches("http://ads.com/adbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE,
                           documentUrls1);
   ASSERT_TRUE(match1);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match1->GetType());
 
   std::vector<std::string> documentUrls2;
   documentUrls2.push_back("http://ads.com/frame/");
   documentUrls2.push_back("http://example.org/");
   AdblockPlus::FilterPtr match2 =
-    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+    filterEngine->Matches("http://ads.com/adbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE,
                           documentUrls2);
   ASSERT_TRUE(match2);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, match2->GetType());
 
   std::vector<std::string> documentUrls3;
   documentUrls3.push_back("http://example.org/");
   AdblockPlus::FilterPtr match3 =
-    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+    filterEngine->Matches("http://ads.com/adbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE,
                           documentUrls3);
   ASSERT_TRUE(match3);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match3->GetType());
 
   std::vector<std::string> documentUrls4;
   documentUrls4.push_back("http://example.org/");
   documentUrls4.push_back("http://ads.com/frame/");
   AdblockPlus::FilterPtr match4 =
-    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+    filterEngine->Matches("http://ads.com/adbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE,
                           documentUrls4);
   ASSERT_TRUE(match4);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match4->GetType());
 
   std::vector<std::string> documentUrls5;
   documentUrls5.push_back("http://ads.com/frame/");
   documentUrls5.push_back("http://example.org/");
   documentUrls5.push_back("http://example.com/");
   AdblockPlus::FilterPtr match5 =
-    filterEngine->Matches("http://ads.com/adbanner.gif", "IMAGE",
+    filterEngine->Matches("http://ads.com/adbanner.gif", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE,
                           documentUrls5);
   ASSERT_TRUE(match5);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, match5->GetType());
 }
 
 TEST_F(FilterEngineTest, FirstRunFlag)
 {
   ASSERT_FALSE(filterEngine->IsFirstRun());
 }
 
 TEST_F(FilterEngineTestNoData, FirstRunFlag)
 {
   ASSERT_TRUE(filterEngine->IsFirstRun());
 }
+
+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;
+  MockUpdateAvailableCallback mockUpdateAvailableCallback(timesCalled);
+
+  filterEngine->SetUpdateAvailableCallback(mockUpdateAvailableCallback);
+  filterEngine->ForceUpdateCheck(&NoOpUpdaterCallback);
+  AdblockPlus::Sleep(100);
+  ASSERT_EQ(1, timesCalled);
+
+  filterEngine->RemoveUpdateAvailableCallback();
+  filterEngine->ForceUpdateCheck(&NoOpUpdaterCallback);
+  AdblockPlus::Sleep(100);
+  ASSERT_EQ(1, timesCalled);
+}