Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/TestAutoType.cpp4
-rw-r--r--tests/TestCryptoHash.cpp4
-rw-r--r--tests/TestDeletedObjects.cpp4
-rw-r--r--tests/TestEntry.cpp4
-rw-r--r--tests/TestEntryModel.cpp4
-rw-r--r--tests/TestEntrySearcher.cpp1
-rw-r--r--tests/TestGroup.cpp4
-rw-r--r--tests/TestGroupModel.cpp4
-rw-r--r--tests/TestHashedBlockStream.cpp4
-rw-r--r--tests/TestKeePass1Reader.cpp4
-rw-r--r--tests/TestKeePass2RandomStream.cpp4
-rw-r--r--tests/TestKeePass2Reader.cpp4
-rw-r--r--tests/TestKeePass2Writer.cpp4
-rw-r--r--tests/TestKeePass2XmlReader.cpp4
-rw-r--r--tests/TestKeys.cpp4
-rw-r--r--tests/TestModified.cpp4
-rw-r--r--tests/TestQCommandLineParser.cpp4
-rw-r--r--tests/TestQSaveFile.cpp4
-rw-r--r--tests/TestRandom.cpp4
-rw-r--r--tests/TestSymmetricCipher.cpp4
-rw-r--r--tests/TestWildcardMatcher.cpp4
21 files changed, 40 insertions, 41 deletions
diff --git a/tests/TestAutoType.cpp b/tests/TestAutoType.cpp
index c09a8366c..4f4350e71 100644
--- a/tests/TestAutoType.cpp
+++ b/tests/TestAutoType.cpp
@@ -31,6 +31,8 @@
#include "autotype/test/AutoTypeTestInterface.h"
#include "gui/MessageBox.h"
+QTEST_GUILESS_MAIN(TestAutoType)
+
void TestAutoType::initTestCase()
{
Crypto::init();
@@ -154,5 +156,3 @@ void TestAutoType::testGlobalAutoTypeTitleMatchDisabled()
QCOMPARE(m_test->actionChars(), QString());
}
-
-QTEST_GUILESS_MAIN(TestAutoType)
diff --git a/tests/TestCryptoHash.cpp b/tests/TestCryptoHash.cpp
index 4f258a179..d189d456c 100644
--- a/tests/TestCryptoHash.cpp
+++ b/tests/TestCryptoHash.cpp
@@ -23,6 +23,8 @@
#include "crypto/Crypto.h"
#include "crypto/CryptoHash.h"
+QTEST_GUILESS_MAIN(TestCryptoHash)
+
void TestCryptoHash::initTestCase()
{
Crypto::init();
@@ -47,5 +49,3 @@ void TestCryptoHash::test()
QCOMPARE(cryptoHash3.result(),
QByteArray::fromHex("0b56e5f65263e747af4a833bd7dd7ad26a64d7a4de7c68e52364893dca0766b4"));
}
-
-QTEST_GUILESS_MAIN(TestCryptoHash)
diff --git a/tests/TestDeletedObjects.cpp b/tests/TestDeletedObjects.cpp
index 914096cec..5967e58ee 100644
--- a/tests/TestDeletedObjects.cpp
+++ b/tests/TestDeletedObjects.cpp
@@ -26,6 +26,8 @@
#include "format/KeePass2XmlReader.h"
#include "config-keepassx-tests.h"
+QTEST_GUILESS_MAIN(TestDeletedObjects)
+
void TestDeletedObjects::initTestCase()
{
Crypto::init();
@@ -158,5 +160,3 @@ void TestDeletedObjects::testDatabaseChange()
delete db;
delete db2;
}
-
-QTEST_GUILESS_MAIN(TestDeletedObjects)
diff --git a/tests/TestEntry.cpp b/tests/TestEntry.cpp
index 15f398f18..481250a20 100644
--- a/tests/TestEntry.cpp
+++ b/tests/TestEntry.cpp
@@ -23,6 +23,8 @@
#include "core/Entry.h"
#include "crypto/Crypto.h"
+QTEST_GUILESS_MAIN(TestEntry)
+
void TestEntry::initTestCase()
{
Crypto::init();
@@ -121,5 +123,3 @@ void TestEntry::testClone()
QCOMPARE(entryCloneHistory->historyItems().first()->title(), QString("Original Title"));
QCOMPARE(entryCloneHistory->timeInfo().creationTime(), entryOrg->timeInfo().creationTime());
}
-
-QTEST_GUILESS_MAIN(TestEntry)
diff --git a/tests/TestEntryModel.cpp b/tests/TestEntryModel.cpp
index fab63db68..5347a3c52 100644
--- a/tests/TestEntryModel.cpp
+++ b/tests/TestEntryModel.cpp
@@ -33,6 +33,8 @@
#include "gui/entry/EntryAttachmentsModel.h"
#include "gui/entry/EntryAttributesModel.h"
+QTEST_GUILESS_MAIN(TestEntryModel)
+
void TestEntryModel::initTestCase()
{
qRegisterMetaType<QModelIndex>("QModelIndex");
@@ -341,5 +343,3 @@ void TestEntryModel::testDatabaseDelete()
delete modelTest;
delete model;
}
-
-QTEST_GUILESS_MAIN(TestEntryModel)
diff --git a/tests/TestEntrySearcher.cpp b/tests/TestEntrySearcher.cpp
index b37992df9..9f7ca1397 100644
--- a/tests/TestEntrySearcher.cpp
+++ b/tests/TestEntrySearcher.cpp
@@ -21,7 +21,6 @@
#include "tests.h"
-
QTEST_GUILESS_MAIN(TestEntrySearcher)
void TestEntrySearcher::initTestCase()
diff --git a/tests/TestGroup.cpp b/tests/TestGroup.cpp
index 0b4564f2b..32398f01f 100644
--- a/tests/TestGroup.cpp
+++ b/tests/TestGroup.cpp
@@ -27,6 +27,8 @@
#include "core/Metadata.h"
#include "crypto/Crypto.h"
+QTEST_GUILESS_MAIN(TestGroup)
+
void TestGroup::initTestCase()
{
qRegisterMetaType<Entry*>("Entry*");
@@ -440,5 +442,3 @@ void TestGroup::testCopyCustomIcons()
QCOMPARE(metaTarget->customIcon(group1Icon).pixel(0, 0), qRgb(1, 2, 3));
QCOMPARE(metaTarget->customIcon(group2Icon).pixel(0, 0), qRgb(4, 5, 6));
}
-
-QTEST_GUILESS_MAIN(TestGroup)
diff --git a/tests/TestGroupModel.cpp b/tests/TestGroupModel.cpp
index a16386c7d..fe7018e84 100644
--- a/tests/TestGroupModel.cpp
+++ b/tests/TestGroupModel.cpp
@@ -27,6 +27,8 @@
#include "crypto/Crypto.h"
#include "gui/group/GroupModel.h"
+QTEST_GUILESS_MAIN(TestGroupModel)
+
void TestGroupModel::initTestCase()
{
qRegisterMetaType<QModelIndex>("QModelIndex");
@@ -149,5 +151,3 @@ void TestGroupModel::test()
delete modelTest;
delete model;
}
-
-QTEST_GUILESS_MAIN(TestGroupModel)
diff --git a/tests/TestHashedBlockStream.cpp b/tests/TestHashedBlockStream.cpp
index ab7d386a6..b062908f7 100644
--- a/tests/TestHashedBlockStream.cpp
+++ b/tests/TestHashedBlockStream.cpp
@@ -24,6 +24,8 @@
#include "crypto/Crypto.h"
#include "streams/HashedBlockStream.h"
+QTEST_GUILESS_MAIN(TestHashedBlockStream)
+
void TestHashedBlockStream::initTestCase()
{
Crypto::init();
@@ -69,5 +71,3 @@ void TestHashedBlockStream::testWriteRead()
buffer.reset();
buffer.buffer().clear();
}
-
-QTEST_GUILESS_MAIN(TestHashedBlockStream)
diff --git a/tests/TestKeePass1Reader.cpp b/tests/TestKeePass1Reader.cpp
index 3ec4e7830..423087c91 100644
--- a/tests/TestKeePass1Reader.cpp
+++ b/tests/TestKeePass1Reader.cpp
@@ -33,6 +33,8 @@
#include "keys/FileKey.h"
#include "keys/PasswordKey.h"
+QTEST_GUILESS_MAIN(TestKeePass1Reader)
+
void TestKeePass1Reader::initTestCase()
{
Crypto::init();
@@ -292,5 +294,3 @@ void TestKeePass1Reader::reopenDatabase(Database* db, const QString& password, c
QVERIFY(!reader.hasError());
delete newDb;
}
-
-QTEST_GUILESS_MAIN(TestKeePass1Reader)
diff --git a/tests/TestKeePass2RandomStream.cpp b/tests/TestKeePass2RandomStream.cpp
index 74a154069..328decb30 100644
--- a/tests/TestKeePass2RandomStream.cpp
+++ b/tests/TestKeePass2RandomStream.cpp
@@ -26,6 +26,8 @@
#include "format/KeePass2.h"
#include "format/KeePass2RandomStream.h"
+QTEST_GUILESS_MAIN(TestKeePass2RandomStream)
+
void TestKeePass2RandomStream::initTestCase()
{
Crypto::init();
@@ -77,5 +79,3 @@ void TestKeePass2RandomStream::test()
QCOMPARE(cipherData, cipherDataEncrypt);
QCOMPARE(randomStreamData, cipherData);
}
-
-QTEST_GUILESS_MAIN(TestKeePass2RandomStream)
diff --git a/tests/TestKeePass2Reader.cpp b/tests/TestKeePass2Reader.cpp
index 6b1ee1e95..3dd87c4f4 100644
--- a/tests/TestKeePass2Reader.cpp
+++ b/tests/TestKeePass2Reader.cpp
@@ -28,6 +28,8 @@
#include "format/KeePass2Reader.h"
#include "keys/PasswordKey.h"
+QTEST_GUILESS_MAIN(TestKeePass2Reader)
+
void TestKeePass2Reader::initTestCase()
{
Crypto::init();
@@ -154,5 +156,3 @@ void TestKeePass2Reader::testFormat300()
delete db;
}
-
-QTEST_GUILESS_MAIN(TestKeePass2Reader)
diff --git a/tests/TestKeePass2Writer.cpp b/tests/TestKeePass2Writer.cpp
index bbc4992a0..f00b38e86 100644
--- a/tests/TestKeePass2Writer.cpp
+++ b/tests/TestKeePass2Writer.cpp
@@ -29,6 +29,8 @@
#include "format/KeePass2Writer.h"
#include "keys/PasswordKey.h"
+QTEST_GUILESS_MAIN(TestKeePass2Writer)
+
void TestKeePass2Writer::initTestCase()
{
Crypto::init();
@@ -104,5 +106,3 @@ void TestKeePass2Writer::cleanupTestCase()
delete m_dbOrg;
delete m_dbTest;
}
-
-QTEST_GUILESS_MAIN(TestKeePass2Writer)
diff --git a/tests/TestKeePass2XmlReader.cpp b/tests/TestKeePass2XmlReader.cpp
index ca57db958..d9935804d 100644
--- a/tests/TestKeePass2XmlReader.cpp
+++ b/tests/TestKeePass2XmlReader.cpp
@@ -28,6 +28,8 @@
#include "format/KeePass2XmlReader.h"
#include "config-keepassx-tests.h"
+QTEST_GUILESS_MAIN(TestKeePass2XmlReader)
+
namespace QTest {
template<>
char* toString(const Uuid& uuid)
@@ -378,5 +380,3 @@ void TestKeePass2XmlReader::cleanupTestCase()
{
delete m_db;
}
-
-QTEST_GUILESS_MAIN(TestKeePass2XmlReader)
diff --git a/tests/TestKeys.cpp b/tests/TestKeys.cpp
index ec9a35b4b..d5cba4abc 100644
--- a/tests/TestKeys.cpp
+++ b/tests/TestKeys.cpp
@@ -31,6 +31,8 @@
#include "keys/FileKey.h"
#include "keys/PasswordKey.h"
+QTEST_GUILESS_MAIN(TestKeys)
+
void TestKeys::initTestCase()
{
Crypto::init();
@@ -184,5 +186,3 @@ void TestKeys::benchmarkTransformKey()
compositeKey.transform(seed, 1e6);
}
}
-
-QTEST_GUILESS_MAIN(TestKeys)
diff --git a/tests/TestModified.cpp b/tests/TestModified.cpp
index 864ea1c36..85a6bf23e 100644
--- a/tests/TestModified.cpp
+++ b/tests/TestModified.cpp
@@ -27,6 +27,8 @@
#include "core/Tools.h"
#include "crypto/Crypto.h"
+QTEST_GUILESS_MAIN(TestModified)
+
void TestModified::initTestCase()
{
Crypto::init();
@@ -466,5 +468,3 @@ void TestModified::testHistoryItem()
delete db;
}
-
-QTEST_GUILESS_MAIN(TestModified)
diff --git a/tests/TestQCommandLineParser.cpp b/tests/TestQCommandLineParser.cpp
index d487862c0..4e2c63505 100644
--- a/tests/TestQCommandLineParser.cpp
+++ b/tests/TestQCommandLineParser.cpp
@@ -46,6 +46,8 @@
#include "tests.h"
#include "core/qcommandlineparser.h"
+QTEST_GUILESS_MAIN(TestQCommandLineParser)
+
Q_DECLARE_METATYPE(char**)
static char *empty_argv[] = { 0 };
@@ -412,5 +414,3 @@ void TestQCommandLineParser::testSingleDashWordOptionModes()
QCOMPARE(parser.value(parser.optionNames().at(i)), expectedOptionValues.at(i));
QCOMPARE(parser.unknownOptionNames(), QStringList());
}
-
-QTEST_GUILESS_MAIN(TestQCommandLineParser)
diff --git a/tests/TestQSaveFile.cpp b/tests/TestQSaveFile.cpp
index bccee0ec4..6be714efd 100644
--- a/tests/TestQSaveFile.cpp
+++ b/tests/TestQSaveFile.cpp
@@ -29,6 +29,8 @@
#include "tests.h"
#include "core/qsavefile.h"
+QTEST_GUILESS_MAIN(TestQSaveFile)
+
class DirCleanup
{
public:
@@ -197,5 +199,3 @@ QString TestQSaveFile::tmpDir()
return dirName;
}
-
-QTEST_GUILESS_MAIN(TestQSaveFile)
diff --git a/tests/TestRandom.cpp b/tests/TestRandom.cpp
index 8ac570e1c..40ab702db 100644
--- a/tests/TestRandom.cpp
+++ b/tests/TestRandom.cpp
@@ -22,6 +22,8 @@
#include <QTest>
+QTEST_GUILESS_MAIN(TestRandom)
+
void TestRandom::initTestCase()
{
m_backend = new RandomBackendTest();
@@ -93,5 +95,3 @@ void RandomBackendTest::setNextBytes(const QByteArray& nextBytes)
m_nextBytes = nextBytes;
m_bytesIndex = 0;
}
-
-QTEST_GUILESS_MAIN(TestRandom)
diff --git a/tests/TestSymmetricCipher.cpp b/tests/TestSymmetricCipher.cpp
index b47a00576..9f05db1bd 100644
--- a/tests/TestSymmetricCipher.cpp
+++ b/tests/TestSymmetricCipher.cpp
@@ -25,6 +25,8 @@
#include "crypto/SymmetricCipher.h"
#include "streams/SymmetricCipherStream.h"
+QTEST_GUILESS_MAIN(TestSymmetricCipher)
+
void TestSymmetricCipher::initTestCase()
{
Crypto::init();
@@ -192,5 +194,3 @@ void TestSymmetricCipher::testPadding()
QByteArray decrypted = streamDec.readAll();
QCOMPARE(decrypted, plainText);
}
-
-QTEST_GUILESS_MAIN(TestSymmetricCipher)
diff --git a/tests/TestWildcardMatcher.cpp b/tests/TestWildcardMatcher.cpp
index e06125b86..dc9991db9 100644
--- a/tests/TestWildcardMatcher.cpp
+++ b/tests/TestWildcardMatcher.cpp
@@ -22,6 +22,8 @@
#include "tests.h"
#include "autotype/WildcardMatcher.h"
+QTEST_GUILESS_MAIN(TestWildcardMatcher)
+
const QString TestWildcardMatcher::DefaultText = QString("some text");
const QString TestWildcardMatcher::AlternativeText = QString("some other text");
@@ -82,5 +84,3 @@ void TestWildcardMatcher::verifyNoMatch(QString pattern)
bool matchResult = m_matcher->match(pattern);
QVERIFY(!matchResult);
}
-
-QTEST_GUILESS_MAIN(TestWildcardMatcher)
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-07 20:09:01 +0300