1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stabilize qwidget autotest

Browse Source 
These changes are required to make event delivery from
test lib synchronous.

Change-Id: I8f7093a2bfe01dfa1b0315620d672e7346a7a23a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
This commit is contained in:
Lars Knoll 2015-05-22 15:11:29 +02:00 committed by Simon Hausmann
parent b5af68d978
commit cf5f961064
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -3444,7 +3444,8 @@ void tst_QWidget::testDeletionInEventHandlers()
w = new Widget; w = new Widget;
w->show(); w->show();
w->deleteThis = true; w->deleteThis = true;
QTest::mouseRelease(w, Qt::LeftButton); QMouseEvent me(QEvent::MouseButtonRelease, QPoint(1, 1), Qt::LeftButton, Qt::LeftButton, 0);
qApp->notify(w, &me);
QVERIFY(w == 0); QVERIFY(w == 0);
delete w; delete w;
@ -3482,7 +3483,7 @@ void tst_QWidget::testDeletionInEventHandlers()
w->setMouseTracking(true); w->setMouseTracking(true);
w->show(); w->show();
w->deleteThis = true; w->deleteThis = true;
QMouseEvent me(QEvent::MouseMove, QPoint(0, 0), Qt::NoButton, Qt::NoButton, Qt::NoModifier); me = QMouseEvent(QEvent::MouseMove, QPoint(0, 0), Qt::NoButton, Qt::NoButton, Qt::NoModifier);
QApplication::sendEvent(w, &me); QApplication::sendEvent(w, &me);
QVERIFY(w == 0); QVERIFY(w == 0);
delete w; delete w;
@ -8957,7 +8958,7 @@ void tst_QWidget::taskQTBUG_4055_sendSyntheticEnterLeave()
int numEnterEvents, numMouseMoveEvents; int numEnterEvents, numMouseMoveEvents;
}; };
QCursor::setPos(QPoint(0,0)); QCursor::setPos(QPoint(0,0));
SELParent parent; SELParent parent;
parent.move(200, 200); parent.move(200, 200);
@ -8965,8 +8966,7 @@ void tst_QWidget::taskQTBUG_4055_sendSyntheticEnterLeave()
SELChild child(&parent); SELChild child(&parent);
child.resize(200, 200); child.resize(200, 200);
parent.show(); parent.show();
QVERIFY(QTest::qWaitForWindowExposed(&parent)); QVERIFY(QTest::qWaitForWindowActive(&parent));
QTest::qWait(150);
QCursor::setPos(child.mapToGlobal(QPoint(100, 100))); QCursor::setPos(child.mapToGlobal(QPoint(100, 100)));
// Make sure the cursor has entered the child. // Make sure the cursor has entered the child.
@ -9714,8 +9714,9 @@ void tst_QWidget::grabMouse()
QVERIFY(QTest::qWaitForWindowActive(&w)); QVERIFY(QTest::qWaitForWindowActive(&w));
QStringList expectedLog; QStringList expectedLog;
grabber->grabMouse();
QPoint mousePos = QPoint(w.width() / 2, 10); QPoint mousePos = QPoint(w.width() / 2, 10);
QTest::mouseMove(w.windowHandle(), mousePos);
grabber->grabMouse();
const int step = w.height() / 5; const int step = w.height() / 5;
for ( ; mousePos.y() < w.height() ; mousePos.ry() += step) { for ( ; mousePos.y() < w.height() ; mousePos.ry() += step) {
QTest::mouseClick(w.windowHandle(), Qt::LeftButton, 0, mousePos); QTest::mouseClick(w.windowHandle(), Qt::LeftButton, 0, mousePos);
@ -10333,6 +10334,9 @@ public:
void tst_QWidget::keyboardModifiers() void tst_QWidget::keyboardModifiers()
{ {
KeyboardWidget w; KeyboardWidget w;
w.resize(300, 300);
w.show();
QVERIFY(QTest::qWaitForWindowActive(&w));
QTest::mouseClick(&w, Qt::LeftButton, Qt::ControlModifier); QTest::mouseClick(&w, Qt::LeftButton, Qt::ControlModifier);
QCOMPARE(w.m_eventCounter, 1); QCOMPARE(w.m_eventCounter, 1);
QCOMPARE(int(w.m_modifiers), int(Qt::ControlModifier)); QCOMPARE(int(w.m_modifiers), int(Qt::ControlModifier));