Issue 3337 - Update adblockplus reference in libadblockplus to revision hg:813682c7161e

test/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 262 matching lines @@
   ASSERT_TRUE(match1);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match1->GetType());
 
   AdblockPlus::FilterPtr match2 =
     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, MatchesWithContentTypeMask)

[Eric, 2016/02/09 15:43:03]

There ten (or so) unit tests here combined into one. Better to split them out
individually. Easier to read results if one fails.

[sergei, 2016/02/09 17:15:47]

I thought about it, it definitely makes sense to create a set of individual
tests, however, having looked around, I'm not sure that it would be easier to
read them because of the following reasons.
It's convenient to have the same initialization for all of those tests because
we can see the behavior picture through comparison of the tests in that group.
The best way to do it is to use test fixture, however in that case the asserts
will be split by several lines with code and one has to pay attention to the
test case name (according to gtest framework terminology), the latter actually
reduces the readability.
Other tests around actually prove that it's not a bad way to organize such
tests.

So, I would like to keep the current version until it really becomes
inconvenient. In that case I will be happy to sort them out individually and may
be even move some of the tests from that file into a separate files.

+{
+  filterEngine->GetFilter("adbanner.gif.js$script,image")->AddToList();
+  filterEngine->GetFilter("@@notbanner.gif")->AddToList();
+  filterEngine->GetFilter("blockme")->AddToList();
+  filterEngine->GetFilter("@@||example.doc^$document")->AddToList();
+
+  EXPECT_FALSE(filterEngine->Matches("http://example.org/foobar.gif",
+    AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE, ""))
+    << "another url should not match";
+
+  EXPECT_FALSE(filterEngine->Matches("http://example.org/adbanner.gif.js",
+    /*mask*/ 0, "")) << "zero mask should not match (filter with some options)";
+
+  EXPECT_FALSE(filterEngine->Matches("http://example.xxx/blockme",
+    /*mask*/ 0, "")) << "zero mask should not match (filter without any option)";
+
+  EXPECT_FALSE(filterEngine->Matches("http://example.org/adbanner.gif.js",
+    AdblockPlus::FilterEngine::CONTENT_TYPE_OBJECT, ""))
+    << "one arbitrary flag in mask should not match";
+
+  EXPECT_TRUE(filterEngine->Matches("http://example.org/adbanner.gif.js",
+    AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE |
+    AdblockPlus::FilterEngine::CONTENT_TYPE_OBJECT, ""))
+    << "one of flags in mask should match";
+
+  EXPECT_TRUE(filterEngine->Matches("http://example.org/adbanner.gif.js",
+    AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE |
+    AdblockPlus::FilterEngine::CONTENT_TYPE_SCRIPT, ""))
+    << "both flags in mask should match";
+
+  EXPECT_TRUE(filterEngine->Matches("http://example.org/adbanner.gif.js",
+    AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE |
+    AdblockPlus::FilterEngine::CONTENT_TYPE_SCRIPT |
+    AdblockPlus::FilterEngine::CONTENT_TYPE_OBJECT, ""))
+    << "both flags with another flag in mask should match";
+
+  EXPECT_TRUE(filterEngine->Matches("http://example.org/adbanner.gif.js",
+    AdblockPlus::FilterEngine::CONTENT_TYPE_SCRIPT |
+    AdblockPlus::FilterEngine::CONTENT_TYPE_OBJECT, ""))
+    << "one of flags in mask should match";
+
+  {
+    AdblockPlus::FilterPtr filter;
+    ASSERT_TRUE(filter = filterEngine->Matches("http://child.any/blockme",
+      AdblockPlus::FilterEngine::CONTENT_TYPE_SCRIPT |
+      AdblockPlus::FilterEngine::CONTENT_TYPE_OBJECT, "http://example.doc"))
+      << "non-zero mask should match on whitelisted document";
+
+    EXPECT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, filter->GetType());
+  }
+
+  {
+    AdblockPlus::FilterPtr filter;
+    ASSERT_TRUE(filter = filterEngine->Matches("http://example.doc/blockme",
+      /*mask*/0, "http://example.doc"))
+      << "zero mask should match when document is whitelisted";
+
+    EXPECT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, filter->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", AdblockPlus::FilterEngine::CONTENT_TYPE_IMAGE,
@@ skipping 171 matching lines @@
   documentUrls1.push_back("http://example.de");
 
   ASSERT_TRUE(filterEngine->IsElemhideWhitelisted(
       "http://example.com",
       documentUrls1));
 
   ASSERT_FALSE(filterEngine->IsElemhideWhitelisted(
       "http://example.co.uk",
       documentUrls1));
 }