Skip failing test.
authorAndrew den Exter <andrew.den-exter@nokia.com>
Wed, 16 May 2012 23:35:34 +0000 (09:35 +1000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 17 May 2012 00:39:14 +0000 (02:39 +0200)
Fix in qtbase can't be merged until the QEXPECT_FAIL's are removed.

Change-Id: Id416627cce3074549eda13331b7a88cc0313a910
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp

index 5397b6c..3367d22 100644 (file)
@@ -2684,7 +2684,7 @@ void tst_qquicktextinput::cursorRectangle_data()
 
 void tst_qquicktextinput::cursorRectangle()
 {
-
+    QSKIP("QTBUG-24801");
     QFETCH(QString, text);
     QFETCH(int, positionAtWidth);
     QFETCH(int, wrapPosition);
@@ -2756,8 +2756,6 @@ void tst_qquicktextinput::cursorRectangle()
         input.setCursorPosition(i);
         r = input.cursorRectangle();
 
-        if (i > positionAtWidth)
-            QEXPECT_FAIL("right to left", "QTBUG-24801", Continue);
         QCOMPARE(r.left(), line.cursorToX(i, QTextLine::Leading) - offset);
         QCOMPARE(r.top(), 0.);
         QCOMPARE(input.inputMethodQuery(Qt::ImCursorRectangle).toRectF(), r);
@@ -2835,7 +2833,6 @@ void tst_qquicktextinput::cursorRectangle()
     input.setCursorPosition(wrapPosition - 1);
     r = input.cursorRectangle();
     QCOMPARE(r.top(), 0.);
-    QEXPECT_FAIL("right to left", "QTBUG-24801", Continue);
     QCOMPARE(r.left(), leftToRight ? input.width() : 0);
     QCOMPARE(input.inputMethodQuery(Qt::ImCursorRectangle).toRectF(), r);
     QCOMPARE(input.positionToRectangle(10), r);