diff --git a/tests/autotests/autotests.pro b/tests/autotests/autotests.pro index 571d6f78a..46995d89f 100644 --- a/tests/autotests/autotests.pro +++ b/tests/autotests/autotests.pro @@ -45,7 +45,6 @@ INCLUDEPATH += $$PWD/../../src/lib/3rdparty \ $$PWD/../../src/lib/plugins \ $$PWD/../../src/lib/popupwindow \ $$PWD/../../src/lib/preferences \ - $$PWD/../../src/lib/rss \ $$PWD/../../src/lib/session \ $$PWD/../../src/lib/sidebar \ $$PWD/../../src/lib/tabwidget \ @@ -55,9 +54,7 @@ INCLUDEPATH += $$PWD/../../src/lib/3rdparty \ HEADERS += \ qztoolstest.h \ - formcompletertest.h \ cookiestest.h \ - downloadstest.h \ adblocktest.h \ updatertest.h \ pactest.h \ @@ -67,9 +64,7 @@ HEADERS += \ SOURCES += \ qztoolstest.cpp \ main.cpp \ - formcompletertest.cpp \ cookiestest.cpp \ - downloadstest.cpp \ adblocktest.cpp \ updatertest.cpp \ pactest.cpp \ diff --git a/tests/autotests/downloadstest.cpp b/tests/autotests/downloadstest.cpp deleted file mode 100644 index b8782163e..000000000 --- a/tests/autotests/downloadstest.cpp +++ /dev/null @@ -1,70 +0,0 @@ -/* ============================================================ -* QupZilla - WebKit based browser -* Copyright (C) 2013-2014 David Rosca -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -* ============================================================ */ -#include "downloadstest.h" -#include "downloadfilehelper.h" - -#include -#include - -void DownloadsTest::parseContentDispositionTest_data() -{ - QTest::addColumn("header"); - QTest::addColumn("result"); - - QTest::newRow("filename") << QByteArray("attachment; filename=\"foo.html\"") << "foo.html"; - QTest::newRow("filename25") << QByteArray("attachment; filename=\"0000000000111111111122222\"") << "0000000000111111111122222"; - QTest::newRow("filename35") << QByteArray("attachment; filename=\"00000000001111111111222222222233333\"") << "00000000001111111111222222222233333"; - QTest::newRow("semicolon") << QByteArray("attachment; filename=\"Here's a semicolon;.html\"") << "Here's a semicolon;.html"; - QTest::newRow("semicolon2") << QByteArray("attachment; filename=\"Here's a semi\\\"colon;.html\"") << "Here's a semi\\\"colon;.html"; - QTest::newRow("semicolon3") << QByteArray("attachment; filename=\"Here's a\\\" semi\\\"colon;.html\"") << "Here's a\\\" semi\\\"colon;.html"; - QTest::newRow("invalidParameter") << QByteArray("attachment; foo=\"bar\"; filename=\"foo.html\"") << "foo.html"; - QTest::newRow("filenameUpper") << QByteArray("attachment; FILENAME=\"foo.html\"") << "foo.html"; - QTest::newRow("noQuotes") << QByteArray("attachment; filename=foo.html") << "foo.html"; - QTest::newRow("singleQuotesFileame") << QByteArray("attachment; filename='foo.bar'") << "'foo.bar'"; - QTest::newRow("filenamePlain") << QByteArray("attachment; filename=\"foo-ä.html\"") << QString::fromUtf8("foo-ä.html"); - QTest::newRow("percent") << QByteArray("attachment; filename=\"foo-%41.html\"") << "foo-%41.html"; - QTest::newRow("percent2") << QByteArray("attachment; filename=\"foo-%c3%a4-%e2%82%ac.html\"") << "foo-%c3%a4-%e2%82%ac.html"; - QTest::newRow("withSpace") << QByteArray("attachment; filename =\"foo.html\"") << "foo.html"; - QTest::newRow("filenameInside") << QByteArray("attachment; example=\"filename=example.txt\"") << ""; - QTest::newRow("xfilename") << QByteArray("attachment; xfilename=\"example.txt\"") << ""; - QTest::newRow("withSpaceBefore") << QByteArray("attachment; filename *=UTF-8''foo-%c3%a4.html") << ""; - QTest::newRow("withSpaceAfter") << QByteArray("attachment; filename*= UTF-8''foo-%c3%a4.html") << QString::fromUtf8("foo-ä.html"); - QTest::newRow("withSpaceInside") << QByteArray("attachment; filename* =UTF-8''foo-%c3%a4.html") << QString::fromUtf8("foo-ä.html"); - QTest::newRow("withDoubleQuotes") << QByteArray("attachment; filename*=\"UTF-8''foo-%c3%a4.html\"") << ""; - QTest::newRow("multiTypes") << QByteArray("attachment; filename*=UTF-8''foo-%c3%a4.html; filename=\"foo-ae.html\"") << QString::fromUtf8("foo-ä.html"); - - // Ignored, but passing in browser - // QTest::newRow("filenameUtf8") << QByteArray("attachment; filename=\"foo-ä.html\"") << QString::fromUtf8("foo-ä.html"); - // QTest::newRow("*utf8") << QByteArray("attachment; filename*=UTF-8''foo-%c3%a4-%e2%82%ac.html") << QString::fromUtf8("foo-ä-€.html"); - // QTest::newRow("rfc2231") << QByteArray("attachment; filename*=UTF-8''foo-a%cc%88.html") << QString::fromUtf8("foo-ä.html"); - - // ISO-8859-1 decoding not supported - // QTest::newRow("*iso") << QByteArray("attachment; filename*=iso-8859-1''foo-%E4.html") << QString::fromUtf8("foo-ä.html"); - // QTest::newRow("multiTypes2") << QByteArray("attachment; filename*=ISO-8859-1''currency-sign%3d%a4; filename=\"foo-ae.html\"") << QString::fromUtf8("currency-sign=¤"); - - // Not yet supported - // QTest::newRow("multiType2") << QByteArray("attachment; filename*0*=ISO-8859-15''euro-sign%3d%a4; filename*=ISO-8859-1''currency-sign%3d%a4") << QString::fromUtf8("euro-sign=€"); -} - -void DownloadsTest::parseContentDispositionTest() -{ - QFETCH(QByteArray, header); - QFETCH(QString, result); - - QCOMPARE(DownloadFileHelper::parseContentDisposition(header), result); -} diff --git a/tests/autotests/downloadstest.h b/tests/autotests/downloadstest.h deleted file mode 100644 index c739fb62b..000000000 --- a/tests/autotests/downloadstest.h +++ /dev/null @@ -1,33 +0,0 @@ -/* ============================================================ -* QupZilla - WebKit based browser -* Copyright (C) 2013-2014 David Rosca -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -* ============================================================ */ -#ifndef DOWNLOADSTEST_H -#define DOWNLOADSTEST_H - -#include - -class DownloadsTest : public QObject -{ - Q_OBJECT - -private slots: - void parseContentDispositionTest_data(); - void parseContentDispositionTest(); - -}; - -#endif // DOWNLOADSTEST_H diff --git a/tests/autotests/main.cpp b/tests/autotests/main.cpp index 1e67902a7..acb5e658c 100644 --- a/tests/autotests/main.cpp +++ b/tests/autotests/main.cpp @@ -16,9 +16,7 @@ * along with this program. If not, see . * ============================================================ */ #include "qztoolstest.h" -#include "formcompletertest.h" #include "cookiestest.h" -#include "downloadstest.h" #include "adblocktest.h" #include "updatertest.h" #include "pactest.h" @@ -29,7 +27,6 @@ #define RUN_TEST(X) \ { \ - qDebug() << ""; \ X t; \ int r = QTest::qExec(&t, argc, argv); \ if (r != 0) return 1; \ @@ -41,9 +38,7 @@ int main(int argc, char *argv[]) QTEST_DISABLE_KEYPAD_NAVIGATION; RUN_TEST(QzToolsTest) - RUN_TEST(FormCompleterTest) RUN_TEST(CookiesTest) - RUN_TEST(DownloadsTest) RUN_TEST(AdBlockTest) RUN_TEST(UpdaterTest) RUN_TEST(PacTest)