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

test/ReferrerMapping.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 37 matching lines @@
   referrerMapping.Add("first", "", FrameIndicator::FRAME_INDICATOR_FRAME);
   std::vector<std::string> referrerChain =
     referrerMapping.BuildFrameStructure("first");
   ASSERT_EQ(1, referrerChain.size());
   EXPECT_EQ("first", referrerChain[0]);
 }
 
 TEST(ReferrerMappingTest, NotAFrame)
 {
   AdblockPlus::ReferrerMapping referrerMapping;
-  referrerMapping.Add("first", "", FrameIndicator::FRAME_INDICATOR_NOT_A_FRAME);
+  referrerMapping.Add("first", "", FrameIndicator::FRAME_INDICATOR_NOT_FRAME);
   std::vector<std::string> referrerChain =
     referrerMapping.BuildFrameStructure("first");
   ASSERT_EQ(0, referrerChain.size());
 }
 
 TEST(ReferrerMappingTest, TwoElementReferrerChain)
 {
   AdblockPlus::ReferrerMapping referrerMapping;
   referrerMapping.Add("second", "first", FrameIndicator::FRAME_INDICATOR_FRAME);
   std::vector<std::string> referrerChain =
@@ skipping 48 matching lines @@
   ASSERT_EQ("fourth", referrerChain[2]);
   ASSERT_EQ("fifth", referrerChain[3]);
   ASSERT_EQ("sixth", referrerChain[4]);
   ASSERT_EQ("seventh", referrerChain[5]);
 }
 
 TEST(ReferrerMappingTest, OnlyFrames)
 {
   AdblockPlus::ReferrerMapping referrerMapping;
   referrerMapping.Add("iframe1", "root-page", FrameIndicator::FRAME_INDICATOR_FRAME);
-  referrerMapping.Add("not a frame", "iframe1", FrameIndicator::FRAME_INDICATOR_NOT_A_FRAME);
+  referrerMapping.Add("not a frame", "iframe1", FrameIndicator::FRAME_INDICATOR_NOT_FRAME);
   referrerMapping.Add("iframe2", "not a frame", FrameIndicator::FRAME_INDICATOR_FRAME);
-  referrerMapping.Add("media", "iframe2", FrameIndicator::FRAME_INDICATOR_NOT_A_FRAME);
+  referrerMapping.Add("media", "iframe2", FrameIndicator::FRAME_INDICATOR_NOT_FRAME);
 
   std::vector<std::string> referrerChain = referrerMapping.BuildFrameStructure("media");
   ASSERT_EQ(3, referrerChain.size());
   EXPECT_EQ("root-page", referrerChain[0]);
   EXPECT_EQ("iframe1", referrerChain[1]);
   EXPECT_EQ("iframe2", referrerChain[2]);
 
   referrerMapping.Add("iframe3", "media", FrameIndicator::FRAME_INDICATOR_FRAME);
   referrerChain = referrerMapping.BuildFrameStructure("iframe3");
   ASSERT_EQ(4, referrerChain.size());
   EXPECT_EQ("root-page", referrerChain[0]);
   EXPECT_EQ("iframe1", referrerChain[1]);
   EXPECT_EQ("iframe2", referrerChain[2]);
   EXPECT_EQ("iframe3", referrerChain[3]);
 }