From 777cbb6fc0d2c558701ed4afad99eaad3088bbc1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 16 Oct 2022 15:06:41 +0200 Subject: [PATCH] Apply clang-format on tests --- tests/buttonoverlay.cpp | 5 +++-- tests/dbusnotification.cpp | 16 +++++++--------- tests/dialogs.cpp | 6 +++--- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tests/buttonoverlay.cpp b/tests/buttonoverlay.cpp index 42106c3..283c00d 100644 --- a/tests/buttonoverlay.cpp +++ b/tests/buttonoverlay.cpp @@ -4,8 +4,8 @@ #include "../widgets/clearspinbox.h" #include "../widgets/iconbutton.h" -#include #include +#include #include using namespace QtUtilities; @@ -37,7 +37,8 @@ void ButtonOverlayTests::changeBasicConfiguration(ButtonOverlay &buttonOverlay) { buttonOverlay.setClearButtonEnabled(false); QVERIFY2(!buttonOverlay.isClearButtonEnabled(), "clear button disabled"); - buttonOverlay.enableInfoButton(QIcon::fromTheme(QStringLiteral("data-information")).pixmap(IconButton::defaultPixmapSize), QStringLiteral("Some info")); + buttonOverlay.enableInfoButton( + QIcon::fromTheme(QStringLiteral("data-information")).pixmap(IconButton::defaultPixmapSize), QStringLiteral("Some info")); QVERIFY2(buttonOverlay.isInfoButtonEnabled(), "info button enabled"); } diff --git a/tests/dbusnotification.cpp b/tests/dbusnotification.cpp index 79339a2..b68fc45 100644 --- a/tests/dbusnotification.cpp +++ b/tests/dbusnotification.cpp @@ -2,8 +2,8 @@ #include "resources/config.h" -#include #include +#include using namespace QtUtilities; @@ -61,19 +61,17 @@ void DBusNotificationTests::semiAutomaticTest() auto envValueIsInt = false; if (envValue.isEmpty() || (envValue.toInt(&envValueIsInt) == 0 && envValueIsInt)) { QSKIP("Set the environment variable " PROJECT_VARNAME_UPPER "_ENABLE_SEMI_AUTOMATIC_NOTIFICATION_TESTS to run " - "the semi-automatic D-Bus notification test."); + "the semi-automatic D-Bus notification test."); } QVERIFY2(DBusNotification::isAvailable(), "D-Bus notifications are available"); DBusNotification n(QStringLiteral("Semi-automatic test"), NotificationIcon::Information, 10000); QString clickedAction, error; - const auto actionConnection = connect(&n, &DBusNotification::actionInvoked, [&clickedAction] (const QString &actionName) { - clickedAction = actionName; - }); - const auto errorConnection = connect(&n, &DBusNotification::error, [&error] () { - error = QStringLiteral("error occurred (TODO: pass an error message here)"); - }); + const auto actionConnection + = connect(&n, &DBusNotification::actionInvoked, [&clickedAction](const QString &actionName) { clickedAction = actionName; }); + const auto errorConnection + = connect(&n, &DBusNotification::error, [&error]() { error = QStringLiteral("error occurred (TODO: pass an error message here)"); }); n.setApplicationName(QStringLiteral(APP_NAME " tests; " APP_VERSION)); n.show(QStringLiteral("Some message; will append more lines later")); for (auto i = 1; i <= 10; ++i) { @@ -83,7 +81,7 @@ void DBusNotificationTests::semiAutomaticTest() QCOMPARE(error, QString()); n.setImage(QIcon::fromTheme(QStringLiteral("document-open")).pixmap(64).toImage()); n.setTitle(n.title() + QStringLiteral(" - click action to continue")); - n.setActions(QStringList({QStringLiteral("fail"), QStringLiteral("Let test fail"), QStringLiteral("pass"), QStringLiteral("Let test pass")})); + n.setActions(QStringList({ QStringLiteral("fail"), QStringLiteral("Let test fail"), QStringLiteral("pass"), QStringLiteral("Let test pass") })); QSignalSpy actionInvokedSpy(&n, &DBusNotification::actionInvoked); n.update(QStringLiteral("Click on \"Let test pass\" to continue within 10 seconds")); actionInvokedSpy.wait(10000); diff --git a/tests/dialogs.cpp b/tests/dialogs.cpp index ab6d08d..0bd2d5b 100644 --- a/tests/dialogs.cpp +++ b/tests/dialogs.cpp @@ -1,7 +1,7 @@ -#include "../settingsdialog/settingsdialog.h" #include "../settingsdialog/optioncategory.h" #include "../settingsdialog/optioncategorymodel.h" #include "../settingsdialog/qtsettings.h" +#include "../settingsdialog/settingsdialog.h" #include @@ -25,10 +25,10 @@ void DialogsTests::testSettingsDialog() auto *const testCategory = new OptionCategory(); testCategory->setDisplayName(QStringLiteral("Test category")); testCategory->setIcon(QIcon::fromTheme(QStringLiteral("preferences"))); - settingsDlg.showCategory(nullptr); // ensure no current category is shown anymore + settingsDlg.showCategory(nullptr); // ensure no current category is shown anymore settingsDlg.setSingleCategory(nullptr); auto *const qtCategory = qtSettings.category(); - settingsDlg.categoryModel()->setCategories(QList({testCategory, qtCategory})); + settingsDlg.categoryModel()->setCategories(QList({ testCategory, qtCategory })); settingsDlg.showCategory(qtCategory); settingsDlg.show(); }