[graphics/digikam] core/tests/database: polish
Gilles Caulier <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 502f7617ecdd0f170c211ca764ec0e9817b91f9c by Gilles Caulier.
Committed on 13/08/2026 at 06:44.
Pushed by cgilles into branch 'master'.
polish
M +19 -19 core/tests/database/databasemariadbinit_utest.cpp
M +0 -1 core/tests/database/databasemariadbinit_utest.h
https://invent.kde.org/graphics/digikam/-/commit/502f7617ecdd0f170c211ca764ec0e9817b91f9c
diff --git a/core/tests/database/databasemariadbinit_utest.cpp b/core/tests/database/databasemariadbinit_utest.cpp
index dc64029a20..30be1fefc1 100644
--- a/core/tests/database/databasemariadbinit_utest.cpp
+++ b/core/tests/database/databasemariadbinit_utest.cpp
@@ -49,11 +49,6 @@ using namespace Digikam;
QTEST_MAIN(DatabaseMariaDBInitTest)
-void DatabaseMariaDBInitTest::cleanupTestCase()
-{
- WSToolUtils::removeTemporaryDir(m_tempPath.toLatin1().data());
-}
-
void DatabaseMariaDBInitTest::initTestCase()
{
m_tempPath = QString::fromLatin1(QTest::currentAppName());
@@ -122,24 +117,24 @@ void DatabaseMariaDBInitTest::testMariaDBInit()
}
DbEngineParameters params;
- QString defaultAkDir = DbEngineParameters::serverPrivatePath();
- QString miscDir = QDir(defaultAkDir).absoluteFilePath(QLatin1String("db_misc"));
- params.databaseType = DbEngineParameters::MariaDBDatabaseType();
- params.databaseNameCore = QLatin1String("digikam");
- params.databaseNameThumbnails = QLatin1String("digikam");
- params.databaseNameFace = QLatin1String("digikam");
- params.databaseNameSimilarity = QLatin1String("digikam");
- params.userName = QLatin1String("root");
- params.password = QString();
- params.internalServer = true;
- params.internalServerDBPath = m_tempDir.path();
+ QString defaultAkDir = DbEngineParameters::serverPrivatePath();
+ QString miscDir = QDir(defaultAkDir).absoluteFilePath(QLatin1String("db_misc"));
+ params.databaseType = DbEngineParameters::MariaDBDatabaseType();
+ params.databaseNameCore = QLatin1String("digikam");
+ params.databaseNameThumbnails = QLatin1String("digikam");
+ params.databaseNameFace = QLatin1String("digikam");
+ params.databaseNameSimilarity = QLatin1String("digikam");
+ params.userName = QLatin1String("root");
+ params.password = QString();
+ params.internalServer = true;
+ params.internalServerDBPath = m_tempDir.path();
params.internalServerMariaDBUpgradeCmd = mariadbUpgradeBin.path();
params.internalServerMariaDBServerCmd = mariadbServerBin.path();
params.internalServerMariaDBAdminCmd = mariadbAdminBin.path();
params.internalServerMariaDBInitCmd = mariadbInitBin.path();
- params.hostName = QString();
- params.port = -1;
- params.connectOptions = QString::fromLatin1("UNIX_SOCKET=%1/mysql.socket").arg(miscDir);
+ params.hostName = QString();
+ params.port = -1;
+ params.connectOptions = QString::fromLatin1("UNIX_SOCKET=%1/mysql.socket").arg(miscDir);
// ------------------------------------------------------------------------------------
@@ -162,4 +157,9 @@ void DatabaseMariaDBInitTest::testMariaDBInit()
DatabaseServerStarter::instance()->stopServerManagerProcess();
}
+void DatabaseMariaDBInitTest::cleanupTestCase()
+{
+ WSToolUtils::removeTemporaryDir(m_tempPath.toLatin1().data());
+}
+
#include "moc_databasemariadbinit_utest.cpp"
diff --git a/core/tests/database/databasemariadbinit_utest.h b/core/tests/database/databasemariadbinit_utest.h
index 7421350103..ee8671cf7f 100644
--- a/core/tests/database/databasemariadbinit_utest.h
+++ b/core/tests/database/databasemariadbinit_utest.h
@@ -34,7 +34,6 @@ public:
private Q_SLOTS:
void testMariaDBInit();
-
void initTestCase();
void cleanupTestCase();