From: J-P Nurmi Date: Fri, 7 Sep 2012 12:58:43 +0000 (+0200) Subject: Remove tst_qquicktextedit::alignments() X-Git-Tag: upstream/5.2.1~1167 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=953d620489f883100da748a922962d0f95314815;p=platform%2Fupstream%2Fqtdeclarative.git 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 --- 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 99de219..0000000 Binary files a/tests/auto/quick/qquicktextedit/data/alignments_cb.png and /dev/null differ 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 cb85251..0000000 Binary files a/tests/auto/quick/qquicktextedit/data/alignments_cc.png and /dev/null differ diff --git a/tests/auto/quick/qquicktextedit/data/alignments_ct.png b/tests/auto/quick/qquicktextedit/data/alignments_ct.png deleted file mode 100644 index ddca549..0000000 Binary files a/tests/auto/quick/qquicktextedit/data/alignments_ct.png and /dev/null differ 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 1b50a81..0000000 Binary files a/tests/auto/quick/qquicktextedit/data/alignments_lb.png and /dev/null differ 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 f041b86..0000000 Binary files a/tests/auto/quick/qquicktextedit/data/alignments_lc.png and /dev/null differ diff --git a/tests/auto/quick/qquicktextedit/data/alignments_lt.png b/tests/auto/quick/qquicktextedit/data/alignments_lt.png deleted file mode 100644 index c75e0d1..0000000 Binary files a/tests/auto/quick/qquicktextedit/data/alignments_lt.png and /dev/null differ 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 b06a5da..0000000 Binary files a/tests/auto/quick/qquicktextedit/data/alignments_rb.png and /dev/null differ diff --git a/tests/auto/quick/qquicktextedit/data/alignments_rc.png b/tests/auto/quick/qquicktextedit/data/alignments_rc.png deleted file mode 100644 index e468857..0000000 Binary files a/tests/auto/quick/qquicktextedit/data/alignments_rc.png and /dev/null differ 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 576715f..0000000 Binary files a/tests/auto/quick/qquicktextedit/data/alignments_rt.png and /dev/null differ 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() {