diff options
author | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-07-18 10:07:51 +0200 |
---|---|---|
committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-07-18 10:07:51 +0200 |
commit | f507a7a5557c7cca9570c684920e055c5251b08e (patch) | |
tree | 0fad83fc99053006b375608e2a2d04388776ad89 /test/urlfilter/adblocktest.cpp | |
parent | AdBlockTest: loading subscription (diff) | |
download | smolbote-f507a7a5557c7cca9570c684920e055c5251b08e.tar.xz |
AdBlockRule: move matching logic to FilterRule
Diffstat (limited to 'test/urlfilter/adblocktest.cpp')
-rw-r--r-- | test/urlfilter/adblocktest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/urlfilter/adblocktest.cpp b/test/urlfilter/adblocktest.cpp index 304a29e..416bc20 100644 --- a/test/urlfilter/adblocktest.cpp +++ b/test/urlfilter/adblocktest.cpp @@ -2,10 +2,10 @@ #include <QtTest/QtTest> #include "urlfilter/adblockrule.h" -inline bool check(const std::vector<AdBlockRule> rules, const QUrl &url) +inline bool check(const std::vector<FilterRule> rules, const QUrl &url) { - for(const AdBlockRule &rule : rules) { - if(rule.matchesUrl(url)) + for(const FilterRule &rule : rules) { + if(rule.matchesDomain(url.host()) && rule.matchesUrl(url)) return true; } return false; @@ -13,7 +13,7 @@ inline bool check(const std::vector<AdBlockRule> rules, const QUrl &url) void AdBlockTest::parseList() { - std::vector<AdBlockRule> rules; + std::vector<FilterRule> rules; QFile list("adblock.txt"); QCOMPARE(list.open(QIODevice::ReadOnly | QIODevice::Text), true); |