Request filter now properly takes hostlists

- hostslist directory is set in browser.filterPath

3 files changed, 0 insertions, 119 deletions

diff --git a/lib/adblock/test/filtertest.cpp b/lib/adblock/test/filtertest.cpp
deleted file mode 100644
index 76e607b..0000000
--- a/lib/adblock/test/filtertest.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * This file is part of smolbote. It's copyrighted by the contributors recorded
- * in the version control history of the file, available from its original
- * location: git://neueland.iserlohn-fortress.net/smolbote.git
- *
- * SPDX-License-Identifier: GPL-3.0
- */
-
-#include "filtertest.h"
-#include <QtTest/QtTest>
-#include "../filterrule.h"
-#include <QUrl>
-
-FilterTest::FilterTest(QObject *parent) : QObject(parent)
-{
-}
-
-void FilterTest::initTestCase()
-{
-    addressRule = new FilterRule("/banner/*/img^");
-    QVERIFY(addressRule->isValid() == true);
-    QVERIFY(addressRule->isException() == false);
-
-    domainRule = new FilterRule("||ads.example.com^");
-    QVERIFY(domainRule->isValid() == true);
-    QVERIFY(domainRule->isException() == false);
-
-    exactAddressRule = new FilterRule("|http://example.com/|");
-    QVERIFY(exactAddressRule->isValid() == true);
-    QVERIFY(exactAddressRule->isException() == false);
-}
-
-void FilterTest::testAddressBlock()
-{
-    // This rule blocks:
-    QVERIFY(addressRule->shouldBlock(QUrl("http://example.com/banner/foo/img")) == true);
-    QVERIFY(addressRule->shouldBlock(QUrl("http://example.com/banner/foo/bar/img?param")) == true);
-    QVERIFY(addressRule->shouldBlock(QUrl("http://example.com/banner//img/foo")) == true);
-
-    // This rule doesn't block:
-    QVERIFY(addressRule->shouldBlock(QUrl("http://example.com/banner/img")) == false);
-    QVERIFY(addressRule->shouldBlock(QUrl("http://example.com/banner/foo/imgraph")) == false);
-    QVERIFY(addressRule->shouldBlock(QUrl("http://example.com/banner/foo/img.gif")) == false);
-}
-
-void FilterTest::testDomainBlock()
-{
-    // This rule blocks:
-    QVERIFY(domainRule->shouldBlock(QUrl("http://ads.example.com/foo.gif")) == true);
-    QVERIFY(domainRule->shouldBlock(QUrl("http://server1.ads.example.com/foo.gif")) == true);
-    QVERIFY(domainRule->shouldBlock(QUrl("https://ads.example.com:8000/")) == true);
-
-    // This rule doesn't block:
-    QVERIFY(domainRule->shouldBlock(QUrl("http://ads.example.com.ua/foo.gif")) == false);
-    QVERIFY(domainRule->shouldBlock(QUrl("http://example.com/redirect/http://ads.example.com/")) == false);
-}
-
-void FilterTest::testExactAddressBlock()
-{
-    // This rule blocks:
-    QVERIFY(exactAddressRule->shouldBlock(QUrl("http://example.com/")) == true);
-
-    // This rule doesn't block:
-    QVERIFY(exactAddressRule->shouldBlock(QUrl("http://example.com/foo.gif")) == false);
-    QVERIFY(exactAddressRule->shouldBlock(QUrl("http://example.info/redirect/http://example.com/")) == false);
-}
-
-void FilterTest::cleanupTestCase()
-{
-    delete addressRule;
-}
diff --git a/lib/adblock/test/filtertest.h b/lib/adblock/test/filtertest.h
deleted file mode 100644
index f91c3dd..0000000
--- a/lib/adblock/test/filtertest.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of smolbote. It's copyrighted by the contributors recorded
- * in the version control history of the file, available from its original
- * location: git://neueland.iserlohn-fortress.net/smolbote.git
- *
- * SPDX-License-Identifier: GPL-3.0
- */
-
-#ifndef FILTERTEST_H
-#define FILTERTEST_H
-
-#include <QObject>
-
-class FilterRule;
-class FilterTest : public QObject
-{
-    Q_OBJECT
-public:
-    explicit FilterTest(QObject *parent = nullptr);
-
-signals:
-
-private slots:
-    void initTestCase();
-    void testAddressBlock();
-    void testDomainBlock();
-    void testExactAddressBlock();
-    void cleanupTestCase();
-
-private:
-    FilterRule *addressRule;
-    FilterRule *domainRule;
-    FilterRule *exactAddressRule;
-};
-
-#endif // FILTERTEST_H
diff --git a/lib/adblock/test/main.cpp b/lib/adblock/test/main.cpp
deleted file mode 100644
index b8c9dca..0000000
--- a/lib/adblock/test/main.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * This file is part of smolbote. It's copyrighted by the contributors recorded
- * in the version control history of the file, available from its original
- * location: git://neueland.iserlohn-fortress.net/smolbote.git
- *
- * SPDX-License-Identifier: GPL-3.0
- */
-
-#include <QtTest/QtTest>
-#include "filtertest.h"
-
-QTEST_APPLESS_MAIN(FilterTest)