QQuickTextInput: Fix validators test

The behavior of QDoubleValidator has changed in qtbase, in commit
3359b29c99581f52acf033489ad35884a01ccac8.

"12," is not an acceptable input anymore. Adapt the test to
reflect this.

Change-Id: I0daaae2f84325b911263ee0545523ce3cc322049
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>

1 files changed, 23 insertions, 19 deletions

diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index ed2ce98eae..2e64c80b85 100644
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
@@ -2073,11 +2073,15 @@ void tst_qquicktextinput::validators()
     QTest::keyPress(&window, Qt::Key_Comma);
     QTest::keyRelease(&window, Qt::Key_Comma, Qt::NoModifier);
     QTRY_COMPARE(dblInput->text(), QLatin1String("12,"));
-    QCOMPARE(dblInput->hasAcceptableInput(), true);
-    QTest::keyPress(&window, Qt::Key_1);
-    QTest::keyRelease(&window, Qt::Key_1, Qt::NoModifier);
-    QTRY_COMPARE(dblInput->text(), QLatin1String("12,"));
-    QCOMPARE(dblInput->hasAcceptableInput(), true);
+    int extraSignals = 2;
+    if (dblInput->hasAcceptableInput()) {
+        // TODO: old behavior of QDoubleValidator - remove when merged from qtbase
+        QTest::keyPress(&window, Qt::Key_1);
+        QTest::keyRelease(&window, Qt::Key_1, Qt::NoModifier);
+        QTRY_COMPARE(dblInput->text(), QLatin1String("12,"));
+        QCOMPARE(dblInput->hasAcceptableInput(), true);
+        extraSignals = 0;
+    }
     dblValidator->setLocaleName(deLocale.name());
     QCOMPARE(dblInput->hasAcceptableInput(), true);
     QTest::keyPress(&window, Qt::Key_1);
@@ -2106,84 +2110,84 @@ void tst_qquicktextinput::validators()
     QTRY_COMPARE(dblInput->text(), QLatin1String("12."));
     QCOMPARE(dblInput->hasAcceptableInput(), true);
     QCOMPARE(dblInput->property("acceptable").toBool(), true);
-    QCOMPARE(dblSpy.count(), 1);
+    QCOMPARE(dblSpy.count(), 1 + extraSignals);
     QTest::keyPress(&window, Qt::Key_1);
     QTest::keyRelease(&window, Qt::Key_1, Qt::NoModifier);
     QTRY_COMPARE(dblInput->text(), QLatin1String("12.1"));
     QCOMPARE(dblInput->hasAcceptableInput(), true);
     QCOMPARE(dblInput->property("acceptable").toBool(), true);
-    QCOMPARE(dblSpy.count(), 1);
+    QCOMPARE(dblSpy.count(), 1 + extraSignals);
     QTest::keyPress(&window, Qt::Key_1);
     QTest::keyRelease(&window, Qt::Key_1, Qt::NoModifier);
     QTRY_COMPARE(dblInput->text(), QLatin1String("12.11"));
     QCOMPARE(dblInput->hasAcceptableInput(), true);
     QCOMPARE(dblInput->property("acceptable").toBool(), true);
-    QCOMPARE(dblSpy.count(), 1);
+    QCOMPARE(dblSpy.count(), 1 + extraSignals);
     QTest::keyPress(&window, Qt::Key_1);
     QTest::keyRelease(&window, Qt::Key_1, Qt::NoModifier);
     QTRY_COMPARE(dblInput->text(), QLatin1String("12.11"));
     QCOMPARE(dblInput->hasAcceptableInput(), true);
     QCOMPARE(dblInput->property("acceptable").toBool(), true);
-    QCOMPARE(dblSpy.count(), 1);
+    QCOMPARE(dblSpy.count(), 1 + extraSignals);
 
     // Ensure the validator doesn't prevent characters being removed.
     dblInput->setValidator(intInput->validator());
     QCOMPARE(dblInput->text(), QLatin1String("12.11"));
     QCOMPARE(dblInput->hasAcceptableInput(), false);
     QCOMPARE(dblInput->property("acceptable").toBool(), false);
-    QCOMPARE(dblSpy.count(), 2);
+    QCOMPARE(dblSpy.count(), 2 + extraSignals);
     QTest::keyPress(&window, Qt::Key_Backspace);
     QTest::keyRelease(&window, Qt::Key_Backspace, Qt::NoModifier);
     QTRY_COMPARE(dblInput->text(), QLatin1String("12.1"));
     QCOMPARE(dblInput->hasAcceptableInput(), false);
     QCOMPARE(dblInput->property("acceptable").toBool(), false);
-    QCOMPARE(dblSpy.count(), 2);
+    QCOMPARE(dblSpy.count(), 2 + extraSignals);
     // Once unacceptable input is in anything goes until it reaches an acceptable state again.
     QTest::keyPress(&window, Qt::Key_1);
     QTest::keyRelease(&window, Qt::Key_1, Qt::NoModifier);
     QTRY_COMPARE(dblInput->text(), QLatin1String("12.11"));
     QCOMPARE(dblInput->hasAcceptableInput(), false);
-    QCOMPARE(dblSpy.count(), 2);
+    QCOMPARE(dblSpy.count(), 2 + extraSignals);
     QTest::keyPress(&window, Qt::Key_Backspace);
     QTest::keyRelease(&window, Qt::Key_Backspace, Qt::NoModifier);
     QTRY_COMPARE(dblInput->text(), QLatin1String("12.1"));
     QCOMPARE(dblInput->hasAcceptableInput(), false);
     QCOMPARE(dblInput->property("acceptable").toBool(), false);
-    QCOMPARE(dblSpy.count(), 2);
+    QCOMPARE(dblSpy.count(), 2 + extraSignals);
     QTest::keyPress(&window, Qt::Key_Backspace);
     QTest::keyRelease(&window, Qt::Key_Backspace, Qt::NoModifier);
     QTRY_COMPARE(dblInput->text(), QLatin1String("12."));
     QCOMPARE(dblInput->hasAcceptableInput(), false);
     QCOMPARE(dblInput->property("acceptable").toBool(), false);
-    QCOMPARE(dblSpy.count(), 2);
+    QCOMPARE(dblSpy.count(), 2 + extraSignals);
     QTest::keyPress(&window, Qt::Key_Backspace);
     QTest::keyRelease(&window, Qt::Key_Backspace, Qt::NoModifier);
     QTRY_COMPARE(dblInput->text(), QLatin1String("12"));
     QCOMPARE(dblInput->hasAcceptableInput(), false);
     QCOMPARE(dblInput->property("acceptable").toBool(), false);
-    QCOMPARE(dblSpy.count(), 2);
+    QCOMPARE(dblSpy.count(), 2 + extraSignals);
     QTest::keyPress(&window, Qt::Key_Backspace);
     QTest::keyRelease(&window, Qt::Key_Backspace, Qt::NoModifier);
     QTRY_COMPARE(dblInput->text(), QLatin1String("1"));
     QCOMPARE(dblInput->hasAcceptableInput(), false);
     QCOMPARE(dblInput->property("acceptable").toBool(), false);
-    QCOMPARE(dblSpy.count(), 2);
+    QCOMPARE(dblSpy.count(), 2 + extraSignals);
     QTest::keyPress(&window, Qt::Key_1);
     QTest::keyRelease(&window, Qt::Key_1, Qt::NoModifier);
     QCOMPARE(dblInput->text(), QLatin1String("11"));
     QCOMPARE(dblInput->property("acceptable").toBool(), true);
     QCOMPARE(dblInput->hasAcceptableInput(), true);
-    QCOMPARE(dblSpy.count(), 3);
+    QCOMPARE(dblSpy.count(), 3 + extraSignals);
 
     // Changing the validator properties will re-evaluate whether the input is acceptable.
     intValidator->setTop(10);
     QCOMPARE(dblInput->property("acceptable").toBool(), false);
     QCOMPARE(dblInput->hasAcceptableInput(), false);
-    QCOMPARE(dblSpy.count(), 4);
+    QCOMPARE(dblSpy.count(), 4 + extraSignals);
     intValidator->setTop(12);
     QCOMPARE(dblInput->property("acceptable").toBool(), true);
     QCOMPARE(dblInput->hasAcceptableInput(), true);
-    QCOMPARE(dblSpy.count(), 5);
+    QCOMPARE(dblSpy.count(), 5 + extraSignals);
 
     QQuickTextInput *strInput = qobject_cast<QQuickTextInput *>(qvariant_cast<QObject *>(window.rootObject()->property("strInput")));
     QVERIFY(strInput);