diff options
author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-10-23 14:41:31 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-23 22:14:38 +0200 |
commit | 3172631f0d40f34249f376f9b94a40919573d0c7 (patch) | |
tree | f2ddbfbf2089bb5aa4e66154e781b41c6b63f5f6 /tests/auto/sql | |
parent | 7ec068f7f054a1a9a4287cd0563941c951baf2ab (diff) |
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>
Diffstat (limited to 'tests/auto/sql')
-rw-r--r-- | tests/auto/sql/kernel/qsqlquery/qsqlquery.pro | 8 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 35 |
2 files changed, 4 insertions, 39 deletions
diff --git a/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro b/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro index 9f862de9a4..c1e2a7ebb1 100644 --- a/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro +++ b/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro @@ -1,12 +1,12 @@ -load(qttest_p4) -SOURCES += tst_qsqlquery.cpp +TARGET = tst_qsqlquery +CONFIG += testcase -QT = core sql +SOURCES += tst_qsqlquery.cpp +QT = core sql testlib !wince*:win32:LIBS += -lws2_32 - wince*: { plugFiles.files = ../../../plugins/sqldrivers plugFiles.path = . diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp index c2c66a5642..a88a26d24d 100644 --- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp @@ -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" |