diff options
Diffstat (limited to 'tests/auto/sql/kernel/qsqlthread')
| -rw-r--r-- | tests/auto/sql/kernel/qsqlthread/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | tests/auto/sql/kernel/qsqlthread/qsqlthread.pro | 5 | ||||
| -rw-r--r-- | tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp | 59 |
3 files changed, 26 insertions, 51 deletions
diff --git a/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt index a2f66c7ed3..98108528e6 100644 --- a/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt +++ b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt @@ -1,13 +1,20 @@ -# Generated from qsqlthread.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qsqlthread Test: ##################################################################### -qt_add_test(tst_qsqlthread +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qsqlthread LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + +qt_internal_add_test(tst_qsqlthread SOURCES tst_qsqlthread.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::Sql Qt::SqlPrivate diff --git a/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro b/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro deleted file mode 100644 index 32e0f2228f..0000000000 --- a/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG += testcase -TARGET = tst_qsqlthread -SOURCES += tst_qsqlthread.cpp - -QT = core sql testlib core-private sql-private diff --git a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp index 6d1062d881..0bebb7edd5 100644 --- a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp +++ b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp @@ -1,33 +1,8 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include <QtTest/QtTest> +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + + +#include <QTest> #include "../qsqldatabase/tst_databases.h" @@ -93,7 +68,7 @@ class QtTestSqlThread : public QThread { Q_OBJECT public: - QtTestSqlThread(const QSqlDatabase &aDb, QObject *parent = 0) + QtTestSqlThread(const QSqlDatabase &aDb, QObject *parent = nullptr) : QThread(parent), sourceDb(aDb) {} void runHelper(const QString &dbName) @@ -129,7 +104,7 @@ class SqlProducer: public QThread { Q_OBJECT public: - SqlProducer(const QSqlDatabase &aDb, QObject *parent = 0) + SqlProducer(const QSqlDatabase &aDb, QObject *parent = nullptr) : QThread(parent), sourceDb(aDb) {} void runHelper(const QString &dbName) @@ -164,7 +139,7 @@ class SqlConsumer: public QThread Q_OBJECT public: - SqlConsumer(const QSqlDatabase &aDb, QObject *parent = 0) + SqlConsumer(const QSqlDatabase &aDb, QObject *parent = nullptr) : QThread(parent), sourceDb(aDb) {} void runHelper(const QString &dbName) @@ -203,7 +178,7 @@ class SqlThread: public QThread public: enum Mode { SimpleReading, PreparedReading, SimpleWriting, PreparedWriting }; - SqlThread(Mode m, const QSqlDatabase &db, QObject *parent = 0) + SqlThread(Mode m, const QSqlDatabase &db, QObject *parent = nullptr) : QThread(parent), sourceDb(db), mode(m) {} void run() override @@ -283,18 +258,16 @@ void tst_QSqlThread::generic_data(const QString& engine) void tst_QSqlThread::dropTestTables() { - for (int i = 0; i < dbs.dbNames.count(); ++i) { - QSqlDatabase db = QSqlDatabase::database(dbs.dbNames.at(i)); - QSqlQuery q(db); - - tst_Databases::safeDropTables(db, QStringList() << qtest << qTableName("qtest2", __FILE__, db) << qTableName("emptytable", __FILE__, db)); + for (const auto &dbName : dbs.dbNames) { + QSqlDatabase db = QSqlDatabase::database(dbName); + tst_Databases::safeDropTables(db, { qtest, qTableName("qtest2", __FILE__, db), qTableName("emptytable", __FILE__, db) }); } } void tst_QSqlThread::createTestTables() { - for (int i = 0; i < dbs.dbNames.count(); ++i) { - QSqlDatabase db = QSqlDatabase::database(dbs.dbNames.at(i)); + for (const auto &dbName : dbs.dbNames) { + QSqlDatabase db = QSqlDatabase::database(dbName); QSqlQuery q(db); QVERIFY_SQL(q, exec("create table " + qtest @@ -310,8 +283,8 @@ void tst_QSqlThread::createTestTables() void tst_QSqlThread::repopulateTestTables() { - for (int i = 0; i < dbs.dbNames.count(); ++i) { - QSqlDatabase db = QSqlDatabase::database(dbs.dbNames.at(i)); + for (const auto &dbName : dbs.dbNames) { + QSqlDatabase db = QSqlDatabase::database(dbName); QSqlQuery q(db); QVERIFY_SQL(q, exec("delete from " + qtest)); |