aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJ-P Nurmi <j-p.nurmi@nokia.com>2012-09-07 14:58:43 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-13 14:20:56 +0200
commit953d620489f883100da748a922962d0f95314815 (patch)
tree8f49725c47f543a310166b6617b1296836d874e6 /tests
parent77155afc5743022b8a08a9725cfc96378930419a (diff)
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 <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>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/quick/qquicktextedit/data/alignments.qml41
-rw-r--r--tests/auto/quick/qquicktextedit/data/alignments_cb.pngbin496 -> 0 bytes
-rw-r--r--tests/auto/quick/qquicktextedit/data/alignments_cc.pngbin556 -> 0 bytes
-rw-r--r--tests/auto/quick/qquicktextedit/data/alignments_ct.pngbin533 -> 0 bytes
-rw-r--r--tests/auto/quick/qquicktextedit/data/alignments_lb.pngbin496 -> 0 bytes
-rw-r--r--tests/auto/quick/qquicktextedit/data/alignments_lc.pngbin535 -> 0 bytes
-rw-r--r--tests/auto/quick/qquicktextedit/data/alignments_lt.pngbin514 -> 0 bytes
-rw-r--r--tests/auto/quick/qquicktextedit/data/alignments_rb.pngbin505 -> 0 bytes
-rw-r--r--tests/auto/quick/qquicktextedit/data/alignments_rc.pngbin559 -> 0 bytes
-rw-r--r--tests/auto/quick/qquicktextedit/data/alignments_rt.pngbin539 -> 0 bytes
-rw-r--r--tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp50
11 files changed, 0 insertions, 91 deletions
diff --git a/tests/auto/quick/qquicktextedit/data/alignments.qml b/tests/auto/quick/qquicktextedit/data/alignments.qml
deleted file mode 100644
index 7d365da8cb..0000000000
--- 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 + "<br>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 99de2192de..0000000000
--- a/tests/auto/quick/qquicktextedit/data/alignments_cb.png
+++ /dev/null
Binary files 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 cb85251180..0000000000
--- a/tests/auto/quick/qquicktextedit/data/alignments_cc.png
+++ /dev/null
Binary files 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 ddca549c82..0000000000
--- a/tests/auto/quick/qquicktextedit/data/alignments_ct.png
+++ /dev/null
Binary files 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 1b50a81f3d..0000000000
--- a/tests/auto/quick/qquicktextedit/data/alignments_lb.png
+++ /dev/null
Binary files 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 f041b868f8..0000000000
--- a/tests/auto/quick/qquicktextedit/data/alignments_lc.png
+++ /dev/null
Binary files 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 c75e0d158e..0000000000
--- a/tests/auto/quick/qquicktextedit/data/alignments_lt.png
+++ /dev/null
Binary files 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 b06a5da715..0000000000
--- a/tests/auto/quick/qquicktextedit/data/alignments_rb.png
+++ /dev/null
Binary files 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 e468857cd0..0000000000
--- a/tests/auto/quick/qquicktextedit/data/alignments_rc.png
+++ /dev/null
Binary files 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 576715ffce..0000000000
--- a/tests/auto/quick/qquicktextedit/data/alignments_rt.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
index b93d9f0bda..f9f585b07a 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<int>("hAlign");
- QTest::addColumn<int>("vAlign");
- QTest::addColumn<QString>("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()
{