diff options
Diffstat (limited to 'tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp')
-rw-r--r-- | tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp | 41 |
1 files changed, 0 insertions, 41 deletions
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 <QtDeclarative/qmlcomponent.h> #include <QtDeclarative/qfxtextedit.h> #include <QFontMetrics> -#include <QLibraryInfo> -#include <QProcess> -#include <QDir> 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<QFxItem*>("cursorInstance")); } -void tst_qfxtextedit::visualTests_data() -{ - QTest::addColumn<QString>("qmlFile"); - QTest::addColumn<QString>("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" |