Issue 1564-Fix FilterEngine::Matches for allowing request which is whitelisted in the ascendant node

test/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 279 matching lines @@
   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", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE,
                           documentUrls3);
   ASSERT_TRUE(match3);
-  ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match3->GetType());
+  ASSERT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, 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/");
@@ skipping 68 matching lines @@
   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);
 }