Fixed: domain options aren`t treated correctly by the matcher

test/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 137 matching lines @@
   ASSERT_FALSE(subscription->IsUpdating());
   subscription->UpdateFilters();
 }
 
 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", "");
   ASSERT_FALSE(match1);
 
   AdblockPlus::FilterPtr match2 = filterEngine->Matches("http://example.org/adbanner.gif", "IMAGE", "");
   ASSERT_TRUE(match2);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match2->GetType());
 
   AdblockPlus::FilterPtr match3 = filterEngine->Matches("http://example.org/notbanner.gif", "IMAGE", "");
   ASSERT_TRUE(match3);
   ASSERT_EQ(AdblockPlus::Filter::TYPE_EXCEPTION, match3->GetType());
 
   AdblockPlus::FilterPtr match4 = filterEngine->Matches("http://example.org/notbanner.gif", "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/");
   ASSERT_FALSE(match5);
 
   AdblockPlus::FilterPtr match6 = filterEngine->Matches("http://example.org/fpbanner.gif", "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/");
   ASSERT_TRUE(match7);
-  ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match6->GetType());
+  ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match7->GetType());
 
   AdblockPlus::FilterPtr match8 = filterEngine->Matches("http://example.org/fpbanner.gif", "IMAGE", "http://example.com/");
   ASSERT_FALSE(match8);
+
+  AdblockPlus::FilterPtr match9 = filterEngine->Matches("http://example.org/combanner.gif", "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/");
+  ASSERT_FALSE(match10);
+
+  AdblockPlus::FilterPtr match11 = filterEngine->Matches("http://example.org/orgbanner.gif", "IMAGE", "http://example.com/");
+  ASSERT_FALSE(match11);
+
+  AdblockPlus::FilterPtr match12 = filterEngine->Matches("http://example.org/orgbanner.gif", "IMAGE", "http://example.org/");
+  ASSERT_TRUE(match12);
+  ASSERT_EQ(AdblockPlus::Filter::TYPE_BLOCKING, match12->GetType());
 }
 
 TEST_F(FilterEngineTest, FirstRunFlag)
 {
   ASSERT_FALSE(filterEngine->IsFirstRun());
 }
 
 TEST_F(FilterEngineTestNoData, FirstRunFlag)
 {
   ASSERT_FALSE(filterEngine->IsFirstRun());
 }