1 files changed, 75 insertions, 12 deletions

diff --git a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
index 08c6039e37..871ac24be4 100644
--- a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
+++ b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
@@ -42,10 +42,13 @@ public:
     virtual ~tst_QSqlError();
 
 private slots:
+#if QT_DEPRECATED_SINCE(5, 1)
     void getSetCheck();
+#endif
     void construction();
     void moveOperator();
     void operators();
+    void qtbug_74575();
 };
 
 tst_QSqlError::tst_QSqlError()
@@ -56,6 +59,7 @@ tst_QSqlError::~tst_QSqlError()
 {
 }
 
+#if QT_DEPRECATED_SINCE(5, 1)
 // Testing get/set functions
 void tst_QSqlError::getSetCheck()
 {
@@ -82,14 +86,28 @@ void tst_QSqlError::getSetCheck()
     obj1.setNumber(INT_MAX);
     QCOMPARE(INT_MAX, obj1.number());
 }
+#endif
 
 void tst_QSqlError::construction()
 {
-   QSqlError obj1("drivertext", "databasetext", QSqlError::UnknownError, 123);
+#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());
 
@@ -97,7 +115,9 @@ 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());
 
@@ -105,7 +125,9 @@ 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());
 
@@ -113,8 +135,11 @@ void tst_QSqlError::construction()
    QVERIFY(!obj4.isValid());
    QCOMPARE(obj4.driverText(), QString());
    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"),
@@ -122,7 +147,9 @@ 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());
 
@@ -131,17 +158,31 @@ 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());
 
-   // Default constructed object as constructed before Qt 5.3
-   QSqlError obj7(QString(), QString(), QSqlError::NoError, -1);
+#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());
    QCOMPARE(obj7.driverText(), QString());
    QCOMPARE(obj7.databaseText(), QString());
    QCOMPARE(obj7.type(), QSqlError::NoError);
-   QCOMPARE(obj7.number(), -1);
    QCOMPARE(obj7.nativeErrorCode(), QString());
 
    // Move constructor
@@ -149,37 +190,59 @@ 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());
 }
 
 void tst_QSqlError::moveOperator()
 {
-   QSqlError obj1("drivertext", "databasetext", QSqlError::UnknownError, 123), obj2;
+   QSqlError obj1("drivertext", "databasetext", QSqlError::UnknownError, QStringLiteral("123")), obj2;
    obj2 = std::move(obj1);
    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());
 }
 
 void tst_QSqlError::operators()
 {
-   QSqlError error1;
-   QSqlError error2;
-   QSqlError error3;
-
-   error1.setType(QSqlError::NoError);
-   error2.setType(QSqlError::NoError);
-   error3.setType(QSqlError::UnknownError);
+   QSqlError error1(QString(), QString(), QSqlError::NoError);
+   QSqlError error2(QString(), QString(), QSqlError::NoError);
+   QSqlError error3(QString(), QString(), QSqlError::UnknownError);
 
    QCOMPARE(error1, error2);
    QVERIFY(error1 != error3);
 }
 
+void tst_QSqlError::qtbug_74575()
+{
+   const QString driverText(QStringLiteral("drivertext"));
+   const QString databaseText(QStringLiteral("databasetext"));
+   const QString databaseTextNewline(QStringLiteral("databasetext\n"));
+
+   QSqlError error1(driverText, databaseText,
+                  QSqlError::UnknownError, QStringLiteral("123"));
+   QCOMPARE(error1.text(), databaseText + QLatin1Char(' ') + driverText);
+
+   QSqlError error2(QString(), databaseText,
+                  QSqlError::UnknownError, QStringLiteral("123"));
+   QCOMPARE(error2.text(), databaseText);
+
+   QSqlError error3(driverText, QString(),
+                  QSqlError::UnknownError, QStringLiteral("123"));
+   QCOMPARE(error3.text(), driverText);
+
+   QSqlError error4(driverText, databaseTextNewline,
+                  QSqlError::UnknownError, QStringLiteral("123"));
+   QCOMPARE(error4.text(), databaseTextNewline + driverText);
+}
 
 QTEST_MAIN(tst_QSqlError)
 #include "tst_qsqlerror.moc"