make the tests works with the existing adblock code

autotests/adblockfilter/tst_adblockfilter.cpp

@@ -18,7 +18,11 @@
  */
 
 #include <QtTest/QtTest>
-#include <adblockfilter.h>
+
+#include <qbuffer.h>
+
+#include <urlaccessrule.h>
+#include <networkaccesspolicy.h>
 
 class tst_AdBlockFilter : public QObject
 {
@@ -36,13 +40,31 @@ private slots:
 };
 
 // Subclass that exposes the protected functions.
-class SubAdBlockFilter : public AdBlockFilter
+class SubAdBlockFilter
 {
 public:
-    SubAdBlockFilter(const QString &filter)
-       : AdBlockFilter(filter) {}
+    SubAdBlockFilter(const QString &filter);
+    bool match(const QUrl &url);
+    UrlAccessRule *rule;
 };
 
+SubAdBlockFilter::SubAdBlockFilter(const QString &filter)
+    : rule(0)
+{
+    QList<UrlAccessRule*> rules;
+    QString dummy = "dummy";
+    QBuffer buffer(&filter.toUtf8());
+    bool ok = NetworkAccessPolicy::importAdBlockRules(buffer,  rules, dummy);
+    rule = rules.value(0);
+}
+
+bool SubAdBlockFilter::match(const QUrl &url)
+{
+    if (!rule)
+        return false;
+    return rule->match(url.toString());
+}
+
 // This will be called before the first test function is executed.
 // It is only called once.
 void tst_AdBlockFilter::initTestCase()

src/adblock/adblock.pri

@@ -3,7 +3,6 @@ DEPENDPATH += $$PWD
 
 HEADERS += \
     adblocksubscription.h \
-    adblockfilter.h \
     blockednetworkreply.h \
     networkaccesspolicy.h \
     urlaccessrule.h \
@@ -16,7 +15,6 @@ HEADERS += \
 
 SOURCES += \
     adblocksubscription.cpp \
-#    adblockfilter.cpp \
     blockednetworkreply.cpp \
     networkaccesspolicy.cpp \
     urlaccessrule.cpp \

src/adblock/networkaccesspolicy.cpp

@@ -148,7 +148,7 @@ bool NetworkAccessPolicy::importAdBlockRules(QTextStream &txt,  QList<UrlAccessR
     QString line;
     rules.clear();
     do {
-        line = txt.readLine(1024);
+        line = txt.readLine();
         if (!line.startsWith(QLatin1String("!")) && !line.contains(QLatin1Char('#'))) {
             bool exception = false;