From 953d620489f883100da748a922962d0f95314815 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 7 Sep 2012 14:58:43 +0200 Subject: [PATCH] Remove tst_qquicktextedit::alignments() These tests are not valid. Will be covered by Lancelot-based scenegraph rendering tests: https://codereview.qt-project.org/#change,34437 Change-Id: I5f32d09f95bab1b153c821b101599ee7d52e1867 Reviewed-by: Sergio Ahumada Reviewed-by: Caroline Chao Reviewed-by: Yoann Lopes Reviewed-by: Jens Bache-Wiig --- .../auto/quick/qquicktextedit/data/alignments.qml | 41 ---------------- .../quick/qquicktextedit/data/alignments_cb.png | Bin 496 -> 0 bytes .../quick/qquicktextedit/data/alignments_cc.png | Bin 556 -> 0 bytes .../quick/qquicktextedit/data/alignments_ct.png | Bin 533 -> 0 bytes .../quick/qquicktextedit/data/alignments_lb.png | Bin 496 -> 0 bytes .../quick/qquicktextedit/data/alignments_lc.png | Bin 535 -> 0 bytes .../quick/qquicktextedit/data/alignments_lt.png | Bin 514 -> 0 bytes .../quick/qquicktextedit/data/alignments_rb.png | Bin 505 -> 0 bytes .../quick/qquicktextedit/data/alignments_rc.png | Bin 559 -> 0 bytes .../quick/qquicktextedit/data/alignments_rt.png | Bin 539 -> 0 bytes .../quick/qquicktextedit/tst_qquicktextedit.cpp | 50 -------------------- 11 files changed, 0 insertions(+), 91 deletions(-) delete mode 100644 tests/auto/quick/qquicktextedit/data/alignments.qml delete mode 100644 tests/auto/quick/qquicktextedit/data/alignments_cb.png delete mode 100644 tests/auto/quick/qquicktextedit/data/alignments_cc.png delete mode 100644 tests/auto/quick/qquicktextedit/data/alignments_ct.png delete mode 100644 tests/auto/quick/qquicktextedit/data/alignments_lb.png delete mode 100644 tests/auto/quick/qquicktextedit/data/alignments_lc.png delete mode 100644 tests/auto/quick/qquicktextedit/data/alignments_lt.png delete mode 100644 tests/auto/quick/qquicktextedit/data/alignments_rb.png delete mode 100644 tests/auto/quick/qquicktextedit/data/alignments_rc.png delete mode 100644 tests/auto/quick/qquicktextedit/data/alignments_rt.png diff --git a/tests/auto/quick/qquicktextedit/data/alignments.qml b/tests/auto/quick/qquicktextedit/data/alignments.qml deleted file mode 100644 index 7d365da..0000000 --- a/tests/auto/quick/qquicktextedit/data/alignments.qml +++ /dev/null @@ -1,41 +0,0 @@ -import QtQuick 2.0 - -Rectangle { - id: top - width: 70; height: 70; - - property alias horizontalAlignment: t.horizontalAlignment - property alias verticalAlignment: t.verticalAlignment - property alias wrapMode: t.wrapMode - property alias running: timer.running - property string txt: "Test" - - Rectangle { - anchors.centerIn: parent - width: 40 - height: 40 - color: "green" - - TextEdit { - id: t - - anchors.fill: parent - horizontalAlignment: TextEdit.AlignRight - verticalAlignment: TextEdit.AlignBottom - wrapMode: TextEdit.WordWrap - text: top.txt - } - Timer { - id: timer - - interval: 1 - running: true - repeat: true - onTriggered: { - top.txt = top.txt + "
more " + top.txt.length; - if (top.txt.length > 50) - running = false - } - } - } -} diff --git a/tests/auto/quick/qquicktextedit/data/alignments_cb.png b/tests/auto/quick/qquicktextedit/data/alignments_cb.png deleted file mode 100644 index 99de2192de7fd86a09fa99164b5a86af72038c04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT1SJ3YlwJl>%*9TgAsieWw;%dH0CG7CJR*x3 z82EgFSdH<(om;6442+XKT^vI)8sE-(-NmfP(^`7-`@5U!<@FqoGIDy4`58S~ETZpd zBW$?bIoV6ILnv7%`+UKjo+klUeAx|7YIvzuui9t(OyFP))SS5)u~0`W--6KvU>e=Z{nl3=T$wrsR0;g44$rjF6*2UngBwc*VO<3 diff --git a/tests/auto/quick/qquicktextedit/data/alignments_cc.png b/tests/auto/quick/qquicktextedit/data/alignments_cc.png deleted file mode 100644 index cb8525118018bd1c907edf1467c86956bee0abbc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 556 zcmV+{0@MA8P)&2!?gpeed0syB|#q ziuOpw7CN6SjUR;dEwpkHVoE8zi?63|K%Xti16z^@UMT5X(N~O-PMlxP_9^tdVtTl+3mshBwgY)Y$yO`3ZEeR~;n!8N{Fq=!rs)v0pJ;Rpd0UMIg|60f~BkAMHFcTkfuqntom>D0e zVJ=E2uV5z+O3QJ#BKwjXs|U!9aYdV+B(Rig?luij+Eh~^yL#}zmgIrke=jvbIY4V` z7<-aXuE?=kJycF4SgIb-cO}70^#HZn&sg>F(Q<%YJ$PVC@_@agwl^5Yo+Qi`5Vos_ zOUy+H>@Rd4GadI_1$T*ufn9V$Ex}Ut&@`5_s|OG4?i3H$IBG)(r2VUE+mrgSBB?2( z*Uop&bxFLFmA0YLp0&z;@WEg1*_(QoX!GN72UP>!;Pck)IJ__M&Tl&Rxz1}-lT;;M uZ?|bc<9w{lXxrzK2eu>+Y)Kw?p`<@wJNAS<)`9B)0000%*9TgAsieWw;%dH0CG7CJR*x3 z82EgFSdH<(om;6442(NGT^vI)8sE;inRi5i$JP1j|95YvUuL%wtTvd@GxuYqLxRqc zqdIp=@75`lnK)^?A_Csn)=;O?D>1snT@S#_50!;Cimu*U#T+z$jpva~?7Tqx@BG^v!kWptbzR~UPp7Pf%BIyP*cK{i zRy$N{a3yVG-|)2V(580p^Nc#x7Z`NCv?>y&xY%qx_gDU6@#!gIhcXtK%_}}vE&s*G zKgZ7Nxf9!_l{$KVPC4o4?om*lvao1RnAPmCW&2gS&zw58`@POr_3+rf)2%BGsjaMM zJ9lrDb2k5Z#n)8{4;$Z4^1Rg0@kUX=o_TrT7u9>qwI09ouF3vZ;NrOW6FXDI)hV9$ Sb=CkQmci52&t;ucLK6V0vEAVS diff --git a/tests/auto/quick/qquicktextedit/data/alignments_lb.png b/tests/auto/quick/qquicktextedit/data/alignments_lb.png deleted file mode 100644 index 1b50a81f3d4591a90ee76782234738242d99e480..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT1SJ3YlwJl>%*9TgAsieWw;%dH0CG7CJR*x3 z82EgFSdH<(om;6442+XKT^vI)8sE-(op)G)r#10b_4_v`Z}xk16nJJQr|tf{uOdt#eXa*=g(ARt`*@-ey7MerRZuo{{+hptDc?goIE?&b&Sra-f3okbYD{r g=o&Qi!@;xu%*^Y&bKV6!2gVtLr>mdKI;Vst08QW2{{R30 diff --git a/tests/auto/quick/qquicktextedit/data/alignments_lc.png b/tests/auto/quick/qquicktextedit/data/alignments_lc.png deleted file mode 100644 index f041b868f8347253aecfe9923a4d2604e01d2d85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 535 zcmV+y0_gpTP)r{`>6ta_6Cm zp`cSeEyUf3b{3 z;CZP?bX^F6x-oW-=VQV~zojG;BZq+ae9}<@UZTs5?dRhyGAfA%TM~GYhXZffUe3er zrEmE#m`(U+gwhMWw1FfD&$n6<fxn?~$41jmdO*3Fjw>FqgHj=eaiMLLhs% z0S%*&)HW;$S;!Sfiw4MSB;aKab}y~LBxzu&B-GE00ai=8eZ$AHhXb6S$nGDUE!(GM z*;iPdJrs>Gq;03{A?fyF*@Fg5k_P6Vco*Q@Kxv52Hj;3DGr(rqLo!Jh8)OftPu0ch z>;dw*-yYe+ttAJ`9yDN*G_cK8TWj#yMiRslh%K{+F}l2j?B^=mOxv}ooVvh6!ze1Q z?qY-Np=dmSWe*y#>J$wuy=t9vq$Vt>LY)N@}E3HkVg=~p^%*9TgAsieWw;%dH0CG7CJR*x3 z82EgFSdH<(om;6442(-XT^vI)8sE-1oyV-m9tLUm8df@uHc zlJZA1L>(_U+VmYzm=ksKORQ7zpRDXO?u6b+E8XAp`gl9F^RT?F(s}8xUpxI9(C~r= z6@%Zmbvgg&z4Vm1soqqWl2(~+=p5*DXVE{a*txUjZ#yU;bJbb8wm0S8o7QjGU8NzF>~-7os`Dqy zt}uR~08gQa`5&be-Yqb3eJ#bnHol+aHR-@L z`B%qgDBNw``S69xy=5AY?|Rl`eobgv!26kfyTH{cyv~;kfw9Qo>FVdQ&MBb@0N4`c A1^@s6 diff --git a/tests/auto/quick/qquicktextedit/data/alignments_rb.png b/tests/auto/quick/qquicktextedit/data/alignments_rb.png deleted file mode 100644 index b06a5da715257327dcdd80f24b9b1be21fe4efe9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 505 zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT1SJ3YlwJl>%*9TgAsieWw;%dH0CG7CJR*x3 z82EgFSdH<(om;6442*L;T^vI)8sE;kop(fm$7SKG`uAT>zho9-D&}O1dUL{kwJ4){ zVp2+)zFo_Me}eC8cP;*I_qAQ%Qli`jgT3$Hdge_$UlHv2Xqn2SnKqf7H%YCQZCP+!R{v3o&`OizyKdd_@jP$$e6xu9bdwf=6aOxk@SC2N zUZ?OqK-jc+>)*91n?6)6KHFe(e$DJz)fX7@AO4&_b=5Ba9|qGdac@@f6q@6_dUB_M zXTPm*j(A~6`-xwHtyg<5&p9Dzuy*#zFZYbvZ2vKPF0sBqhMLid?MCGQn+>pm~}{Ow29IuZS< zhYvGLWDFWTzJHLgJaVU*&1VwZlDw@;6nAy-J6t=ktMS4ExfvYA{7yCsV425B{?>%Rqoc&>z zRBlp4Xx)C95H6MRNQIizhY;Mm_}YB~^D#*pFi9GCp``C+|Kz==&F2mezxZ78p7D%21a|t5MW%c$vZG#G% zqlar%NBLn)`LHBpE>|2a8X&XjgBLy6xwHq9qyb5iP~Rjt2$OW#)4}ac99a{jADLNR znazwf6AoZwCDxx>> z1|SuT2M`*f2PVRzhvbr25$$;B7)52N`;Zqs6pcAp^q>LDPSJp*qt-b`(!7%Ny#5(v zNh->yrR~+YD=E)drRiogH!ZR6eDDLgc@y3xn&f!gL6T_K`Mhst7DiS(Ui+qFKC7Ut x$;9z$qeTO{&PUIfHanLzV3IUok~Hu_Nxw#4_JDxB@nQe~002ovPDHLkV1il>0TuuN diff --git a/tests/auto/quick/qquicktextedit/data/alignments_rt.png b/tests/auto/quick/qquicktextedit/data/alignments_rt.png deleted file mode 100644 index 576715ffce82fd054908168ca109cf7c534ae43e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 539 zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT1SJ3YlwJl>%*9TgAsieWw;%dH0CG7CJR*x3 z82EgFSdH<(om;6442=6cT^vI)8sE;inRi5i$93VW`txt6UuKs&A}8aqAy~dw$$;-s zl34nh;&Xet*WYE1==Yk`fQk-qtJY55^R|C)rcCXf_7ALI-Y+&`-F3CpMnYA_$Y4$S z1>L6yH9{Rj9J1V>d{8XeS*pJV<;gThWnryHK!V!KD@F&tDE2MtI?;D%t*C`Y10%I&ZY>)3& z{V8uV&$i)R&)%EN*OqcemP(wJQvuq%;diwrTP9 bKNnv#@#+ML9m?v!=wbP0l+XkKm%{97 diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index b93d9f0..f9f585b 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -106,8 +106,6 @@ private slots: void width(); void wrap(); void textFormat(); - void alignments(); - void alignments_data(); // ### these tests may be trivial void hAlign(); @@ -603,54 +601,6 @@ void tst_qquicktextedit::textFormat() } } -void tst_qquicktextedit::alignments_data() -{ - QTest::addColumn("hAlign"); - QTest::addColumn("vAlign"); - QTest::addColumn("expectfile"); - - QTest::newRow("LT") << int(Qt::AlignLeft) << int(Qt::AlignTop) << "alignments_lt"; - QTest::newRow("RT") << int(Qt::AlignRight) << int(Qt::AlignTop) << "alignments_rt"; - QTest::newRow("CT") << int(Qt::AlignHCenter) << int(Qt::AlignTop) << "alignments_ct"; - - QTest::newRow("LB") << int(Qt::AlignLeft) << int(Qt::AlignBottom) << "alignments_lb"; - QTest::newRow("RB") << int(Qt::AlignRight) << int(Qt::AlignBottom) << "alignments_rb"; - QTest::newRow("CB") << int(Qt::AlignHCenter) << int(Qt::AlignBottom) << "alignments_cb"; - - QTest::newRow("LC") << int(Qt::AlignLeft) << int(Qt::AlignVCenter) << "alignments_lc"; - QTest::newRow("RC") << int(Qt::AlignRight) << int(Qt::AlignVCenter) << "alignments_rc"; - QTest::newRow("CC") << int(Qt::AlignHCenter) << int(Qt::AlignVCenter) << "alignments_cc"; -} - - -void tst_qquicktextedit::alignments() -{ - QSKIP("Image comparison of text is almost guaranteed to fail during development"); - - QFETCH(int, hAlign); - QFETCH(int, vAlign); - QFETCH(QString, expectfile); - - QQuickView window(testFileUrl("alignments.qml")); - - window.show(); - QVERIFY(QTest::qWaitForWindowExposed(&window)); - - QObject *ob = window.rootObject(); - QVERIFY(ob != 0); - ob->setProperty("horizontalAlignment",hAlign); - ob->setProperty("verticalAlignment",vAlign); - QTRY_COMPARE(ob->property("running").toBool(),false); - QImage actual = window.grabWindow(); - - expectfile = createExpectedFileIfNotFound(expectfile, actual); - - QImage expect(expectfile); - - QCOMPARE(actual,expect); -} - - //the alignment tests may be trivial o.oa void tst_qquicktextedit::hAlign() { -- 1.7.2.5