diff options
Diffstat (limited to 'tests/auto/sql')
19 files changed, 202 insertions, 81 deletions
diff --git a/tests/auto/sql/CMakeLists.txt b/tests/auto/sql/CMakeLists.txt new file mode 100644 index 0000000000..415d7598ae --- /dev/null +++ b/tests/auto/sql/CMakeLists.txt @@ -0,0 +1,4 @@ +# Generated from sql.pro. + +add_subdirectory(kernel) +add_subdirectory(models) diff --git a/tests/auto/sql/kernel/CMakeLists.txt b/tests/auto/sql/kernel/CMakeLists.txt new file mode 100644 index 0000000000..8d3f0b6bc5 --- /dev/null +++ b/tests/auto/sql/kernel/CMakeLists.txt @@ -0,0 +1,9 @@ +add_subdirectory(qsqlfield) +add_subdirectory(qsqldatabase) +add_subdirectory(qsqlerror) +add_subdirectory(qsqldriver) +add_subdirectory(qsqlquery) +add_subdirectory(qsqlrecord) +add_subdirectory(qsqlthread) +add_subdirectory(qsql) +add_subdirectory(qsqlresult) diff --git a/tests/auto/sql/kernel/qsql/CMakeLists.txt b/tests/auto/sql/kernel/qsql/CMakeLists.txt new file mode 100644 index 0000000000..c3c3eac7d2 --- /dev/null +++ b/tests/auto/sql/kernel/qsql/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from qsql.pro. + +##################################################################### +## tst_qsql Test: +##################################################################### + +add_qt_test(tst_qsql + SOURCES + tst_qsql.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::SqlPrivate +) diff --git a/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt new file mode 100644 index 0000000000..ae64269c11 --- /dev/null +++ b/tests/auto/sql/kernel/qsqldatabase/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qsqldatabase.pro. + +##################################################################### +## tst_qsqldatabase Test: +##################################################################### + +add_qt_test(tst_qsqldatabase + SOURCES + tst_qsqldatabase.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Sql + Qt::SqlPrivate +) diff --git a/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt new file mode 100644 index 0000000000..30ce3c1053 --- /dev/null +++ b/tests/auto/sql/kernel/qsqldriver/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qsqldriver.pro. + +##################################################################### +## tst_qsqldriver Test: +##################################################################### + +add_qt_test(tst_qsqldriver + SOURCES + tst_qsqldriver.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Sql + Qt::SqlPrivate +) diff --git a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp index 15190b0f3e..5fa5c1bb58 100644 --- a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp +++ b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp @@ -143,7 +143,7 @@ void tst_QSqlDriver::record() QCOMPARE(rec.count(), fields.size()); QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db); - // QTBUG-1363: QSqlField::length() always return -1 when using QODBC3 driver and QSqlDatabase::record() + // QTBUG-1363: QSqlField::length() always return -1 when using QODBC driver and QSqlDatabase::record() if (dbType == QSqlDriver::MSSqlServer && db.driverName().startsWith("QODBC")) QCOMPARE(rec.field(1).length(), 20); diff --git a/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt b/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt new file mode 100644 index 0000000000..45e7bb383b --- /dev/null +++ b/tests/auto/sql/kernel/qsqlerror/CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from qsqlerror.pro. + +##################################################################### +## tst_qsqlerror Test: +##################################################################### + +add_qt_test(tst_qsqlerror + SOURCES + tst_qsqlerror.cpp + PUBLIC_LIBRARIES + Qt::Sql +) diff --git a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp index 871ac24be4..db64e5aa47 100644 --- a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp +++ b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp @@ -42,9 +42,6 @@ public: virtual ~tst_QSqlError(); private slots: -#if QT_DEPRECATED_SINCE(5, 1) - void getSetCheck(); -#endif void construction(); void moveOperator(); void operators(); @@ -59,55 +56,12 @@ tst_QSqlError::~tst_QSqlError() { } -#if QT_DEPRECATED_SINCE(5, 1) -// Testing get/set functions -void tst_QSqlError::getSetCheck() -{ - QSqlError obj1; - // ErrorType QSqlError::type() - // void QSqlError::setType(ErrorType) - obj1.setType(QSqlError::ErrorType(QSqlError::NoError)); - QCOMPARE(QSqlError::ErrorType(QSqlError::NoError), obj1.type()); - obj1.setType(QSqlError::ErrorType(QSqlError::ConnectionError)); - QCOMPARE(QSqlError::ErrorType(QSqlError::ConnectionError), obj1.type()); - obj1.setType(QSqlError::ErrorType(QSqlError::StatementError)); - QCOMPARE(QSqlError::ErrorType(QSqlError::StatementError), obj1.type()); - obj1.setType(QSqlError::ErrorType(QSqlError::TransactionError)); - QCOMPARE(QSqlError::ErrorType(QSqlError::TransactionError), obj1.type()); - obj1.setType(QSqlError::ErrorType(QSqlError::UnknownError)); - QCOMPARE(QSqlError::ErrorType(QSqlError::UnknownError), obj1.type()); - - // int QSqlError::number() - // void QSqlError::setNumber(int) - obj1.setNumber(0); - QCOMPARE(0, obj1.number()); - obj1.setNumber(INT_MIN); - QCOMPARE(INT_MIN, obj1.number()); - obj1.setNumber(INT_MAX); - QCOMPARE(INT_MAX, obj1.number()); -} -#endif - void tst_QSqlError::construction() { -#if QT_DEPRECATED_SINCE(5, 3) - { - QSqlError obj1("drivertext", "databasetext", QSqlError::UnknownError, 123); - QCOMPARE(obj1.driverText(), QString("drivertext")); - QCOMPARE(obj1.databaseText(), QString("databasetext")); - QCOMPARE(obj1.type(), QSqlError::UnknownError); - QCOMPARE(obj1.number(), 123); - QCOMPARE(obj1.nativeErrorCode(), QStringLiteral("123")); - QVERIFY(obj1.isValid()); - } -#endif QSqlError obj1("drivertext", "databasetext", QSqlError::UnknownError, QStringLiteral("123")); QCOMPARE(obj1.driverText(), QString("drivertext")); QCOMPARE(obj1.databaseText(), QString("databasetext")); QCOMPARE(obj1.type(), QSqlError::UnknownError); -#if QT_DEPRECATED_SINCE(5, 3) - QCOMPARE(obj1.number(), 123); -#endif QCOMPARE(obj1.nativeErrorCode(), QStringLiteral("123")); QVERIFY(obj1.isValid()); @@ -115,9 +69,6 @@ void tst_QSqlError::construction() QCOMPARE(obj2.driverText(), obj1.driverText()); QCOMPARE(obj2.databaseText(), obj1.databaseText()); QCOMPARE(obj2.type(), obj1.type()); -#if QT_DEPRECATED_SINCE(5, 3) - QCOMPARE(obj2.number(), obj1.number()); -#endif QCOMPARE(obj2.nativeErrorCode(), obj1.nativeErrorCode()); QVERIFY(obj2.isValid()); @@ -125,9 +76,6 @@ void tst_QSqlError::construction() QCOMPARE(obj3.driverText(), obj2.driverText()); QCOMPARE(obj3.databaseText(), obj2.databaseText()); QCOMPARE(obj3.type(), obj2.type()); -#if QT_DEPRECATED_SINCE(5, 3) - QCOMPARE(obj3.number(), obj2.number()); -#endif QCOMPARE(obj3.nativeErrorCode(), obj2.nativeErrorCode()); QVERIFY(obj3.isValid()); @@ -137,9 +85,6 @@ void tst_QSqlError::construction() QCOMPARE(obj4.databaseText(), QString()); QCOMPARE(obj4.text(), QString()); QCOMPARE(obj4.type(), QSqlError::NoError); -#if QT_DEPRECATED_SINCE(5, 3) - QCOMPARE(obj4.number(), -1); -#endif QCOMPARE(obj4.nativeErrorCode(), QString()); QSqlError obj5(QStringLiteral("drivertext"), QStringLiteral("databasetext"), @@ -147,9 +92,6 @@ void tst_QSqlError::construction() QCOMPARE(obj5.driverText(), QString("drivertext")); QCOMPARE(obj5.databaseText(), QString("databasetext")); QCOMPARE(obj5.type(), QSqlError::UnknownError); -#if QT_DEPRECATED_SINCE(5, 3) - QCOMPARE(obj5.number(), 123); -#endif QCOMPARE(obj5.nativeErrorCode(), QStringLiteral("123")); QVERIFY(obj5.isValid()); @@ -158,25 +100,9 @@ void tst_QSqlError::construction() QCOMPARE(obj6.driverText(), QString("drivertext")); QCOMPARE(obj6.databaseText(), QString("databasetext")); QCOMPARE(obj6.type(), QSqlError::UnknownError); -#if QT_DEPRECATED_SINCE(5, 3) - QCOMPARE(obj6.number(), 0); -#endif QCOMPARE(obj6.nativeErrorCode(), QStringLiteral("Err123")); QVERIFY(obj6.isValid()); -#if QT_DEPRECATED_SINCE(5, 3) - { - // Default constructed object as constructed before Qt 5.3 - QSqlError obj7(QString(), QString(), QSqlError::NoError, -1); - QVERIFY(!obj7.isValid()); - QCOMPARE(obj7.driverText(), QString()); - QCOMPARE(obj7.databaseText(), QString()); - QCOMPARE(obj7.type(), QSqlError::NoError); - QCOMPARE(obj7.number(), -1); - QCOMPARE(obj7.nativeErrorCode(), QString()); - } -#endif - // Default constructed object QSqlError obj7; QVERIFY(!obj7.isValid()); @@ -190,9 +116,6 @@ void tst_QSqlError::construction() QCOMPARE(obj8.driverText(), obj2.driverText()); QCOMPARE(obj8.databaseText(), obj2.databaseText()); QCOMPARE(obj8.type(), obj2.type()); -#if QT_DEPRECATED_SINCE(5, 3) - QCOMPARE(obj8.number(), obj2.number()); -#endif QCOMPARE(obj8.nativeErrorCode(), obj2.nativeErrorCode()); QVERIFY(obj8.isValid()); } @@ -204,9 +127,6 @@ void tst_QSqlError::moveOperator() QCOMPARE(obj2.driverText(), QString("drivertext")); QCOMPARE(obj2.databaseText(), QString("databasetext")); QCOMPARE(obj2.type(), QSqlError::UnknownError); -#if QT_DEPRECATED_SINCE(5, 3) - QCOMPARE(obj2.number(), 123); -#endif QCOMPARE(obj2.nativeErrorCode(), QStringLiteral("123")); QVERIFY(obj2.isValid()); } diff --git a/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt b/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt new file mode 100644 index 0000000000..0a570ed1f2 --- /dev/null +++ b/tests/auto/sql/kernel/qsqlfield/CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from qsqlfield.pro. + +##################################################################### +## tst_qsqlfield Test: +##################################################################### + +add_qt_test(tst_qsqlfield + SOURCES + tst_qsqlfield.cpp + PUBLIC_LIBRARIES + Qt::Sql +) diff --git a/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt new file mode 100644 index 0000000000..a5d3c96baa --- /dev/null +++ b/tests/auto/sql/kernel/qsqlquery/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qsqlquery.pro. + +##################################################################### +## tst_qsqlquery Test: +##################################################################### + +add_qt_test(tst_qsqlquery + SOURCES + tst_qsqlquery.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Sql + Qt::SqlPrivate +) diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp index 3aa23c504d..e15ac4faf3 100644 --- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp @@ -4537,6 +4537,9 @@ void tst_QSqlQuery::QTBUG_57138() void tst_QSqlQuery::dateTime_data() { + if (dbs.dbNames.isEmpty()) + QSKIP( "No database drivers are available in this Qt configuration"); + QTest::addColumn<QString>("dbName"); QTest::addColumn<QString>("tableName"); QTest::addColumn<QString>("createTableString"); diff --git a/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt b/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt new file mode 100644 index 0000000000..743dc27e9d --- /dev/null +++ b/tests/auto/sql/kernel/qsqlrecord/CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from qsqlrecord.pro. + +##################################################################### +## tst_qsqlrecord Test: +##################################################################### + +add_qt_test(tst_qsqlrecord + SOURCES + tst_qsqlrecord.cpp + PUBLIC_LIBRARIES + Qt::Sql +) diff --git a/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt new file mode 100644 index 0000000000..c150c8a9d7 --- /dev/null +++ b/tests/auto/sql/kernel/qsqlresult/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from qsqlresult.pro. + +##################################################################### +## tst_qsqlresult Test: +##################################################################### + +add_qt_test(tst_qsqlresult + SOURCES + testsqldriver.h + tst_qsqlresult.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Sql + Qt::SqlPrivate +) diff --git a/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt new file mode 100644 index 0000000000..17e66f42dd --- /dev/null +++ b/tests/auto/sql/kernel/qsqlthread/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qsqlthread.pro. + +##################################################################### +## tst_qsqlthread Test: +##################################################################### + +add_qt_test(tst_qsqlthread + SOURCES + tst_qsqlthread.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Sql + Qt::SqlPrivate +) diff --git a/tests/auto/sql/models/CMakeLists.txt b/tests/auto/sql/models/CMakeLists.txt new file mode 100644 index 0000000000..df530443c4 --- /dev/null +++ b/tests/auto/sql/models/CMakeLists.txt @@ -0,0 +1,6 @@ +add_subdirectory(qsqlrelationaltablemodel) +add_subdirectory(qsqltablemodel) + +if(TARGET Qt::Widgets) + add_subdirectory(qsqlquerymodel) +endif() diff --git a/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt b/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt new file mode 100644 index 0000000000..f2da569f8f --- /dev/null +++ b/tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt @@ -0,0 +1,16 @@ +# Generated from qsqlquerymodel.pro. + +##################################################################### +## tst_qsqlquerymodel Test: +##################################################################### + +add_qt_test(tst_qsqlquerymodel + SOURCES + tst_qsqlquerymodel.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::Sql + Qt::SqlPrivate + Qt::Widgets +) diff --git a/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt b/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt new file mode 100644 index 0000000000..caadae1df5 --- /dev/null +++ b/tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from qsqlrelationaldelegate.pro. + +##################################################################### +## tst_qsqlrelationaldelegate Test: +##################################################################### + +add_qt_test(tst_qsqlrelationaldelegate + SOURCES + tst_qsqlrelationaldelegate.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Sql + Qt::SqlPrivate + Qt::Widgets +) diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt b/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt new file mode 100644 index 0000000000..f695a6173e --- /dev/null +++ b/tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qsqlrelationaltablemodel.pro. + +##################################################################### +## tst_qsqlrelationaltablemodel Test: +##################################################################### + +add_qt_test(tst_qsqlrelationaltablemodel + SOURCES + tst_qsqlrelationaltablemodel.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Sql + Qt::SqlPrivate +) diff --git a/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt b/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt new file mode 100644 index 0000000000..f3e703591f --- /dev/null +++ b/tests/auto/sql/models/qsqltablemodel/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qsqltablemodel.pro. + +##################################################################### +## tst_qsqltablemodel Test: +##################################################################### + +add_qt_test(tst_qsqltablemodel + SOURCES + tst_qsqltablemodel.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Sql + Qt::SqlPrivate +) |