diff options
author | J-P Nurmi <j-p.nurmi@nokia.com> | 2012-09-07 14:55:36 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-13 14:20:36 +0200 |
commit | 77155afc5743022b8a08a9725cfc96378930419a (patch) | |
tree | b3cdded9cf4b87a7130e1f3a8a80f3d52b9a0599 | |
parent | c2e6830e7af23a6c4c01e47cea3fdf6acb263beb (diff) |
Remove tst_qquicktextinput::horizontalAlignment()
These tests are not valid. Will be covered by Lancelot-based scenegraph
rendering tests: https://codereview.qt-project.org/#change,34437
Change-Id: I1bb6261d7849ec00e23acce496c1e2e61152322e
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
-rw-r--r-- | tests/auto/quick/qquicktextinput/data/halign_center.png | bin | 293 -> 0 bytes | |||
-rw-r--r-- | tests/auto/quick/qquicktextinput/data/halign_left.png | bin | 291 -> 0 bytes | |||
-rw-r--r-- | tests/auto/quick/qquicktextinput/data/halign_right.png | bin | 292 -> 0 bytes | |||
-rw-r--r-- | tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp | 36 |
4 files changed, 0 insertions, 36 deletions
diff --git a/tests/auto/quick/qquicktextinput/data/halign_center.png b/tests/auto/quick/qquicktextinput/data/halign_center.png Binary files differdeleted file mode 100644 index 53e09a8e5b..0000000000 --- a/tests/auto/quick/qquicktextinput/data/halign_center.png +++ /dev/null diff --git a/tests/auto/quick/qquicktextinput/data/halign_left.png b/tests/auto/quick/qquicktextinput/data/halign_left.png Binary files differdeleted file mode 100644 index 247acbc9df..0000000000 --- a/tests/auto/quick/qquicktextinput/data/halign_left.png +++ /dev/null diff --git a/tests/auto/quick/qquicktextinput/data/halign_right.png b/tests/auto/quick/qquicktextinput/data/halign_right.png Binary files differdeleted file mode 100644 index 691bc75c89..0000000000 --- a/tests/auto/quick/qquicktextinput/data/halign_right.png +++ /dev/null diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp index b901aeaf75..0879b4bdb6 100644 --- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp @@ -131,8 +131,6 @@ private slots: void renderType(); void tripleClickSelectsAll(); - void horizontalAlignment_data(); - void horizontalAlignment(); void horizontalAlignment_RightToLeft(); void verticalAlignment(); @@ -1414,40 +1412,6 @@ void tst_qquicktextinput::renderType() QCOMPARE(spy.count(), 2); } -void tst_qquicktextinput::horizontalAlignment_data() -{ - QTest::addColumn<int>("hAlign"); - QTest::addColumn<QString>("expectfile"); - - QTest::newRow("L") << int(Qt::AlignLeft) << "halign_left"; - QTest::newRow("R") << int(Qt::AlignRight) << "halign_right"; - QTest::newRow("C") << int(Qt::AlignHCenter) << "halign_center"; -} - -void tst_qquicktextinput::horizontalAlignment() -{ - QSKIP("Image comparison of text is almost guaranteed to fail during development"); - - QFETCH(int, hAlign); - QFETCH(QString, expectfile); - - QQuickView window(testFileUrl("horizontalAlignment.qml")); - - window.show(); - QVERIFY(QTest::qWaitForWindowExposed(&window)); - - QObject *ob = window.rootObject(); - QVERIFY(ob != 0); - ob->setProperty("horizontalAlignment",hAlign); - QImage actual = window.grabWindow(); - - expectfile = createExpectedFileIfNotFound(expectfile, actual); - - QImage expect(expectfile); - - QCOMPARE(actual,expect); -} - void tst_qquicktextinput::horizontalAlignment_RightToLeft() { PlatformInputContext platformInputContext; |