amass/qt6windows7
1
0
Fork 0
mirror of https://github.com/crystalidea/qt6windows7.git synced 2025-07-02 07:15:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

qt 6.6.0 clean

Browse Source
This commit is contained in:
kleuter
2023-11-01 22:23:55 +01:00
parent 7b5ada15e7
commit 5d8194efa7
1449 changed files with 134276 additions and 31391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/benchmarks/corelib/itemmodels/qsortfilterproxymodel/tst_bench_qsortfilterproxymodel.cpp
View File

@ -31,6 +31,7 @@ class tst_QSortFilterProxyModel : public QObject
private slots:
void clearFilter_data();
void clearFilter();
void setSourceModel();
private:
QStringList m_numberList; ///< Cache the strings for efficiency.
@ -93,6 +94,19 @@ void tst_QSortFilterProxyModel::clearFilter()
QCOMPARE(proxy.rowCount(), itemCount);
}
void tst_QSortFilterProxyModel::setSourceModel()
{
QStringListModel model1;
QStringListModel model2;
QSortFilterProxyModel proxy;
QBENCHMARK {
proxy.setSourceModel(&model1);
proxy.setSourceModel(&model2);
}
}
QTEST_MAIN(tst_QSortFilterProxyModel)
#include "tst_bench_qsortfilterproxymodel.moc"

9
tests/benchmarks/corelib/text/qlocale/tst_bench_qlocale.cpp
View File

@ -455,10 +455,6 @@ void tst_QLocale::toLongLong()
QBENCHMARK {
actual = loc.toLongLong(text, &ok);
}
QEXPECT_FAIL("ar_EG: +403", "Code wrongly assumes single character, QTBUG-107801", Abort);
QEXPECT_FAIL("ar_EG: -403", "Code wrongly assumes single character, QTBUG-107801", Abort);
QEXPECT_FAIL("fa_IR: +403", "Code wrongly assumes single character, QTBUG-107801", Abort);
QEXPECT_FAIL("fa_IR: -403", "Code wrongly assumes single character, QTBUG-107801", Abort);
QCOMPARE(ok, good);
QCOMPARE(actual, expected);
}
@ -488,8 +484,6 @@ void tst_QLocale::toULongLong()
QBENCHMARK {
actual = loc.toULongLong(text, &ok);
}
QEXPECT_FAIL("ar_EG: +403", "Code wrongly assumes single character, QTBUG-107801", Abort);
QEXPECT_FAIL("fa_IR: +403", "Code wrongly assumes single character, QTBUG-107801", Abort);
QCOMPARE(ok, good);
QCOMPARE(actual, expected);
}
@ -588,9 +582,6 @@ void tst_QLocale::toDouble()
QBENCHMARK {
actual = loc.toDouble(text, &ok);
}
QEXPECT_FAIL("sv_SE: 4e-3", "Code wrongly assumes single character, QTBUG-107801", Abort);
QEXPECT_FAIL("se_NO: 4e-3", "Code wrongly assumes single character, QTBUG-107801", Abort);
QEXPECT_FAIL("ar_EG: 4e-3", "Code wrongly assumes single character, QTBUG-107801", Abort);
QEXPECT_FAIL("en: &infin;", "Localized infinity support missing: QTBUG-95460", Abort);
QEXPECT_FAIL("ga: Nuimh", "Localized NaN support missing: QTBUG-95460", Abort);
QCOMPARE(ok, good);

18
tests/benchmarks/corelib/thread/qfuture/tst_bench_qfuture.cpp
View File

@ -13,7 +13,7 @@ class tst_QFuture : public QObject
Q_OBJECT
private slots:
void makeReadyfuture();
void makeReadyValueFuture();
#ifndef QT_NO_EXCEPTIONS
void makeExceptionalFuture();
#endif
@ -43,10 +43,10 @@ private slots:
void progressText();
};
void tst_QFuture::makeReadyfuture()
void tst_QFuture::makeReadyValueFuture()
{
QBENCHMARK {
auto future = QtFuture::makeReadyFuture(42);
auto future = QtFuture::makeReadyValueFuture(42);
Q_UNUSED(future);
}
}
@ -64,7 +64,7 @@ void tst_QFuture::makeExceptionalFuture()
void tst_QFuture::result()
{
auto future = QtFuture::makeReadyFuture(42);
auto future = QtFuture::makeReadyValueFuture(42);
QBENCHMARK {
auto value = future.result();
@ -92,7 +92,7 @@ void tst_QFuture::results()
void tst_QFuture::takeResult()
{
QBENCHMARK {
auto future = QtFuture::makeReadyFuture(42);
auto future = QtFuture::makeReadyValueFuture(42);
auto value = future.takeResult();
Q_UNUSED(value);
}
@ -140,7 +140,7 @@ void tst_QFuture::reportException()
void tst_QFuture::then()
{
auto f = QtFuture::makeReadyFuture(42);
auto f = QtFuture::makeReadyValueFuture(42);
QBENCHMARK {
auto future = f.then([](int value) { return value; });
Q_UNUSED(future);
@ -149,7 +149,7 @@ void tst_QFuture::then()
void tst_QFuture::thenVoid()
{
auto f = QtFuture::makeReadyFuture();
auto f = QtFuture::makeReadyVoidFuture();
QBENCHMARK {
auto future = f.then([] {});
Q_UNUSED(future);
@ -205,7 +205,7 @@ void tst_QFuture::onFailedVoid()
void tst_QFuture::thenOnFailed()
{
auto f = QtFuture::makeReadyFuture(42);
auto f = QtFuture::makeReadyValueFuture(42);
QBENCHMARK {
auto future =
f.then([](int) { throw std::runtime_error("error"); }).onFailed([] { return 0; });
@ -215,7 +215,7 @@ void tst_QFuture::thenOnFailed()
void tst_QFuture::thenOnFailedVoid()
{
auto f = QtFuture::makeReadyFuture();
auto f = QtFuture::makeReadyVoidFuture();
QBENCHMARK {
auto future = f.then([] { throw std::runtime_error("error"); }).onFailed([] {});
Q_UNUSED(future);

23
tests/benchmarks/corelib/thread/qmutex/tst_bench_qmutex.cpp
View File

@ -9,6 +9,8 @@
//#define USE_SEM_T
using namespace std::chrono_literals;
#if defined(Q_OS_UNIX)
#if !defined(USE_SEM_T)
# include <pthread.h>
@ -228,7 +230,8 @@ void tst_QMutex::contendedNative_data()
class NativeMutexThread : public QThread
{
NativeMutexType *mutex1, *mutex2;
int iterations, msleepDuration;
int iterations;
std::chrono::milliseconds msleepDuration;
bool use2mutexes;
public:
bool done;
@ -246,8 +249,8 @@ public:
NativeMutexLock(mutex1);
if (use2mutexes)
NativeMutexLock(mutex2);
if (msleepDuration >= 0)
msleep(msleepDuration);
if (msleepDuration >= 0ms)
sleep(msleepDuration);
if (use2mutexes)
NativeMutexUnlock(mutex2);
NativeMutexUnlock(mutex1);
@ -298,7 +301,8 @@ void tst_QMutex::contendedNative()
class QMutexThread : public QThread
{
QMutex *mutex1, *mutex2;
int iterations, msleepDuration;
int iterations;
std::chrono::milliseconds msleepDuration;
bool use2mutexes;
public:
bool done;
@ -316,8 +320,8 @@ public:
mutex1->lock();
if (use2mutexes)
mutex2->lock();
if (msleepDuration >= 0)
msleep(msleepDuration);
if (msleepDuration >= 0ms)
sleep(msleepDuration);
if (use2mutexes)
mutex2->unlock();
mutex1->unlock();
@ -363,7 +367,8 @@ void tst_QMutex::contendedQMutex()
class QMutexLockerThread : public QThread
{
QMutex *mutex1, *mutex2;
int iterations, msleepDuration;
int iterations;
std::chrono::milliseconds msleepDuration;
bool use2mutexes;
public:
bool done;
@ -381,8 +386,8 @@ public:
{
QMutexLocker locker1(mutex1);
QMutexLocker locker2(use2mutexes ? mutex2 : 0);
if (msleepDuration >= 0)
msleep(msleepDuration);
if (msleepDuration >= 0ms)
sleep(msleepDuration);
}
QThread::yieldCurrentThread();

2
tests/benchmarks/corelib/tools/qcryptographichash/tst_bench_qcryptographichash.cpp
View File

@ -178,7 +178,7 @@ void tst_QCryptographicHash::hmac_addData()
mac.reset();
mac.addData(data);
[[maybe_unused]]
auto r = mac.result();
auto r = mac.resultView();
}
}

22
tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -21,6 +21,8 @@
#include <QtNetwork/private/qhostinfo_p.h>
#endif
using namespace std::chrono_literals;
Q_DECLARE_METATYPE(QSharedPointer<char>)
class TimedSender: public QThread
@ -456,7 +458,7 @@ void tst_qnetworkreply::httpLatency()
QNetworkRequest request(QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/"));
QNetworkReply* reply = manager.get(request);
connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()), Qt::QueuedConnection);
QTestEventLoop::instance().enterLoop(5);
QTestEventLoop::instance().enterLoop(5s);
QVERIFY(!QTestEventLoop::instance().timeout());
delete reply;
}
@ -470,7 +472,7 @@ QPair<QNetworkReply *, qint64> tst_qnetworkreply::runGetRequest(
QNetworkReply *reply = manager->get(request);
connect(reply, SIGNAL(sslErrors(QList<QSslError>)), reply, SLOT(ignoreSslErrors()));
connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()), Qt::QueuedConnection);
QTestEventLoop::instance().enterLoop(20);
QTestEventLoop::instance().enterLoop(20s);
qint64 elapsed = timer.elapsed();
return qMakePair(reply, elapsed);
}
@ -501,7 +503,7 @@ void tst_qnetworkreply::echoPerformance()
QNetworkReply* reply = manager.post(request, data);
connect(reply, SIGNAL(sslErrors(QList<QSslError>)), reply, SLOT(ignoreSslErrors()));
connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()), Qt::QueuedConnection);
QTestEventLoop::instance().enterLoop(5);
QTestEventLoop::instance().enterLoop(5s);
QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(reply->error() == QNetworkReply::NoError);
delete reply;
@ -510,7 +512,7 @@ void tst_qnetworkreply::echoPerformance()
void tst_qnetworkreply::preConnectEncrypted()
{
QFETCH(int, sleepTime);
QFETCH(std::chrono::milliseconds, sleepTime);
QString hostName = QLatin1String("www.google.com");
QNetworkAccessManager manager;
@ -541,7 +543,7 @@ void tst_qnetworkreply::preConnectEncrypted()
// now try to make the connection beforehand
manager.connectToHostEncrypted(hostName);
QTestEventLoop::instance().enterLoopMSecs(sleepTime);
QTestEventLoop::instance().enterLoop(sleepTime);
// now make another request and hopefully use the existing connection
QPair<QNetworkReply *, qint64> preConnectResult = runGetRequest(&manager, request);
@ -559,12 +561,12 @@ void tst_qnetworkreply::preConnectEncrypted()
void tst_qnetworkreply::preConnectEncrypted_data()
{
#ifndef QT_NO_OPENSSL
QTest::addColumn<int>("sleepTime");
QTest::addColumn<std::chrono::milliseconds>("sleepTime");
// start a new normal request after preconnecting is done
QTest::newRow("HTTPS-2secs") << 2000;
QTest::newRow("HTTPS-2secs") << 2000ms;
// start a new normal request while preconnecting is in-flight
QTest::newRow("HTTPS-100ms") << 100;
QTest::newRow("HTTPS-100ms") << 100ms;
#endif // QT_NO_OPENSSL
}
@ -915,9 +917,9 @@ void tst_qnetworkreply::preConnect()
manager.clearAccessCache();
// now try to make the connection beforehand
QFETCH(int, sleepTime);
QFETCH(std::chrono::milliseconds, sleepTime);
manager.connectToHost(hostName);
QTestEventLoop::instance().enterLoopMSecs(sleepTime);
QTestEventLoop::instance().enterLoop(sleepTime);
// now make another request and hopefully use the existing connection
QPair<QNetworkReply *, qint64> preConnectResult = runGetRequest(&manager, request);

8
tests/benchmarks/network/socket/qlocalsocket/tst_qlocalsocket.cpp
View File

@ -14,6 +14,8 @@
#include <QtNetwork/qlocalsocket.h>
#include <QtNetwork/qlocalserver.h>
using namespace std::chrono_literals;
class tst_QLocalSocket : public QObject
{
Q_OBJECT
@ -175,7 +177,7 @@ void tst_QLocalSocket::dataExchange()
QFETCH(int, chunkSize);
Q_ASSERT(chunkSize > 0 && connections > 0);
const qint64 timeToTest = 5000;
const auto timeToTest = 5000ms;
ServerThread serverThread(chunkSize);
serverThread.start();
@ -191,7 +193,7 @@ void tst_QLocalSocket::dataExchange()
Q_UNUSED(channel);
totalReceived += bytes;
if (timer.elapsed() >= timeToTest) {
if (timer.elapsed() >= timeToTest.count()) {
factory.stopped = true;
eventLoop.exitLoop();
}
@ -199,7 +201,7 @@ void tst_QLocalSocket::dataExchange()
timer.start();
emit factory.start();
eventLoop.enterLoopMSecs(timeToTest * 2);
eventLoop.enterLoop(timeToTest * 2);
if (!QTest::currentTestFailed())
qDebug("Transfer rate: %.1f MB/s", totalReceived / 1048.576 / timer.elapsed());

187
tests/benchmarks/sql/kernel/qsqlquery/main.cpp
View File

@ -6,15 +6,12 @@
#include "../../../../auto/sql/kernel/qsqldatabase/tst_databases.h"
const QString qtest(qTableName("qtest", __FILE__, QSqlDatabase()));
class tst_QSqlQuery : public QObject
{
Q_OBJECT
public:
tst_QSqlQuery();
virtual ~tst_QSqlQuery();
using QObject::QObject;
public slots:
void initTestCase();
@ -30,45 +27,20 @@ private slots:
private:
// returns all database connections
void generic_data(const QString &engine=QString());
void dropTestTables( QSqlDatabase db );
void createTestTables( QSqlDatabase db );
void populateTestTables( QSqlDatabase db );
void generic_data(const QString &engine = QString());
tst_Databases dbs;
};
QTEST_MAIN(tst_QSqlQuery)
tst_QSqlQuery::tst_QSqlQuery()
{
}
tst_QSqlQuery::~tst_QSqlQuery()
{
}
void tst_QSqlQuery::initTestCase()
{
dbs.open();
for ( QStringList::ConstIterator it = dbs.dbNames.begin(); it != dbs.dbNames.end(); ++it ) {
QSqlDatabase db = QSqlDatabase::database(( *it ) );
CHECK_DATABASE( db );
dropTestTables( db ); //in case of leftovers
createTestTables( db );
populateTestTables( db );
}
}
void tst_QSqlQuery::cleanupTestCase()
{
for ( QStringList::ConstIterator it = dbs.dbNames.begin(); it != dbs.dbNames.end(); ++it ) {
QSqlDatabase db = QSqlDatabase::database(( *it ) );
CHECK_DATABASE( db );
dropTestTables( db );
}
dbs.close();
}
@ -78,29 +50,11 @@ void tst_QSqlQuery::init()
void tst_QSqlQuery::cleanup()
{
QFETCH( QString, dbName );
QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db );
const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if ( QTest::currentTestFunction() == QLatin1String( "numRowsAffected" )
|| QTest::currentTestFunction() == QLatin1String( "transactions" )
|| QTest::currentTestFunction() == QLatin1String( "size" )
|| QTest::currentTestFunction() == QLatin1String( "isActive" )
|| QTest::currentTestFunction() == QLatin1String( "lastInsertId" ) ) {
populateTestTables( db );
}
if (QTest::currentTestFailed() && (dbType == QSqlDriver::Oracle || db.driverName().startsWith("QODBC"))) {
//since Oracle ODBC totally craps out on error, we init again
db.close();
db.open();
}
}
void tst_QSqlQuery::generic_data(const QString& engine)
void tst_QSqlQuery::generic_data(const QString &engine)
{
if ( dbs.fillTestTable(engine) == 0 ) {
if (dbs.fillTestTable(engine) == 0) {
if (engine.isEmpty())
QSKIP( "No database drivers are available in this Qt configuration");
else
@ -108,153 +62,48 @@ void tst_QSqlQuery::generic_data(const QString& engine)
}
}
void tst_QSqlQuery::dropTestTables( QSqlDatabase db )
{
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
QStringList tablenames;
// drop all the table in case a testcase failed
tablenames << qtest
<< qTableName("qtest_null", __FILE__, db)
<< qTableName("qtest_blob", __FILE__, db)
<< qTableName("qtest_bittest", __FILE__, db)
<< qTableName("qtest_nullblob", __FILE__, db)
<< qTableName("qtest_rawtest", __FILE__, db)
<< qTableName("qtest_precision", __FILE__, db)
<< qTableName("qtest_prepare", __FILE__, db)
<< qTableName("qtestj1", __FILE__, db)
<< qTableName("qtestj2", __FILE__, db)
<< qTableName("char1Select", __FILE__, db)
<< qTableName("char1SU", __FILE__, db)
<< qTableName("qxmltest", __FILE__, db)
<< qTableName("qtest_exerr", __FILE__, db)
<< qTableName("qtest_empty", __FILE__, db)
<< qTableName("clobby", __FILE__, db)
<< qTableName("bindtest", __FILE__, db)
<< qTableName("more_results", __FILE__, db)
<< qTableName("blobstest", __FILE__, db)
<< qTableName("oraRowId", __FILE__, db)
<< qTableName("qtest_batch", __FILE__, db)
<< qTableName("bug6421", __FILE__, db).toUpper()
<< qTableName("bug5765", __FILE__, db)
<< qTableName("bug6852", __FILE__, db)
<< qTableName("qtest_lockedtable", __FILE__, db)
<< qTableName("Planet", __FILE__, db)
<< qTableName("task_250026", __FILE__, db)
<< qTableName("task_234422", __FILE__, db)
<< qTableName("test141895", __FILE__, db)
<< qTableName("qtest_oraOCINumber", __FILE__, db);
if (dbType == QSqlDriver::PostgreSQL)
tablenames << qTableName("task_233829", __FILE__, db);
if (dbType == QSqlDriver::SQLite)
tablenames << qTableName("record_sqlite", __FILE__, db);
if (dbType == QSqlDriver::MSSqlServer || dbType == QSqlDriver::Oracle)
tablenames << qTableName("qtest_longstr", __FILE__, db);
if (dbType == QSqlDriver::MSSqlServer)
db.exec("DROP PROCEDURE " + qTableName("test141895_proc", __FILE__, db));
if (dbType == QSqlDriver::MySqlServer)
db.exec("DROP PROCEDURE IF EXISTS "+qTableName("bug6852_proc", __FILE__, db));
tst_Databases::safeDropTables( db, tablenames );
if (dbType == QSqlDriver::Oracle) {
QSqlQuery q( db );
q.exec("DROP PACKAGE " + qTableName("pkg", __FILE__, db));
}
}
void tst_QSqlQuery::createTestTables( QSqlDatabase db )
{
const QString qtestNull = qTableName("qtest_null", __FILE__, db);
QSqlQuery q( db );
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if (dbType == QSqlDriver::MySqlServer)
// ### stupid workaround until we find a way to hardcode this
// in the MySQL server startup script
q.exec( "set table_type=innodb" );
else if (dbType == QSqlDriver::PostgreSQL)
QVERIFY_SQL( q, exec("set client_min_messages='warning'"));
if (dbType == QSqlDriver::PostgreSQL)
QVERIFY_SQL( q, exec( "create table " + qtest + " (id serial NOT NULL, t_varchar varchar(20), t_char char(20), primary key(id)) WITH OIDS" ) );
else
QVERIFY_SQL( q, exec( "create table " + qtest + " (id int "+tst_Databases::autoFieldName(db) +" NOT NULL, t_varchar varchar(20), t_char char(20), primary key(id))" ) );
if (dbType == QSqlDriver::MSSqlServer || dbType == QSqlDriver::Sybase)
QVERIFY_SQL(q, exec("create table " + qtestNull + " (id int null, t_varchar varchar(20) null)"));
else
QVERIFY_SQL(q, exec("create table " + qtestNull + " (id int, t_varchar varchar(20))"));
}
void tst_QSqlQuery::populateTestTables( QSqlDatabase db )
{
QSqlQuery q( db );
const QString qtest_null(qTableName("qtest_null", __FILE__, db));
q.exec( "delete from " + qtest );
QVERIFY_SQL( q, exec( "insert into " + qtest + " values (1, 'VarChar1', 'Char1')" ) );
QVERIFY_SQL( q, exec( "insert into " + qtest + " values (2, 'VarChar2', 'Char2')" ) );
QVERIFY_SQL( q, exec( "insert into " + qtest + " values (3, 'VarChar3', 'Char3')" ) );
QVERIFY_SQL( q, exec( "insert into " + qtest + " values (4, 'VarChar4', 'Char4')" ) );
QVERIFY_SQL( q, exec( "insert into " + qtest + " values (5, 'VarChar5', 'Char5')" ) );
q.exec( "delete from " + qtest_null );
QVERIFY_SQL( q, exec( "insert into " + qtest_null + " values (0, NULL)" ) );
QVERIFY_SQL( q, exec( "insert into " + qtest_null + " values (1, 'n')" ) );
QVERIFY_SQL( q, exec( "insert into " + qtest_null + " values (2, 'i')" ) );
QVERIFY_SQL( q, exec( "insert into " + qtest_null + " values (3, NULL)" ) );
}
void tst_QSqlQuery::benchmark()
{
QFETCH( QString, dbName );
QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db );
QFETCH(QString, dbName);
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
QSqlQuery q(db);
const QString tableName(qTableName("benchmark", __FILE__, db));
TableScope ts(db, "benchmark", __FILE__);
tst_Databases::safeDropTable( db, tableName );
QVERIFY_SQL(q, exec("CREATE TABLE "+tableName+"(\n"
QVERIFY_SQL(q, exec("CREATE TABLE " + ts.tableName() + "(\n"
"MainKey INT NOT NULL,\n"
"OtherTextCol VARCHAR(45) NOT NULL,\n"
"PRIMARY KEY(`MainKey`))"));
"PRIMARY KEY(MainKey))"));
int i=1;
QBENCHMARK {
QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" VALUES("+QString::number(i)+", \"Value"+QString::number(i)+"\")"));
const QString num = QString::number(i);
QVERIFY_SQL(q, exec("INSERT INTO " + ts.tableName() + " VALUES(" + num + ", 'Value" + num + "')"));
i++;
}
tst_Databases::safeDropTable( db, tableName );
}
void tst_QSqlQuery::benchmarkSelectPrepared()
{
QFETCH( QString, dbName );
QFETCH(QString, dbName);
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
QSqlQuery q(db);
const QString tableName(qTableName("benchmark", __FILE__, db));
TableScope ts(db, "benchmark", __FILE__);
tst_Databases::safeDropTable(db, tableName);
QVERIFY_SQL(q, exec("CREATE TABLE " + tableName + "(id INT NOT NULL)"));
QVERIFY_SQL(q, exec("CREATE TABLE " + ts.tableName() + "(id INT NOT NULL)"));
const int NUM_ROWS = 1000;
int expectedSum = 0;
QString fillQuery = "INSERT INTO " + tableName + " VALUES (0)";
QString fillQuery = "INSERT INTO " + ts.tableName() + " VALUES (0)";
for (int i = 1; i < NUM_ROWS; ++i) {
fillQuery += ", (" + QString::number(i) + QLatin1Char(')');
expectedSum += i;
}
QVERIFY_SQL(q, exec(fillQuery));
QVERIFY_SQL(q, prepare("SELECT id FROM "+tableName));
QVERIFY_SQL(q, prepare("SELECT id FROM " + ts.tableName()));
QBENCHMARK {
QVERIFY_SQL(q, exec());
int sum = 0;
@ -264,8 +113,6 @@ void tst_QSqlQuery::benchmarkSelectPrepared()
QCOMPARE(sum, expectedSum);
}
tst_Databases::safeDropTable(db, tableName);
}
#include "main.moc"

83
tests/benchmarks/sql/kernel/qsqlrecord/tst_bench_qsqlrecord.cpp
View File

@ -6,8 +6,6 @@
#include "../../../../auto/sql/kernel/qsqldatabase/tst_databases.h"
const QString qtest(qTableName("qtest", __FILE__, QSqlDatabase()));
class tst_QSqlRecord : public QObject
{
Q_OBJECT
@ -27,9 +25,6 @@ private slots:
private:
void generic_data(const QString &engine = QString());
void dropTestTables(QSqlDatabase db);
void createTestTables(QSqlDatabase db);
void populateTestTables(QSqlDatabase db);
tst_Databases dbs;
};
@ -39,38 +34,15 @@ QTEST_MAIN(tst_QSqlRecord)
void tst_QSqlRecord::initTestCase()
{
dbs.open();
for (const auto &dbName : std::as_const(dbs.dbNames)) {
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
dropTestTables(db); // In case of leftovers
createTestTables(db);
populateTestTables(db);
}
}
void tst_QSqlRecord::cleanupTestCase()
{
for (const auto &dbName : std::as_const(dbs.dbNames)) {
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
dropTestTables(db);
}
dbs.close();
}
void tst_QSqlRecord::cleanup()
{
QFETCH(QString, dbName);
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if (QTest::currentTestFailed() && (dbType == QSqlDriver::Oracle ||
db.driverName().startsWith("QODBC"))) {
// Since Oracle ODBC has a problem when encountering an error, we init again
db.close();
db.open();
}
}
void tst_QSqlRecord::generic_data(const QString &engine)
@ -83,74 +55,28 @@ void tst_QSqlRecord::generic_data(const QString &engine)
}
}
void tst_QSqlRecord::dropTestTables(QSqlDatabase db)
{
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
QStringList tablenames;
// drop all the tables in case a testcase failed
tablenames << qtest
<< qTableName("record", __FILE__, db);
tst_Databases::safeDropTables(db, tablenames);
if (dbType == QSqlDriver::Oracle) {
QSqlQuery q(db);
q.exec("DROP PACKAGE " + qTableName("pkg", __FILE__, db));
}
}
void tst_QSqlRecord::createTestTables(QSqlDatabase db)
{
QSqlQuery q(db);
switch (tst_Databases::getDatabaseType(db)) {
case QSqlDriver::PostgreSQL:
QVERIFY_SQL(q, exec("set client_min_messages='warning'"));
QVERIFY_SQL(q, exec("create table " + qtest + " (id serial NOT NULL, t_varchar varchar(20), "
"t_char char(20), primary key(id)) WITH OIDS"));
break;
case QSqlDriver::MySqlServer:
QVERIFY_SQL(q, exec("set table_type=innodb"));
Q_FALLTHROUGH();
default:
QVERIFY_SQL(q, exec("create table " + qtest + " (id int " + tst_Databases::autoFieldName(db) +
" NOT NULL, t_varchar varchar(20), t_char char(20), primary key(id))"));
break;
}
}
void tst_QSqlRecord::populateTestTables(QSqlDatabase db)
{
QSqlQuery q(db);
QVERIFY_SQL(q, exec("delete from " + qtest));
QVERIFY_SQL(q, exec("insert into " + qtest + " values (1, 'VarChar1', 'Char1')"));
QVERIFY_SQL(q, exec("insert into " + qtest + " values (2, 'VarChar2', 'Char2')"));
QVERIFY_SQL(q, exec("insert into " + qtest + " values (3, 'VarChar3', 'Char3')"));
QVERIFY_SQL(q, exec("insert into " + qtest + " values (4, 'VarChar4', 'Char4')"));
QVERIFY_SQL(q, exec("insert into " + qtest + " values (5, 'VarChar5', 'Char5')"));
}
void tst_QSqlRecord::benchmarkRecord()
{
QFETCH(QString, dbName);
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
const auto tableName = qTableName("record", __FILE__, db);
TableScope ts(db, "record", __FILE__);
{
QSqlQuery qry(db);
QVERIFY_SQL(qry, exec("create table " + tableName +
QVERIFY_SQL(qry, exec("create table " + ts.tableName() +
" (id int NOT NULL, t_varchar varchar(20), "
"t_char char(20), primary key(id))"));
// Limit to 500: at 600, the set-up takes nearly 5 minutes
for (int i = 0; i < 500; i++)
QVERIFY_SQL(qry, exec(QString("INSERT INTO " + tableName +
QVERIFY_SQL(qry, exec(QString("INSERT INTO " + ts.tableName() +
" VALUES (%1, 'VarChar%1', 'Char%1')").arg(i)));
QVERIFY_SQL(qry, exec(QString("SELECT * from ") + tableName));
QVERIFY_SQL(qry, exec(QString("SELECT * from ") + ts.tableName()));
QBENCHMARK {
while (qry.next())
qry.record();
QVERIFY(qry.seek(0));
}
}
tst_Databases::safeDropTables(db, QStringList() << tableName);
}
void tst_QSqlRecord::benchFieldName()
@ -174,7 +100,6 @@ void tst_QSqlRecord::benchFieldIndex()
QCOMPARE(tst_Databases::getDatabaseType(db), QSqlDriver::PostgreSQL);
QSqlQuery qry(db);
QVERIFY_SQL(qry, exec("SELECT GENERATE_SERIES(1,5000) AS r"));
qry = db.exec("SELECT GENERATE_SERIES(1,5000) AS r");
QBENCHMARK {
while (qry.next())
qry.value(0);

3
tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.cpp
View File

@ -79,7 +79,6 @@ void ChipTester::populateScene()
// Populate scene
int xx = 0;
int nitems = 0;
for (int i = -1100; i < 1100; i += 110) {
++xx;
int yy = 0;
@ -92,8 +91,6 @@ void ChipTester::populateScene()
QGraphicsItem *item = new Chip(color, xx, yy);
item->setPos(QPointF(i, j));
scene->addItem(item);
++nitems;
}
}
}