test: Split `qsqlquery' unit and benchmark test
Moving benchmark test from 'tests/auto' to 'tests/benchmarks'. Also removing 'qttest_p4' usage while we are at it. - void benchmark(); was moved to 'tests/benchmarks/sql/kernel/qsqlquery' Task-number: QTQAINFRA-353 Change-Id: I241bb1a2fba1c1b5524c21e5941a6c5daf5a4a89 Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
This commit is contained in:
Sergio Ahumada
Qt by Nokia
parent
7ec068f7f0
commit
3172631f0d
@ -1,12 +1,12 @@
|
||||
load(qttest_p4)
|
||||
TARGET = tst_qsqlquery
|
||||
CONFIG += testcase
|
||||
|
||||
SOURCES += tst_qsqlquery.cpp
|
||||
|
||||
QT = core sql
|
||||
|
||||
QT = core sql testlib
|
||||
|
||||
!wince*:win32:LIBS += -lws2_32
|
||||
|
||||
|
||||
wince*: {
|
||||
plugFiles.files = ../../../plugins/sqldrivers
|
||||
plugFiles.path = .
|
||||
|
||||
@ -217,11 +217,6 @@ private slots:
|
||||
void sqlite_constraint_data() { generic_data("QSQLITE"); }
|
||||
void sqlite_constraint();
|
||||
|
||||
#if 0
|
||||
void benchmark_data() { generic_data(); }
|
||||
void benchmark();
|
||||
#endif
|
||||
|
||||
private:
|
||||
// returns all database connections
|
||||
void generic_data(const QString &engine=QString());
|
||||
@ -3215,35 +3210,5 @@ void tst_QSqlQuery::sqlite_constraint()
|
||||
QCOMPARE(q.lastError().databaseText(), QLatin1String("Raised Abort successfully"));
|
||||
}
|
||||
|
||||
#if 0
|
||||
void tst_QSqlQuery::benchmark()
|
||||
{
|
||||
QFETCH( QString, dbName );
|
||||
QSqlDatabase db = QSqlDatabase::database( dbName );
|
||||
CHECK_DATABASE( db );
|
||||
if ( tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 )
|
||||
QSKIP( "Test requires MySQL >= 5.0");
|
||||
|
||||
QSqlQuery q(db);
|
||||
const QString tableName(qTableName("benchmark", __FILE__));
|
||||
|
||||
tst_Databases::safeDropTable( db, tableName );
|
||||
|
||||
QVERIFY_SQL(q, exec("CREATE TABLE "+tableName+"(\n"
|
||||
"MainKey INT NOT NULL,\n"
|
||||
"OtherTextCol VARCHAR(45) NOT NULL,\n"
|
||||
"PRIMARY KEY(`MainKey`))"));
|
||||
|
||||
int i=1;
|
||||
|
||||
QBENCHMARK {
|
||||
QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" VALUES("+QString::number(i)+", \"Value"+QString::number(i)+"\")"));
|
||||
i++;
|
||||
}
|
||||
|
||||
tst_Databases::safeDropTable( db, tableName );
|
||||
}
|
||||
#endif
|
||||
|
||||
QTEST_MAIN( tst_QSqlQuery )
|
||||
#include "tst_qsqlquery.moc"
|
||||
|
||||
273
tests/benchmarks/sql/kernel/qsqlquery/main.cpp
Normal file
273
tests/benchmarks/sql/kernel/qsqlquery/main.cpp
Normal file
@ -0,0 +1,273 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** This file is part of the test suite of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU Lesser
|
||||
** General Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU General
|
||||
** Public License version 3.0 as published by the Free Software Foundation
|
||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU General
|
||||
** Public License version 3.0 requirements will be met:
|
||||
** http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <QtTest/QtTest>
|
||||
#include <QtSql/QtSql>
|
||||
|
||||
#include "../../../../auto/sql/kernel/qsqldatabase/tst_databases.h"
|
||||
|
||||
const QString qtest(qTableName( "qtest", __FILE__ ));
|
||||
|
||||
class tst_QSqlQuery : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
tst_QSqlQuery();
|
||||
virtual ~tst_QSqlQuery();
|
||||
|
||||
public slots:
|
||||
void initTestCase();
|
||||
void cleanupTestCase();
|
||||
void init();
|
||||
void cleanup();
|
||||
|
||||
private slots:
|
||||
void benchmark_data() { generic_data(); }
|
||||
void benchmark();
|
||||
|
||||
private:
|
||||
// returns all database connections
|
||||
void generic_data(const QString &engine=QString());
|
||||
void dropTestTables( QSqlDatabase db );
|
||||
void createTestTables( QSqlDatabase db );
|
||||
void populateTestTables( QSqlDatabase db );
|
||||
|
||||
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();
|
||||
}
|
||||
|
||||
void tst_QSqlQuery::init()
|
||||
{
|
||||
}
|
||||
|
||||
void tst_QSqlQuery::cleanup()
|
||||
{
|
||||
QFETCH( QString, dbName );
|
||||
QSqlDatabase db = QSqlDatabase::database( dbName );
|
||||
CHECK_DATABASE( 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() && ( db.driverName().startsWith( "QOCI" )
|
||||
|| 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)
|
||||
{
|
||||
if ( dbs.fillTestTable(engine) == 0 ) {
|
||||
if (engine.isEmpty())
|
||||
QSKIP( "No database drivers are available in this Qt configuration");
|
||||
else
|
||||
QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
|
||||
}
|
||||
}
|
||||
|
||||
void tst_QSqlQuery::dropTestTables( QSqlDatabase db )
|
||||
{
|
||||
QStringList tablenames;
|
||||
// drop all the table in case a testcase failed
|
||||
tablenames << qtest
|
||||
<< qTableName( "qtest_null", __FILE__ )
|
||||
<< qTableName( "qtest_blob", __FILE__ )
|
||||
<< qTableName( "qtest_bittest", __FILE__ )
|
||||
<< qTableName( "qtest_nullblob", __FILE__ )
|
||||
<< qTableName( "qtest_rawtest", __FILE__ )
|
||||
<< qTableName( "qtest_precision", __FILE__ )
|
||||
<< qTableName( "qtest_prepare", __FILE__ )
|
||||
<< qTableName( "qtestj1", __FILE__ )
|
||||
<< qTableName( "qtestj2", __FILE__ )
|
||||
<< qTableName( "char1Select", __FILE__ )
|
||||
<< qTableName( "char1SU", __FILE__ )
|
||||
<< qTableName( "qxmltest", __FILE__ )
|
||||
<< qTableName( "qtest_exerr", __FILE__ )
|
||||
<< qTableName( "qtest_empty", __FILE__ )
|
||||
<< qTableName( "clobby", __FILE__ )
|
||||
<< qTableName( "bindtest", __FILE__ )
|
||||
<< qTableName( "more_results", __FILE__ )
|
||||
<< qTableName( "blobstest", __FILE__ )
|
||||
<< qTableName( "oraRowId", __FILE__ )
|
||||
<< qTableName( "qtest_batch", __FILE__ )
|
||||
<< qTableName("bug6421", __FILE__).toUpper()
|
||||
<< qTableName("bug5765", __FILE__)
|
||||
<< qTableName("bug6852", __FILE__)
|
||||
<< qTableName( "qtest_lockedtable", __FILE__ )
|
||||
<< qTableName( "Planet", __FILE__ )
|
||||
<< qTableName( "task_250026", __FILE__ )
|
||||
<< qTableName( "task_234422", __FILE__ )
|
||||
<< qTableName("test141895", __FILE__)
|
||||
<< qTableName("qtest_oraOCINumber", __FILE__);
|
||||
|
||||
if ( db.driverName().startsWith("QPSQL") )
|
||||
tablenames << qTableName("task_233829", __FILE__);
|
||||
|
||||
if ( db.driverName().startsWith("QSQLITE") )
|
||||
tablenames << qTableName( "record_sqlite", __FILE__ );
|
||||
|
||||
if ( tst_Databases::isSqlServer( db ) || db.driverName().startsWith( "QOCI" ) )
|
||||
tablenames << qTableName( "qtest_longstr", __FILE__ );
|
||||
|
||||
if (tst_Databases::isSqlServer( db ))
|
||||
db.exec("DROP PROCEDURE " + qTableName("test141895_proc", __FILE__));
|
||||
|
||||
if (tst_Databases::isMySQL( db ))
|
||||
db.exec("DROP PROCEDURE IF EXISTS "+qTableName("bug6852_proc", __FILE__));
|
||||
|
||||
tst_Databases::safeDropTables( db, tablenames );
|
||||
|
||||
if ( db.driverName().startsWith( "QOCI" ) ) {
|
||||
QSqlQuery q( db );
|
||||
q.exec( "DROP PACKAGE " + qTableName("pkg", __FILE__) );
|
||||
}
|
||||
}
|
||||
|
||||
void tst_QSqlQuery::createTestTables( QSqlDatabase db )
|
||||
{
|
||||
QSqlQuery q( db );
|
||||
|
||||
if ( db.driverName().startsWith( "QMYSQL" ) )
|
||||
// ### stupid workaround until we find a way to hardcode this
|
||||
// in the MySQL server startup script
|
||||
q.exec( "set table_type=innodb" );
|
||||
else if (tst_Databases::isPostgreSQL(db))
|
||||
QVERIFY_SQL( q, exec("set client_min_messages='warning'"));
|
||||
|
||||
if (tst_Databases::isPostgreSQL(db))
|
||||
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 ( tst_Databases::isSqlServer( db ) || db.driverName().startsWith( "QTDS" ) )
|
||||
QVERIFY_SQL( q, exec( "create table " + qTableName( "qtest_null", __FILE__ ) + " (id int null, t_varchar varchar(20) null)" ) );
|
||||
else
|
||||
QVERIFY_SQL( q, exec( "create table " + qTableName( "qtest_null", __FILE__ ) + " (id int, t_varchar varchar(20))" ) );
|
||||
}
|
||||
|
||||
void tst_QSqlQuery::populateTestTables( QSqlDatabase db )
|
||||
{
|
||||
QSqlQuery q( db );
|
||||
const QString qtest_null(qTableName( "qtest_null", __FILE__ ));
|
||||
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 );
|
||||
if ( tst_Databases::getMySqlVersion( db ).section( QChar('.'), 0, 0 ).toInt()<5 )
|
||||
QSKIP( "Test requires MySQL >= 5.0");
|
||||
|
||||
QSqlQuery q(db);
|
||||
const QString tableName(qTableName("benchmark", __FILE__));
|
||||
|
||||
tst_Databases::safeDropTable( db, tableName );
|
||||
|
||||
QVERIFY_SQL(q, exec("CREATE TABLE "+tableName+"(\n"
|
||||
"MainKey INT NOT NULL,\n"
|
||||
"OtherTextCol VARCHAR(45) NOT NULL,\n"
|
||||
"PRIMARY KEY(`MainKey`))"));
|
||||
|
||||
int i=1;
|
||||
|
||||
QBENCHMARK {
|
||||
QVERIFY_SQL(q, exec("INSERT INTO "+tableName+" VALUES("+QString::number(i)+", \"Value"+QString::number(i)+"\")"));
|
||||
i++;
|
||||
}
|
||||
|
||||
tst_Databases::safeDropTable( db, tableName );
|
||||
}
|
||||
|
||||
#include "main.moc"
|
||||
8
tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro
Normal file
8
tests/benchmarks/sql/kernel/qsqlquery/qsqlquery.pro
Normal file
@ -0,0 +1,8 @@
|
||||
TARGET = tst_bench_qsqlquery
|
||||
|
||||
# do not run benchmarks by default in 'make check'
|
||||
CONFIG -= testcase
|
||||
|
||||
SOURCES += main.cpp
|
||||
|
||||
QT = core sql testlib
|
||||
Loading…
Reference in New Issue
Block a user