diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp b/tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp index 57f55c3121..ec0d63f67c 100644 --- a/tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp +++ b/tests/auto/gui/util/qintvalidator/tst_qintvalidator.cpp @@ -54,7 +54,7 @@ void tst_QIntValidator::validate_data() QTest::addColumn<QValidator::State>("state"); QTest::newRow("data0") << 0 << 100 << QString("50") << ACC; - QTest::newRow("data1") << 0 << 100 << QString("500") << INV; + QTest::newRow("data1") << 0 << 100 << QString("500") << INT; QTest::newRow("data1a") << 0 << 100 << QString("5000") << INV; QTest::newRow("data1b") << -100 << 0 << QString("50") << INT; QTest::newRow("data1c") << -100 << 0 << QString("500") << INV; @@ -121,7 +121,7 @@ void tst_QIntValidator::validate_data() QTest::newRow("5.1") << 6 << 8 << QString("5") << INT; QTest::newRow("5.2") << 6 << 8 << QString("7") << ACC; - QTest::newRow("5.3") << 6 << 8 << QString("9") << INV; + QTest::newRow("5.3") << 6 << 8 << QString("9") << INT; QTest::newRow("5.3a") << 6 << 8 << QString("19") << INV; QTest::newRow("5.4") << -8 << -6 << QString("-5") << INT; QTest::newRow("5.5") << -8 << -6 << QString("-7") << ACC; @@ -129,13 +129,13 @@ void tst_QIntValidator::validate_data() QTest::newRow("5.6a") << -8 << -6 << QString("-19") << INV; QTest::newRow("5.7") << -8 << -6 << QString("5") << INT; QTest::newRow("5.8") << -8 << -6 << QString("7") << INT; - QTest::newRow("5.9") << -8 << -6 << QString("9") << INV; + QTest::newRow("5.9") << -8 << -6 << QString("9") << INT; QTest::newRow("5.10") << -6 << 8 << QString("-5") << ACC; QTest::newRow("5.11") << -6 << 8 << QString("5") << ACC; QTest::newRow("5.12") << -6 << 8 << QString("-7") << INV; QTest::newRow("5.13") << -6 << 8 << QString("7") << ACC; QTest::newRow("5.14") << -6 << 8 << QString("-9") << INV; - QTest::newRow("5.15") << -6 << 8 << QString("9") << INV; + QTest::newRow("5.15") << -6 << 8 << QString("9") << INT; QTest::newRow("6.1") << 100 << 102 << QString("11") << INT; QTest::newRow("6.2") << 100 << 102 << QString("-11") << INV; diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index a10f128860..448e2030bc 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -2664,9 +2664,9 @@ void tst_QLineEdit::setValidator_QIntValidator_data() << 0 << 100 << QString("153") - << QString(useKeys ? "15" : "") + << QString("153") << bool(useKeys) - << bool(useKeys ? true : false) + << bool(false) << uint(QLineEdit::Normal); QTest::newRow(QString(inputMode + "range [-100,100] int '-153'").toLatin1()) << -100 @@ -2687,7 +2687,7 @@ void tst_QLineEdit::setValidator_QIntValidator_data() QTest::newRow(QString(inputMode + "range [3,7] int '8'").toLatin1()) << 3 << 7 - << QString("8") + << QString("") << QString("") << bool(useKeys) << bool(false) @@ -3292,7 +3292,7 @@ void tst_QLineEdit::editInvalidText() { QLineEdit *testWidget = ensureTestWidget(); testWidget->clear(); - testWidget->setValidator(new QIntValidator(0, 120, 0)); + testWidget->setValidator(new QIntValidator(0, 12, 0)); testWidget->setText("1234"); QVERIFY(!testWidget->hasAcceptableInput()); |