mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-04-03 04:27:39 +03:00
Fix code formatting with new clang-format version
This commit is contained in:
Janek Bevendorff
Jonathan White
parent
afe634d4f2
commit
e48ef80e9c
25 changed files with 91 additions and 178 deletions
|
|
@ -170,26 +170,22 @@ void TestBrowser::testSortPriority_data()
|
|||
QTest::newRow("Exact Match") << siteUrl << siteUrl << siteUrl << 100;
|
||||
QTest::newRow("Exact Match (site)") << siteUrl << siteUrl << formUrl << 100;
|
||||
QTest::newRow("Exact Match (form)") << siteUrl << "https://github.net" << siteUrl << 100;
|
||||
QTest::newRow("Exact Match No Trailing Slash") << "https://github.com"
|
||||
<< "https://github.com/" << formUrl << 100;
|
||||
QTest::newRow("Exact Match No Trailing Slash") << "https://github.com" << "https://github.com/" << formUrl << 100;
|
||||
QTest::newRow("Exact Match No Scheme") << "github.com/login" << siteUrl << formUrl << 100;
|
||||
QTest::newRow("Exact Match with Query") << "https://github.com/login?test=test#fragment"
|
||||
<< "https://github.com/login?test=test" << formUrl << 100;
|
||||
QTest::newRow("Exact Match with Query")
|
||||
<< "https://github.com/login?test=test#fragment" << "https://github.com/login?test=test" << formUrl << 100;
|
||||
|
||||
QTest::newRow("Site Query Mismatch") << siteUrl << siteUrl + "?test=test" << formUrl << 90;
|
||||
|
||||
QTest::newRow("Path Mismatch (site)") << "https://github.com/" << siteUrl << formUrl << 85;
|
||||
QTest::newRow("Path Mismatch (site) No Scheme") << "github.com" << siteUrl << formUrl << 85;
|
||||
QTest::newRow("Path Mismatch (form)") << "https://github.com/"
|
||||
<< "https://github.net" << formUrl << 85;
|
||||
QTest::newRow("Path Mismatch (form)") << "https://github.com/" << "https://github.net" << formUrl << 85;
|
||||
QTest::newRow("Path Mismatch (diff parent)") << "https://github.com/keepassxreboot" << siteUrl << formUrl << 80;
|
||||
QTest::newRow("Path Mismatch (diff parent, form)") << "https://github.com/keepassxreboot"
|
||||
<< "https://github.net" << formUrl << 70;
|
||||
QTest::newRow("Path Mismatch (diff parent, form)")
|
||||
<< "https://github.com/keepassxreboot" << "https://github.net" << formUrl << 70;
|
||||
|
||||
QTest::newRow("Subdomain Mismatch (site)") << siteUrl << "https://sub.github.com/"
|
||||
<< "https://github.net/" << 60;
|
||||
QTest::newRow("Subdomain Mismatch (form)") << siteUrl << "https://github.net/"
|
||||
<< "https://sub.github.com/" << 50;
|
||||
QTest::newRow("Subdomain Mismatch (site)") << siteUrl << "https://sub.github.com/" << "https://github.net/" << 60;
|
||||
QTest::newRow("Subdomain Mismatch (form)") << siteUrl << "https://github.net/" << "https://sub.github.com/" << 50;
|
||||
|
||||
QTest::newRow("Scheme Mismatch") << "http://github.com" << siteUrl << formUrl << 0;
|
||||
QTest::newRow("Scheme Mismatch w/path") << "http://github.com/login" << siteUrl << formUrl << 0;
|
||||
|
|
|
|||
|
|
@ -74,8 +74,7 @@ void TestCsvParser::testBackslashSyntax()
|
|||
QTextStream out(file.data());
|
||||
// attended result: one"\t\"wo
|
||||
out << "Xone\\\"\\\\t\\\\\\\"w\noX\n"
|
||||
<< "X13X,X2\\X,X,\"\"3\"X\r"
|
||||
<< "3,X\"4\"X,,\n"
|
||||
<< "X13X,X2\\X,X,\"\"3\"X\r" << "3,X\"4\"X,,\n"
|
||||
<< "XX\n"
|
||||
<< "\\";
|
||||
QVERIFY(parser->parse(file.data()));
|
||||
|
|
@ -195,8 +194,7 @@ void TestCsvParser::testComments()
|
|||
QTextStream out(file.data());
|
||||
out << " #one\n"
|
||||
<< " \t # two, three \r\n"
|
||||
<< " #, sing\t with\r"
|
||||
<< " #\t me!\n"
|
||||
<< " #, sing\t with\r" << " #\t me!\n"
|
||||
<< "useful,text #1!";
|
||||
QVERIFY(parser->parse(file.data()));
|
||||
t = parser->getCsvTable();
|
||||
|
|
@ -311,8 +309,7 @@ void TestCsvParser::testQualifier()
|
|||
{
|
||||
parser->setTextQualifier(QChar('X'));
|
||||
QTextStream out(file.data());
|
||||
out << "X1X,X2XX,X,\"\"3\"\"\"X\r"
|
||||
<< "3,X\"4\"X,,\n";
|
||||
out << "X1X,X2XX,X,\"\"3\"\"\"X\r" << "3,X\"4\"X,,\n";
|
||||
QVERIFY(parser->parse(file.data()));
|
||||
t = parser->getCsvTable();
|
||||
QVERIFY(t.size() == 2);
|
||||
|
|
|
|||
|
|
@ -42,8 +42,7 @@ void TestSSHAgent::initTestCase()
|
|||
QVERIFY(m_agentSocketFile.remove());
|
||||
|
||||
QStringList arguments;
|
||||
arguments << "-D"
|
||||
<< "-a" << m_agentSocketFileName;
|
||||
arguments << "-D" << "-a" << m_agentSocketFileName;
|
||||
|
||||
QElapsedTimer timer;
|
||||
timer.start();
|
||||
|
|
|
|||
|
|
@ -117,12 +117,9 @@ void TestSharing::testReferenceSerialization_data()
|
|||
QTest::addColumn<QString>("path");
|
||||
QTest::addColumn<QUuid>("uuid");
|
||||
QTest::addColumn<int>("type");
|
||||
QTest::newRow("1") << "Password"
|
||||
<< "/some/path" << QUuid::createUuid() << int(KeeShareSettings::Inactive);
|
||||
QTest::newRow("2") << ""
|
||||
<< "" << QUuid() << int(KeeShareSettings::SynchronizeWith);
|
||||
QTest::newRow("3") << ""
|
||||
<< "/some/path" << QUuid() << int(KeeShareSettings::ExportTo);
|
||||
QTest::newRow("1") << "Password" << "/some/path" << QUuid::createUuid() << int(KeeShareSettings::Inactive);
|
||||
QTest::newRow("2") << "" << "" << QUuid() << int(KeeShareSettings::SynchronizeWith);
|
||||
QTest::newRow("3") << "" << "/some/path" << QUuid() << int(KeeShareSettings::ExportTo);
|
||||
}
|
||||
|
||||
void TestSharing::testSettingsSerialization()
|
||||
|
|
|
|||
|
|
@ -161,13 +161,11 @@ void TestTools::testBackupFilePatternSubstitution_data()
|
|||
QTest::newRow("{DB_FILENAME} substitution")
|
||||
<< "some {DB_FILENAME} thing" << DEFAULT_DB_FILE_PATH
|
||||
<< QStringLiteral("some ") + DEFAULT_DB_FILE_NAME + QStringLiteral(" thing");
|
||||
QTest::newRow("{DB_FILENAME} substitution with multiple extensions") << "some {DB_FILENAME} thing"
|
||||
<< "/tmp/KeePassXC.kdbx.ext"
|
||||
<< "some KeePassXC.kdbx thing";
|
||||
QTest::newRow("{DB_FILENAME} substitution with multiple extensions")
|
||||
<< "some {DB_FILENAME} thing" << "/tmp/KeePassXC.kdbx.ext" << "some KeePassXC.kdbx thing";
|
||||
// Not relevant right now, added test anyway
|
||||
QTest::newRow("There should be no substitution loops") << "{DB_FILENAME}"
|
||||
<< "{TIME:'{DB_FILENAME}'}.ext"
|
||||
<< "{TIME:'{DB_FILENAME}'}";
|
||||
QTest::newRow("There should be no substitution loops")
|
||||
<< "{DB_FILENAME}" << "{TIME:'{DB_FILENAME}'}.ext" << "{TIME:'{DB_FILENAME}'}";
|
||||
}
|
||||
|
||||
void TestTools::testBackupFilePatternSubstitution()
|
||||
|
|
@ -193,8 +191,8 @@ void TestTools::testEscapeRegex_data()
|
|||
}
|
||||
|
||||
QTest::newRow("Regular characters should not be escaped") << all_regular_characters << all_regular_characters;
|
||||
QTest::newRow("Special characters should be escaped") << R"(.^$*+-?()[]{}|\)"
|
||||
<< R"(\.\^\$\*\+\-\?\(\)\[\]\{\}\|\\)";
|
||||
QTest::newRow("Special characters should be escaped")
|
||||
<< R"(.^$*+-?()[]{}|\)" << R"(\.\^\$\*\+\-\?\(\)\[\]\{\}\|\\)";
|
||||
QTest::newRow("Null character") << QString::fromLatin1("ab\0c", 4) << "ab\\0c";
|
||||
}
|
||||
|
||||
|
|
@ -256,23 +254,17 @@ void TestTools::testConvertToRegex_data()
|
|||
|
||||
void TestTools::testArrayContainsValues()
|
||||
{
|
||||
const auto values = QStringList() << "first"
|
||||
<< "second"
|
||||
<< "third";
|
||||
const auto values = QStringList() << "first" << "second" << "third";
|
||||
|
||||
// One missing
|
||||
const auto result1 = Tools::getMissingValuesFromList<QString>(values,
|
||||
QStringList() << "first"
|
||||
<< "second"
|
||||
<< "none");
|
||||
const auto result1 =
|
||||
Tools::getMissingValuesFromList<QString>(values, QStringList() << "first" << "second" << "none");
|
||||
QCOMPARE(result1.length(), 1);
|
||||
QCOMPARE(result1.first(), QString("none"));
|
||||
|
||||
// All found
|
||||
const auto result2 = Tools::getMissingValuesFromList<QString>(values,
|
||||
QStringList() << "first"
|
||||
<< "second"
|
||||
<< "third");
|
||||
const auto result2 =
|
||||
Tools::getMissingValuesFromList<QString>(values, QStringList() << "first" << "second" << "third");
|
||||
QCOMPARE(result2.length(), 0);
|
||||
|
||||
// None are found
|
||||
|
|
|
|||
|
|
@ -801,32 +801,23 @@ void TestGui::testPasswordEntryEntropy_data()
|
|||
QTest::addColumn<QString>("password");
|
||||
QTest::addColumn<QString>("expectedStrengthLabel");
|
||||
|
||||
QTest::newRow("Empty password") << ""
|
||||
<< "Password Quality: Poor";
|
||||
QTest::newRow("Empty password") << "" << "Password Quality: Poor";
|
||||
|
||||
QTest::newRow("Well-known password") << "hello"
|
||||
<< "Password Quality: Poor";
|
||||
QTest::newRow("Well-known password") << "hello" << "Password Quality: Poor";
|
||||
|
||||
QTest::newRow("Password composed of well-known words.") << "helloworld"
|
||||
<< "Password Quality: Poor";
|
||||
QTest::newRow("Password composed of well-known words.") << "helloworld" << "Password Quality: Poor";
|
||||
|
||||
QTest::newRow("Password composed of well-known words with number.") << "password1"
|
||||
<< "Password Quality: Poor";
|
||||
QTest::newRow("Password composed of well-known words with number.") << "password1" << "Password Quality: Poor";
|
||||
|
||||
QTest::newRow("Password out of small character space.") << "D0g.................."
|
||||
<< "Password Quality: Poor";
|
||||
QTest::newRow("Password out of small character space.") << "D0g.................." << "Password Quality: Poor";
|
||||
|
||||
QTest::newRow("XKCD, easy substitutions.") << "Tr0ub4dour&3"
|
||||
<< "Password Quality: Poor";
|
||||
QTest::newRow("XKCD, easy substitutions.") << "Tr0ub4dour&3" << "Password Quality: Poor";
|
||||
|
||||
QTest::newRow("XKCD, word generator.") << "correcthorsebatterystaple"
|
||||
<< "Password Quality: Weak";
|
||||
QTest::newRow("XKCD, word generator.") << "correcthorsebatterystaple" << "Password Quality: Weak";
|
||||
|
||||
QTest::newRow("Random characters, medium length.") << "YQC3kbXbjC652dTDH"
|
||||
<< "Password Quality: Good";
|
||||
QTest::newRow("Random characters, medium length.") << "YQC3kbXbjC652dTDH" << "Password Quality: Good";
|
||||
|
||||
QTest::newRow("Random characters, long.") << "Bs5ZFfthWzR8DGFEjaCM6bGqhmCT4km"
|
||||
<< "Password Quality: Excellent";
|
||||
QTest::newRow("Random characters, long.") << "Bs5ZFfthWzR8DGFEjaCM6bGqhmCT4km" << "Password Quality: Excellent";
|
||||
|
||||
QTest::newRow("Long password using Zxcvbn chunk estimation")
|
||||
<< "quintet-tamper-kinswoman-humility-vengeful-haven-tastiness-aspire-widget-ipad-cussed-reaffirm-ladylike-"
|
||||
|
|
@ -1544,18 +1535,14 @@ void TestGui::testSaveBackupPath_data()
|
|||
|
||||
QTest::newRow("Absolute backup path") << tmpFile.fileName() << tmpFile.fileName();
|
||||
// relative paths should be resolved to database parent directory
|
||||
QTest::newRow("Relative backup path (implicit)") << "other_dir/test.old.kdbx"
|
||||
<< "other_dir/test.old.kdbx";
|
||||
QTest::newRow("Relative backup path (explicit)") << "./other_dir2/test2.old.kdbx"
|
||||
<< "other_dir2/test2.old.kdbx";
|
||||
QTest::newRow("Relative backup path (implicit)") << "other_dir/test.old.kdbx" << "other_dir/test.old.kdbx";
|
||||
QTest::newRow("Relative backup path (explicit)") << "./other_dir2/test2.old.kdbx" << "other_dir2/test2.old.kdbx";
|
||||
|
||||
QTest::newRow("Path with placeholders") << "{DB_FILENAME}.old.kdbx"
|
||||
<< "KeePassXC.old.kdbx";
|
||||
QTest::newRow("Path with placeholders") << "{DB_FILENAME}.old.kdbx" << "KeePassXC.old.kdbx";
|
||||
// empty path should be replaced with default pattern
|
||||
QTest::newRow("Empty path") << QString("") << config()->getDefault(Config::BackupFilePathPattern).toString();
|
||||
// {DB_FILENAME} should be replaced with database filename
|
||||
QTest::newRow("") << "{DB_FILENAME}_.old.kdbx"
|
||||
<< "{DB_FILENAME}_.old.kdbx";
|
||||
QTest::newRow("") << "{DB_FILENAME}_.old.kdbx" << "{DB_FILENAME}_.old.kdbx";
|
||||
}
|
||||
|
||||
void TestGui::testSaveBackupPath()
|
||||
|
|
|
|||
|
|
@ -119,8 +119,8 @@ class FakeClient : public DBusClient
|
|||
public:
|
||||
explicit FakeClient(DBusMgr* dbus)
|
||||
: DBusClient(
|
||||
dbus,
|
||||
{QStringLiteral("local"), 0, true, {ProcInfo{0, 0, QStringLiteral("fake-client"), QString{}, QString{}}}})
|
||||
dbus,
|
||||
{QStringLiteral("local"), 0, true, {ProcInfo{0, 0, QStringLiteral("fake-client"), QString{}, QString{}}}})
|
||||
{
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue