From 27f9f136f7e39b5d612bc02f7ff8778ab424c07d Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 19 Oct 2011 12:53:13 +1000 Subject: Remove SkipMode parameter from QSKIP calls. The previous commit removed SkipMode from the testlib APi. This commit removes the parameter from all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I21c0ee6731c1bc6ac6d962590d9b31d7459dfbc5 Reviewed-by: Rohan McGovern --- .../qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/auto/sql/models/qsqlrelationaltablemodel') diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp index 5bfff0dc32..ad94da8e5d 100644 --- a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp +++ b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp @@ -103,7 +103,7 @@ void tst_QSqlRelationalTableModel::initTestCase_data() { dbs.open(); if (dbs.fillTestTable() == 0) - QSKIP("No database drivers are available in this Qt configuration", SkipAll); + QSKIP("No database drivers are available in this Qt configuration"); } void tst_QSqlRelationalTableModel::recreateTestTables(QSqlDatabase db) @@ -1086,7 +1086,7 @@ void tst_QSqlRelationalTableModel::casing() CHECK_DATABASE(db); if (db.driverName().startsWith("QSQLITE") || db.driverName().startsWith("QIBASE") || tst_Databases::isSqlServer(db)) - QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities", SkipAll); + QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities"); QSqlQuery q(db); QVERIFY_SQL( q, exec("create table " + qTableName("CASETEST1", db.driver()).toUpper() + @@ -1094,7 +1094,7 @@ void tst_QSqlRelationalTableModel::casing() if( !q.exec("create table " + qTableName("casetest1", db.driver()) + " (ident int not null primary key, name varchar(20), title_key int)")) - QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities", SkipAll); + QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities"); QVERIFY_SQL( q, exec("insert into " + qTableName("CASETEST1", db.driver()).toUpper() + " values(1, 'harry', 1, 2)")); QVERIFY_SQL( q, exec("insert into " + qTableName("CASETEST1", db.driver()).toUpper() + " values(2, 'trond', 2, 1)")); @@ -1364,7 +1364,7 @@ void tst_QSqlRelationalTableModel::whiteSpaceInIdentifiers() CHECK_DATABASE(db); if (!testWhiteSpaceNames(db.driverName())) - QSKIP("White space test irrelevant for driver", SkipAll); + QSKIP("White space test irrelevant for driver"); QSqlRelationalTableModel model(0, db); model.setTable(db.driver()->escapeIdentifier(qTableName("rel", __FILE__)+" test6", QSqlDriver::TableName)); model.setSort(0, Qt::DescendingOrder); @@ -1448,7 +1448,7 @@ void tst_QSqlRelationalTableModel::psqlSchemaTest() CHECK_DATABASE(db); if(!tst_Databases::isPostgreSQL(db)) - QSKIP("Postgresql specific test", SkipSingle); + QSKIP("Postgresql specific test"); QSqlRelationalTableModel model(0, db); QSqlQuery q(db); -- cgit v1.2.3