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

Add some debug information to tst_qwindow

Browse Source 
The test still fails sporadically at a new place, so this adds some
debug information when it fails to may help us identify what is going
wrong.

Change-Id: Ife0f171299ef7e800a2d808602e76ca2f3885964
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
This commit is contained in:
Simon Hausmann 2014-12-17 13:47:19 +01:00 committed by Jørgen Lind
parent 7f6c4390ec
commit bfbb985ed5
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
View File

@ -154,6 +154,7 @@ public:
void reset() void reset()
{ {
m_received.clear(); m_received.clear();
m_framePositionsOnMove.clear();
} }
bool event(QEvent *event) bool event(QEvent *event)
@ -162,6 +163,8 @@ public:
m_order << event->type(); m_order << event->type();
if (event->type() == QEvent::Expose) if (event->type() == QEvent::Expose)
m_exposeRegion = static_cast<QExposeEvent *>(event)->region(); m_exposeRegion = static_cast<QExposeEvent *>(event)->region();
else if (event->type() == QEvent::Move)
m_framePositionsOnMove << framePosition();
return QWindow::event(event); return QWindow::event(event);
} }
@ -181,6 +184,7 @@ public:
return m_exposeRegion; return m_exposeRegion;
} }
QVector<QPoint> m_framePositionsOnMove;
private: private:
QHash<QEvent::Type, int> m_received; QHash<QEvent::Type, int> m_received;
QVector<QEvent::Type> m_order; QVector<QEvent::Type> m_order;
@ -304,9 +308,17 @@ void tst_QWindow::positioning()
QPoint framePos = QPlatformScreen::platformScreenForWindow(&window)->availableGeometry().center(); QPoint framePos = QPlatformScreen::platformScreenForWindow(&window)->availableGeometry().center();
window.reset(); window.reset();
const QPoint oldFramePos = window.framePosition();
window.setFramePosition(framePos); window.setFramePosition(framePos);
QTRY_VERIFY(window.received(QEvent::Move)); QTRY_VERIFY(window.received(QEvent::Move));
if (window.framePosition() != framePos) {
qDebug() << "About to fail auto-test. Here is some additional information:";
qDebug() << "window.framePosition() == " << window.framePosition();
qDebug() << "old frame position == " << oldFramePos;
qDebug() << "We received " << window.received(QEvent::Move) << " move events";
qDebug() << "frame positions after each move event:" << window.m_framePositionsOnMove;
}
QTRY_COMPARE(framePos, window.framePosition()); QTRY_COMPARE(framePos, window.framePosition());
QTRY_COMPARE(originalMargins, window.frameMargins()); QTRY_COMPARE(originalMargins, window.frameMargins());
QCOMPARE(window.position(), window.framePosition() + QPoint(originalMargins.left(), originalMargins.top())); QCOMPARE(window.position(), window.framePosition() + QPoint(originalMargins.left(), originalMargins.top()));