From b4de0b17211c58fdecece48d065e8b2dac53711c Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 7 Oct 2011 10:55:06 +1000 Subject: No need to return after QSKIP. QSKIP already causes the test function that calls it to return, so the returns removed by this commit were unreachable. Change-Id: I1fa2f3a3271927d8a600b02d8b31bd81db9146b1 Reviewed-on: http://codereview.qt-project.org/6188 Reviewed-by: Rohan McGovern --- tests/auto/sql/kernel/qsqldatabase/tst_databases.h | 2 +- tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 36 ++++++---------------- .../tst_qsqlrelationaltablemodel.cpp | 5 ++- 3 files changed, 12 insertions(+), 31 deletions(-) (limited to 'tests/auto/sql') diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h index 497f5a49df..9515d01049 100644 --- a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h +++ b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h @@ -71,7 +71,7 @@ #define QFAIL_SQL(q, stmt) QVERIFY2(!(q).stmt, tst_Databases::printError((q).lastError(), db)) #define DBMS_SPECIFIC(db, driver) \ - if (!db.driverName().startsWith(driver)) { QSKIP(driver " specific test", SkipSingle); return; } + if (!db.driverName().startsWith(driver)) { QSKIP(driver " specific test", SkipSingle); } // ### use QSystem::hostName if it is integrated in qtest/main static QString qGetHostName() diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp index dc0c86d6f4..5546cefd09 100644 --- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp @@ -571,10 +571,8 @@ void tst_QSqlQuery::oraOutValues() CHECK_DATABASE( db ); const QString tst_outValues(qTableName("tst_outValues", __FILE__)); - if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) ) { + if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) ) QSKIP( "Test requires prepared query support", SkipSingle ); - return; - } QSqlQuery q( db ); @@ -755,10 +753,8 @@ void tst_QSqlQuery::outValuesDB2() QSqlDatabase db = QSqlDatabase::database( dbName ); CHECK_DATABASE( db ); - if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) ) { + if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) ) QSKIP( "Test requires prepared query support", SkipSingle ); - return; - } QSqlQuery q( db ); @@ -794,10 +790,8 @@ void tst_QSqlQuery::outValues() CHECK_DATABASE( db ); const QString tst_outValues(qTableName("tst_outValues", __FILE__)); - if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) ) { + if ( !db.driver()->hasFeature( QSqlDriver::PreparedQueries ) ) QSKIP( "Test requires prepared query support", SkipSingle ); - return; - } QSqlQuery q( db ); @@ -824,10 +818,8 @@ void tst_QSqlQuery::outValues() " set @x = 42\n" "end\n" ) ); QVERIFY( q.prepare( "{call " + tst_outValues + "(?)}" ) ); - } else { + } else QSKIP( "Don't know how to create a stored procedure for this database server, please fix this test", SkipSingle ); - return; - } q.addBindValue( 0, QSql::Out ); @@ -1600,12 +1592,10 @@ void tst_QSqlQuery::joins() if ( db.driverName().startsWith( "QOCI" ) || db.driverName().startsWith( "QTDS" ) || db.driverName().startsWith( "QODBC" ) - || db.driverName().startsWith( "QIBASE" ) ) { + || db.driverName().startsWith( "QIBASE" ) ) // Oracle broken beyond recognition - cannot outer join on more than // one table. QSKIP( "DBMS cannot understand standard SQL", SkipSingle ); - return; - } QSqlQuery q( db ); @@ -2222,10 +2212,8 @@ void tst_QSqlQuery::bindWithDoubleColonCastOperator() // Only PostgreSQL support the double-colon cast operator - if ( !db.driverName().startsWith( "QPSQL" ) ) { + if ( !db.driverName().startsWith( "QPSQL" ) ) QSKIP( "Test requires PostgreSQL", SkipSingle ); - return; - } const QString tablename(qTableName( "bindtest", __FILE__ )); @@ -2292,10 +2280,8 @@ void tst_QSqlQuery::createQueryOnClosedDatabase() if ( !db.driverName().startsWith( "QPSQL" ) && !db.driverName().startsWith( "QOCI" ) && !db.driverName().startsWith( "QMYSQL" ) - && !db.driverName().startsWith( "QDB2" ) ) { + && !db.driverName().startsWith( "QDB2" ) ) QSKIP( "Test is specific for PostgreSQL, Oracle, MySql and DB2", SkipSingle ); - return; - } db.close(); @@ -2380,10 +2366,8 @@ void tst_QSqlQuery::sqlite_finish() QFETCH( QString, dbName ); QSqlDatabase db = QSqlDatabase::database( dbName ); CHECK_DATABASE( db ); - if (db.driverName() != QLatin1String("QSQLITE")) { + if (db.driverName() != QLatin1String("QSQLITE")) QSKIP("Sqlite3 specific test", SkipSingle); - return; - } if ( db.databaseName().startsWith( ':' ) ) QSKIP( "This test requires a database on the filesystem, not in-memory", SkipAll ); @@ -3214,10 +3198,8 @@ void tst_QSqlQuery::sqlite_constraint() QSqlDatabase db = QSqlDatabase::database( dbName ); CHECK_DATABASE( db ); - if (db.driverName() != QLatin1String("QSQLITE")) { + if (db.driverName() != QLatin1String("QSQLITE")) QSKIP("Sqlite3 specific test", SkipSingle); - return; - } QSqlQuery q(db); const QString trigger(qTableName("test_constraint", __FILE__)); diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp index 2c5af13c0c..c133b8efa0 100644 --- a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp +++ b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp @@ -1449,10 +1449,9 @@ void tst_QSqlRelationalTableModel::psqlSchemaTest() QSqlDatabase db = QSqlDatabase::database(dbName); CHECK_DATABASE(db); - if(!tst_Databases::isPostgreSQL(db)) { + if(!tst_Databases::isPostgreSQL(db)) QSKIP("Postgresql specific test", SkipSingle); - return; - } + QSqlRelationalTableModel model(0, db); QSqlQuery q(db); QVERIFY_SQL(q, exec("create schema "+qTableName("QTBUG_5373", __FILE__))); -- cgit v1.2.3