From 0cb940b1d3b9a1ba50f2d1973fca411706da266d Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Fri, 6 Apr 2018 16:25:21 +0300 Subject: tests/auto/widgets/widgets: Avoid unconditional qWait()s Task-number: QTBUG-63992 Change-Id: I7b0c259800082284ddae4e25d139ad3adc858467 Reviewed-by: Gatis Paeglis --- tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp') diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index 0c229c9194..7c1deb8fff 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -1995,19 +1995,16 @@ void tst_QComboBox::flaggedItems() QApplication::setActiveWindow(&comboBox); comboBox.activateWindow(); comboBox.setFocus(); + QVERIFY(QTest::qWaitForWindowActive(&comboBox)); QTRY_VERIFY(comboBox.isVisible()); QTRY_VERIFY(comboBox.hasFocus()); if (editable) comboBox.lineEdit()->selectAll(); - QSignalSpy indexChangedInt(&comboBox, SIGNAL(currentIndexChanged(int))); for (int i = 0; i < keyMovementList.count(); ++i) { Qt::Key key = keyMovementList[i]; QTest::keyClick(&comboBox, key); - if (indexChangedInt.count() != i + 1) { - QTest::qWait(400); - } } QCOMPARE(comboBox.currentIndex() , expectedIndex); @@ -2447,7 +2444,7 @@ void tst_QComboBox::task220195_keyBoardSelection2() combo.addItem( QLatin1String("foo3")); combo.show(); QApplication::setActiveWindow(&combo); - QTRY_COMPARE(QApplication::activeWindow(), static_cast(&combo)); + QVERIFY(QTest::qWaitForWindowActive(&combo)); combo.setCurrentIndex(-1); QVERIFY(combo.currentText().isNull()); -- cgit v1.2.3