From 5507d0f1b04ea6b1d91be9ade30bc31d1830c220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io>
Date: Mon, 6 Jan 2020 13:23:42 +0100
Subject: [PATCH] Make setReadOnly track ReadOnlyChange events only
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The test was previously tracking all Change events,
which made it fragile.

Change-Id: I17872341237009a9a0a2ad2fd5482f917991d7b2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 .../widgets/widgets/qspinbox/tst_qspinbox.cpp     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
index 30c57c73e52..f8022559b20 100644
--- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
+++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
@@ -500,26 +500,27 @@ void tst_QSpinBox::valueChangedHelper(int value)
     actualValues << value;
 }
 
-class MySpinBox: public QSpinBox
+class ReadOnlyChangeTracker: public QSpinBox
 {
 public:
-    MySpinBox(QWidget *parent = 0) : QSpinBox(parent) {}
+    ReadOnlyChangeTracker(QWidget *parent = 0) : QSpinBox(parent) {}
 
     void changeEvent(QEvent *ev) {
-        eventsReceived.append(ev->type());
+        if (ev->type() == QEvent::ReadOnlyChange)
+            ++readOnlyChangeEventCount;
     }
-    QList<QEvent::Type> eventsReceived;
+    int readOnlyChangeEventCount = 0;
 };
 
 void tst_QSpinBox::setReadOnly()
 {
-    MySpinBox spin(0);
+    ReadOnlyChangeTracker spin(0);
     spin.show();
     QTest::keyClick(&spin, Qt::Key_Up);
     QCOMPARE(spin.value(), 1);
     spin.setReadOnly(true);
 #ifndef Q_OS_WINRT // QTBUG-68297
-    QCOMPARE(spin.eventsReceived, QList<QEvent::Type>() << QEvent::ReadOnlyChange);
+    QCOMPARE(spin.readOnlyChangeEventCount, 1);
 #endif
     QTest::keyClick(&spin, Qt::Key_Up);
     QCOMPARE(spin.value(), 1);
@@ -527,7 +528,7 @@ void tst_QSpinBox::setReadOnly()
     QCOMPARE(spin.value(), 2);
     spin.setReadOnly(false);
 #ifndef Q_OS_WINRT // QTBUG-68297
-    QCOMPARE(spin.eventsReceived, QList<QEvent::Type>() << QEvent::ReadOnlyChange << QEvent::ReadOnlyChange);
+    QCOMPARE(spin.readOnlyChangeEventCount, 2);
 #endif
     QTest::keyClick(&spin, Qt::Key_Up);
     QCOMPARE(spin.value(), 3);