AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make textEditTest pass on Windows 8

Browse Source 
We make it pass by relaxing the comparison of the characterRect....

Change-Id: I900e0601d9e1e568c12a3952cf42657743345013
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Jan Arve Saether 2013-01-04 09:21:35 +01:00 committed by The Qt Project
parent 32f7db7686
commit 07e69c7896
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
View File

@ -1544,6 +1544,21 @@ static QRect characterRect(const QTextEdit &edit, int offset)
return r;
}
/* The rects does not have to be exactly the same. They may be slightly different due to
different ways of calculating them. By having an acceptable delta, this should also
make the test a bit more resilient against any future changes in the behavior of
characterRect().
*/
static bool fuzzyRectCompare(const QRect &a, const QRect &b)
{
static const int MAX_ACCEPTABLE_DELTA = 1;
const QMargins delta(a.left() - b.left(), a.top() - b.top(),
a.right() - b.right(), a.bottom() - b.bottom());
return qAbs(delta.left()) <= MAX_ACCEPTABLE_DELTA && qAbs(delta.top()) <= MAX_ACCEPTABLE_DELTA
&& qAbs(delta.right()) <= MAX_ACCEPTABLE_DELTA && qAbs(delta.bottom()) <= MAX_ACCEPTABLE_DELTA;
}
void tst_QAccessibility::textEditTest()
{
for (int pass = 0; pass < 2; ++pass) {
@ -1580,16 +1595,16 @@ void tst_QAccessibility::textEditTest()
int offset = 10;
QCOMPARE(iface->textInterface()->text(offset, offset + 1), QStringLiteral("d"));
QCOMPARE(iface->textInterface()->characterRect(offset), characterRect(edit, offset));
QVERIFY(fuzzyRectCompare(iface->textInterface()->characterRect(offset), characterRect(edit, offset)));
offset = 13;
QCOMPARE(iface->textInterface()->text(offset, offset + 1), QStringLiteral("H"));
QCOMPARE(iface->textInterface()->characterRect(offset), characterRect(edit, offset));
QVERIFY(fuzzyRectCompare(iface->textInterface()->characterRect(offset), characterRect(edit, offset)));
offset = 21;
QCOMPARE(iface->textInterface()->text(offset, offset + 1), QStringLiteral("y"));
QCOMPARE(iface->textInterface()->characterRect(offset), characterRect(edit, offset));
QVERIFY(fuzzyRectCompare(iface->textInterface()->characterRect(offset), characterRect(edit, offset)));
offset = 32;
QCOMPARE(iface->textInterface()->text(offset, offset + 1), QStringLiteral("I"));
QCOMPARE(iface->textInterface()->characterRect(offset), characterRect(edit, offset));
QVERIFY(fuzzyRectCompare(iface->textInterface()->characterRect(offset), characterRect(edit, offset)));
QTestAccessibility::clearEvents();