From 400ff21dbd0edeec2b1be202961e146f76b9fbf8 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 7 Sep 2012 14:47:47 +0200 Subject: [PATCH] Remove tst_qquicktext::alignments() These tests are not valid. Will be covered by Lancelot-based scenegraph rendering tests: https://codereview.qt-project.org/#change,34437 Change-Id: I4e5e1b7b5b141d377e4367d143ded6abbddd52a1 Reviewed-by: Sergio Ahumada Reviewed-by: Caroline Chao Reviewed-by: Yoann Lopes Reviewed-by: Paul Olav Tvete --- tests/auto/quick/qquicktext/data/alignments.qml | 41 --------------- tests/auto/quick/qquicktext/data/alignments_cb.png | Bin 496 -> 0 bytes tests/auto/quick/qquicktext/data/alignments_cc.png | Bin 556 -> 0 bytes tests/auto/quick/qquicktext/data/alignments_ct.png | Bin 533 -> 0 bytes tests/auto/quick/qquicktext/data/alignments_lb.png | Bin 496 -> 0 bytes tests/auto/quick/qquicktext/data/alignments_lc.png | Bin 535 -> 0 bytes tests/auto/quick/qquicktext/data/alignments_lt.png | Bin 514 -> 0 bytes tests/auto/quick/qquicktext/data/alignments_rb.png | Bin 505 -> 0 bytes tests/auto/quick/qquicktext/data/alignments_rc.png | Bin 559 -> 0 bytes tests/auto/quick/qquicktext/data/alignments_rt.png | Bin 539 -> 0 bytes tests/auto/quick/qquicktext/tst_qquicktext.cpp | 56 --------------------- 11 files changed, 97 deletions(-) delete mode 100644 tests/auto/quick/qquicktext/data/alignments.qml delete mode 100644 tests/auto/quick/qquicktext/data/alignments_cb.png delete mode 100644 tests/auto/quick/qquicktext/data/alignments_cc.png delete mode 100644 tests/auto/quick/qquicktext/data/alignments_ct.png delete mode 100644 tests/auto/quick/qquicktext/data/alignments_lb.png delete mode 100644 tests/auto/quick/qquicktext/data/alignments_lc.png delete mode 100644 tests/auto/quick/qquicktext/data/alignments_lt.png delete mode 100644 tests/auto/quick/qquicktext/data/alignments_rb.png delete mode 100644 tests/auto/quick/qquicktext/data/alignments_rc.png delete mode 100644 tests/auto/quick/qquicktext/data/alignments_rt.png diff --git a/tests/auto/quick/qquicktext/data/alignments.qml b/tests/auto/quick/qquicktext/data/alignments.qml deleted file mode 100644 index 9798d9c..0000000 --- a/tests/auto/quick/qquicktext/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" - - Text { - id: t - - anchors.fill: parent - horizontalAlignment: Text.AlignRight - verticalAlignment: Text.AlignBottom - wrapMode: Text.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/qquicktext/data/alignments_cb.png b/tests/auto/quick/qquicktext/data/alignments_cb.png deleted file mode 100644 index cf6199a418a00a470de94a46747394952f2c6551..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFT1SJ3YlwJl>%*9TgAsieWw;%dH0CG7CJR*yM z%C7@)BIAeclYkl+Cwsa$hGaCpo%OnlS&^r;^yc?>H`UAQIUcEQ6Yiaxa>89RuBk#T z$*=v`lpq1sV-eSS45xjZ67=#K<0I)GQ)Ba%-1``)+PZntt}|CWwVyaTwzAK^7W?PU zUdGCpNvu~qmDUT0?NWLBn)CPcitU|6!Oy#=tXX@v!-6UD)NF03Ag@?UrL#vmLjKym zle4;)Zx#{hMhnh;J|}m_Hlm^Y!=w2JRCha68TMUb-n_&?$ce#pM;D)` zyt~DkxJMGZRva^I>FrIr1vfRJdz?e-~oB#kN9|@07|y*+{3Q)i1;n7ag-r*e4<^`;KwaJ^#toKO`!7%lX9$ zJjDXSveJ2hDjg3vXq54<2HJ91-AAtY?mS)5GqN@@GmffU^|`Wx-Kc^Ssy-mgxZ=|8 zc7utHcCVDQ?mFMtbxL$k^?^LaR{<~Oz6Cs%GdO7=4^;c1etEIDm1+;OXk;vd$@?2>{Jf&9ndj diff --git a/tests/auto/quick/qquicktext/data/alignments_cc.png b/tests/auto/quick/qquicktext/data/alignments_cc.png deleted file mode 100644 index f81ccb4238d278b201067cd15f1d54438967808a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 556 zcmV+{0@MA8P)&2!?gpeed0syB|#q z6>UZF6gr~hPA@J^TE$F?2W%mwDa+}gQEMc^LeYc8-6J9u5UUwxvFT>kyIpJ uYqx4Z<9w`4YTM_M2eu>+Y)Kw?p`%*9TgAsieWw;%dH0CG7CJR*yM z%C7@)BIAeclYkl+cX+xuhGaCpopCqsfC5MB>rLP9-JHCed%K(KT8(X&KE_J8CfPjV zU;Fu<{QF0bUvi#Eo@A1Miat1b&ezHR{#NYl;@*oK1bAyYDsgez!(dFu&XUaZd5Q-wV>y z!kPoE#EmBSrWQR^53j6w%qqE%XX@kprJFNTe`!XhsF~mMO(*RgBH{m`4K!fP|%mgQ0U1CzYk&h46~cKjBKpJgi(c!BK)A(O0 diff --git a/tests/auto/quick/qquicktext/data/alignments_lb.png b/tests/auto/quick/qquicktext/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/qquicktext/data/alignments_lc.png b/tests/auto/quick/qquicktext/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/qquicktext/data/alignments_rb.png b/tests/auto/quick/qquicktext/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/qquicktext/data/alignments_rt.png b/tests/auto/quick/qquicktext/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/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index deaaa13..20dd7f0 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -83,9 +83,6 @@ private slots: void implicitElide(); void textFormat(); - void alignments_data(); - void alignments(); - void baseUrl(); void embeddedImages_data(); void embeddedImages(); @@ -689,59 +686,6 @@ void tst_qquicktext::textFormat() } } - -void tst_qquicktext::alignments_data() -{ - QTest::addColumn("hAlign"); - QTest::addColumn("vAlign"); - QTest::addColumn("expectfile"); - - QTest::newRow("LT") << int(Qt::AlignLeft) << int(Qt::AlignTop) << testFile("alignments_lt.png"); - QTest::newRow("RT") << int(Qt::AlignRight) << int(Qt::AlignTop) << testFile("alignments_rt.png"); - QTest::newRow("CT") << int(Qt::AlignHCenter) << int(Qt::AlignTop) << testFile("alignments_ct.png"); - - QTest::newRow("LB") << int(Qt::AlignLeft) << int(Qt::AlignBottom) << testFile("alignments_lb.png"); - QTest::newRow("RB") << int(Qt::AlignRight) << int(Qt::AlignBottom) << testFile("alignments_rb.png"); - QTest::newRow("CB") << int(Qt::AlignHCenter) << int(Qt::AlignBottom) << testFile("alignments_cb.png"); - - QTest::newRow("LC") << int(Qt::AlignLeft) << int(Qt::AlignVCenter) << testFile("alignments_lc.png"); - QTest::newRow("RC") << int(Qt::AlignRight) << int(Qt::AlignVCenter) << testFile("alignments_rc.png"); - QTest::newRow("CC") << int(Qt::AlignHCenter) << int(Qt::AlignVCenter) << testFile("alignments_cc.png"); -} - - -void tst_qquicktext::alignments() -{ - QSKIP("Text alignment pixmap comparison tests will not work with scenegraph"); -#if (0)// No widgets in scenegraph - QFETCH(int, hAlign); - QFETCH(int, vAlign); - QFETCH(QString, expectfile); - - QQuickView *window = createView(testFile("alignments.qml")); - window->show(); - window->requestActivateWindow(); - QTest::qWait(50); - QTRY_COMPARE(QGuiApplication::activeWindow(), static_cast(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->width(), window->height(), QImage::Format_RGB32); - actual.fill(qRgb(255,255,255)); - QPainter p(&actual); - window->render(&p); - - QImage expect(expectfile); - if (QGuiApplicationPrivate::graphics_system_name == "raster" || QGuiApplicationPrivate::graphics_system_name == "") { - QCOMPARE(actual,expect); - } - delete window; -#endif -} - //the alignment tests may be trivial o.oa void tst_qquicktext::horizontalAlignment() { -- 2.7.4