tests enhanced

silverqx · Apr 11, 2024 · 6a67c85 · 6a67c85
1 parent d9bccd6
commit 6a67c85
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 28 deletions.
diff --git a/tests/auto/functional/drivers/sqldatabasemanager/tst_sqldatabasemanager.cpp b/tests/auto/functional/drivers/sqldatabasemanager/tst_sqldatabasemanager.cpp
@@ -86,24 +86,10 @@ private Q_SLOTS:
 // NOLINTBEGIN(readability-convert-member-functions-to-static)
 void tst_SqlDatabaseManager::MySQL_removeConnection_Connected() const
 {
-    const auto databaseName = qEnvironmentVariable("DB_MYSQL_DATABASE", EMPTY);
-    const auto driverName = QMYSQL;
-
     // Add a new database connection
-    const auto connectionName = Databases::createDriversConnectionTemp(
+    const auto connectionName = Databases::createDriversConnectionTempFrom(
                                     Databases::MYSQL_DRIVERS,
-                                    {ClassName, QString::fromUtf8(__func__)}, // NOLINT(cppcoreguidelines-pro-bounds-array-to-pointer-decay)
-    {
-        {driver_,    driverName},
-        {host_,      qEnvironmentVariable("DB_MYSQL_HOST",      H127001)},
-        {port_,      qEnvironmentVariable("DB_MYSQL_PORT",      P5432)},
-        {database_,  databaseName},
-        {username_,  qEnvironmentVariable("DB_MYSQL_USERNAME",  EMPTY)},
-        {password_,  qEnvironmentVariable("DB_MYSQL_PASSWORD",  EMPTY)},
-        {charset_,   qEnvironmentVariable("DB_MYSQL_CHARSET",   UTF8MB4)},
-        {collation_, qEnvironmentVariable("DB_MYSQL_COLLATION", UTF8MB40900aici)},
-        {options_,   ConfigUtils::mysqlSslOptions()},
-    });
+                                    {ClassName, QString::fromUtf8(__func__)}); // NOLINT(cppcoreguidelines-pro-bounds-array-to-pointer-decay)
 
     if (!connectionName)
         QSKIP(TestUtils::AutoTestSkipped
@@ -118,8 +104,8 @@ void tst_SqlDatabaseManager::MySQL_removeConnection_Connected() const
     QVERIFY(connection.isOpen());
     QVERIFY(!connection.isOpenError());
     QCOMPARE(connection.connectionName(), *connectionName);
-    QCOMPARE(connection.databaseName(), databaseName);
-    QCOMPARE(connection.driverName(), driverName);
+    QCOMPARE(connection.databaseName(), qEnvironmentVariable("DB_MYSQL_DATABASE", EMPTY));
+    QCOMPARE(connection.driverName(), QMYSQL);
     QCOMPARE(openedConnections.size(), 1);
     QCOMPARE(openedConnections.first(), *connectionName);
     QCOMPARE(Databases::driversConnectionNames().size(), 1);

diff --git a/tests/auto/functional/orm/databasemanager/tst_databasemanager.cpp b/tests/auto/functional/orm/databasemanager/tst_databasemanager.cpp
@@ -116,9 +116,6 @@ void tst_DatabaseManager::initTestCase()
 
 void tst_DatabaseManager::MySQL_removeConnection_Connected() const
 {
-    const auto databaseName = qEnvironmentVariable("DB_MYSQL_DATABASE", EMPTY);
-    const auto driverName = QMYSQL;
-
     // Add a new database connection
     const auto connectionName = Databases::createConnectionTempFrom(
                                     Databases::MYSQL,
@@ -134,8 +131,9 @@ void tst_DatabaseManager::MySQL_removeConnection_Connected() const
     const auto openedConnections = m_dm->openedConnectionNames();
 
     QCOMPARE(connection.getName(), *connectionName);
-    QCOMPARE(connection.getDatabaseName(), databaseName);
-    QCOMPARE(connection.driverName(), driverName);
+    QCOMPARE(connection.getDatabaseName(),
+             qEnvironmentVariable("DB_MYSQL_DATABASE", EMPTY));
+    QCOMPARE(connection.driverName(), QMYSQL);
     QCOMPARE(m_dm->connectionNames().size(), 1);
     QCOMPARE(openedConnections.size(), 1);
     QCOMPARE(openedConnections.first(), *connectionName);
@@ -190,9 +188,6 @@ void tst_DatabaseManager::MySQL_removeConnection_NotConnected() const
 
 void tst_DatabaseManager::Postgres_removeConnection_Connected() const
 {
-    const auto databaseName = qEnvironmentVariable("DB_PGSQL_DATABASE", "");
-    const auto driverName = QPSQL;
-
     // Add a new database connection
     const auto connectionName = Databases::createConnectionTempFrom(
                                     Databases::POSTGRESQL,
@@ -208,8 +203,8 @@ void tst_DatabaseManager::Postgres_removeConnection_Connected() const
     const auto openedConnections = m_dm->openedConnectionNames();
 
     QCOMPARE(connection.getName(), *connectionName);
-    QCOMPARE(connection.getDatabaseName(), databaseName);
-    QCOMPARE(connection.driverName(), driverName);
+    QCOMPARE(connection.getDatabaseName(), qEnvironmentVariable("DB_PGSQL_DATABASE", ""));
+    QCOMPARE(connection.driverName(), QPSQL);
     QCOMPARE(m_dm->connectionNames().size(), 1);
     QCOMPARE(openedConnections.size(), 1);
     QCOMPARE(openedConnections.first(), *connectionName);