From 77155afc5743022b8a08a9725cfc96378930419a Mon Sep 17 00:00:00 2001
From: J-P Nurmi <j-p.nurmi@nokia.com>
Date: Fri, 7 Sep 2012 14:55:36 +0200
Subject: [PATCH] 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>
---
 .../quick/qquicktextinput/data/halign_center.png   | Bin 293 -> 0 bytes
 .../quick/qquicktextinput/data/halign_left.png     | Bin 291 -> 0 bytes
 .../quick/qquicktextinput/data/halign_right.png    | Bin 292 -> 0 bytes
 .../quick/qquicktextinput/tst_qquicktextinput.cpp  |  36 ---------------------
 4 files changed, 36 deletions(-)
 delete mode 100644 tests/auto/quick/qquicktextinput/data/halign_center.png
 delete mode 100644 tests/auto/quick/qquicktextinput/data/halign_left.png
 delete mode 100644 tests/auto/quick/qquicktextinput/data/halign_right.png

diff --git a/tests/auto/quick/qquicktextinput/data/halign_center.png b/tests/auto/quick/qquicktextinput/data/halign_center.png
deleted file mode 100644
index 53e09a8e5ba3919c71d89e0371097d3c9a7b5d6d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 293
zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT1SJ3YlwJl>%*9TgAsieWw;%dH0CG7CJR*yM
z%C7@)BIAeclRz3yc)B=-WHi3L>B!e)Ai@xswP*YN$=9bY6HsL3vM9aR#8GnaNxOr=
z(>d+??yTF_@Xbfbp!0wV(_{`bMibxUca#5q@tGcTT<)jguU)^`gKz1HmHS`G^ZIzM
z<JG)VsoGm-UkVTW)A8}6hS-$lW!9hKx{f}c|Mt$NwdZDCGO*uxt<R^ct4Cv7?~;@8
zX?D}=CVH}{3C?gy5Nh;fxm>=7uf#$X!&ay}793t8uIwhqtvp@v2GCCop00i_>zopr
E0GI7?p8x;=

diff --git a/tests/auto/quick/qquicktextinput/data/halign_left.png b/tests/auto/quick/qquicktextinput/data/halign_left.png
deleted file mode 100644
index 247acbc9df0d48ec7fe3a531d6a0530cd84e20ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 291
zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT1SJ3YlwJl>%*9TgAsieWw;%dH0CG7CJR*yM
z%C7@)BIAeclRz4ddAc};WHi3L>B!e)Ai{9*T1EbT_4V4mnoe0JQ&xT!b6LQxX3x^J
zbIPP=MUu6Q`_qLQJz3NQXSgJwF??o}<bL~X%fGWPf6DDguV2agXdZp1cQDKA<C%_k
z^UkHZNBX{8yQ1#Mr-~5nSHX`<?s#vk{<HONRM`&x<x{q)mr2QbUYsa+wQS3sKdH}(
zU-tMY8FU^{VVcb0qm*&~qng3PDM%u4DG;NHbFy6QXF2X$7s{sqeZ=7D>gTe~DWM4f
Divw;y

diff --git a/tests/auto/quick/qquicktextinput/data/halign_right.png b/tests/auto/quick/qquicktextinput/data/halign_right.png
deleted file mode 100644
index 691bc75c89077c876aabd8b22d6a1f991499187c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT1SJ3YlwJl>%*9TgAsieWw;%dH0CG7CJR*yM
z%C7@)BIAeclRz4dd%8G=WHi3Ld6BEhK*AwWeDC&p|9yIk3ZlCLH_R>F*L}h8;9+@@
zSw-hg$LQ_NfAHN$$)NLq3e#i`G)5EW<aJjocP-WX{;_wDn1A^H1h2bC9==p>n;B$d
z{HWyoxowHdzJ%rQEsE(s+qQK_#thA^j|%>Ny_wVOlX-J~MDl|r785^4=<KgpS(W<i
z{iO~h<5&ED?3-{%bEZpzP@^Y{n&1pHhOpXQ#=!4#oGv%--35Ay!PC{xWt~$(69CT5
BbF}~f

diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index b901aea..0879b4b 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;
-- 
2.7.4