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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <AdblockPlus.h>
 #include <gtest/gtest.h>
 
 typedef AdblockPlus::FilterEngine::ContentType ContentType;
+typedef AdblockPlus::ReferrerMapping::FrameIndicator FrameIndicator;
 
-TEST(ReferrerMappingTest, BuildFrameStructureShouldIncludeUrlItselfWhenThereIsNoMappingEntryForIt)

[Wladimir Palant, 2014/11/25 15:46:37]

Now that you've earned the price for the longest class name ever, could you
please change it back? Note that the test name should generally describe the
setup and not the result. The result is defined in the asserts below.

+TEST(ReferrerMappingTest, EmptyReferrerChain)
 {
   AdblockPlus::ReferrerMapping referrerMapping;
   std::vector<std::string> referrerChain =
     referrerMapping.BuildFrameStructure("first");
   ASSERT_EQ(1, referrerChain.size());
-  ASSERT_EQ("first", referrerChain[0]);
+  EXPECT_EQ("first", referrerChain[0]);
 }
 
-TEST(ReferrerMappingTest, BuildFrameStructureShouldNotIncludeUrlItselfWhenItsTypeIsNotSubdocument)
+TEST(ReferrerMappingTest, EmptyUrl)
 {
   AdblockPlus::ReferrerMapping referrerMapping;
-  referrerMapping.Add("first", "", ContentType::CONTENT_TYPE_IMAGE);
+  std::vector<std::string> referrerChain =
+    referrerMapping.BuildFrameStructure("");
+  EXPECT_EQ(0, referrerChain.size());
+
+  referrerMapping.Add("", "referrer", FrameIndicator::FRAME_INDICATOR_FRAME);
+  referrerChain = referrerMapping.BuildFrameStructure("");
+  EXPECT_EQ(0, referrerChain.size());
+}
+
+TEST(ReferrerMappingTest, EmptyReferrer)
+{
+  AdblockPlus::ReferrerMapping referrerMapping;
+  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_FRAME);
   std::vector<std::string> referrerChain =
     referrerMapping.BuildFrameStructure("first");
   ASSERT_EQ(0, referrerChain.size());
 }
 
-TEST(ReferrerMappingTest, BuildFrameStructureShouldIncludeReferrerIfThereIsNoInfoAboutIt)
+TEST(ReferrerMappingTest, TwoElementReferrerChain)
 {
   AdblockPlus::ReferrerMapping referrerMapping;
-  referrerMapping.Add("second", "first", ContentType::CONTENT_TYPE_SUBDOCUMENT);
+  referrerMapping.Add("second", "first", FrameIndicator::FRAME_INDICATOR_FRAME);
   std::vector<std::string> referrerChain =
     referrerMapping.BuildFrameStructure("second");
   ASSERT_EQ(2, referrerChain.size());
   ASSERT_EQ("first", referrerChain[0]);
   ASSERT_EQ("second", referrerChain[1]);
 }
 
 TEST(ReferrerMappingTest, TenElementReferrerChain)
 {
   AdblockPlus::ReferrerMapping referrerMapping;
-  referrerMapping.Add("second", "first", ContentType::CONTENT_TYPE_SUBDOCUMENT);
-  referrerMapping.Add("third", "second", ContentType::CONTENT_TYPE_SUBDOCUMENT);
-  referrerMapping.Add("fourth", "third", ContentType::CONTENT_TYPE_SUBDOCUMENT);
-  referrerMapping.Add("fifth", "fourth", ContentType::CONTENT_TYPE_SUBDOCUMENT);
-  referrerMapping.Add("sixth", "fifth", ContentType::CONTENT_TYPE_SUBDOCUMENT);
-  referrerMapping.Add("seventh", "sixth", ContentType::CONTENT_TYPE_SUBDOCUMENT);
-  referrerMapping.Add("eighth", "seventh", ContentType::CONTENT_TYPE_SUBDOCUMENT);
-  referrerMapping.Add("ninth", "eighth", ContentType::CONTENT_TYPE_SUBDOCUMENT);
-  referrerMapping.Add("tenth", "ninth", ContentType::CONTENT_TYPE_SUBDOCUMENT);
+  referrerMapping.Add("second", "first", FrameIndicator::FRAME_INDICATOR_FRAME);
+  referrerMapping.Add("third", "second", FrameIndicator::FRAME_INDICATOR_FRAME);
+  referrerMapping.Add("fourth", "third", FrameIndicator::FRAME_INDICATOR_FRAME);
+  referrerMapping.Add("fifth", "fourth", FrameIndicator::FRAME_INDICATOR_FRAME);
+  referrerMapping.Add("sixth", "fifth", FrameIndicator::FRAME_INDICATOR_FRAME);
+  referrerMapping.Add("seventh", "sixth", FrameIndicator::FRAME_INDICATOR_FRAME);
+  referrerMapping.Add("eighth", "seventh", FrameIndicator::FRAME_INDICATOR_FRAME);
+  referrerMapping.Add("ninth", "eighth", FrameIndicator::FRAME_INDICATOR_FRAME);
+  referrerMapping.Add("tenth", "ninth", FrameIndicator::FRAME_INDICATOR_FRAME);
   std::vector<std::string> referrerChain =
     referrerMapping.BuildFrameStructure("tenth");
   ASSERT_EQ(10, referrerChain.size());
   ASSERT_EQ("first", referrerChain[0]);
   ASSERT_EQ("second", referrerChain[1]);
   ASSERT_EQ("third", referrerChain[2]);
   ASSERT_EQ("fourth", referrerChain[3]);
   ASSERT_EQ("fifth", referrerChain[4]);
   ASSERT_EQ("sixth", referrerChain[5]);
   ASSERT_EQ("seventh", referrerChain[6]);
   ASSERT_EQ("eighth", referrerChain[7]);
   ASSERT_EQ("ninth", referrerChain[8]);
   ASSERT_EQ("tenth", referrerChain[9]);
 }
 
 TEST(ReferrerMappingTest, CacheOnlyFiveUrls)
 {
   AdblockPlus::ReferrerMapping referrerMapping(5);
   std::string outOfCacheUrl = "first";
-  referrerMapping.Add("second", outOfCacheUrl, ContentType::CONTENT_TYPE_SUBDOCUMENT);
-  referrerMapping.Add("third", "second", ContentType::CONTENT_TYPE_SUBDOCUMENT);
-  referrerMapping.Add("fourth", "third", ContentType::CONTENT_TYPE_SUBDOCUMENT);
-  referrerMapping.Add("fifth", "fourth", ContentType::CONTENT_TYPE_SUBDOCUMENT);
-  referrerMapping.Add("sixth", "fifth", ContentType::CONTENT_TYPE_SUBDOCUMENT);
-  referrerMapping.Add("seventh", "sixth", ContentType::CONTENT_TYPE_SUBDOCUMENT);
+  referrerMapping.Add("second", outOfCacheUrl, FrameIndicator::FRAME_INDICATOR_FRAME);
+  referrerMapping.Add("third", "second", FrameIndicator::FRAME_INDICATOR_FRAME);
+  referrerMapping.Add("fourth", "third", FrameIndicator::FRAME_INDICATOR_FRAME);
+  referrerMapping.Add("fifth", "fourth", FrameIndicator::FRAME_INDICATOR_FRAME);
+  referrerMapping.Add("sixth", "fifth", FrameIndicator::FRAME_INDICATOR_FRAME);
+  referrerMapping.Add("seventh", "sixth", FrameIndicator::FRAME_INDICATOR_FRAME);
   std::vector<std::string> referrerChain =
     referrerMapping.BuildFrameStructure("seventh");
   ASSERT_EQ(6, referrerChain.size());
   ASSERT_EQ("second", referrerChain[0]);
   ASSERT_EQ("third", referrerChain[1]);
   ASSERT_EQ("fourth", referrerChain[2]);
   ASSERT_EQ("fifth", referrerChain[3]);
   ASSERT_EQ("sixth", referrerChain[4]);
   ASSERT_EQ("seventh", referrerChain[5]);
 }
 
-TEST(ReferrerMappingTest, BuildFrameStructureShouldIncludeOnlySubdocumentReferrers)
+TEST(ReferrerMappingTest, OnlyFrames)
 {
   AdblockPlus::ReferrerMapping referrerMapping;
-  referrerMapping.Add("iframe1", "root-page", ContentType::CONTENT_TYPE_SUBDOCUMENT);
-  referrerMapping.Add("other", "iframe1", ContentType::CONTENT_TYPE_OTHER);
-  referrerMapping.Add("script", "other", ContentType::CONTENT_TYPE_SCRIPT);
-  referrerMapping.Add("image", "script", ContentType::CONTENT_TYPE_IMAGE);
-  referrerMapping.Add("stylesheet", "image", ContentType::CONTENT_TYPE_STYLESHEET);
-  referrerMapping.Add("object", "stylesheet", ContentType::CONTENT_TYPE_OBJECT);
-  referrerMapping.Add("iframe2", "object", ContentType::CONTENT_TYPE_SUBDOCUMENT);
-  referrerMapping.Add("document", "iframe2", ContentType::CONTENT_TYPE_DOCUMENT);
-  referrerMapping.Add("xmlhttprequest", "document", ContentType::CONTENT_TYPE_XMLHTTPREQUEST);
-  referrerMapping.Add("object subrequest", "xmlhttprequest", ContentType::CONTENT_TYPE_OBJECT_SUBREQUEST);
-  referrerMapping.Add("font", "object subrequest", ContentType::CONTENT_TYPE_FONT);
-  referrerMapping.Add("media", "font", ContentType::CONTENT_TYPE_MEDIA);
+  referrerMapping.Add("iframe1", "root-page", FrameIndicator::FRAME_INDICATOR_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_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", ContentType::CONTENT_TYPE_SUBDOCUMENT);
+  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]);
 }