From 2af81c611841ba19c952f638da802e3ae8bb21fa Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Thu, 24 Sep 2009 14:58:54 +1000 Subject: Revert "Add some visual autotests for QFxTextEdit" This reverts commit 9b6a71ec68edf836ab29cc3e5db71b53fe3d9346. Turns out that (at least now) visual tests don't work like that. --- .../declarative/qfxtextedit/data/QT-669-test.qml | 8 ---- tests/auto/declarative/qfxtextedit/data/QT-669.png | Bin 4762 -> 0 bytes tests/auto/declarative/qfxtextedit/data/QT-669.qml | 11 ------ .../declarative/qfxtextedit/data/basic-test.qml | 5 --- tests/auto/declarative/qfxtextedit/data/basic.png | Bin 8051 -> 0 bytes tests/auto/declarative/qfxtextedit/data/basic.qml | 12 ------ .../declarative/qfxtextedit/data/colorful-test.qml | 5 --- .../auto/declarative/qfxtextedit/data/colorful.png | Bin 9645 -> 0 bytes .../auto/declarative/qfxtextedit/data/colorful.qml | 18 --------- .../declarative/qfxtextedit/tst_qfxtextedit.cpp | 41 --------------------- 10 files changed, 100 deletions(-) delete mode 100644 tests/auto/declarative/qfxtextedit/data/QT-669-test.qml delete mode 100644 tests/auto/declarative/qfxtextedit/data/QT-669.png delete mode 100644 tests/auto/declarative/qfxtextedit/data/QT-669.qml delete mode 100644 tests/auto/declarative/qfxtextedit/data/basic-test.qml delete mode 100644 tests/auto/declarative/qfxtextedit/data/basic.png delete mode 100644 tests/auto/declarative/qfxtextedit/data/basic.qml delete mode 100644 tests/auto/declarative/qfxtextedit/data/colorful-test.qml delete mode 100644 tests/auto/declarative/qfxtextedit/data/colorful.png delete mode 100644 tests/auto/declarative/qfxtextedit/data/colorful.qml diff --git a/tests/auto/declarative/qfxtextedit/data/QT-669-test.qml b/tests/auto/declarative/qfxtextedit/data/QT-669-test.qml deleted file mode 100644 index 9d6b5e5..0000000 --- a/tests/auto/declarative/qfxtextedit/data/QT-669-test.qml +++ /dev/null @@ -1,8 +0,0 @@ -import Qt.VisualTest 4.6 - -VisualTest { - Frame { msec: 0; image: "QT-669.png" } - Key { key: Qt.Key_Right; count: 20 } - Key { key: Qt.Key_Left; count: 20 } - Frame { msec: 100; image: "QT-669.png" } -} diff --git a/tests/auto/declarative/qfxtextedit/data/QT-669.png b/tests/auto/declarative/qfxtextedit/data/QT-669.png deleted file mode 100644 index 657fce9..0000000 Binary files a/tests/auto/declarative/qfxtextedit/data/QT-669.png and /dev/null differ diff --git a/tests/auto/declarative/qfxtextedit/data/QT-669.qml b/tests/auto/declarative/qfxtextedit/data/QT-669.qml deleted file mode 100644 index b9bf86a..0000000 --- a/tests/auto/declarative/qfxtextedit/data/QT-669.qml +++ /dev/null @@ -1,11 +0,0 @@ -import Qt 4.6 - -Rectangle { - color: "green" - width:400; - height:40; - TextEdit { - focus: true; - text: "Jackdaws love my big sphinx of Quartz" - } -} diff --git a/tests/auto/declarative/qfxtextedit/data/basic-test.qml b/tests/auto/declarative/qfxtextedit/data/basic-test.qml deleted file mode 100644 index 021bfc5..0000000 --- a/tests/auto/declarative/qfxtextedit/data/basic-test.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.VisualTest 4.6 - -VisualTest { - Frame { msec: 0; image: "basic.png" } -} diff --git a/tests/auto/declarative/qfxtextedit/data/basic.png b/tests/auto/declarative/qfxtextedit/data/basic.png deleted file mode 100644 index b3cf1bf..0000000 Binary files a/tests/auto/declarative/qfxtextedit/data/basic.png and /dev/null differ diff --git a/tests/auto/declarative/qfxtextedit/data/basic.qml b/tests/auto/declarative/qfxtextedit/data/basic.qml deleted file mode 100644 index db4ec1c..0000000 --- a/tests/auto/declarative/qfxtextedit/data/basic.qml +++ /dev/null @@ -1,12 +0,0 @@ -import Qt 4.6 - -Item { - width:600; - height:100; - TextEdit { - focus: false; - font.pointSize: 14 - font.bold: false - text: "Jackdaws love my big sphinx of Quartz" - } -} diff --git a/tests/auto/declarative/qfxtextedit/data/colorful-test.qml b/tests/auto/declarative/qfxtextedit/data/colorful-test.qml deleted file mode 100644 index f148746..0000000 --- a/tests/auto/declarative/qfxtextedit/data/colorful-test.qml +++ /dev/null @@ -1,5 +0,0 @@ -import Qt.VisualTest 4.6 - -VisualTest { - Frame { msec: 80; image: "colorful.png" } -} diff --git a/tests/auto/declarative/qfxtextedit/data/colorful.png b/tests/auto/declarative/qfxtextedit/data/colorful.png deleted file mode 100644 index 16189e5..0000000 Binary files a/tests/auto/declarative/qfxtextedit/data/colorful.png and /dev/null differ diff --git a/tests/auto/declarative/qfxtextedit/data/colorful.qml b/tests/auto/declarative/qfxtextedit/data/colorful.qml deleted file mode 100644 index 36d9c66..0000000 --- a/tests/auto/declarative/qfxtextedit/data/colorful.qml +++ /dev/null @@ -1,18 +0,0 @@ -import Qt 4.6 - -Rectangle { - color:"lightsteelblue" - width:600; - height:100; - Timer{ interval: 20; running: true; repeat: false; onTriggered: "Txt.selectionEnd = 14" } - TextEdit { - id: Txt - focus: false; - font.pointSize: 14 - font.bold: false - color: "red" - selectionColor: "yellow" - selectedTextColor: "blue" - text: "Jackdaws love my big sphinx of Quartz" - } -} diff --git a/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp b/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp index ab55454..e38e0e7 100644 --- a/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp +++ b/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp @@ -6,9 +6,6 @@ #include #include #include -#include -#include -#include class tst_qfxtextedit : public QObject @@ -31,8 +28,6 @@ private slots: void cursorDelegate(); - void visualTests_data(); - void visualTests(); private: QStringList standard; QStringList richText; @@ -46,7 +41,6 @@ private: QStringList colorStrings; QmlEngine engine; - QString qmlviewerBinary; }; tst_qfxtextedit::tst_qfxtextedit() @@ -90,16 +84,6 @@ tst_qfxtextedit::tst_qfxtextedit() // << "#AA0011DD" // << "#00F16B11"; // - - QString binaries = QLibraryInfo::location(QLibraryInfo::BinariesPath); - -#if defined(Q_WS_MAC) - qmlviewerBinary = QDir(binaries).absoluteFilePath("qmlviewer.app/Contents/MacOS/qmlviewer"); -#elif defined(Q_WS_WIN) - qmlviewerBinary = QDir(binaries).absoluteFilePath("qmlviewer.exe"); -#else - qmlviewerBinary = QDir(binaries).absoluteFilePath("qmlviewer"); -#endif } void tst_qfxtextedit::text() @@ -468,31 +452,6 @@ void tst_qfxtextedit::cursorDelegate() QVERIFY(!textEditObject->findChild("cursorInstance")); } -void tst_qfxtextedit::visualTests_data() -{ - QTest::addColumn("qmlFile"); - QTest::addColumn("scriptFile"); - QTest::newRow("basic") << "data/basic.qml" << "data/basic-test"; - QTest::newRow("colorful") << "data/colorful.qml" << "data/colorful-test"; - QTest::newRow("QT-669") << "data/QT-669.qml" << "data/QT-669-test"; -} - -void tst_qfxtextedit::visualTests() -{ - QFETCH(QString, qmlFile); - QFETCH(QString, scriptFile); - - QStringList arguments; - arguments << "-script" << scriptFile - << "-scriptopts" << "play,exitoncomplete,exitonfailure" - << qmlFile; - QProcess p; - p.start(qmlviewerBinary, arguments); - QVERIFY(p.waitForFinished()); - QCOMPARE(p.exitStatus(), QProcess::NormalExit); - QCOMPARE(p.exitCode(), 0); -} - QTEST_MAIN(tst_qfxtextedit) #include "tst_qfxtextedit.moc" -- cgit v0.12