Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-13 10:32:11 +01:00
Code Releases Activity

Autotests: Convert to proper tests runnable with make test

Browse Source
This commit is contained in:
David Rosca 2018-01-24 16:38:25 +01:00
parent d2e2eef5a5
commit 98e8a9355d
14 changed files with 205 additions and 521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
autotests/CMakeLists.txt
View File

@ -1,11 +1,26 @@
set( autotests_SRCS
qztoolstest.cpp
main.cpp
cookiestest.cpp
adblocktest.cpp
updatertest.cpp
passwordbackendtest.cpp
)
include(ECMMarkAsTest)
add_executable(autotests ${autotests_SRCS})
target_link_libraries(autotests FalkonPrivate Qt5::Test)
set(falkon_autotests_SRCS )
macro(falkon_tests)
foreach(_testname ${ARGN})
add_executable(${_testname} ${_testname}.cpp ${falkon_autotests_SRCS})
target_link_libraries(${_testname} Qt5::Test FalkonPrivate)
add_test(NAME falkon-${_testname} COMMAND ${_testname})
ecm_mark_as_test(${_testname})
set_tests_properties(falkon-${_testname} PROPERTIES RUN_SERIAL TRUE)
endforeach(_testname)
endmacro()
falkon_tests(
qztoolstest
#cookiestest
adblocktest
updatertest
)
set(falkon_autotests_SRCS passwordbackendtest.cpp)
falkon_tests(
databasepasswordbackendtest
databaseencryptedpasswordbackendtest
)

2
autotests/adblocktest.cpp
View File

@ -107,3 +107,5 @@ void AdBlockTest::parseRegExpFilterTest()
QCOMPARE(rule_test.parseRegExpFilter(parsedFilter), result);
}
QTEST_MAIN(AdBlockTest)

2
autotests/cookiestest.cpp
View File

@ -98,3 +98,5 @@ void CookiesTest::listMatchesDomainTest()
QCOMPARE(m_cookieJar->listMatchesDomain(list, cookieDomain), result);
}
QTEST_MAIN(CookiesTest)

57
autotests/databaseencryptedpasswordbackendtest.cpp Normal file
View File

@ -0,0 +1,57 @@
/* ============================================================
* Falkon - Qt web browser
* Copyright (C) 2013-2018 David Rosca <nowrep@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
* ============================================================ */
#include "databaseencryptedpasswordbackendtest.h"
#include "aesinterface.h"
#include <QtTest/QtTest>
#include <QSqlDatabase>
#include <QSqlQuery>
void DatabaseEncryptedPasswordBackendTest::reloadBackend()
{
delete m_backend;
DatabaseEncryptedPasswordBackend* backend = new DatabaseEncryptedPasswordBackend;
if (m_testMasterPassword.isEmpty()) {
m_testMasterPassword = AesInterface::passwordToHash(QString::fromUtf8(AesInterface::createRandomData(8)));
backend->updateSampleData(m_testMasterPassword);
}
// a trick for setting masterPassword without gui interactions
backend->isPasswordVerified(m_testMasterPassword);
backend->setAskMasterPasswordState(false);
m_backend = backend;
}
void DatabaseEncryptedPasswordBackendTest::init()
{
QSqlDatabase db = QSqlDatabase::database();
if (!db.isValid()) {
db = QSqlDatabase::addDatabase("QSQLITE");
db.setDatabaseName(":memory:");
}
db.open();
}
void DatabaseEncryptedPasswordBackendTest::cleanup()
{
QSqlDatabase::removeDatabase(QSqlDatabase::database().databaseName());
}
QTEST_MAIN(DatabaseEncryptedPasswordBackendTest)

34
autotests/databaseencryptedpasswordbackendtest.h Normal file
View File

@ -0,0 +1,34 @@
/* ============================================================
* Falkon - Qt web browser
* Copyright (C) 2013-2018 David Rosca <nowrep@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
* ============================================================ */
#pragma once
#include "passwordbackendtest.h"
#include "passwordbackends/databaseencryptedpasswordbackend.h"
class DatabaseEncryptedPasswordBackendTest : public PasswordBackendTest
{
Q_OBJECT
private:
QByteArray m_testMasterPassword;
protected:
void reloadBackend();
void init();
void cleanup();
};

45
autotests/databasepasswordbackendtest.cpp Normal file
View File

@ -0,0 +1,45 @@
/* ============================================================
* Falkon - Qt web browser
* Copyright (C) 2013-2018 David Rosca <nowrep@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
* ============================================================ */
#include "databasepasswordbackendtest.h"
#include <QtTest/QTest>
#include <QSqlDatabase>
#include <QSqlQuery>
void DatabasePasswordBackendTest::reloadBackend()
{
delete m_backend;
m_backend = new DatabasePasswordBackend;
}
void DatabasePasswordBackendTest::init()
{
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
db.setDatabaseName(":memory:");
db.open();
db.exec("CREATE TABLE autofill (data TEXT, id INTEGER PRIMARY KEY, password TEXT,"
"server TEXT, username TEXT, last_used NUMERIC)");
}
void DatabasePasswordBackendTest::cleanup()
{
QSqlDatabase::removeDatabase(QSqlDatabase::database().databaseName());
}
QTEST_MAIN(DatabasePasswordBackendTest)

31
autotests/databasepasswordbackendtest.h Normal file
View File

@ -0,0 +1,31 @@
/* ============================================================
* Falkon - Qt web browser
* Copyright (C) 2013-2018 David Rosca <nowrep@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
* ============================================================ */
#pragma once
#include "passwordbackendtest.h"
#include "passwordbackends/databasepasswordbackend.h"
class DatabasePasswordBackendTest : public PasswordBackendTest
{
Q_OBJECT
protected:
void reloadBackend();
void init();
void cleanup();
};

303
autotests/formcompletertest.cpp
View File

@ -1,303 +0,0 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2013-2014 David Rosca <nowrep@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
* ============================================================ */
#include "formcompletertest.h"
#include "pageformcompleter.h"
#include <QWebView>
#include <QWebPage>
#include <QWebFrame>
void FormCompleterTest::initTestCase()
{
view = new QWebView();
}
void FormCompleterTest::cleanupTestCase()
{
delete view;
}
void FormCompleterTest::init()
{
view->setHtml(QString());
}
void FormCompleterTest::completePageTest1()
{
// Basic test
QByteArray data = "username=tst_username&password=tst_password";
QString html = "<form name='form1' method='post' action='foo.php'>"
"<input id='id1' type='text' name='username' value='xx'>"
"<input id='id2' type='password' name='password' value='xx'>"
"<input type='submit' value='submit' name='submit'>"
"</form>";
completeWithData(html, data);
QCOMPARE(getElementByIdValue("id1").toString(), QString("tst_username"));
QCOMPARE(getElementByIdValue("id2").toString(), QString("tst_password"));
}
void FormCompleterTest::completePageTest2()
{
// Real word test: GMail login
// uses input type=email for username
QByteArray data = "dsh=-821344601702946291&GALX=pAkf3B9TdCo&timeStmp=&secTok="
"&_utf8=%E2%98%83&bgresponse=%21A0IjdiuCmhg1wERY2iLkbgozxgIAAAAOUgAAA"
"AcqAMaxqx-r1kXOOzeHkuDrRiOJvacFeSxGJ-pg_KQbwMJk3mBUCoZO2g602Uq4upHsM"
"KVfjKRkuPCC0bVCaglP90VLBN8lqCQ5zLSrczVa-WpBFXlEZsKm5UXasE2ZZUQfDc1MI"
"VQbDUviv7Ap54jx6vlTinen6UlxWW_wAvtLkpSO1hqrWnDSDmvFtbJZX61BlMFoHTPYk"
"ijYnuCWzrHWsfKVI8uigtpClgwBTGovCWzuLrbFhG6txV5SokxdfNhbr3Vv-zO9xCw&E"
"mail=tst_mail%40google.com&&Passwd=pass+%CB%87+word1&signIn=P%+se&Per"
"sistentCookie=yes&rmShown=1";
QString html = "<form novalidate='' id='gaia_loginform' action='ServiceLoginAuth' method='post'>"
"<input type='hidden' name='continue' id='continue' value='http://mail.google.com/mail/'>"
"<input type='hidden' name='service' id='service' value='mail'>"
"<input type='hidden' name='rm' id='rm' value='false'>"
"<input type='hidden' name='dsh' id='dsh' value='3557358644105009435'>"
"<input type='hidden' name='ltmpl' id='ltmpl' value='default'>"
"<input type='hidden' name='scc' id='scc' value='1'>"
"<input type='hidden' name='GALX' value='2_UW3T0wRN4'>"
"<input type='hidden' name='timeStmp' id='timeStmp' value=''>"
"<input type='hidden' name='secTok' id='secTok' value=''>"
"<input type='hidden' id='_utf8' name='_utf8' value='d'>"
"<input type='hidden' name='bgresponse' id='bgresponse' value='js_disabled'>"
"<div class='email-div'>"
"<label for='Email'><strong class='email-label'>Username</strong></label>"
"<input type='email' spellcheck='false' name='Email' id='Email' value='xx'>"
"</div>"
"<div class='passwd-div'>"
"<label for='Passwd'><strong class='passwd-label'>Password</strong></label>"
"<input type='password' name='Passwd' id='Passwd' value='xx'>"
"</div>"
"<input type='submit' class='g-button g-button-submit' name='signIn' id='signIn' value='Login'>"
"<label class='remember' onclick=''>"
"<input type='checkbox' name='PersistentCookie' id='PersistentCookie' value='yes'>"
"<strong class='remember-label'>"
"</strong>"
"</label>"
"<input type='hidden' name='rmShown' value='1'>"
"</form>";
completeWithData(html, data);
QCOMPARE(getElementByIdValue("Email").toString(), QString("tst_mail@google.com"));
QCOMPARE(getElementByIdValue("Passwd").toString(), QString::fromUtf8("pass ˇ word1"));
}
void FormCompleterTest::completePageTest3()
{
// This test is mainly to test properly decoding special characters
// in post data.
QByteArray data = "user=%2B%C4%9B%C5%A1S+%CB%87+-+%2520+%2F+aa_&"
"pass=%C3%BD%C5%BE%C4%9B%C5%A1%2B%C3%AD%C3%A1+das+%2B%2F+%5C+%C4%91";
QString html = "<form name='form1' method='post' action='foo.php'>"
"<input id='id1' type='text' name='user' value='xx'>"
"<input id='id2' type='password' name='pass' value='xx'>"
"<input type='submit' value='submit' name='submit'>"
"</form>";
completeWithData(html, data);
QCOMPARE(getElementByIdValue("id1").toString(), QString::fromUtf8("+ěšS ˇ - %20 / aa_"));
QCOMPARE(getElementByIdValue("id2").toString(), QString::fromUtf8("ýžěš+íá das +/ \\ đ"));
}
void FormCompleterTest::extractFormTest1()
{
// Basic test
QByteArray data = "username=tst_username&password=tst_password";
QString html = "<form name='form1' method='post' action='foo.php'>"
"<input id='id1' type='text' name='username' value='tst_username'>"
"<input id='id2' type='password' name='password' value='tst_password'>"
"<input type='submit' value='submit' name='submit'>"
"</form>";
PageFormData form = extractFormData(html, data);
QVERIFY(form.isValid() == true);
QCOMPARE(form.username, QString("tst_username"));
QCOMPARE(form.password, QString("tst_password"));
}
void FormCompleterTest::extractFormTest2()
{
// Test special characters (even in input name)
QByteArray data = "use%C2%B6+_nam%C4%8D=%2B%C4%9B+%2B%2B+%C3%A9%C3%AD%C2%A7%60%5D%7C%7E%C4%9111+%2B%21%3A"
"&pA+%5DsQ+%2Bword=%2B%C4%9B%C5%A1+asn%7E%C4%91%C2%B0%23%26%23+%7C%E2%82%AC";
QString html = QString::fromUtf8("<form name='form1' method='post' action='foo.php'>"
"<input id='id1' type='text' name='use¶ _namč' value='+ě ++ éí§`]|~đ11 +!:'>"
"<input id='id2' type='password' name='pA ]sQ +word' value='+ěš asn~đ°#&# |€'>"
"<input type='submit' value='submit' name='submit'>"
"</form>");
PageFormData form = extractFormData(html, data);
QVERIFY(form.isValid() == true);
QCOMPARE(form.username, QString::fromUtf8("+ě ++ éí§`]|~đ11 +!:"));
QCOMPARE(form.password, QString::fromUtf8("+ěš asn~đ°#&# |€"));
}
void FormCompleterTest::extractFormTest3()
{
// Test detecting sent form between 2 identical forms
// but only one form is filled with correct data
QByteArray data = "username=tst_username&password=tst_password";
QString html = "<form name='form1' method='post' action='foo.php'>"
"<input id='id1' type='text' name='username' value='wrong_username'>"
"<input id='id2' type='password' name='password' value='wrong_password'>"
"<input type='submit' value='submit' name='submit'>"
"</form>";
QString html2 = "<form name='form2' method='post' action='foo2.php'>"
"<input id='id3' type='text' name='username' value='tst_username'>"
"<input id='id4' type='password' name='password' value='tst_password'>"
"<input type='submit' value='submit' name='submit'>"
"</form>";
PageFormData form = extractFormData(html + html2, data);
QVERIFY(form.isValid() == true);
QCOMPARE(form.username, QString("tst_username"));
QCOMPARE(form.password, QString("tst_password"));
}
void FormCompleterTest::extractFormTest4()
{
// Test extracting form that contains only password
// as editable input
QByteArray data = "username=tst_username&password=tst_password";
QString html = "<form name='form2' method='post' action='foo2.php'>"
"<input id='id3' type='hidden' name='username' value='tst_username'>"
"<input id='id4' type='password' name='password' value='tst_password'>"
"<input type='submit' value='submit' name='submit'>"
"</form>";
PageFormData form = extractFormData(html, data);
QVERIFY(form.isValid() == true);
QCOMPARE(form.username, QString());
QCOMPARE(form.password, QString("tst_password"));
}
void FormCompleterTest::extractFormTest5()
{
// Twitter.com : Multiple almost same forms
QByteArray data = "session%5Busername_or_email%5D=user1&session%5Bpassword%5D=pass&"
"return_to_ssl=true&scribe_log=&redirect_after_login=%2F&"
"authenticity_token=0d37030972c34b021d4a5ebab35817821dc0358b";
QString html = "<!-- 1) -->"
"<form action='https://twitter.com/sessions' class='js-signin signin' method='post'>"
"<input class='js-username-field email-input' type='text' name='session[username_or_email]'"
"autocomplete='on' value='user2'>"
"<input class='js-password-field' type='password' value='pass' name='session[password]'>"
"<input type='checkbox' value='1' name='remember_me'>"
"<button type='submit' class='btn submit'>Login</button>"
"<input type='hidden' name='scribe_log'>"
"<input type='hidden' name='redirect_after_login' value='/'>"
"<input type='hidden' value='0d37030972c34b021d4a5ebab35817821dc0358b' name='authenticity_token'>"
"</form>"
"<!-- 2) Correct -->"
"<form action='https://twitter.com/sessions' class='signin' method='post'>"
"<input type='text' id='signin-email' class='text-input email-input'"
"name='session[username_or_email]' title='' autocomplete='on' tabindex='1' value='user1'>"
"<input type='password' id='signin-password' class='text-'"
"name='session[password]' title='' tabindex='2' value='pass'>"
"<button type='submit' class='submit btn primary-btn flex-table-btn js-submit' tabindex='4'>"
"<input type='checkbox' value='1' name='remember_me' tabindex='3'>"
"<input type='hidden' name='return_to_ssl' value='true'>"
"<input type='hidden' name='scribe_log'>"
"<input type='hidden' name='redirect_after_login' value='/'>"
"<input type='hidden' value='0d37030972c34b021d4a5ebab35817821dc0358b' name='authenticity_token'>"
"</form>"
"<!-- 3) -->"
"<form action='https://twitter.com/sessions' class='signin' method='post'>"
"<input class='js-username-field email-input' type='text' "
"name='session[username_or_email]' autocomplete='on' value='user2' tabindex='1'>"
"<input class='js-password-field' type='password' name='session[password]' tabindex='2' value='pass'>"
"<input type='hidden' value='0d37030972c34b021d4a5ebab35817821dc0358b' name='authenticity_token'>"
"<input type='hidden' name='scribe_log'>"
"<input type='hidden' name='redirect_after_login' value='/'>"
"<input type='hidden' value='0d37030972c34b021d4a5ebab35817821dc0358b' name='authenticity_token'>"
"<button type='submit' class='submit btn primary-btn' tabindex='4'></button>"
"<input type='checkbox' value='1' name='remember_me' tabindex='3'>"
"</form>";
PageFormData form = extractFormData(html, data);
QVERIFY(form.isValid() == true);
QCOMPARE(form.username, QString("user1"));
QCOMPARE(form.password, QString("pass"));
}
void FormCompleterTest::extractFormTest6()
{
// Not found form test
QByteArray data = "username=tst_username&password=tst_password";
QString html = "<form name='form1' method='post' action='foo.php'>"
"<input id='id1' type='text' name='username' value='tst_username'>"
"<input id='id2' type='password' name='passwordinvalid' value='tst_password'>"
"<input type='submit' value='submit' name='submit'>"
"</form>";
PageFormData form = extractFormData(html, data);
QVERIFY(form.isValid() == false);
}
void FormCompleterTest::completeWithData(const QString &html, const QByteArray &data)
{
view->setHtml(html);
PageFormCompleter completer;
completer.completeFormData(view->page(), data);
}
PageFormData FormCompleterTest::extractFormData(const QString &html, const QByteArray &data)
{
view->setHtml(html);
PageFormCompleter completer;
return completer.extractFormData(view->page(), data);
}
QVariant FormCompleterTest::getElementByIdValue(const QString &id)
{
QString source = QString("document.getElementById('%1').value").arg(id);
return view->page()->mainFrame()->evaluateJavaScript(source);
}

57
autotests/formcompletertest.h
View File

@ -1,57 +0,0 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2013-2014 David Rosca <nowrep@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
* ============================================================ */
#ifndef FORMPAGECOMPLETERTEST_H
#define FORMPAGECOMPLETERTEST_H
#include <QObject>
#include <QtTest/QtTest>
class QWebView;
struct PageFormData;
class FormCompleterTest : public QObject
{
Q_OBJECT
private slots:
void initTestCase();
void cleanupTestCase();
void init();
void completePageTest1();
void completePageTest2();
void completePageTest3();
void extractFormTest1();
void extractFormTest2();
void extractFormTest3();
void extractFormTest4();
void extractFormTest5();
void extractFormTest6();
private:
void completeWithData(const QString &html, const QByteArray &data);
PageFormData extractFormData(const QString &html, const QByteArray &data);
QVariant getElementByIdValue(const QString &id);
QWebView *view;
};
#endif // FORMPAGECOMPLETERTEST_H

55
autotests/main.cpp
View File

@ -1,55 +0,0 @@
/* ============================================================
* QupZilla - Qt web browser
* Copyright (C) 2013-2017 David Rosca <nowrep@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
* ============================================================ */
#include "qztoolstest.h"
#include "cookiestest.h"
#include "adblocktest.h"
#include "updatertest.h"
#include "passwordbackendtest.h"
#include <QtTest/QtTest>
#define RUN_TEST(X) \
{ \
X t; \
int r = QTest::qExec(&t, argc, argv); \
if (r != 0) return 1; \
}
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
QTEST_DISABLE_KEYPAD_NAVIGATION;
RUN_TEST(QzToolsTest)
// RUN_TEST(CookiesTest)
RUN_TEST(AdBlockTest)
RUN_TEST(UpdaterTest)
RUN_TEST(DatabasePasswordBackendTest)
RUN_TEST(DatabaseEncryptedPasswordBackendTest)
#ifdef HAVE_KDE_PASSWORDS_PLUGIN
RUN_TEST(KWalletPasswordBackendTest)
#endif
#ifdef HAVE_GNOME_PASSWORDS_PLUGIN
RUN_TEST(GnomeKeyringPasswordBackendTest)
#endif
return 0;
}

65
autotests/passwordbackendtest.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2013-2014 David Rosca <nowrep@gmail.com>
* Falkon - Qt web browser
* Copyright (C) 2013-2018 David Rosca <nowrep@gmail.com>
*
* 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
@ -16,14 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* ============================================================ */
#include "passwordbackendtest.h"
#include "aesinterface.h"
#include <QtTest/QtTest>
#include <QSqlDatabase>
#include <QSqlQuery>
#include <QDebug>
#include <QDBusMessage>
#include <QDBusConnection>
#ifdef Q_OS_WIN
#include "qt_windows.h"
@ -215,59 +210,3 @@ void PasswordBackendTest::updateLastUsedTest()
reloadBackend();
QCOMPARE(m_backend->getAllEntries().count(), 0);
}
// DatabasePasswordBackendTest
void DatabasePasswordBackendTest::reloadBackend()
{
delete m_backend;
m_backend = new DatabasePasswordBackend;
}
void DatabasePasswordBackendTest::init()
{
QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE");
db.setDatabaseName(":memory:");
db.open();
db.exec("CREATE TABLE autofill (data TEXT, id INTEGER PRIMARY KEY, password TEXT,"
"server TEXT, username TEXT, last_used NUMERIC)");
}
void DatabasePasswordBackendTest::cleanup()
{
QSqlDatabase::removeDatabase(QSqlDatabase::database().databaseName());
}
// DatabaseEncryptedPasswordBackendTest
void DatabaseEncryptedPasswordBackendTest::reloadBackend()
{
delete m_backend;
DatabaseEncryptedPasswordBackend* backend = new DatabaseEncryptedPasswordBackend;
if (m_testMasterPassword.isEmpty()) {
m_testMasterPassword = AesInterface::passwordToHash(QString::fromUtf8(AesInterface::createRandomData(8)));
backend->updateSampleData(m_testMasterPassword);
}
// a trick for setting masterPassword without gui interactions
backend->isPasswordVerified(m_testMasterPassword);
backend->setAskMasterPasswordState(false);
m_backend = backend;
}
void DatabaseEncryptedPasswordBackendTest::init()
{
QSqlDatabase db = QSqlDatabase::database();
if (!db.isValid()) {
db = QSqlDatabase::addDatabase("QSQLITE");
db.setDatabaseName(":memory:");
}
db.open();
}
void DatabaseEncryptedPasswordBackendTest::cleanup()
{
QSqlDatabase::removeDatabase(QSqlDatabase::database().databaseName());
}

36
autotests/passwordbackendtest.h
View File

@ -1,6 +1,6 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2013-2014 David Rosca <nowrep@gmail.com>
* Falkon - Qt web browser
* Copyright (C) 2013-2018 David Rosca <nowrep@gmail.com>
*
* 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
@ -15,8 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* ============================================================ */
#ifndef PASSWORDBACKENDTEST_H
#define PASSWORDBACKENDTEST_H
#pragma once
#include <QObject>
#include <QVector>
@ -47,32 +46,3 @@ protected:
PasswordBackend* m_backend;
QVector<PasswordEntry> m_entries;
};
#include "passwordbackends/databasepasswordbackend.h"
class DatabasePasswordBackendTest : public PasswordBackendTest
{
Q_OBJECT
protected:
void reloadBackend();
void init();
void cleanup();
};
#include "passwordbackends/databaseencryptedpasswordbackend.h"
class DatabaseEncryptedPasswordBackendTest : public PasswordBackendTest
{
Q_OBJECT
private:
QByteArray m_testMasterPassword;
protected:
void reloadBackend();
void init();
void cleanup();
};
#endif // PASSWORDBACKENDTEST_H

2
autotests/qztoolstest.cpp
View File

@ -275,3 +275,5 @@ QString QzToolsTest::createPath(const char *file) const
{
return m_tmpPath + QL1S("/") + file;
}
QTEST_MAIN(QzToolsTest)

2
autotests/updatertest.cpp
View File

@ -91,3 +91,5 @@ void UpdaterTest::compareVersionsTest()
QCOMPARE(v1 > v2, more);
QCOMPARE(v1 == v2, equal);
}
QTEST_MAIN(UpdaterTest)